Rip defines.h apart some more