Merge branch 'feature/fix-headercheck' into 'master'

Ansgar Burchardtrequested to merge
cherry-pick-88bfaa67 into releases/2.5

Fix includes etc. to make headercheck pass

This should solve #35 (closed) .

See merge request !108 (merged)

Merge request reports