diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c
index b644eecec..b477a0b4b 100644
--- a/src/modules/conf_imc/e_int_config_imc.c
+++ b/src/modules/conf_imc/e_int_config_imc.c
@@ -148,7 +148,7 @@ _change_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED_
 }
 
 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)
 {
    if (cfdata->win_import)
      e_int_config_imc_import_del(cfdata->win_import);
@@ -178,7 +178,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 
 /*** Start Basic Dialog Logic ***/
 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)
 {
    if (cfdata->imc_current)
      {
@@ -222,7 +222,7 @@ _e_imc_setup_button_toggle(Evas_Object *button, E_Input_Method_Config *imc)
 }
 
 static void
-_e_imc_list_change_cb(void *data, Evas_Object *obj)
+_e_imc_list_change_cb(void *data, Evas_Object *obj __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
    E_Input_Method_Config *imc;
@@ -238,7 +238,7 @@ _e_imc_list_change_cb(void *data, Evas_Object *obj)
 }
 
 static void
-_e_imc_setup_cb(void *data, void *data2)
+_e_imc_setup_cb(void *data, void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
 
@@ -427,7 +427,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 
 /* Radio Toggled */
 static void
-_cb_dir(void *data, Evas_Object *obj)
+_cb_dir(void *data, Evas_Object *obj __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
    const char *path;
@@ -442,7 +442,7 @@ _cb_dir(void *data, Evas_Object *obj)
 
 /* Directory Navigator */
 static void
-_cb_button_up(void *data, void *data2)
+_cb_button_up(void *data, void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
 
@@ -455,7 +455,7 @@ _cb_button_up(void *data, void *data2)
 
 /* Entry chagned */
 static void
-_e_imc_entry_change_cb(void *data, Evas_Object *obj)
+_e_imc_entry_change_cb(void *data, Evas_Object *obj __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
 
@@ -465,7 +465,7 @@ _e_imc_entry_change_cb(void *data, Evas_Object *obj)
 
 /* Creating a new IMC */
 static void
-_cb_new(void *data, void *data2)
+_cb_new(void *data, void *data2 __UNUSED__)
 {
    E_Input_Method_Config *imc_new;
    Eet_File *ef;
@@ -492,7 +492,7 @@ _cb_new(void *data, void *data2)
 }
 
 static void
-_e_imc_adv_setup_cb(void *data, void *data2)
+_e_imc_adv_setup_cb(void *data, void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
 
@@ -521,7 +521,7 @@ _e_imc_adv_setup_cb(void *data, void *data2)
 
 /** Start IMC FM2 Callbacks **/
 static void
-_cb_files_changed(void *data, Evas_Object *obj, void *event_info)
+_cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
 
@@ -542,7 +542,7 @@ _cb_files_changed(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
+_cb_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
    Eina_List *selected;
@@ -576,7 +576,7 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
+_cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    const char *buf;
    const char *p;
@@ -606,7 +606,7 @@ _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
+_cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
    Eina_List *sel, *all, *n;
@@ -757,7 +757,7 @@ e_int_config_imc_import_done(E_Config_Dialog *dia)
 }
 
 static void
-_cb_import(void *data1, void *data2)
+_cb_import(void *data1, void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
 
diff --git a/src/modules/conf_imc/e_int_config_imc_import.c b/src/modules/conf_imc/e_int_config_imc_import.c
index 6b1742410..d31cb2a12 100644
--- a/src/modules/conf_imc/e_int_config_imc_import.c
+++ b/src/modules/conf_imc/e_int_config_imc_import.c
@@ -192,7 +192,7 @@ _imc_import_cb_wid_focus(void *data, Evas_Object *obj)
 }
 
 static void 
-_imc_import_cb_selected(void *data, Evas_Object *obj) 
+_imc_import_cb_selected(void *data, Evas_Object *obj __UNUSED__) 
 {
    Import *import;
 
@@ -201,7 +201,7 @@ _imc_import_cb_selected(void *data, Evas_Object *obj)
 }
 
 static void 
-_imc_import_cb_changed(void *data, Evas_Object *obj) 
+_imc_import_cb_changed(void *data, Evas_Object *obj __UNUSED__) 
 {
    Import *import;
    const char *path;
@@ -241,7 +241,7 @@ _imc_import_cb_changed(void *data, Evas_Object *obj)
 }
 
 static void 
-_imc_import_cb_ok(void *data, void *data2) 
+_imc_import_cb_ok(void *data, void *data2 __UNUSED__) 
 {
    Import *import;
    E_Win *win;
@@ -310,7 +310,7 @@ _imc_import_cb_ok(void *data, void *data2)
 }
 
 static void 
-_imc_import_cb_close(void *data, void *data2) 
+_imc_import_cb_close(void *data, void *data2 __UNUSED__) 
 {
    E_Win *win;
 
@@ -319,7 +319,7 @@ _imc_import_cb_close(void *data, void *data2)
 }
 
 static void 
-_imc_import_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event) 
+_imc_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) 
 {
    Evas_Event_Key_Down *ev;
    Import *import;
diff --git a/src/modules/conf_imc/e_mod_main.c b/src/modules/conf_imc/e_mod_main.c
index 25d3adf62..a538b2d6d 100644
--- a/src/modules/conf_imc/e_mod_main.c
+++ b/src/modules/conf_imc/e_mod_main.c
@@ -14,18 +14,23 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("language", 70, _("Language"), NULL, "preferences-desktop-locale");
-   e_configure_registry_item_add("language/input_method_settings", 20, _("Input Method Settings"), NULL, "preferences-imc", e_int_config_imc);
+   e_configure_registry_category_add("language", 70, _("Language"), NULL, 
+                                     "preferences-desktop-locale");
+   e_configure_registry_item_add("language/input_method_settings", 20, 
+                                 _("Input Method Settings"), NULL, 
+                                 "preferences-imc", e_int_config_imc);
    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", "language/input_method_settings"))) e_object_del(E_OBJECT(cfd));
+
+   while ((cfd = e_config_dialog_get("E", "language/input_method_settings"))) 
+     e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("language/input_method_settings");
    e_configure_registry_category_del("language");
    conf_module = NULL;
@@ -33,7 +38,7 @@ e_modapi_shutdown(E_Module *m)
 }
 
 EAPI int
-e_modapi_save(E_Module *m)
+e_modapi_save(E_Module *m __UNUSED__)
 {
    return 1;
 }