Replace deprecated INCLUDES with AM_CPPFLAGS; where needed, still