More cleaning of header files.