moved some #define's to the header file