18 files changed, 111 insertions, 111 deletions
diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c
index 7839bf59df..77ee737c46 100644
--- a/src/modules/everything/e_mod_main.c
+++ b/src/modules/everything/e_mod_main.c
@@ -148,7 +148,7 @@ e_modapi_init(E_Module *m)
 }
 
 EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
+e_modapi_shutdown(E_Module *m EINA_UNUSED)
 {
    E_Config_Dialog *cfd;
    const char *t;
@@ -229,7 +229,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 }
 
 EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
+e_modapi_save(E_Module *m EINA_UNUSED)
 {
    e_config_domain_save("module.everything", conf_edd, evry_conf);
 
@@ -331,7 +331,7 @@ evry_view_unregister(Evry_View *view)
 /***************************************************************************/
 
 static Eina_Bool
-_cleanup_history(void *data __UNUSED__)
+_cleanup_history(void *data EINA_UNUSED)
 {
    /* evrything is active */
    if (evry_hist)
@@ -558,7 +558,7 @@ _e_mod_action_cb(E_Object *obj EINA_UNUSED, const char *params)
 }
 
 static void
-_e_mod_action_cb_edge(E_Object *obj  __UNUSED__, const char *params, E_Event_Zone_Edge *ev)
+_e_mod_action_cb_edge(E_Object *obj  EINA_UNUSED, const char *params, E_Event_Zone_Edge *ev)
 {
    IF_RELEASE(_params);
    if (params && params[0])
@@ -571,7 +571,7 @@ _e_mod_action_cb_edge(E_Object *obj  __UNUSED__, const char *params, E_Event_Zon
 
 /* menu item callback(s) */
 static void
-_e_mod_run_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
+_e_mod_run_cb(void *data EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED)
 {
    IF_RELEASE(_params);
    ecore_idle_enterer_add(_e_mod_run_defer_cb, m->zone);
@@ -579,7 +579,7 @@ _e_mod_run_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
 
 /* menu item add hook */
 static void
-_e_mod_menu_add(void *data __UNUSED__, E_Menu *m)
+_e_mod_menu_add(void *data EINA_UNUSED, E_Menu *m)
 {
    E_Menu_Item *mi;
 
diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index 9982249418..670d52b3a3 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -19,7 +19,7 @@
 #define DBG(...)
 #endif
 
-static Eina_Bool     _evry_cb_desklock(Evry_Window *win, int type __UNUSED__, E_Event_Desklock *ev);
+static Eina_Bool     _evry_cb_desklock(Evry_Window *win, int type EINA_UNUSED, E_Event_Desklock *ev);
 static void           _evry_matches_update(Evry_Selector *sel, int async);
 static void           _evry_plugin_action(Evry_Selector *sel, int finished);
 static void           _evry_plugin_select(Evry_State *s, Evry_Plugin *p);
@@ -132,7 +132,7 @@ _evry_aggregator_fetch(Evry_State *s)
 }
 
 static Eina_Bool
-_evry_cb_item_changed(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_evry_cb_item_changed(EINA_UNUSED void *data, EINA_UNUSED int type, void *event)
 {
    Evry_Event_Item_Changed *ev = event;
    Evry_Selector *sel;
@@ -871,7 +871,7 @@ _evry_cb_drag_finished(E_Drag *drag, int dropped)
 #endif
 
 static Eina_Bool
-_evry_cb_desklock(Evry_Window *win, int type __UNUSED__, E_Event_Desklock *ev)
+_evry_cb_desklock(Evry_Window *win, int type EINA_UNUSED, E_Event_Desklock *ev)
 {
    if (ev->on) evry_hide(win, 0);
    return ECORE_CALLBACK_RENEW;
@@ -987,7 +987,7 @@ _evry_window_free(Evry_Window *win)
 }
 
 static void
-_evry_selector_cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_evry_selector_cb_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
    Evry_Selector *sel = data;
@@ -1000,7 +1000,7 @@ _evry_selector_cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
 }
 
 static void
-_evry_selector_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_evry_selector_cb_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Evas_Event_Mouse_Wheel *ev = event_info;
    Evry_Selector *sel = data;
@@ -1019,7 +1019,7 @@ _evry_selector_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
 }
 
 static void
-_evry_selector_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_evry_selector_cb_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;
    Evry_Selector *sel = data;
@@ -1211,7 +1211,7 @@ _evry_selector_activate(Evry_Selector *sel, int slide)
 }
 
 static void
-_evry_selector_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_evry_selector_thumb_gen(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Coord w, h;
    Evry_Selector *sel = data;
@@ -1902,7 +1902,7 @@ _evry_cheat_history(Evry_State *s, int promote, int delete)
 }
 
 static Eina_Bool
-_evry_cb_key_down(void *data, int type __UNUSED__, void *event)
+_evry_cb_key_down(void *data, int type EINA_UNUSED, void *event)
 {
    Ecore_Event_Key *ev = event;
    Evry_State *s;
@@ -2307,7 +2307,7 @@ _evry_clear(Evry_Selector *sel)
 }
 
 static void
-_evry_cb_free_action_performed(void *data __UNUSED__, void *event)
+_evry_cb_free_action_performed(void *data EINA_UNUSED, void *event)
 {
    Evry_Event_Action_Performed *ev = event;
 
@@ -2980,7 +2980,7 @@ _evry_plugin_select(Evry_State *s, Evry_Plugin *p)
 }
 
 static void
-_evry_cb_free_plugin_selected(void *data __UNUSED__, void *event)
+_evry_cb_free_plugin_selected(void *data EINA_UNUSED, void *event)
 {
    Evry_Event_Item_Selected *ev = event;
 
@@ -3041,7 +3041,7 @@ _evry_cb_show(Evry_Window *win, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSE
 
 #ifndef HAVE_WAYLAND_ONLY
 static Eina_Bool
-_evry_cb_selection_notify(void *data, int type __UNUSED__, void *event)
+_evry_cb_selection_notify(void *data, int type EINA_UNUSED, void *event)
 {
    Ecore_X_Event_Selection_Notify *ev;
    Evry_Window *win = data;
diff --git a/src/modules/everything/evry_config.c b/src/modules/everything/evry_config.c
index eb5d8a01e7..fb02a40871 100644
--- a/src/modules/everything/evry_config.c
+++ b/src/modules/everything/evry_config.c
@@ -60,7 +60,7 @@ struct _E_Config_Dialog_Data
 };
 
 EAPI E_Config_Dialog *
-evry_config_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__)
+evry_config_dialog(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
@@ -108,7 +108,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 }
 
 static void *
-_create_data(E_Config_Dialog *cfd __UNUSED__)
+_create_data(E_Config_Dialog *cfd EINA_UNUSED)
 {
    E_Config_Dialog_Data *cfdata;
 
@@ -118,7 +118,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
 }
 
 static void
-_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
 {
    if (cfdata->page[0].configs) eina_list_free(cfdata->page[0].configs);
    if (cfdata->page[1].configs) eina_list_free(cfdata->page[1].configs);
@@ -128,7 +128,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 }
 
 static int
-_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
 {
    int i;
    Plugin_Config *pc;
@@ -185,7 +185,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 }
 
 static void
-_fill_list(Eina_List *plugins, Evas_Object *obj, int enabled __UNUSED__)
+_fill_list(Eina_List *plugins, Evas_Object *obj, int enabled EINA_UNUSED)
 {
    Evas *evas;
    Evas_Coord w;
@@ -261,13 +261,13 @@ _plugin_move(Plugin_Page *page, int dir)
 }
 
 static void
-_plugin_move_up_cb(void *data, void *data2 __UNUSED__)
+_plugin_move_up_cb(void *data, void *data2 EINA_UNUSED)
 {
    _plugin_move(data, -1);
 }
 
 static void
-_plugin_move_down_cb(void *data, void *data2 __UNUSED__)
+_plugin_move_down_cb(void *data, void *data2 EINA_UNUSED)
 {
    _plugin_move(data, 1);
 }
@@ -341,7 +341,7 @@ _list_select_cb(void *data, Evas_Object *obj)
 }
 
 static void
-_plugin_config_cb(void *data, void *data2 __UNUSED__)
+_plugin_config_cb(void *data, void *data2 EINA_UNUSED)
 {
    Plugin_Page *page = data;
    Evry_Plugin *p = page->cur->plugin;
@@ -353,7 +353,7 @@ _plugin_config_cb(void *data, void *data2 __UNUSED__)
 }
 
 static Evas_Object *
-_create_plugin_page(E_Config_Dialog_Data *cfdata __UNUSED__, Evas *e, Plugin_Page *page)
+_create_plugin_page(E_Config_Dialog_Data *cfdata EINA_UNUSED, Evas *e, Plugin_Page *page)
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
@@ -679,7 +679,7 @@ _cat_create_data(E_Config_Dialog *cfd)
 }
 
 static void
-_cat_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+_cat_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
 {
    if (cfdata->page[0].configs) eina_list_free(cfdata->page[0].configs);
 
@@ -724,7 +724,7 @@ _cat_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 }
 
 static Evas_Object *
-_cat_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *e, E_Config_Dialog_Data *cfdata)
+_cat_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *e, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *ob, *otb;
 
diff --git a/src/modules/everything/evry_gadget.c b/src/modules/everything/evry_gadget.c
index 62bd56c36c..e6981b0b85 100644
--- a/src/modules/everything/evry_gadget.c
+++ b/src/modules/everything/evry_gadget.c
@@ -28,7 +28,7 @@ struct _Instance
 
 /* static void _button_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info); */
 static void             _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static Eina_Bool        _cb_focus_out(void *data, int type __UNUSED__, void *event);
+static Eina_Bool        _cb_focus_out(void *data, int type EINA_UNUSED, void *event);
 static void _del_func(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
 
 /* gadcon requirements */
@@ -147,7 +147,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
 }
 
 static void
-_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
+_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED)
 {
    Instance *inst;
    Evas_Coord mw, mh;
@@ -164,13 +164,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
 {
    return _("Everything Starter");
 }
 
 static Evas_Object *
-_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas __UNUSED__)
+_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas EINA_UNUSED)
 {
    Evas_Object *o;
    char buf[PATH_MAX];
@@ -200,7 +200,7 @@ _conf_item_get(const char *id)
 }
 
 static const char *
-_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
 {
    Gadget_Config *ci = NULL;
 
@@ -222,7 +222,7 @@ _del_func(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
 }
 
 static void
-_cb_menu_configure(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
+_cb_menu_configure(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
 {
    _conf_dialog(data);
 }
@@ -244,7 +244,7 @@ _hide_done(void *data, Evas_Object *obj EINA_UNUSED, const char *s EINA_UNUSED,
 }
 
 static void
-_evry_hide_func(Evry_Window *win, int finished __UNUSED__)
+_evry_hide_func(Evry_Window *win, int finished EINA_UNUSED)
 {
    Instance *inst = win->data;
    E_Client *ec;
@@ -264,7 +264,7 @@ _evry_hide_func(Evry_Window *win, int finished __UNUSED__)
 }
 
 static Eina_Bool
-_cb_focus_out(void *data, int type __UNUSED__, void *event)
+_cb_focus_out(void *data, int type EINA_UNUSED, void *event)
 {
    E_Event_Client *ev;
    Instance *inst;
@@ -426,7 +426,7 @@ _gadget_window_show(Instance *inst)
 }
 
 static void
-_button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Instance *inst;
    Evas_Event_Mouse_Down *ev;
@@ -512,7 +512,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
 }
 
 /* static void
- * _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+ * _button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
  * {
  *    Instance *inst;
  *    Evas_Event_Mouse_Down *ev;
@@ -605,7 +605,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 }
 
 static void
-_cb_button_settings(void *data __UNUSED__, void *data2 __UNUSED__)
+_cb_button_settings(void *data EINA_UNUSED, void *data2 EINA_UNUSED)
 {
    /* evry_collection_conf_dialog(NULL, "Start"); */
 }
@@ -649,7 +649,7 @@ _fill_list(Eina_List *plugins, Evas_Object *obj, E_Config_Dialog_Data *cfdata)
 
 #if 0
 static void
-_list_select_cb(void *data __UNUSED__, Evas_Object *obj)
+_list_select_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    int sel = e_widget_ilist_selected_get(obj);
 
diff --git a/src/modules/everything/evry_history.c b/src/modules/everything/evry_history.c
index 40d804d94c..a729f8bc48 100644
--- a/src/modules/everything/evry_history.c
+++ b/src/modules/everything/evry_history.c
@@ -67,7 +67,7 @@ evry_history_init(void)
 }
 
 static Eina_Bool
-_hist_entry_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
+_hist_entry_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED)
 {
    History_Entry *he = data;
    History_Item *hi;
@@ -91,7 +91,7 @@ _hist_entry_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__
 }
 
 static Eina_Bool
-_hist_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
+_hist_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED)
 {
    History_Types *ht = data;
 
@@ -107,7 +107,7 @@ _hist_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void
 }
 
 static Eina_Bool
-_hist_entry_cleanup_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata)
+_hist_entry_cleanup_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata)
 {
    History_Entry *he = data;
    Cleanup_Data *d = fdata;
@@ -149,7 +149,7 @@ _hist_entry_cleanup_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *
 }
 
 static Eina_Bool
-_hist_cleanup_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata)
+_hist_cleanup_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata)
 {
    History_Types *ht = data;
    Cleanup_Data *d = fdata;
diff --git a/src/modules/everything/evry_plug_aggregator.c b/src/modules/everything/evry_plug_aggregator.c
index 3102591f09..2a3c701d03 100644
--- a/src/modules/everything/evry_plug_aggregator.c
+++ b/src/modules/everything/evry_plug_aggregator.c
@@ -292,7 +292,7 @@ _finish(Evry_Plugin *plugin)
 }
 
 static Evry_Plugin *
-_begin(Evry_Plugin *plugin, const Evry_Item *it __UNUSED__)
+_begin(Evry_Plugin *plugin, const Evry_Item *it EINA_UNUSED)
 {
    Plugin *p;
 
diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c
index 337b74d728..423a90df2a 100644
--- a/src/modules/everything/evry_plug_apps.c
+++ b/src/modules/everything/evry_plug_apps.c
@@ -199,7 +199,7 @@ _item_exe_add(Plugin *p, const char *exe, int match)
 }
 
 static Eina_Bool
-_hist_exe_get_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata)
+_hist_exe_get_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata)
 {
    History_Entry *he = data;
    History_Item *hi;
@@ -478,7 +478,7 @@ _desktop_list_get(void)
 }
 
 static Eina_Bool
-_hist_items_get_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata)
+_hist_items_get_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata)
 {
    History_Entry *he = data;
    History_Item *hi;
@@ -806,7 +806,7 @@ _fetch_mime(Evry_Plugin *plugin, const char *input)
 }
 
 static int
-_complete(Evry_Plugin *plugin __UNUSED__, const Evry_Item *it, char **input)
+_complete(Evry_Plugin *plugin EINA_UNUSED, const Evry_Item *it, char **input)
 {
    GET_APP(app, it);
 
@@ -832,7 +832,7 @@ _complete(Evry_Plugin *plugin __UNUSED__, const Evry_Item *it, char **input)
 /***************************************************************************/
 
 static int
-_exec_app_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it __UNUSED__)
+_exec_app_check_item(Evry_Action *act EINA_UNUSED, const Evry_Item *it EINA_UNUSED)
 {
    return 1;
 }
@@ -873,7 +873,7 @@ _exec_term_action(Evry_Action *act)
 }
 
 static int
-_exec_term_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
+_exec_term_check_item(Evry_Action *act EINA_UNUSED, const Evry_Item *it)
 {
    GET_APP(app, it);
 
@@ -905,7 +905,7 @@ _exec_sudo_action(Evry_Action *act)
 }
 
 static int
-_edit_app_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
+_edit_app_check_item(Evry_Action *act EINA_UNUSED, const Evry_Item *it)
 {
    GET_APP(app, it);
 
@@ -939,7 +939,7 @@ _edit_app_action(Evry_Action *act)
 }
 
 static int
-_new_app_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
+_new_app_check_item(Evry_Action *act EINA_UNUSED, const Evry_Item *it)
 {
    GET_APP(app, it);
 
@@ -1054,7 +1054,7 @@ _open_term_action(Evry_Action *act)
 }
 
 static int
-_check_executable(Evry_Action *act __UNUSED__, const Evry_Item *it)
+_check_executable(Evry_Action *act EINA_UNUSED, const Evry_Item *it)
 {
    GET_FILE(file, it);
 
@@ -1073,7 +1073,7 @@ _run_executable(Evry_Action *act)
 
 /***************************************************************************/
 static Eina_Bool
-_desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+_desktop_cache_update(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
 {
    Efreet_Desktop *d;
 
@@ -1083,7 +1083,7 @@ _desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __
    return EINA_TRUE;
 }
 static void
-_dir_watcher(void *data  __UNUSED__, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path  __UNUSED__)
+_dir_watcher(void *data  EINA_UNUSED, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path  EINA_UNUSED)
 {
    //printf("exebuf path changed\n");
    switch (event)
@@ -1285,7 +1285,7 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dia
 static int          _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 
 static E_Config_Dialog *
-_conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__)
+_conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
 {
    E_Config_Dialog *cfd = NULL;
    E_Config_Dialog_View *v = NULL;
@@ -1308,7 +1308,7 @@ _conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__)
 }
 
 static void *
-_create_data(E_Config_Dialog *cfd __UNUSED__)
+_create_data(E_Config_Dialog *cfd EINA_UNUSED)
 {
    E_Config_Dialog_Data *cfdata = NULL;
 
@@ -1318,7 +1318,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
 }
 
 static void
-_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
 {
    _conf->cfd = NULL;
    E_FREE(cfdata);
@@ -1359,7 +1359,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 }
 
 static int
-_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
 {
 #define CP(_name)                        \
    eina_stringshare_replace(&(_conf->_name), cfdata->_name)
@@ -1493,7 +1493,7 @@ evry_plug_apps_save(void)
 
 /* taken from e_exebuf.c */
 static Eina_Bool
-_scan_idler(void *data __UNUSED__)
+_scan_idler(void *data EINA_UNUSED)
 {
    char *dir;
 
diff --git a/src/modules/everything/evry_plug_calc.c b/src/modules/everything/evry_plug_calc.c
index 09e3341283..9fe3f501e8 100644
--- a/src/modules/everything/evry_plug_calc.c
+++ b/src/modules/everything/evry_plug_calc.c
@@ -27,7 +27,7 @@ static char _module_icon[] = "accessories-calculator";
 static Evry_Item *cur_item = NULL;
 
 static Evry_Plugin *
-_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
+_begin(Evry_Plugin *plugin, const Evry_Item *item EINA_UNUSED)
 {
    Plugin *p;
 
@@ -104,7 +104,7 @@ _finish(Evry_Plugin *plugin)
 }
 
 static Eina_Bool
-_cb_action_performed(__UNUSED__ void *data, __UNUSED__ int type, void *event)
+_cb_action_performed(EINA_UNUSED void *data, EINA_UNUSED int type, void *event)
 {
    Eina_List *l;
    Evry_Item *it, *it2, *it_old;
@@ -197,7 +197,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
 }
 
 static Eina_Bool
-_cb_data(void *data, int type __UNUSED__, void *event)
+_cb_data(void *data, int type EINA_UNUSED, void *event)
 {
    Ecore_Exe_Event_Data *ev = event;
    Evry_Plugin *p = data;
@@ -224,7 +224,7 @@ _cb_data(void *data, int type __UNUSED__, void *event)
 }
 
 static Eina_Bool
-_cb_error(void *data, int type __UNUSED__, void *event)
+_cb_error(void *data, int type EINA_UNUSED, void *event)
 {
    Ecore_Exe_Event_Data *ev = event;
    Evry_Plugin *p = data;
@@ -240,7 +240,7 @@ _cb_error(void *data, int type __UNUSED__, void *event)
 }
 
 static Eina_Bool
-_cb_del(void *data __UNUSED__, int type __UNUSED__, void *event)
+_cb_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
 {
    Ecore_Exe_Event_Del *e = event;
 
@@ -294,7 +294,7 @@ _plugins_shutdown(void)
 /***************************************************************************/
 
 Eina_Bool
-evry_plug_calc_init(E_Module *m __UNUSED__)
+evry_plug_calc_init(E_Module *m EINA_UNUSED)
 {
    EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown);
 
diff --git a/src/modules/everything/evry_plug_clipboard.c b/src/modules/everything/evry_plug_clipboard.c
index c4c83f7310..6859ffb0c7 100644
--- a/src/modules/everything/evry_plug_clipboard.c
+++ b/src/modules/everything/evry_plug_clipboard.c
@@ -17,7 +17,7 @@ _action(Evry_Action *action)
 }
 
 static int
-_check_item(Evry_Action *action __UNUSED__, const Evry_Item *it)
+_check_item(Evry_Action *action EINA_UNUSED, const Evry_Item *it)
 {
    return it && it->label && (strlen(it->label) > 0);
 }
diff --git a/src/modules/everything/evry_plug_collection.c b/src/modules/everything/evry_plug_collection.c
index fdc6db270b..1386d62ca0 100644
--- a/src/modules/everything/evry_plug_collection.c
+++ b/src/modules/everything/evry_plug_collection.c
@@ -66,7 +66,7 @@ _add_item(Plugin *p, Plugin_Config *pc)
 }
 
 static Evry_Plugin *
-_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
+_begin(Evry_Plugin *plugin, const Evry_Item *item EINA_UNUSED)
 {
    Plugin_Config *pc;
    Eina_List *l;
@@ -81,7 +81,7 @@ _begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
 }
 
 static Evry_Plugin *
-_begin_all(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
+_begin_all(Evry_Plugin *plugin, const Evry_Item *item EINA_UNUSED)
 {
    Plugin_Config *pc;
    Eina_List *l;
diff --git a/src/modules/everything/evry_plug_files.c b/src/modules/everything/evry_plug_files.c
index 18ffdbaf78..4fec177ded 100644
--- a/src/modules/everything/evry_plug_files.c
+++ b/src/modules/everything/evry_plug_files.c
@@ -262,7 +262,7 @@ _files_filter(Plugin *p)
 }
 
 static void
-_scan_cancel_func(void *data, Ecore_Thread *thread __UNUSED__)
+_scan_cancel_func(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Data *d = data;
    Plugin *p = d->plugin;
@@ -364,7 +364,7 @@ _file_add(Plugin *p, Evry_Item *item)
 }
 
 static void
-_scan_end_func(void *data, Ecore_Thread *thread __UNUSED__)
+_scan_end_func(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Data *d = data;
    Plugin *p = d->plugin;
@@ -435,7 +435,7 @@ _scan_end_func(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_dir_watcher(void *data, Ecore_File_Monitor *em __UNUSED__, Ecore_File_Event event, const char *path)
+_dir_watcher(void *data, Ecore_File_Monitor *em EINA_UNUSED, Ecore_File_Event event, const char *path)
 {
    Plugin *p = data;
    Evry_Item_File *file;
@@ -891,7 +891,7 @@ _recentf_end_func(void *data)
 #endif
 
 static Eina_Bool
-_recentf_items_add_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata)
+_recentf_items_add_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata)
 {
    History_Entry *he = data;
    History_Item *hi = NULL, *hi2;
@@ -1104,7 +1104,7 @@ _recentf_fetch(Evry_Plugin *plugin, const char *input)
 /* actions */
 
 static int
-_open_folder_check(Evry_Action *act __UNUSED__, const Evry_Item *it)
+_open_folder_check(Evry_Action *act EINA_UNUSED, const Evry_Item *it)
 {
    return it->browseable && e_action_find("fileman");
 }
@@ -1427,7 +1427,7 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dia
 static int          _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 
 static E_Config_Dialog *
-_conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__)
+_conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
 {
    E_Config_Dialog *cfd = NULL;
    E_Config_Dialog_View *v = NULL;
@@ -1450,13 +1450,13 @@ _conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__)
 }
 
 static void
-_clear_cache_cb(void *data __UNUSED__, void *data2 __UNUSED__)
+_clear_cache_cb(void *data EINA_UNUSED, void *data2 EINA_UNUSED)
 {
    clear_cache = EINA_TRUE;
 }
 
 static Evas_Object *
-_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
+_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *o = NULL, *of = NULL, *ow = NULL;
 
@@ -1495,7 +1495,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
 }
 
 static void *
-_create_data(E_Config_Dialog *cfd __UNUSED__)
+_create_data(E_Config_Dialog *cfd EINA_UNUSED)
 {
    E_Config_Dialog_Data *cfdata = NULL;
 
@@ -1505,7 +1505,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
 }
 
 static void
-_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
 {
    _conf->cfd = NULL;
    E_FREE(cfdata);
@@ -1524,7 +1524,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 }
 
 static int
-_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
 {
 #define C(_name) _conf->_name = cfdata->_name;
    C(show_homedir);
diff --git a/src/modules/everything/evry_plug_settings.c b/src/modules/everything/evry_plug_settings.c
index 2b48977c0e..a071b3eb88 100644
--- a/src/modules/everything/evry_plug_settings.c
+++ b/src/modules/everything/evry_plug_settings.c
@@ -44,7 +44,7 @@ _finish(Evry_Plugin *plugin)
 }
 
 static Evas_Object *
-_icon_get(Evry_Item *item, Evas *e __UNUSED__)
+_icon_get(Evry_Item *item, Evas *e EINA_UNUSED)
 {
    Settings_Item *it = (Settings_Item *)item;
 
@@ -89,7 +89,7 @@ _browse(Evry_Plugin *plugin, const Evry_Item *item)
 }
 
 static Evry_Plugin *
-_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
+_begin(Evry_Plugin *plugin, const Evry_Item *item EINA_UNUSED)
 {
    Plugin *pl;
 
@@ -150,7 +150,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
 }
 
 static int
-_action_check(Evry_Action *action __UNUSED__, const Evry_Item *item)
+_action_check(Evry_Action *action EINA_UNUSED, const Evry_Item *item)
 {
    return !!(((Settings_Item *)item)->eci);
 }
diff --git a/src/modules/everything/evry_plug_text.c b/src/modules/everything/evry_plug_text.c
index 5d0f356d9a..b97422dae3 100644
--- a/src/modules/everything/evry_plug_text.c
+++ b/src/modules/everything/evry_plug_text.c
@@ -10,7 +10,7 @@ struct _Plugin
 static Evry_Plugin *p1, *p2;
 
 static Evry_Plugin *
-_begin(Evry_Plugin *plugin, const Evry_Item *it __UNUSED__)
+_begin(Evry_Plugin *plugin, const Evry_Item *it EINA_UNUSED)
 {
    Plugin *p;
 
diff --git a/src/modules/everything/evry_plug_windows.c b/src/modules/everything/evry_plug_windows.c
index 26e70a3cd3..1d5798a56e 100644
--- a/src/modules/everything/evry_plug_windows.c
+++ b/src/modules/everything/evry_plug_windows.c
@@ -75,7 +75,7 @@ _client_item_add(Plugin *p, E_Client *ec)
 }
 
 static Eina_Bool
-_cb_border_remove(void *data, __UNUSED__ int type, void *event)
+_cb_border_remove(void *data, EINA_UNUSED int type, void *event)
 {
    E_Event_Client *ev = event;
    Client_Item *bi;
@@ -101,7 +101,7 @@ _cb_border_remove(void *data, __UNUSED__ int type, void *event)
 }
 
 static Eina_Bool
-_cb_client_add(void *data, __UNUSED__ int type, void *event)
+_cb_client_add(void *data, EINA_UNUSED int type, void *event)
 {
    E_Event_Client *ev = event;
    Plugin *p = data;
@@ -120,7 +120,7 @@ _cb_client_add(void *data, __UNUSED__ int type, void *event)
 }
 
 static Evry_Plugin *
-_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
+_begin(Evry_Plugin *plugin, const Evry_Item *item EINA_UNUSED)
 {
    Plugin *p;
    E_Client *ec;
@@ -483,7 +483,7 @@ _plugins_shutdown(void)
 /***************************************************************************/
 
 Eina_Bool
-evry_plug_windows_init(E_Module *m __UNUSED__)
+evry_plug_windows_init(E_Module *m EINA_UNUSED)
 {
    EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown);
 
diff --git a/src/modules/everything/evry_util.c b/src/modules/everything/evry_util.c
index a6a189193e..0552b3ae7a 100644
--- a/src/modules/everything/evry_util.c
+++ b/src/modules/everything/evry_util.c
@@ -893,7 +893,7 @@ evry_file_url_get(Evry_Item_File *file)
 }
 
 static void
-_cb_free_item_changed(void *data __UNUSED__, void *event)
+_cb_free_item_changed(void *data EINA_UNUSED, void *event)
 {
    Evry_Event_Item_Changed *ev = event;
 
diff --git a/src/modules/everything/evry_view.c b/src/modules/everything/evry_view.c
index 44edb103fe..dea0446c6e 100644
--- a/src/modules/everything/evry_view.c
+++ b/src/modules/everything/evry_view.c
@@ -82,7 +82,7 @@ static void      _animator_del(Evas_Object *obj);
 static Eina_Bool _animator(void *data);
 
 static void
-_cb_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_cb_thumb_gen(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Coord w, h;
    Item *it = data;
@@ -105,7 +105,7 @@ _cb_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
 }
 
 static void
-_cb_preload(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_cb_preload(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Item *it = data;
 
@@ -136,7 +136,7 @@ _check_item(const Evry_Item *it)
 }
 
 static void
-_item_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_item_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
    Item *it = data;
@@ -171,7 +171,7 @@ _item_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
 }
 
 static void
-_item_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_item_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;
    Item *it = data;
@@ -605,19 +605,19 @@ _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
 }
 
 static void
-_e_smart_show(Evas_Object *obj __UNUSED__){}
+_e_smart_show(Evas_Object *obj EINA_UNUSED){}
 
 static void
-_e_smart_hide(Evas_Object *obj __UNUSED__){}
+_e_smart_hide(Evas_Object *obj EINA_UNUSED){}
 
 static void
-_e_smart_color_set(Evas_Object *obj __UNUSED__, int r __UNUSED__, int g __UNUSED__, int b __UNUSED__, int a __UNUSED__){}
+_e_smart_color_set(Evas_Object *obj EINA_UNUSED, int r EINA_UNUSED, int g EINA_UNUSED, int b EINA_UNUSED, int a EINA_UNUSED){}
 
 static void
-_e_smart_clip_set(Evas_Object *obj __UNUSED__, Evas_Object *clip __UNUSED__){}
+_e_smart_clip_set(Evas_Object *obj EINA_UNUSED, Evas_Object *clip EINA_UNUSED){}
 
 static void
-_e_smart_clip_unset(Evas_Object *obj __UNUSED__){}
+_e_smart_clip_unset(Evas_Object *obj EINA_UNUSED){}
 
 static Evas_Object *
 _pan_add(Evas *evas)
@@ -1385,7 +1385,7 @@ end:
 }
 
 static Eina_Bool
-_cb_item_changed(void *data, int type __UNUSED__, void *event)
+_cb_item_changed(void *data, int type EINA_UNUSED, void *event)
 {
    Evry_Event_Item_Changed *ev = event;
    View *v = data;
@@ -1429,7 +1429,7 @@ _cb_item_changed(void *data, int type __UNUSED__, void *event)
 }
 
 static Eina_Bool
-_cb_action_performed(void *data, int type __UNUSED__, void *event)
+_cb_action_performed(void *data, int type EINA_UNUSED, void *event)
 {
    Evry_Event_Action_Performed *ev = event;
    View *v = data;
@@ -1457,7 +1457,7 @@ _cb_action_performed(void *data, int type __UNUSED__, void *event)
 }
 
 static void
-_view_cb_mouse_wheel(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
+_view_cb_mouse_wheel(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Wheel *ev = event_info;
    Smart_Data *sd = evas_object_smart_data_get(obj);
@@ -1473,7 +1473,7 @@ _view_cb_mouse_wheel(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj
 // FIXME: 'drag into' make mouse input hang after some trials 
 #if 0
 static void
-_view_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_view_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
    Smart_Data *sd = evas_object_smart_data_get(data);
@@ -1485,7 +1485,7 @@ _view_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
 }
 
 static void
-_view_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_view_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    /* Evas_Event_Mouse_Up *ev = event_info; */
    Smart_Data *sd = evas_object_smart_data_get(data);
@@ -1500,7 +1500,7 @@ _view_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
 #define SLIDE_RESISTANCE 80
 
 static void
-_view_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_view_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Evas_Event_Mouse_Move *ev = event_info;
    Smart_Data *sd = evas_object_smart_data_get(data);
@@ -1583,7 +1583,7 @@ end:
 #endif
 
 static void
-_cb_list_hide(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+_cb_list_hide(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    View *v = data;
 
@@ -1591,7 +1591,7 @@ _cb_list_hide(void *data, Evas_Object *obj __UNUSED__, const char *emission __UN
 }
 
 static void
-_cb_list_show(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+_cb_list_show(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    View *v = data;
 
diff --git a/src/modules/everything/evry_view_help.c b/src/modules/everything/evry_view_help.c
index eb9891582d..daecd3627e 100644
--- a/src/modules/everything/evry_view_help.c
+++ b/src/modules/everything/evry_view_help.c
@@ -13,7 +13,7 @@ _view_clear(Evry_View *v)
 }
 
 static int
-_view_update(Evry_View *v __UNUSED__)
+_view_update(Evry_View *v EINA_UNUSED)
 {
    return 1;
 }
@@ -58,7 +58,7 @@ _cb_key_down(Evry_View *v, const Ecore_Event_Key *ev)
 }
 
 static Evry_View *
-_view_create(Evry_View *v, const Evry_State *s __UNUSED__, Evas_Object *swallow)
+_view_create(Evry_View *v, const Evry_State *s EINA_UNUSED, Evas_Object *swallow)
 {
    Evas_Object *o;
    int mw, mh;
diff --git a/src/modules/everything/evry_view_tabs.c b/src/modules/everything/evry_view_tabs.c
index f149e40f67..8da9ebaa84 100644
--- a/src/modules/everything/evry_view_tabs.c
+++ b/src/modules/everything/evry_view_tabs.c
@@ -28,13 +28,13 @@ _timer_cb(void *data)
 }
 
 static void
-_tab_cb_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_tab_cb_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    /* Evas_Event_Mouse_Down *ev = event_info; */
 }
 
 static void
-_tab_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_tab_cb_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Evas_Event_Mouse_Up *ev = event_info;
    Tab *tab = data;
@@ -55,7 +55,7 @@ _tab_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
 }
 
 static void
-_tabs_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_tabs_cb_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Evas_Event_Mouse_Wheel *ev = event_info;
    Tab_View *v = data;