[ros-diffs] [cwittich] 18509: fix some headers to compile with MSVC