[ros-diffs] [cfinck] 35711: Add the "wine" include directory for the user32 Wine test and remove ROS-specific additions to some files. Fixes the user32_winetest and thus rostests build under Unix.