[ros-diffs] [ion] 15099: Add basic headers from trunk