Moved macros to header file.