[ros-diffs] [gedmurphy] 68162: [DEVMGR] Make the header c++ friendly