Merge branch 'bugfix/add_missing_header' into 'master'

Christoph Grüningerrequested to merge
cherry-pick-573898b1 into releases/2.5

[bugfix] add missing header guards and headers to make headercheck pass

See merge request !127 (merged)

Merge request reports