cleanup makefile and includes