Make all the header file preprocessor definitions similar across some which were missed