Final header changes.