Merge "Stop defining local "unused" macros now this is C++."