Substitute more tokens in headers.

* Where only part of a condition (#if) is known, this change enables
  substitution of those parts.