Moved macros into header file