Makefile and include changes