Cleanup some header files