Moved a header file around, and fixed the Makefile to use current header
files.