Cleaned up header files and includes