[ros-diffs] [sginsberg] 37449: - Fix a redefinition and remove system_header