More defines -> enums & ObjC global moves