IIRC Walter mentioned something about not touching the backend w.r.t. macros, and the backend uses CPP_MANGLE. Just checking if this change is ok?