[ros-diffs] [sginsberg] 37398: - Remove deprecated header cruft