[ros-diffs] [ion] 15137: Add some missing headers, fix some things so CRT can build