General cleanups in header files