Yet more header changes.