[ros-diffs] [pschweitzer] 42499: Include header where needed