Bug 905976 - (Followup #893707) - [bb][refactor] Headers