Fixup the header heirarchy.