[ros-diffs] [cwittich] 29379: fix some of the build errors