modify Makefile.am and change header includes