General header refactor.