COMP: Try to fix header location for ubuntu builds.
Merge branch 'bug-18116-Fix1'