Cleaned up header files. TODO: Working makefile.