Don't add includes to both CPPFLAGS and CXXFLAGS
Merge pull request #1761 from rubenk/fix-duplicate-includes

Don't add includes to both CPPFLAGS and CXXFLAGS