[ros-diffs] [fireball] 33731: - More header fixes.