Added -g -Wall to CXXFLAGS, moved -I stuff to CPPFLAGS.