Oops, wasn't setting CPPFLAGS.
Fixes for GCC warnings.