remove #undefs in role.c