Cleanup of file headers in hpp files