[ros-diffs] [gedmurphy] 33233: Fix build due to recent header changes