Fix Makefile CPPFLAGS and CXX.