Minor cleanup header files