Revert "Try a space between ifndef directives"

This reverts commit a59bbda881d76c401ca25b65aa8fa7673c5119d8.
Revert "Substitute attributes"

This reverts commit 7d9e8d1b4a4e6b6eb68aa1fbad8bae060baec12c.