Proper macro undefs to avoid clashes