Merge branch 'cherry-pick-573898b1' into 'releases/2.5'

Merge branch 'bugfix/add_missing_header' into 'master'

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

See merge request !127

See merge request !135