diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
index bf12d5454..a34d4ba43 100644
--- a/src/modules/conf_mousebindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
@@ -173,7 +173,7 @@ _create_data(E_Config_Dialog *cfd)
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 {
    E_Config_Binding_Mouse *eb;
    E_Config_Binding_Wheel *bw;
@@ -201,7 +201,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 }
 
 static int
-_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 { 
    Eina_List *l;
    E_Config_Binding_Mouse *eb, *eb2;
@@ -399,7 +399,7 @@ _fill_actions_list(E_Config_Dialog_Data *cfdata)
 
 /******************* Callbacks *************/
 static void
-_add_mouse_binding_cb(void *data, void *data2)
+_add_mouse_binding_cb(void *data, void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
 
@@ -411,7 +411,7 @@ _add_mouse_binding_cb(void *data, void *data2)
 }
 
 static void
-_modify_mouse_binding_cb(void *data, void *data2)
+_modify_mouse_binding_cb(void *data, void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
 
@@ -452,7 +452,7 @@ _binding_change_cb(void *data)
 }
 
 static void
-_delete_all_mouse_binding_cb(void *data, void *data2)
+_delete_all_mouse_binding_cb(void *data, void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
    E_Config_Binding_Mouse *eb;
@@ -489,7 +489,7 @@ _delete_all_mouse_binding_cb(void *data, void *data2)
 }
 
 static void
-_delete_mouse_binding_cb(void *data, void *data2)
+_delete_mouse_binding_cb(void *data, void *data2 __UNUSED__)
 {
    Eina_List *l;
    int sel, n;
@@ -556,7 +556,7 @@ _delete_mouse_binding_cb(void *data, void *data2)
 }
 
 static void
-_restore_mouse_binding_defaults_cb(void *data, void *data2)
+_restore_mouse_binding_defaults_cb(void *data, void *data2 __UNUSED__)
 {
    E_Config_Binding_Mouse *eb;
    E_Config_Binding_Wheel *bw;
diff --git a/src/modules/conf_mousebindings/e_mod_main.c b/src/modules/conf_mousebindings/e_mod_main.c
index 964ad4d63..0c3c51386 100644
--- a/src/modules/conf_mousebindings/e_mod_main.c
+++ b/src/modules/conf_mousebindings/e_mod_main.c
@@ -14,18 +14,24 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "preferences-behavior");
-   e_configure_registry_item_add("keyboard_and_mouse/mouse_bindings", 20, _("Mouse Bindings"), NULL, "preferences-desktop-mouse", e_int_config_mousebindings);
+   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), 
+                                     NULL, "preferences-behavior");
+   e_configure_registry_item_add("keyboard_and_mouse/mouse_bindings", 20, 
+                                 _("Mouse Bindings"), NULL, 
+                                 "preferences-desktop-mouse", 
+                                 e_int_config_mousebindings);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
 }
 
 EAPI int
-e_modapi_shutdown(E_Module *m)
+e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_bindings"))) e_object_del(E_OBJECT(cfd));
+
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_bindings"))) 
+     e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("keyboard_and_mouse/mouse_bindings");
    e_configure_registry_category_del("keyboard_and_mouse");
    conf_module = NULL;
@@ -33,7 +39,7 @@ e_modapi_shutdown(E_Module *m)
 }
 
 EAPI int
-e_modapi_save(E_Module *m)
+e_modapi_save(E_Module *m __UNUSED__)
 {
    return 1;
 }