Don't add includes to both CPPFLAGS and CXXFLAGS