[ros-diffs] [mf] 20878: fix Expat includes