Merge pull request #39 from jas4711/master

Use AM_CPPFLAGS instead of long-obsoleted INCLUDES.