More header shuffling

Podhorszki, Norbertrequested to merge
github/fork/chuckatkins/more-header-shuffling into master

Created by: chuckatkins

Merge request reports