More header migration.