diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 78e015277f..6a3a73b817 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -3151,7 +3151,7 @@ _elm_fileselector_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Fileselect
    return EINA_TRUE;
 }
 
-EOLIAN static Eina_Bool
+static Eina_Bool
 _elm_fileselector_text_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd, const char *part, const char *label)
 {
    if (!part) return EINA_FALSE;
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 9d5684243a..a44a676012 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -255,7 +255,7 @@ _elm_fileselector_entry_elm_widget_disable(Eo *obj, Elm_Fileselector_Entry_Data
    return EINA_TRUE;
 }
 
-EOLIAN static Eina_Bool
+static Eina_Bool
 _elm_fileselector_entry_text_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part, const char *label)
 {
    if (part && strcmp(part, "default"))
@@ -267,7 +267,7 @@ _elm_fileselector_entry_text_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, const
    return EINA_TRUE;
 }
 
-EOLIAN static const char *
+static const char *
 _elm_fileselector_entry_text_get(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part)
 {
    if (part && strcmp(part, "default"))
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 45f41bba31..e9ee09f94d 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -459,7 +459,7 @@ _access_obj_process(Elm_Naviframe_Item_Data *it, Eina_Bool is_access)
      }
 }
 
-EOLIAN static void
+static void
 _elm_naviframe_item_elm_widget_item_part_text_set(Eo *eo_it,
                                                   Elm_Naviframe_Item_Data *it,
                                                   const char *part,
@@ -1027,7 +1027,7 @@ _elm_naviframe_elm_layout_signal_emit(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSE
 
 /* content/text smart functions proxying things to the top item, which
  * is the resize object of the layout */
-EOLIAN static Eina_Bool
+static Eina_Bool
 _elm_naviframe_text_set(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part, const char *label)
 {
    Elm_Object_Item *it;
@@ -1043,7 +1043,7 @@ _elm_naviframe_text_set(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char
    return EINA_FALSE;
 }
 
-EOLIAN static const char*
+static const char *
 _elm_naviframe_text_get(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part)
 {
    Elm_Object_Item *it = elm_naviframe_top_item_get(obj);
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 2369edf6be..2e7c0946af 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1094,7 +1094,7 @@ _content_text_get(const Elm_Popup_Data *sd)
    return str;
 }
 
-EOLIAN static const char*
+static const char *
 _elm_popup_text_get(Eo *obj EINA_UNUSED, Elm_Popup_Data *_pd, const char *part)
 {
    const char *text = NULL;
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 77396840d1..f13a7291eb 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -451,7 +451,7 @@ _mirrored_part_fix(const Evas_Object *obj,
      }
 }
 
-EOLIAN static Eina_Bool
+static Eina_Bool
 _elm_actionslider_text_set(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED, const char *part, const char *text)
 {
    Eina_Bool int_ret = EINA_TRUE;
@@ -466,7 +466,7 @@ _elm_actionslider_text_set(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED, cons
    return int_ret;
 }
 
-EOLIAN static const char*
+static const char *
 _elm_actionslider_text_get(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED, const char *part)
 {
    const char *text = NULL;
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index 084fcd72b6..e35ad7736d 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -116,7 +116,7 @@ _elm_bubble_elm_widget_focus_direction(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED
             (content, base, degree, direction, direction_item, weight);
 }
 
-EOLIAN static Eina_Bool
+static Eina_Bool
 _elm_bubble_text_set(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED, const char *part, const char *label)
 {
    if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 1b7d37846d..24a2ee634f 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3201,7 +3201,7 @@ _entry_text_append(Evas_Object* obj, const char* entry, Eina_Bool set)
      }
 }
 
-EOLIAN static Eina_Bool
+static Eina_Bool
 _elm_entry_text_set(Eo *obj, Elm_Entry_Data *sd, const char *part, const char *entry)
 {
    int len = 0;
@@ -3252,7 +3252,7 @@ _elm_entry_text_set(Eo *obj, Elm_Entry_Data *sd, const char *part, const char *e
    return EINA_TRUE;
 }
 
-EOLIAN static const char *
+static const char *
 _elm_entry_text_get(Eo *obj, Elm_Entry_Data *sd, const char *item)
 {
    const char *text;
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 2d8f07a39b..b36b726817 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -333,7 +333,7 @@ _stringshare_key_value_replace(const char **srcstring, const char *key, const ch
    return 0;
 }
 
-EOLIAN static Eina_Bool
+static Eina_Bool
 _elm_label_text_set(Eo *obj, Elm_Label_Data *sd, const char *part, const char *label)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);