Make all the header file preprocessor definitions similar across some wh...

...ich were missed