[ros-diffs] [weiden] 25526: Fix compilation (second attempt, too many local changes to keep track of)