Get rid of old Rdefines.h macros