More header consolidation