Cleaned up header files, removed superfluous includes