Move the header-munging to the VFP's that require it.