Apply fixes from master (named macros now require proper C++).