Improved CPPFLAGS/CXXFLAGS separation