another round of Makefile.am changes based on additional include path required