diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 56b7efe218..cbd656e9b8 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -116,11 +116,11 @@ efl_exit(int exit_code)
 }
 
 EOLIAN static Efl_Object *
-_efl_loop_efl_object_provider_find(Eo *obj, Efl_Loop_Data *pd, const Efl_Object *klass)
+_efl_loop_efl_object_provider_find(const Eo *obj, Efl_Loop_Data *pd, const Efl_Object *klass)
 {
    Efl_Object *r;
 
-   if (klass == EFL_LOOP_CLASS) return obj;
+   if (klass == EFL_LOOP_CLASS) return (Efl_Object *) obj;
 
    r = eina_hash_find(pd->providers, &klass);
    if (r) return r;
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index cbed6ee19d..ec2672d7f1 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -818,7 +818,7 @@ _eio_model_efl_object_parent_get(Eo *obj , Eio_Model_Data *priv)
 }
 
 EOLIAN static Eo *
-_eio_model_efl_object_provider_find(Eo *obj, Eio_Model_Data *priv EINA_UNUSED, const Efl_Class *klass)
+_eio_model_efl_object_provider_find(const Eo *obj, Eio_Model_Data *priv EINA_UNUSED, const Efl_Class *klass)
 {
    Eo *provider = efl_provider_find(efl_super(obj, MY_CLASS), klass);
 
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index 5b3b06c852..78475588f6 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -1090,10 +1090,10 @@ _efl_ui_focus_manager_calc_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Manager_
 }
 
 EOLIAN static Efl_Object *
-_efl_ui_focus_manager_calc_efl_object_provider_find(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd EINA_UNUSED, const Efl_Object *klass)
+_efl_ui_focus_manager_calc_efl_object_provider_find(const Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd EINA_UNUSED, const Efl_Object *klass)
 {
    if (klass == MY_CLASS)
-     return obj;
+     return (Efl_Object *) obj;
 
    return efl_provider_find(efl_super(obj, MY_CLASS), klass);
 }
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index c97dcb51c9..0d7781dad4 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7061,7 +7061,8 @@ _efl_ui_win_efl_input_state_lock_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Dat
 }
 
 EOLIAN static Efl_Object *
-_efl_ui_win_efl_object_provider_find(Eo *obj, Efl_Ui_Win_Data *pd EINA_UNUSED,
+_efl_ui_win_efl_object_provider_find(const Eo *obj,
+                                     Efl_Ui_Win_Data *pd EINA_UNUSED,
                                      const Efl_Object *klass)
 {
     if (klass == EFL_UI_WIN_CLASS)
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 48b371da71..4db2ed1f4a 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -5697,7 +5697,7 @@ _elm_gengrid_efl_access_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_Gengri
 }
 
 EOLIAN static Efl_Object*
-_elm_gengrid_efl_object_provider_find(Eo *obj, Elm_Gengrid_Data *pd, const Efl_Object *klass)
+_elm_gengrid_efl_object_provider_find(const Eo *obj, Elm_Gengrid_Data *pd, const Efl_Object *klass)
 {
    if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
      return pd->provider;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 664bee7558..07d2fcb087 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -8749,7 +8749,7 @@ _elm_genlist_efl_access_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_Genlis
 }
 
 EOLIAN static Efl_Object*
-_elm_genlist_efl_object_provider_find(Eo *obj, Elm_Genlist_Data *pd, const Efl_Object *klass)
+_elm_genlist_efl_object_provider_find(const Eo *obj, Elm_Genlist_Data *pd, const Efl_Object *klass)
 {
    if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
      return pd->provider;
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 446f58e362..92ef38dfca 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -1507,7 +1507,7 @@ _elm_menu_efl_access_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Menu_
 }
 
 EOLIAN static Efl_Object*
-_elm_menu_efl_object_provider_find(Eo *obj, Elm_Menu_Data *pd, const Efl_Object *klass)
+_elm_menu_efl_object_provider_find(const Eo *obj, Elm_Menu_Data *pd, const Efl_Object *klass)
 {
    Efl_Object *result;
 
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 61dc2c5c57..3d908f1209 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -5470,7 +5470,7 @@ _elm_widget_item_efl_access_component_alpha_get(Eo *obj EINA_UNUSED, Elm_Widget_
 }
 
 EOLIAN static Efl_Object *
-_elm_widget_efl_object_provider_find(Eo *obj, Elm_Widget_Smart_Data *pd, const Efl_Object *klass)
+_elm_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd, const Efl_Object *klass)
 {
    Efl_Object *lookup = NULL;
 
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index c94395d68e..7de713e5be 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -130,7 +130,7 @@ abstract Efl.Object ()
             finalized: bool; [[$true if the object is finalized, $false otherwise]]
          }
       }
-      provider_find {
+      provider_find @const {
         [[Searches upwards in the object tree for a provider which knows the given class/interface.
 
           The object from the provider will then be returned.
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index aba4fb392e..e5d932addc 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -692,7 +692,7 @@ _efl_object_finalized_get(Eo *obj_id, Efl_Object_Data *pd EINA_UNUSED)
 }
 
 EOLIAN static Efl_Object *
-_efl_object_provider_find(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const Efl_Object *klass)
+_efl_object_provider_find(const Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const Efl_Object *klass)
 {
    if (pd->parent) return efl_provider_find(pd->parent, klass);
    return NULL;
diff --git a/src/lib/evas/canvas/efl_input_event.c b/src/lib/evas/canvas/efl_input_event.c
index f18eb3d136..29925b1c46 100644
--- a/src/lib/evas/canvas/efl_input_event.c
+++ b/src/lib/evas/canvas/efl_input_event.c
@@ -50,7 +50,7 @@ _efl_input_event_fake_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
 }
 
 EOLIAN static Efl_Object *
-_efl_input_event_efl_object_provider_find(Eo *obj, void *pd EINA_UNUSED, const Efl_Object *klass)
+_efl_input_event_efl_object_provider_find(const Eo *obj, void *pd EINA_UNUSED, const Efl_Object *klass)
 {
    // Note: provider_find should probably return self if self is a klass object
    if (klass == EVAS_CANVAS_CLASS)
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.c b/src/lib/evas/canvas/evas_canvas3d_object.c
index 2e36a9f2f3..aca9839e51 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.c
+++ b/src/lib/evas/canvas/evas_canvas3d_object.c
@@ -17,7 +17,7 @@ _evas_canvas3d_object_efl_object_constructor(Eo *obj, Evas_Canvas3D_Object_Data
 }
 
 EOLIAN static Evas *
- _evas_canvas3d_object_efl_object_provider_find(Eo *obj, Evas_Canvas3D_Object_Data *pd, const Efl_Class *klass)
+ _evas_canvas3d_object_efl_object_provider_find(const Eo *obj, Evas_Canvas3D_Object_Data *pd, const Efl_Class *klass)
 {
    if (klass == EVAS_CANVAS_CLASS)
      return pd->evas;
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 1e1cb07674..9089f30037 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -829,8 +829,9 @@ evas_data_argb_unpremul(unsigned int *data, unsigned int len)
 }
 
 EOLIAN static Eo *
-_evas_canvas_efl_object_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED,
-                                   const Efl_Class *klass)
+_evas_canvas_efl_object_provider_find(const Eo *eo_e,
+                                      Evas_Public_Data *e EINA_UNUSED,
+                                      const Efl_Class *klass)
 {
    if (klass == EVAS_CANVAS_CLASS)
      return eo_e;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 8383997af0..b18861f90a 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2427,7 +2427,7 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
 }
 
 EOLIAN static Eo *
-_efl_canvas_object_efl_object_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Class *klass)
+_efl_canvas_object_efl_object_provider_find(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Class *klass)
 {
    if (klass == EVAS_CANVAS_CLASS)
      {