Bug 893707 - [bb][refactor] Headers