forgotten commit - fixes and corrections to CPPFLAGS usage.