16 files changed, 69 insertions, 70 deletions

diff --git a/src/lib/elementary/efl_access_object.c b/src/lib/elementary/efl_access_object.c
index 3c56eae6a5..84ae798cc0 100644
--- a/src/lib/elementary/efl_access_object.c
+++ b/src/lib/elementary/efl_access_object.c
@@ -401,7 +401,7 @@ EAPI void efl_access_attributes_list_free(Eina_List *list)
 }
 
 EOLIAN void
-_efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info)
+_efl_access_object_event_emit(Eo *accessible, const Efl_Event_Description *event, void *event_info)
 {
    Eina_List *l;
    Efl_Access_Event_Handler *hdl;
@@ -437,7 +437,7 @@ _efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *a
 }
 
 EOLIAN Efl_Access_Event_Handler *
-_efl_access_object_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data)
+_efl_access_object_event_handler_add(Efl_Event_Cb cb, void *data)
 {
    Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler));
    if (!ret) return NULL;
@@ -451,7 +451,7 @@ _efl_access_object_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED
 }
 
 EOLIAN void
-_efl_access_object_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler)
+_efl_access_object_event_handler_del(Efl_Access_Event_Handler *handler)
 {
    Eina_List *l, *l2;
    Efl_Access_Event_Handler *hdl;
@@ -596,7 +596,7 @@ _efl_access_object_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Object_Da
 }
 
 EOLIAN Eo*
-_efl_access_object_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UNUSED)
+_efl_access_object_access_root_get(void)
 {
    if (!root)
      root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
diff --git a/src/lib/elementary/efl_access_object.h b/src/lib/elementary/efl_access_object.h
index 22dc4bf9ad..b42db31f7f 100644
--- a/src/lib/elementary/efl_access_object.h
+++ b/src/lib/elementary/efl_access_object.h
@@ -46,7 +46,7 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
       Efl_Access_Event_State_Changed_Data evinfo; \
       evinfo.type = (tp); \
       evinfo.new_value = (nvl); \
-      efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \
+      efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \
    } while(0); }
 
 /**
@@ -55,38 +55,38 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
 #define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \
    do { \
          Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \
-         efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \
+         efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \
    } while(0);
 
 /**
  * Emits Accessible 'PropertyChanged' signal for 'Name' property.
  */
 #define efl_access_i18n_name_changed_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name");
+   efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name");
 
 /**
  * Emits Accessible 'PropertyChanged' signal for 'Description' property.
  */
 #define efl_access_description_changed_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description");
+   efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description");
 
 /**
  * Emits Accessible 'PropertyChanged' signal for 'Parent' property.
  */
 #define efl_access_parent_changed_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent");
+   efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent");
 
 /**
  * Emits Accessible 'PropertyChanged' signal for 'Role' property.
  */
 #define efl_access_role_changed_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role");
+   efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role");
 
 /**
  * Emits Accessible 'PropertyChanged' signal for 'Value' property.
  */
 #define efl_access_value_changed_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value");
+   efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value");
 
 /**
  * Emits Accessible 'ChildrenChanged' signal with added child as argument.
@@ -94,7 +94,7 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
 #define efl_access_children_changed_added_signal_emit(obj, child) \
    do { \
       Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
+   efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
    } while(0);
 
 /**
@@ -103,32 +103,32 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
 #define efl_access_children_changed_del_signal_emit(obj, child) \
    do { \
       Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \
-      efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
+      efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
    } while(0);
 
 /**
  * Emits Accessible 'ActiveDescendantChanged' signal.
  */
 #define efl_access_active_descendant_changed_signal_emit(obj, child) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child);
+   efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child);
 
 /**
  * Emits Accessible 'VisibleDataChanged' signal.
  */
 #define efl_access_visible_data_changed_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL);
+   efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL);
 
 /**
  * Emits Accessible 'AddAccessible' signal.
  */
 #define efl_access_added(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL);
+   efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL);
 
 /**
  * Emits Accessible 'RemoveAccessible' signal.
  */
 #define efl_access_removed(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL);
+   efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL);
 
 #endif
 
diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h
index 38938d21ca..c4b3d3c398 100644
--- a/src/lib/elementary/efl_access_window.h
+++ b/src/lib/elementary/efl_access_window.h
@@ -14,43 +14,43 @@
  * Emits 'Window:Activated' accessible signal.
  */
 #define efl_access_window_activated_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
+   efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
 
 /**
  * Emits 'Window:Deactivated' accessible signal.
  */
 #define efl_access_window_deactivated_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
+   efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
 
 /**
  * Emits 'Window:Created' accessible signal.
  */
 #define efl_access_window_created_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL);
+   efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL);
 
 /**
  * Emits 'Window:Destroyed' accessible signal.
  */
 #define efl_access_window_destroyed_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
+   efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
 
 /**
  * Emits 'Window:Maximized' accessible signal.
  */
 #define efl_access_window_maximized_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
+   efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
 
 /**
  * Emits 'Window:Minimized' accessible signal.
  */
 #define efl_access_window_minimized_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
+   efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
 
 /**
  * Emits 'Window:Restored' accessible signal.
  */
 #define efl_access_window_restored_signal_emit(obj) \
-   efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL);
+   efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL);
 
 #endif
 #endif
diff --git a/src/lib/elementary/efl_ui_dnd.c b/src/lib/elementary/efl_ui_dnd.c
index db13fbf242..4ed23e7d76 100644
--- a/src/lib/elementary/efl_ui_dnd.c
+++ b/src/lib/elementary/efl_ui_dnd.c
@@ -28,7 +28,7 @@ Eo*
 _efl_ui_selection_manager_get(Eo *obj)
 {
    if (!efl_isa(obj, EFL_UI_WIDGET_CLASS)) return NULL;
-   Eo *app = efl_app_main_get(EFL_APP_CLASS);
+   Eo *app = efl_app_main_get();
    Eo *sel_man = efl_key_data_get(app, "__selection_manager");
    if (!sel_man)
      {
@@ -41,7 +41,7 @@ _efl_ui_selection_manager_get(Eo *obj)
 void
 _efl_ui_dnd_shutdown(void)
 {
-   Eo *app = efl_app_main_get(EFL_APP_CLASS);
+   Eo *app = efl_app_main_get();
    Eo *sel_man = efl_key_data_get(app, "__selection_manager");
 
    efl_del(sel_man);
diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c
index 1069956881..9cab1327b8 100644
--- a/src/lib/elementary/efl_ui_focus_layer.c
+++ b/src/lib/elementary/efl_ui_focus_layer.c
@@ -112,7 +112,7 @@ _efl_ui_focus_layer_enable_set(Eo *obj, Efl_Ui_Focus_Layer_Data *pd, Eina_Bool v
 
         pd->registered_manager = elm_widget_top_get(obj);
         EINA_SAFETY_ON_FALSE_RETURN(efl_isa(pd->registered_manager, EFL_UI_WIN_CLASS));
-        manager = efl_ui_focus_util_active_manager(EFL_UI_FOCUS_UTIL_CLASS, pd->registered_manager);
+        manager = efl_ui_focus_util_active_manager(pd->registered_manager);
 
         efl_ui_focus_manager_calc_register_logical(pd->registered_manager, obj, efl_ui_focus_manager_root_get(pd->registered_manager), obj);
         _publish_state_change(obj, NULL, NULL);
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index b2b8356cf4..308cdd861e 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -157,7 +157,7 @@ border_onedirection_set(Node *node, Efl_Ui_Focus_Direction direction, Eina_List
 
    EINA_LIST_FREE(border->one_direction, partner)
      {
-        Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS,direction));
+        Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(direction));
         b->cleanup_nodes = eina_list_remove(b->cleanup_nodes, node);
      }
 
@@ -165,7 +165,7 @@ border_onedirection_set(Node *node, Efl_Ui_Focus_Direction direction, Eina_List
 
    EINA_LIST_FOREACH(border->one_direction, lnode, partner)
      {
-        Border *comp_border = &DIRECTION_ACCESS(partner,efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS,direction));
+        Border *comp_border = &DIRECTION_ACCESS(partner,efl_ui_focus_util_direction_complement(direction));
 
         comp_border->cleanup_nodes = eina_list_append(comp_border->cleanup_nodes, node);
      }
@@ -183,7 +183,7 @@ border_onedirection_cleanup(Node *node, Efl_Ui_Focus_Direction direction)
 
    EINA_LIST_FREE(border->cleanup_nodes, partner)
      {
-        Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS,direction));
+        Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(direction));
         b->one_direction = eina_list_remove(b->one_direction, node);
      }
 }
diff --git a/src/lib/elementary/efl_ui_focus_util.c b/src/lib/elementary/efl_ui_focus_util.c
index f422266101..3021c683eb 100644
--- a/src/lib/elementary/efl_ui_focus_util.c
+++ b/src/lib/elementary/efl_ui_focus_util.c
@@ -12,7 +12,7 @@ typedef struct {
 static void
 _manager_changed(void *data, const Efl_Event *event EINA_UNUSED)
 {
-   efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, data);
+   efl_ui_focus_util_focus(data);
 }
 
 static Eina_Bool
@@ -25,7 +25,7 @@ _can_take_focus(Efl_Ui_Focus_Manager *m, Efl_Ui_Focus_Object *user)
 }
 
 EOLIAN static void
-_efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Object *user)
+_efl_ui_focus_util_focus(Efl_Ui_Focus_Object *user)
 {
    Efl_Ui_Focus_Object *entry;
    Efl_Ui_Widget *top, *o;
@@ -64,7 +64,7 @@ _efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus
 }
 
 EOLIAN static Efl_Ui_Focus_Manager*
-_efl_ui_focus_util_active_manager(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Manager *manager)
+_efl_ui_focus_util_active_manager(Efl_Ui_Focus_Manager *manager)
 {
    while (efl_ui_focus_manager_redirect_get(manager))
      manager = efl_ui_focus_manager_redirect_get(manager);
@@ -73,7 +73,7 @@ _efl_ui_focus_util_active_manager(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl
 }
 
 EOLIAN static Efl_Ui_Focus_Direction
-_efl_ui_focus_util_direction_complement(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Direction dir)
+_efl_ui_focus_util_direction_complement(Efl_Ui_Focus_Direction dir)
 {
   #define COMP(a,b) \
         if (dir == a) return b; \
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 065bc3577f..67a2a01bba 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -3422,7 +3422,7 @@ elm_widget_focus_mouse_up_handle(Eo *obj)
 
    if (pd->focus.manager && !pd->focus.logical)
      {
-        efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj);
+        efl_ui_focus_util_focus(obj);
      }
 }
 
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 2e9e463205..74d741f4e2 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2372,7 +2372,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
      {
         Eo *root;
         efl_access_window_created_signal_emit(obj);
-        root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
+        root = efl_access_object_access_root_get();
         if (root)
            efl_access_children_changed_added_signal_emit(root, obj);
      }
@@ -2441,7 +2441,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
    if (_elm_config->atspi_mode)
      {
         Eo *root;
-        root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
+        root = efl_access_object_access_root_get();
         efl_access_window_destroyed_signal_emit(obj);
         if (root)
            efl_access_children_changed_del_signal_emit(root, obj);
@@ -2996,7 +2996,7 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
      }
    if (!_elm_win_list)
      {
-        efl_event_callback_call(efl_app_main_get(EFL_APP_CLASS), EFL_APP_EVENT_STANDBY, NULL);
+        efl_event_callback_call(efl_app_main_get(), EFL_APP_EVENT_STANDBY, NULL);
         if (eina_value_type_get(&exit_on_all_windows_closed))
           efl_loop_quit(efl_loop_get(obj), exit_on_all_windows_closed);
      }
@@ -6266,13 +6266,13 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data)
 }
 
 EOLIAN static const Eina_Value *
-_efl_ui_win_exit_on_all_windows_closed_get(const Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
+_efl_ui_win_exit_on_all_windows_closed_get(void)
 {
    return &exit_on_all_windows_closed;
 }
 
 EOLIAN static void
-_efl_ui_win_exit_on_all_windows_closed_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, const Eina_Value *exit_code)
+_efl_ui_win_exit_on_all_windows_closed_set(const Eina_Value *exit_code)
 {
    const Eina_Value_Type *type = eina_value_type_get(exit_code);
 
@@ -7385,7 +7385,7 @@ _efl_ui_win_efl_object_provider_find(const Eo *obj,
       return (Eo *)obj;
 
    // attach all kinds of windows directly to ATSPI application root object
-   if (klass == EFL_ACCESS_OBJECT_MIXIN) return efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
+   if (klass == EFL_ACCESS_OBJECT_MIXIN) return efl_access_object_access_root_get();
 
     if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
       return pd->provider;
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index f5dcb242dd..588a0c6762 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -701,7 +701,7 @@ _elm_access_highlight_cycle(Evas_Object *obj, Elm_Focus_Direction dir)
           }
         else
           {
-             efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj);
+             efl_ui_focus_util_focus(obj);
              efl_ui_focus_manager_move(elm_widget_top_get(obj), dir);
           }
      }
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index e75f935a71..91ad3dfc93 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -588,7 +588,7 @@ _accessible_get_application(const Eldbus_Service_Interface *iface, const Eldbus_
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret);
-   root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
+   root = efl_access_object_access_root_get();
    _bridge_iter_object_reference_append(bridge, iter, root);
 
    return ret;
@@ -2026,7 +2026,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
    tmp = path + len; /* Skip over the prefix */
    if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp))
      {
-        root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
+        root = efl_access_object_access_root_get();
         return root;
      }
 
@@ -2053,7 +2053,7 @@ _path_from_object(const Eo *eo)
 
    if (!eo)
      return ATSPI_DBUS_PATH_NULL;
-   root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
+   root = efl_access_object_access_root_get();
 
    if (eo == root)
      snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT);
@@ -3201,7 +3201,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
   Efl_Access_State_Set states;
   Efl_Access_Role role;
   Eo *root;
-  root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
+  root = efl_access_object_access_root_get();
 
   role = efl_access_object_role_get(data);
 
@@ -3298,7 +3298,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
    iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE);
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
-   root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
+   root = efl_access_object_access_root_get();
    to_process = eina_list_append(NULL, root);
 
    while (to_process)
@@ -3703,7 +3703,7 @@ _elm_atspi_bridge_app_register(Eo *bridge)
                                     "Embed");
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(message);
 
-   root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
+   root = efl_access_object_access_root_get();
    _bridge_iter_object_reference_append(bridge, iter, root);
    eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1);
 
@@ -3716,7 +3716,7 @@ _elm_atspi_bridge_app_unregister(Eo *bridge)
    Eo *root;
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE);
 
-   root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
+   root = efl_access_object_access_root_get();
 
    Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY,
                                     ATSPI_DBUS_PATH_ROOT,
@@ -4116,7 +4116,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
 
    path = _path_from_object(obj);
-   root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
+   root = efl_access_object_access_root_get();
 
    msg = eldbus_message_signal_new(path, infc, signal->name);
    if (!msg) return;
@@ -4366,7 +4366,7 @@ _a11y_connection_shutdown(Eo *bridge)
    if (pd->event_hash) eina_hash_free(pd->event_hash);
    pd->event_hash = NULL;
 
-   efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_MIXIN, pd->event_hdlr);
+   efl_access_object_event_handler_del(pd->event_hdlr);
    pd->event_hdlr = NULL;
 
    efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
@@ -4458,7 +4458,7 @@ _a11y_bus_initialize(Eo *obj, const char *socket_addr)
    _elm_atspi_bridge_app_register(obj);
 
    // register accessible object event listener
-   pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _bridge_accessible_event_dispatch, obj);
+   pd->event_hdlr = efl_access_object_event_handler_add(_bridge_accessible_event_dispatch, obj);
 }
 
 static void
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index c811e16cb4..336b0f7ae8 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -2231,14 +2231,14 @@ _entry_changed_user_signal_cb(void *data,
              atspi_info.content = edje_info->change.insert.content;
              atspi_info.pos = edje_info->change.insert.pos;
              atspi_info.len = edje_info->change.insert.plain_length;
-             efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
+             efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
           }
         else if (edje_info && !edje_info->insert)
           {
              atspi_info.content = edje_info->change.del.content;
              atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
              atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
-             efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
+             efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
           }
      }
 }
@@ -2263,7 +2263,7 @@ _entry_preedit_changed_signal_cb(void *data,
              atspi_info.content = text;
              atspi_info.pos = edje_info->change.insert.pos;
              atspi_info.len = edje_info->change.insert.plain_length;
-             efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN,
+             efl_access_object_event_emit(
                                                        data,
                                                        EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED,
                                                        &atspi_info);
@@ -2355,7 +2355,7 @@ _entry_selection_changed_signal_cb(void *data,
      _selection_store(ELM_SEL_TYPE_PRIMARY, data);
    _update_selection_handler(data);
    if (_elm_config->atspi_mode)
-     efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
+     efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
 }
 
 static void
@@ -2466,7 +2466,7 @@ _entry_cursor_changed_signal_cb(void *data,
    efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
-     efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
+     efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
 }
 
 static void
@@ -2478,7 +2478,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
    efl_event_callback_legacy_call
      (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
    if (_elm_config->atspi_mode)
-     efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
+     efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
 }
 
 static void
diff --git a/src/lib/elementary/elm_focus_legacy.c b/src/lib/elementary/elm_focus_legacy.c
index 31e1c32db1..5c9651fb15 100644
--- a/src/lib/elementary/elm_focus_legacy.c
+++ b/src/lib/elementary/elm_focus_legacy.c
@@ -110,7 +110,7 @@ elm_object_focus_next_object_set(Evas_Object        *obj,
    #define MAP(direction, field)  if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction) pd->legacy_focus.field = next;
    MAPPING()
    #undef MAP
-   dir = efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS, dir);
+   dir = efl_ui_focus_util_direction_complement(dir);
    #define MAP(direction, field)  if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction) next_pd->legacy_focus.field = obj;
    MAPPING()
    #undef MAP
@@ -218,7 +218,7 @@ elm_object_focus_next(Evas_Object        *obj,
    top = elm_object_top_widget_get(obj);
    EINA_SAFETY_ON_FALSE_RETURN(efl_isa(top, EFL_UI_WIN_CLASS));
 
-   manager_top = efl_ui_focus_util_active_manager(EFL_UI_FOCUS_UTIL_CLASS, obj);
+   manager_top = efl_ui_focus_util_active_manager(obj);
    logical = efl_ui_focus_manager_focus_get(manager_top);
 
    if (elm_widget_is(logical))
@@ -255,7 +255,7 @@ elm_object_focus_next(Evas_Object        *obj,
 
         if (legacy_target)
           {
-             efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, legacy_target);
+             efl_ui_focus_util_focus(legacy_target);
              if (elm_object_focused_object_get(top) == legacy_target)
                {
                   legacy_focus_move = EINA_TRUE;
@@ -289,7 +289,7 @@ elm_object_focus_next_object_get(const Evas_Object  *obj,
    MAPPING()
    #undef MAP
 
-   return efl_ui_focus_manager_request_move(efl_ui_focus_util_active_manager(EFL_UI_FOCUS_UTIL_CLASS, top), dir, NULL, EINA_FALSE);
+   return efl_ui_focus_manager_request_move(efl_ui_focus_util_active_manager(top), dir, NULL, EINA_FALSE);
 }
 
 EAPI Elm_Object_Item *
@@ -364,7 +364,7 @@ elm_object_focus_set(Evas_Object *obj,
    else if (elm_widget_is(obj))
      {
         if (focus)
-          efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj);
+          efl_ui_focus_util_focus(obj);
         else
           {
              if (efl_ui_focus_manager_focus_get(efl_ui_focus_object_focus_manager_get(obj)) == obj)
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 53cc85f2c9..19225b7287 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -498,7 +498,7 @@ _menu_item_activate_cb(void *data,
              if (eo_item2 != EO_OBJ(item))
                elm_menu_item_selected_set(eo_item2, 0);
           }
-        efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
+        efl_access_object_event_emit(EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
      }
    else
      {
@@ -513,7 +513,7 @@ _menu_item_activate_cb(void *data,
                   elm_menu_item_selected_set(eo_item2, 0);
                }
           }
-        efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
+        efl_access_object_event_emit(WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
         if (sd->menu_bar && was_open)
           _menu_item_select_cb(item, NULL, NULL, NULL);
      }
diff --git a/src/lib/elementary/elm_sys_notify.c b/src/lib/elementary/elm_sys_notify.c
index a993a8cc3a..a4789cd12c 100644
--- a/src/lib/elementary/elm_sys_notify.c
+++ b/src/lib/elementary/elm_sys_notify.c
@@ -199,8 +199,7 @@ _elm_sys_notify_servers_get(const Eo            *obj EINA_UNUSED,
 }
 
 EOLIAN static Elm_Sys_Notify *
-_elm_sys_notify_singleton_get(Eo   *obj EINA_UNUSED,
-                              void *sd  EINA_UNUSED)
+_elm_sys_notify_singleton_get(void)
 {
    if (!_singleton)
      _singleton = efl_add(MY_CLASS, efl_main_loop_get());
@@ -224,7 +223,7 @@ _elm_sys_notify_class_constructor(Efl_Class *klass EINA_UNUSED)
 void
 _elm_unneed_sys_notify(void)
 {
-   Elm_Sys_Notify *manager = elm_sys_notify_singleton_get();
+   Elm_Sys_Notify *manager = elm_obj_sys_notify_singleton_get();
    if (manager)
      {
         elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE);
@@ -242,7 +241,7 @@ elm_need_sys_notify(void)
    /* In theory, there can be N notification managers, but
     * in the implementation there will be only one: the
     * singleton which is initialized here. */
-   manager = elm_sys_notify_singleton_get();
+   manager = elm_obj_sys_notify_singleton_get();
    if (EINA_UNLIKELY(!manager))
      {
         CRI("Failed to get notification manager");
diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c
index 6025a95930..13ebf233ca 100644
--- a/src/lib/elementary/elm_theme.c
+++ b/src/lib/elementary/elm_theme.c
@@ -1122,7 +1122,7 @@ _efl_ui_theme_efl_object_destructor(Eo *obj, Efl_Ui_Theme_Data *pd)
 }
 
 EOLIAN static Efl_Ui_Theme *
-_efl_ui_theme_default_get(const Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
+_efl_ui_theme_default_get(void)
 {
    if (theme_default)
      return theme_default->eo_theme;