Added new files to Makefile
Removed obsolate includes