[ros-diffs] [tkreuzer] 44611: shuffle headers, add #undef, helps with wine macros.