More header work.