diff --git a/src/modules/tiling/e_mod_config.c b/src/modules/tiling/e_mod_config.c
index 548f1200c..0b69544f2 100644
--- a/src/modules/tiling/e_mod_config.c
+++ b/src/modules/tiling/e_mod_config.c
@@ -58,7 +58,7 @@ get_vdesk(Eina_List *vdesks,
  *
  */
 static void *
-_create_data(E_Config_Dialog *cfd __UNUSED__)
+_create_data(E_Config_Dialog *cfd EINA_UNUSED)
 {
     E_Config_Dialog_Data *cfdata;
     Eina_List *l;
@@ -92,7 +92,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
 }
 
 static void
-_free_data(E_Config_Dialog      *cfd __UNUSED__,
+_free_data(E_Config_Dialog      *cfd EINA_UNUSED,
            E_Config_Dialog_Data *cfdata)
 {
     eina_list_free(cfdata->config.vdesks);
@@ -147,7 +147,7 @@ _fill_zone_config(E_Zone               *zone,
 
 static void
 _cb_zone_change(void        *data,
-                Evas_Object *obj __UNUSED__)
+                Evas_Object *obj EINA_UNUSED)
 {
     int n;
     E_Config_Dialog_Data *cfdata = data;
@@ -164,7 +164,7 @@ _cb_zone_change(void        *data,
 }
 
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog      *cfd __UNUSED__,
+_basic_create_widgets(E_Config_Dialog      *cfd EINA_UNUSED,
                       Evas                 *evas,
                       E_Config_Dialog_Data *cfdata)
 {
@@ -229,7 +229,7 @@ _basic_create_widgets(E_Config_Dialog      *cfd __UNUSED__,
 }
 
 static int
-_basic_apply_data(E_Config_Dialog      *cfd __UNUSED__,
+_basic_apply_data(E_Config_Dialog      *cfd EINA_UNUSED,
                   E_Config_Dialog_Data *cfdata)
 {
     struct _Config_vdesk *vd;
@@ -306,7 +306,7 @@ _basic_apply_data(E_Config_Dialog      *cfd __UNUSED__,
 
 E_Config_Dialog *
 e_int_config_tiling_module(E_Comp *comp,
-                           const char  *params __UNUSED__)
+                           const char  *params EINA_UNUSED)
 {
     E_Config_Dialog *cfd;
     E_Config_Dialog_View *v;
diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c
index 8b95f752f..2c0d37b69 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -176,8 +176,8 @@ change_window_border(E_Client   *ec,
 }
 
 static Eina_Bool
-_info_hash_update(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
-                  void *data, void *fdata __UNUSED__)
+_info_hash_update(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED,
+                  void *data, void *fdata EINA_UNUSED)
 {
     Tiling_Info *tinfo = data;
 
@@ -536,8 +536,8 @@ toggle_floating(E_Client *ec)
 }
 
 static void
-_e_mod_action_toggle_floating_cb(E_Object   *obj __UNUSED__,
-                                 const char *params __UNUSED__)
+_e_mod_action_toggle_floating_cb(E_Object   *obj EINA_UNUSED,
+                                 const char *params EINA_UNUSED)
 {
     toggle_floating(e_client_focused_get());
 }
@@ -603,7 +603,7 @@ _e_mod_action_swap_window_end_mouse(E_Object * obj EINA_UNUSED, const char *para
 }
 
 static void
-_e_mod_menu_border_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
+_e_mod_menu_border_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
 {
    E_Client *ec = data;
 
@@ -641,29 +641,29 @@ _action_swap(int cross_edge)
 }
 
 static void
-_e_mod_action_move_left_cb(E_Object   *obj __UNUSED__,
-                      const char *params __UNUSED__)
+_e_mod_action_move_left_cb(E_Object   *obj EINA_UNUSED,
+                      const char *params EINA_UNUSED)
 {
    _action_swap(TILING_WINDOW_TREE_EDGE_LEFT);
 }
 
 static void
-_e_mod_action_move_right_cb(E_Object   *obj __UNUSED__,
-                      const char *params __UNUSED__)
+_e_mod_action_move_right_cb(E_Object   *obj EINA_UNUSED,
+                      const char *params EINA_UNUSED)
 {
    _action_swap(TILING_WINDOW_TREE_EDGE_RIGHT);
 }
 
 static void
-_e_mod_action_move_up_cb(E_Object   *obj __UNUSED__,
-                      const char *params __UNUSED__)
+_e_mod_action_move_up_cb(E_Object   *obj EINA_UNUSED,
+                      const char *params EINA_UNUSED)
 {
    _action_swap(TILING_WINDOW_TREE_EDGE_TOP);
 }
 
 static void
-_e_mod_action_move_down_cb(E_Object   *obj __UNUSED__,
-                      const char *params __UNUSED__)
+_e_mod_action_move_down_cb(E_Object   *obj EINA_UNUSED,
+                      const char *params EINA_UNUSED)
 {
    _action_swap(TILING_WINDOW_TREE_EDGE_BOTTOM);
 }
@@ -672,8 +672,8 @@ _e_mod_action_move_down_cb(E_Object   *obj __UNUSED__,
 /* Toggle split mode {{{ */
 
 static void
-_e_mod_action_toggle_split_mode(E_Object   *obj __UNUSED__,
-                                 const char *params __UNUSED__)
+_e_mod_action_toggle_split_mode(E_Object   *obj EINA_UNUSED,
+                                 const char *params EINA_UNUSED)
 {
     E_Desk *desk;
 
@@ -853,7 +853,7 @@ _resize_begin_hook(void *data EINA_UNUSED, E_Client *ec)
 }
 
 static Eina_Bool
-_resize_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *event)
+_resize_hook(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client *event)
 {
     E_Client *ec = event->ec;
 
@@ -863,7 +863,7 @@ _resize_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *event)
 }
 
 static Eina_Bool
-_move_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client*event)
+_move_hook(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client*event)
 {
     E_Client *ec = event->ec;
     Client_Extra *extra = tiling_entry_func(ec);
@@ -883,7 +883,7 @@ _move_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client*event)
 }
 
 static Eina_Bool
-_add_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *event)
+_add_hook(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client *event)
 {
     E_Client *ec = event->ec;
 
@@ -904,7 +904,7 @@ _add_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *event)
 }
 
 static Eina_Bool
-_remove_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *event)
+_remove_hook(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client *event)
 {
     E_Client *ec = event->ec;
 
@@ -924,7 +924,7 @@ _remove_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *event)
 }
 
 static bool
-_iconify_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *event)
+_iconify_hook(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client *event)
 {
     E_Client *ec = event->ec;
 
@@ -939,7 +939,7 @@ _iconify_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *event)
 }
 
 static bool
-_uniconify_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *event)
+_uniconify_hook(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client *event)
 {
     E_Client *ec = event->ec;
 
@@ -973,21 +973,21 @@ toggle_sticky(E_Client *ec)
 }
 
 static Eina_Bool
-_stick_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *event)
+_stick_hook(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client *event)
 {
    toggle_sticky(event->ec);
    return true;
 }
 
 static Eina_Bool
-_unstick_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *event)
+_unstick_hook(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client *event)
 {
    toggle_sticky(event->ec);
    return true;
 }
 
 static Eina_Bool
-_desk_show_hook(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+_desk_show_hook(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
 {
     _G.currently_switching_desktop = 0;
 
@@ -995,7 +995,7 @@ _desk_show_hook(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED
 }
 
 static Eina_Bool
-_desk_before_show_hook(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+_desk_before_show_hook(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
 {
     _G.currently_switching_desktop = 1;
 
@@ -1003,7 +1003,7 @@ _desk_before_show_hook(void *data __UNUSED__, int type __UNUSED__, void *event _
 }
 
 static bool
-_desk_set_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client_Desk_Set *ev)
+_desk_set_hook(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client_Desk_Set *ev)
 {
     DBG("%p: from (%d,%d) to (%d,%d)", ev->ec,
         ev->desk->x, ev->desk->y,
@@ -1036,7 +1036,7 @@ _compositor_resize_hook_desk_reapply(E_Desk *desk)
 }
 
 static bool
-_compositor_resize_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Compositor_Resize *ev EINA_UNUSED)
+_compositor_resize_hook(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Compositor_Resize *ev EINA_UNUSED)
 {
    _foreach_desk(_compositor_resize_hook_desk_reapply);
 
@@ -1044,7 +1044,7 @@ _compositor_resize_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Comp
 }
 
 static void
-_bd_hook(void *d __UNUSED__, E_Client *ec)
+_bd_hook(void *d EINA_UNUSED, E_Client *ec)
 {
    E_Menu_Item *mi;
    E_Menu *m;
@@ -1290,7 +1290,7 @@ _foreach_desk(void (*func)(E_Desk *desk))
 }
 
 EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
+e_modapi_shutdown(E_Module *m EINA_UNUSED)
 {
     _disable_all_tiling();
 
@@ -1361,7 +1361,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.tiling", _G.config_edd, tiling_g.config);