Replaced const header file with magicNums. Cleaned up header files and
includes.