Moved preprocessor declarations above constant Macros