Cleaned up header files