Cleaned up header file imports

Moved and removed imports in various header files.