Fixup of some headers.