Moved more of the imports into the header