[ros-diffs] [sginsberg] 35630: - Remove a header duplication and move a prototype to the correct place