Handle autotools m4 stuff properly
Use modern AM_CPPFLAGS instead of old INCLUDES