fixing some Makefiles and adding src/include/Makefile.am/in files which were mistakenly missed out in the previous checkin.