Cleaning up header includes; may improve cross-platform compiling. Also fixed a minor error in main Makefile.