Finish badiff header refactor