[ros-diffs] [cfinck] 32599: Update two includes to not rely on target headers anymore