Rework some header files