[ros-diffs] [janderwald] 42663: - A few header updates