Cleanup Makefile, add header dependencies for build