Merge "Undef before redefining macros"