[ros-diffs] [sedwards] 16319: move a few more headers to the PSDK