[ros-diffs] [hbelusca] 73754: Restore also some headers the modifications of which were lost during sync.