Fix/headercheck

Merged Thomas Fetzer requested to merge fix/headercheck into master

Merge request reports