added all include dirs to AM_CPPFLAGS in configure.ac; cleaned up Makefile.am
bug fixes