Moved the preproc macros to inside the class.