Remove remaining macros from defines.h