[ros-diffs] [hpoussin] 46015: Fix include directories