a little cleanup header files