[cleanup] fix headercheck errors

Ned Coltmanrequested to merge
fix/headercheck_3.2 into master

Merge request reports