Spiff up the header files