Removed Macros.h, the only macro is only used in one file.