Fixed: Removed all uses of preprocess macros in the compiler