diff --git a/legacy/efreet/src/lib/efreet_base.c b/legacy/efreet/src/lib/efreet_base.c
index 5464163712..d60d21f734 100644
--- a/legacy/efreet/src/lib/efreet_base.c
+++ b/legacy/efreet/src/lib/efreet_base.c
@@ -195,13 +195,13 @@ efreet_dirs_get(const char *key, const char *fallback)
     while (p)
     {
         *p = '\0';
-        if (!eina_list_search_unsorted(dirs, (Eina_Compare_Cb)strcmp, s))
+        if (!eina_list_search_unsorted(dirs, EINA_COMPARE_CB(strcmp), s))
             dirs = eina_list_append(dirs, (void *)eina_stringshare_add(s));
 
         s = ++p;
         p = strchr(s, ':');
     }
-    if (!eina_list_search_unsorted(dirs, ECORE_COMPARE_CB(strcmp), s))
+    if (!eina_list_search_unsorted(dirs, EINA_COMPARE_CB(strcmp), s))
       dirs = eina_list_append(dirs, (void *)eina_stringshare_add(s));
     FREE(tmp);
 
diff --git a/legacy/efreet/src/lib/efreet_desktop.c b/legacy/efreet/src/lib/efreet_desktop.c
index 2dfa357bed..2983983e0d 100644
--- a/legacy/efreet/src/lib/efreet_desktop.c
+++ b/legacy/efreet/src/lib/efreet_desktop.c
@@ -600,7 +600,7 @@ efreet_desktop_category_add(Efreet_Desktop *desktop, const char *category)
     if (!desktop) return;
 
     if (eina_list_search_unsorted(desktop->categories,
-                                  (Eina_Compare_Cb)strcmp, category)) return;
+                                  EINA_COMPARE_CB(strcmp), category)) return;
 
     desktop->categories = eina_list_append(desktop->categories,
                         (void *)eina_stringshare_add(category));
@@ -620,7 +620,7 @@ efreet_desktop_category_del(Efreet_Desktop *desktop, const char *category)
     if (!desktop || !desktop->categories) return 0;
 
     if ((found = eina_list_search_unsorted(desktop->categories,
-                                           (Eina_Compare_Cb)strcmp, category)))
+                                           EINA_COMPARE_CB(strcmp), category)))
     {
         eina_stringshare_del(found);
         desktop->categories = eina_list_remove(desktop->categories, found);
diff --git a/legacy/efreet/src/lib/efreet_icon.c b/legacy/efreet/src/lib/efreet_icon.c
index ab19b785fa..1bb24e9647 100644
--- a/legacy/efreet/src/lib/efreet_icon.c
+++ b/legacy/efreet/src/lib/efreet_icon.c
@@ -1566,7 +1566,7 @@ efreet_icon_cache_check(Efreet_Icon_Theme *theme, const char *icon, unsigned int
     if (!list) return NULL;
 
     snprintf(key, sizeof(key), "%s %d", icon, size);
-    cache = eina_list_search_unsorted(list, (Eina_Compare_Cb)efreet_icon_cache_find, key);
+    cache = eina_list_search_unsorted(list, EINA_COMPARE_CB(efreet_icon_cache_find), key);
     if (cache)
     {
         if (!cache->path)
diff --git a/legacy/efreet/src/lib/efreet_menu.c b/legacy/efreet/src/lib/efreet_menu.c
index e11336a3ef..433557b906 100644
--- a/legacy/efreet/src/lib/efreet_menu.c
+++ b/legacy/efreet/src/lib/efreet_menu.c
@@ -878,7 +878,7 @@ efreet_menu_desktop_remove(Efreet_Menu *menu, Efreet_Desktop *desktop)
     if (!desktop || !menu) return 0;
 
     entry = eina_list_search_unsorted(menu->entries,
-                                      (Eina_Compare_Cb)efreet_menu_cb_entry_compare_desktop,
+                                      EINA_COMPARE_CB(efreet_menu_cb_entry_compare_desktop),
                             desktop);
     if (entry)
     {
@@ -1098,7 +1098,7 @@ efreet_menu_handle_sub_menu(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
     /* if this menu already exists we just take this one and stick it on the
      * start of the existing one */
     if ((match = eina_list_search_unsorted(parent->sub_menus,
-                                           (Eina_Compare_Cb)efreet_menu_cb_menu_compare,
+                                           EINA_COMPARE_CB(efreet_menu_cb_menu_compare),
                                            internal)))
     {
 
@@ -1132,7 +1132,7 @@ efreet_menu_handle_app_dir(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
 
     /* we've already got this guy in our list we can skip it */
     if (eina_list_search_unsorted(parent->app_dirs,
-                                  (Eina_Compare_Cb)efreet_menu_cb_app_dirs_compare,
+                                  EINA_COMPARE_CB(efreet_menu_cb_app_dirs_compare),
                                   path))
     {
         FREE(path);
@@ -1171,7 +1171,7 @@ efreet_menu_handle_default_app_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *xm
         Efreet_Menu_App_Dir *app_dir;
 
         if (eina_list_search_unsorted(parent->app_dirs,
-                                      (Eina_Compare_Cb)efreet_menu_cb_app_dirs_compare,
+                                      EINA_COMPARE_CB(efreet_menu_cb_app_dirs_compare),
                                       dir))
             continue;
 
@@ -2057,7 +2057,7 @@ efreet_menu_handle_old(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
     /* XXX This seems wrong, but it makes efreet pass the fdo tests */
 #ifndef STRICT_SPEC
     move = eina_list_search_unsorted(parent->moves,
-                                     (Eina_Compare_Cb)efreet_menu_cb_move_compare,
+                                     EINA_COMPARE_CB(efreet_menu_cb_move_compare),
                                      xml->text);
     if (move)
     {
@@ -2815,7 +2815,7 @@ efreet_menu_filter_or_matches(Efreet_Menu_Filter_Op *op, Efreet_Menu_Desktop *md
         EINA_LIST_FOREACH(op->categories, l, t)
         {
             if (eina_list_search_unsorted(md->desktop->categories,
-                                          (Eina_Compare_Cb)strcmp, t))
+                                          EINA_COMPARE_CB(strcmp), t))
                 return 1;
         }
     }
@@ -2860,7 +2860,7 @@ efreet_menu_filter_and_matches(Efreet_Menu_Filter_Op *op, Efreet_Menu_Desktop *m
         EINA_LIST_FOREACH(op->categories, l, t)
         {
             if (!eina_list_search_unsorted(md->desktop->categories,
-                                           (Eina_Compare_Cb)strcmp, t))
+                                           EINA_COMPARE_CB(strcmp), t))
                 return 0;
         }
     }
@@ -2910,7 +2910,7 @@ efreet_menu_filter_not_matches(Efreet_Menu_Filter_Op *op, Efreet_Menu_Desktop *m
         EINA_LIST_FOREACH(op->categories, l, t) 
         {
             if (eina_list_search_unsorted(md->desktop->categories,
-                                          (Eina_Compare_Cb)strcmp, t))
+                                          EINA_COMPARE_CB(strcmp), t))
                 return 0;
         }
     }
@@ -3014,7 +3014,7 @@ efreet_menu_concatenate(Efreet_Menu_Internal *dest, Efreet_Menu_Internal *src)
             src->sub_menus = eina_list_remove(src->sub_menus, submenu);
             /* if this menu is in the list already we just add to that */
             if ((match = eina_list_search_unsorted(dest->sub_menus,
-                                                   (Eina_Compare_Cb)efreet_menu_cb_menu_compare,
+                                                   EINA_COMPARE_CB(efreet_menu_cb_menu_compare),
                                                    submenu)))
             {
                 efreet_menu_concatenate(match, submenu);
@@ -3131,7 +3131,7 @@ efreet_menu_by_name_find(Efreet_Menu_Internal *internal, const char *name, Efree
         *part = '\0';
 
         if (!(internal = eina_list_search_unsorted(internal->sub_menus,
-                                                   (Eina_Compare_Cb)efreet_menu_cb_compare_names,
+                                                   EINA_COMPARE_CB(efreet_menu_cb_compare_names),
                                                    ptr)))
         {
             FREE(tmp);
@@ -3146,7 +3146,7 @@ efreet_menu_by_name_find(Efreet_Menu_Internal *internal, const char *name, Efree
 
     /* find the menu in the parent list */
     if (!(internal = eina_list_search_unsorted(internal->sub_menus,
-                                               (Eina_Compare_Cb)efreet_menu_cb_compare_names,
+                                               EINA_COMPARE_CB(efreet_menu_cb_compare_names),
                                                ptr)))
     {
         FREE(tmp);
@@ -3404,7 +3404,7 @@ efreet_menu_app_dir_scan(Efreet_Menu_Internal *internal, const char *path, const
             }
             /* Don't add two files with the same id in the app pool */
             if (eina_list_search_unsorted(internal->app_pool,
-                                          (Eina_Compare_Cb)efreet_menu_cb_md_compare_ids,
+                                          EINA_COMPARE_CB(efreet_menu_cb_md_compare_ids),
                                           buf2))
                 continue;
 
@@ -3613,7 +3613,7 @@ efreet_menu_layout_menu(Efreet_Menu_Internal *internal)
     {
         internal->sub_menus = eina_list_sort(internal->sub_menus,
                                              0,
-                                             (Eina_Compare_Cb)efreet_menu_cb_menu_compare);
+                                             EINA_COMPARE_CB(efreet_menu_cb_menu_compare));
     }
 #endif
 
@@ -3710,7 +3710,7 @@ efreet_menu_layout_entries_get(Efreet_Menu *entry, Efreet_Menu_Internal *interna
         else inline_alias = layout->inline_alias;
 
         sub = eina_list_search_unsorted(internal->sub_menus,
-                                        (Eina_Compare_Cb)efreet_menu_cb_compare_names, layout->name);
+                                        EINA_COMPARE_CB(efreet_menu_cb_compare_names), layout->name);
         if (sub)
         {
             if (!(sub->directory && sub->directory->no_display) && !sub->deleted)
@@ -3776,7 +3776,7 @@ efreet_menu_layout_entries_get(Efreet_Menu *entry, Efreet_Menu_Internal *interna
     {
         Efreet_Menu_Desktop *md;
         md = eina_list_search_unsorted(internal->applications,
-                                       (Eina_Compare_Cb)efreet_menu_cb_md_compare_ids, layout->name);
+                                       EINA_COMPARE_CB(efreet_menu_cb_md_compare_ids), layout->name);
         if (md)
         {
             sub_entry = efreet_menu_layout_desktop(md);
@@ -3795,7 +3795,7 @@ efreet_menu_layout_entries_get(Efreet_Menu *entry, Efreet_Menu_Internal *interna
                 internal->applications = eina_list_remove_list(internal->applications,
                                                                internal->applications);
                 sub_entry = eina_list_search_unsorted(entry->entries,
-                                                      (Eina_Compare_Cb)efreet_menu_cb_entry_compare_desktop,
+                                                      EINA_COMPARE_CB(efreet_menu_cb_entry_compare_desktop),
                                                       md->desktop);
                 if (!sub_entry)
                 {
@@ -3818,7 +3818,7 @@ efreet_menu_layout_entries_get(Efreet_Menu *entry, Efreet_Menu_Internal *interna
                     continue;
                 }
                 sub_entry = eina_list_search_unsorted(entry->entries,
-                                                      (Eina_Compare_Cb)efreet_menu_cb_entry_compare_menu,
+                                                      EINA_COMPARE_CB(efreet_menu_cb_entry_compare_menu),
                                                       sub);
                 if (!sub_entry)
                 {
diff --git a/legacy/efreet/src/lib/efreet_mime.c b/legacy/efreet/src/lib/efreet_mime.c
index eb6af88f1c..176a6d5048 100644
--- a/legacy/efreet/src/lib/efreet_mime.c
+++ b/legacy/efreet/src/lib/efreet_mime.c
@@ -732,7 +732,7 @@ efreet_mime_glob_remove(const char *glob)
 {
     Efreet_Mime_Glob *mime = NULL;
 
-    if ((mime = eina_list_search_unsorted(globs, (Eina_Compare_Cb)strcmp, glob)))
+    if ((mime = eina_list_search_unsorted(globs, EINA_COMPARE_CB(strcmp), glob)))
         {
         globs = eina_list_remove(globs, mime);
             IF_RELEASE(mime->glob);