Fixed the build and removed a the massive repeat importing of the header dump.