Cleanup of header files