adding makefile include capabilities and other fixes