[headercheck] fix several headers to pass make headercheck

Merged Bernd Flemisch requested to merge fix/headercheck into master

Merge request reports