More header fixups.