diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c
index ceb586c2c..d07d9b5c3 100644
--- a/src/modules/conf_keybindings/e_int_config_keybindings.c
+++ b/src/modules/conf_keybindings/e_int_config_keybindings.c
@@ -144,7 +144,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_Key *bi;
 
@@ -166,7 +166,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 = NULL;
    E_Config_Binding_Key *bi, *bi2;
@@ -305,7 +305,7 @@ _fill_actions_list(E_Config_Dialog_Data *cfdata)
 /**************** Callbacks *********/
 
 static void
-_add_key_binding_cb(void *data, void *data2)
+_add_key_binding_cb(void *data, void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
 
@@ -318,7 +318,7 @@ _add_key_binding_cb(void *data, void *data2)
 }
 
 static void
-_modify_key_binding_cb(void *data, void *data2)
+_modify_key_binding_cb(void *data, void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
 
@@ -359,7 +359,7 @@ _action_change_cb(void *data)
 }
 
 static void
-_delete_all_key_binding_cb(void *data, void *data2)
+_delete_all_key_binding_cb(void *data, void *data2 __UNUSED__)
 {
    E_Config_Binding_Key *bi;
    E_Config_Dialog_Data *cfdata;
@@ -388,7 +388,7 @@ _delete_all_key_binding_cb(void *data, void *data2)
 }
 
 static void
-_delete_key_binding_cb(void *data, void *data2)
+_delete_key_binding_cb(void *data, void *data2 __UNUSED__)
 {
    Eina_List *l = NULL;
    const char *n;
@@ -437,7 +437,7 @@ _delete_key_binding_cb(void *data, void *data2)
      }
 }
 static void
-_restore_key_binding_defaults_cb(void *data, void *data2)
+_restore_key_binding_defaults_cb(void *data, void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
    E_Config_Binding_Key *bi;
diff --git a/src/modules/conf_keybindings/e_mod_main.c b/src/modules/conf_keybindings/e_mod_main.c
index d1f0fed81..5895aaa24 100644
--- a/src/modules/conf_keybindings/e_mod_main.c
+++ b/src/modules/conf_keybindings/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/key_bindings", 10, _("Key Bindings"), NULL, "preferences-desktop-keyboard-shortcuts", e_int_config_keybindings);
+   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), 
+                                     NULL, "preferences-behavior");
+   e_configure_registry_item_add("keyboard_and_mouse/key_bindings", 10, 
+                                 _("Key Bindings"), NULL, 
+                                 "preferences-desktop-keyboard-shortcuts", 
+                                 e_int_config_keybindings);
    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/key_bindings"))) e_object_del(E_OBJECT(cfd));
+
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/key_bindings"))) 
+     e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("keyboard_and_mouse/key_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;
 }