[ros-diffs] [sedwards] 14522: remove the use of windows.h in some places where it is not needed