Cleaned up #inlcudes and Makefile