Moved a bunch of #define's to separate header