[ros-diffs] [janderwald] 22645: add missing includes