Fix dependencies

fixed dependencies (within .h files, .cpp files, and the makefile). NOTE: still might be some unnecessary "includes" in .cpp files