[ros-diffs] [Phreak] 14879: Fixed up a few missing includes that were preventing builds