AM_CPPFLAGS is the correct variable to use for preprocessor flags. Importantly, it is placed on the compiler command line before CPPFLAGS, whereas AM_CFLAGS comes after CPPFLAGS. So before this change, it was possible for incorrect headers in external locations to be used instead of the internal ones specified in SET_INCLUDES.