[1.9>master] [1.8>1.9] [MERGE #5060 @MSLaguana] Backporting header fix to 1.8

Merge pull request #5060 from MSLaguana:fixMissingHeader

Fixes #5059 in release/1.8