Cleaned up #includes and cleaned Makefile
Cleaned up #includes and cleaned the Makefile