Updates to use local header files.