[ros-diffs] [janderwald] 25575: - add include guards