move macros to CPPFLAGS