diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c
index 64694c27c..4d7e76378 100644
--- a/src/modules/backlight/e_mod_main.c
+++ b/src/modules/backlight/e_mod_main.c
@@ -5,9 +5,9 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class);
 
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
@@ -436,13 +436,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Backlight");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[4096];
@@ -455,7 +455,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class)
+_gc_id_new(const E_Gadcon_Client_Class *client_class)
 {
    static char buf[PATH_MAX];
 
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 37f40cce1..084eb852d 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -8,9 +8,9 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class);
 
 Eina_List *device_batteries;
 Eina_List *device_ac_adapters;
@@ -146,13 +146,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Battery");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[4096];
@@ -165,7 +165,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class)
+_gc_id_new(const E_Gadcon_Client_Class *client_class)
 {
    static char buf[PATH_MAX];
 
diff --git a/src/modules/bluez/e_mod_main.c b/src/modules/bluez/e_mod_main.c
index 6562c060b..6a9e0ceb9 100644
--- a/src/modules/bluez/e_mod_main.c
+++ b/src/modules/bluez/e_mod_main.c
@@ -1067,13 +1067,13 @@ _gc_orient(E_Gadcon_Client       *gcc,
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _(_e_bluez_Name);
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__,
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__,
          Evas                               *evas)
 {
    Evas_Object *o;
@@ -1084,7 +1084,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__,
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    E_Bluez_Module_Context *ctxt;
 
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index 765339fe7..35447d403 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -8,9 +8,9 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class);
 static Config_Item *_conf_item_get(const char *id);
 
 
@@ -657,13 +657,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Clock");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[4096];
@@ -677,7 +677,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    Config_Item *ci = NULL;
 
diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c
index f5cb427b4..7bfa9e42e 100644
--- a/src/modules/conf/e_mod_main.c
+++ b/src/modules/conf/e_mod_main.c
@@ -20,9 +20,9 @@ static void             _config_pre_activate_cb(void *data, E_Menu *m);
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void             _gc_shutdown(E_Gadcon_Client *gcc);
 static void             _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char      *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object     *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char      *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static const char      *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object     *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char      *_gc_id_new(const E_Gadcon_Client_Class *client_class);
 static void             _cb_action_conf(void *data, Evas_Object *obj, const char *emission, const char *source);
 
 static void             _conf_new(void);
@@ -97,13 +97,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Settings");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[PATH_MAX];
@@ -116,7 +116,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _gadcon_class.name;
 }
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index 6c69b9eeb..cd072d404 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -1672,13 +1672,13 @@ _gc_orient(E_Gadcon_Client       *gcc,
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _(_e_connman_Name);
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__,
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__,
          Evas                               *evas)
 {
    Evas_Object *o;
@@ -1689,7 +1689,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__,
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    E_Connman_Module_Context *ctxt;
    Eina_List *instances;
diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index 8e470b26c..33154999a 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -10,9 +10,9 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class);
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
 {
@@ -127,13 +127,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Cpufreq");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[PATH_MAX];
@@ -146,7 +146,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    static char idbuff[32];
 
diff --git a/src/modules/everything/evry_gadget.c b/src/modules/everything/evry_gadget.c
index 060abc5b6..ec3d78b11 100644
--- a/src/modules/everything/evry_gadget.c
+++ b/src/modules/everything/evry_gadget.c
@@ -36,9 +36,9 @@ static Eina_Bool        _cb_focus_out(void *data, int type __UNUSED__, void *eve
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void             _gc_shutdown(E_Gadcon_Client *gcc);
 static void             _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char      *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object     *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char      *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static const char      *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object     *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char      *_gc_id_new(const E_Gadcon_Client_Class *client_class);
 static Gadget_Config   *_conf_item_get(const char *id);
 
 static void             _conf_dialog(Instance *inst);
@@ -165,13 +165,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Everything Starter");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas __UNUSED__)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas __UNUSED__)
 {
    Evas_Object *o;
    char buf[PATH_MAX];
@@ -201,7 +201,7 @@ _conf_item_get(const char *id)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    Gadget_Config *ci = NULL;
 
diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c
index e9951d6ef..8f2bf6832 100644
--- a/src/modules/fileman/e_fwin_nav.c
+++ b/src/modules/fileman/e_fwin_nav.c
@@ -26,9 +26,9 @@ struct _Instance
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class);
 static void _cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _cb_back_click(void *data, Evas_Object *obj, const char *emission, const char *source);
@@ -258,19 +258,19 @@ _gc_orient(E_Gadcon_Client *gcc __UNUSED__, E_Gadcon_Orient orient)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("EFM Navigation");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    return e_util_icon_theme_icon_add("system-file-manager", 48, evas);
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    static char buf[PATH_MAX];
 
diff --git a/src/modules/fileman_opinfo/e_mod_main.c b/src/modules/fileman_opinfo/e_mod_main.c
index 46d33602a..edc935482 100644
--- a/src/modules/fileman_opinfo/e_mod_main.c
+++ b/src/modules/fileman_opinfo/e_mod_main.c
@@ -16,9 +16,9 @@ typedef struct _Instance
 static E_Gadcon_Client *_gc_init    (E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void             _gc_shutdown(E_Gadcon_Client *gcc);
 static void             _gc_orient  (E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char      *_gc_label   (E_Gadcon_Client_Class *client_class);
-static Evas_Object     *_gc_icon    (E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char      *_gc_id_new  (E_Gadcon_Client_Class *client_class);
+static const char      *_gc_label   (const E_Gadcon_Client_Class *client_class);
+static Evas_Object     *_gc_icon    (const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char      *_gc_id_new  (const E_Gadcon_Client_Class *client_class);
 
 static const E_Gadcon_Client_Class _gadcon_class = {
    GADCON_CLIENT_CLASS_VERSION, "efm_info",
@@ -410,13 +410,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("EFM Operation Info");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[PATH_MAX];
@@ -430,7 +430,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _gadcon_class.name;
 }
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index a72fba97a..20524b3c6 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -13,10 +13,10 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void             _gc_shutdown(E_Gadcon_Client *gcc);
 static void             _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char      *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object     *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char      *_gc_id_new(E_Gadcon_Client_Class *client_class);
-static void             _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id);
+static const char      *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object     *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char      *_gc_id_new(const E_Gadcon_Client_Class *client_class);
+static void             _gc_id_del(const E_Gadcon_Client_Class *client_class, const char *id);
 
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
@@ -279,13 +279,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("IBar");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[PATH_MAX];
@@ -298,7 +298,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    Config_Item *ci;
 
@@ -307,7 +307,7 @@ _gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
 }
 
 static void
-_gc_id_del(E_Gadcon_Client_Class *client_class __UNUSED__, const char *id __UNUSED__)
+_gc_id_del(const E_Gadcon_Client_Class *client_class __UNUSED__, const char *id __UNUSED__)
 {
 /* yes - don't do this. on shutdown gadgets are deleted and this means config
  * for them is deleted - that means empty config is saved. keep them around
diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index ca9d7b361..112fcd5a7 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -5,10 +5,10 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
-static void _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id);
+static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class);
+static void _gc_id_del(const E_Gadcon_Client_Class *client_class, const char *id);
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
 {
@@ -211,13 +211,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("IBox");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[PATH_MAX];
@@ -230,7 +230,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class)
+_gc_id_new(const E_Gadcon_Client_Class *client_class)
 {
    static char buf[PATH_MAX];
 
@@ -240,7 +240,7 @@ _gc_id_new(E_Gadcon_Client_Class *client_class)
 }
 
 static void
-_gc_id_del(E_Gadcon_Client_Class *client_class __UNUSED__, const char *id __UNUSED__)
+_gc_id_del(const E_Gadcon_Client_Class *client_class __UNUSED__, const char *id __UNUSED__)
 {
 /* yes - don't do this. on shutdown gadgets are deleted and this means config
  * for them is deleted - that means empty config is saved. keep them around
diff --git a/src/modules/illume-bluetooth/e_mod_main.c b/src/modules/illume-bluetooth/e_mod_main.c
index dda513c37..455b91b28 100644
--- a/src/modules/illume-bluetooth/e_mod_main.c
+++ b/src/modules/illume-bluetooth/e_mod_main.c
@@ -14,9 +14,9 @@ struct _Instance
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *cc);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
+static const char *_gc_label(const E_Gadcon_Client_Class *cc);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *cc, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *cc);
 static Eina_Bool _cb_poll(void *data);
 static int _get_interface_class(int iclass);
 
@@ -90,13 +90,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *cc __UNUSED__) 
+_gc_label(const E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    return _("Illume Bluetooth");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) 
+_gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) 
 {
    Evas_Object *o;
    char buff[PATH_MAX];
@@ -109,7 +109,7 @@ _gc_icon(E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *cc __UNUSED__) 
+_gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    static char buff[32];
 
diff --git a/src/modules/illume-home-toggle/e_mod_main.c b/src/modules/illume-home-toggle/e_mod_main.c
index 9d33f5338..4885db107 100644
--- a/src/modules/illume-home-toggle/e_mod_main.c
+++ b/src/modules/illume-home-toggle/e_mod_main.c
@@ -12,9 +12,9 @@ struct _Instance
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *cc);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
+static const char *_gc_label(const E_Gadcon_Client_Class *cc);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *cc, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *cc);
 static void _cb_action_home(void *data, Evas_Object *obj, const char *emission, const char *source);
 
 /* local variables */
@@ -96,13 +96,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *cc __UNUSED__) 
+_gc_label(const E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    return _("Illume-Home-Toggle");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) 
+_gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) 
 {
    Evas_Object *o;
    char buff[PATH_MAX];
@@ -114,7 +114,7 @@ _gc_icon(E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *cc __UNUSED__) 
+_gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    static char buff[32];
 
diff --git a/src/modules/illume-kbd-toggle/e_mod_main.c b/src/modules/illume-kbd-toggle/e_mod_main.c
index 6f9b5d0a5..aa8bf51bb 100644
--- a/src/modules/illume-kbd-toggle/e_mod_main.c
+++ b/src/modules/illume-kbd-toggle/e_mod_main.c
@@ -14,9 +14,9 @@ struct _Instance
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *cc);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
+static const char *_gc_label(const E_Gadcon_Client_Class *cc);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *cc, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *cc);
 static void _cb_action_vkbd_enable(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _cb_action_vkbd_disable(void *data, Evas_Object *obj, const char *emission, const char *source);
 static Eina_Bool _cb_border_focus_in(void *data, int type __UNUSED__, void *event);
@@ -121,13 +121,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *cc __UNUSED__) 
+_gc_label(const E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    return _("Illume-Keyboard-Toggle");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) 
+_gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) 
 {
    Evas_Object *o;
    char buff[PATH_MAX];
@@ -139,7 +139,7 @@ _gc_icon(E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *cc __UNUSED__) 
+_gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    static char buff[32];
 
diff --git a/src/modules/illume-mode-toggle/e_mod_main.c b/src/modules/illume-mode-toggle/e_mod_main.c
index 2e65bbede..b026965b5 100644
--- a/src/modules/illume-mode-toggle/e_mod_main.c
+++ b/src/modules/illume-mode-toggle/e_mod_main.c
@@ -14,9 +14,9 @@ struct _Instance
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *cc);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
+static const char *_gc_label(const E_Gadcon_Client_Class *cc);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *cc, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *cc);
 static void _cb_action_mode_single(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__);
 static void _cb_action_mode_dual_top(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__);
 static void _cb_action_mode_dual_left(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__);
@@ -114,13 +114,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *cc __UNUSED__) 
+_gc_label(const E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    return _("Illume-Mode-Toggle");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) 
+_gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) 
 {
    Evas_Object *o;
    char buff[PATH_MAX];
@@ -132,7 +132,7 @@ _gc_icon(E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *cc __UNUSED__) 
+_gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) 
 {
    static char buff[32];
 
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 107ffd1c2..1cddaf300 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -1127,13 +1127,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return (char*)_(_e_mixer_Name);
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o = edje_object_add(evas);
    edje_object_file_set(o, e_mixer_theme_path(), "icon");
@@ -1141,7 +1141,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    E_Mixer_Module_Context *ctxt;
    Eina_List *instances;
diff --git a/src/modules/notification/e_mod_main.c b/src/modules/notification/e_mod_main.c
index 62f6ba69a..2b2caa43f 100644
--- a/src/modules/notification/e_mod_main.c
+++ b/src/modules/notification/e_mod_main.c
@@ -6,10 +6,10 @@ static E_Gadcon_Client *_gc_init(E_Gadcon   *gc,
                                  const char *id,
                                  const char *style);
 static void         _gc_shutdown(E_Gadcon_Client *gcc);
-static const char  *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class,
+static const char  *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class,
                              Evas                  *evas);
-static const char  *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static const char  *_gc_id_new(const E_Gadcon_Client_Class *client_class);
 
 /* Callback function protos */
 static int  _notification_cb_notify(E_Notification_Daemon *daemon,
@@ -121,13 +121,13 @@ _gc_orient(E_Gadcon_Client *gcc,
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Notification Box");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__,
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__,
          Evas                  *evas)
 {
    Evas_Object *o;
@@ -143,7 +143,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__,
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    Config_Item *ci;
 
diff --git a/src/modules/ofono/e_mod_main.c b/src/modules/ofono/e_mod_main.c
index 826c0f54d..bbb83931a 100644
--- a/src/modules/ofono/e_mod_main.c
+++ b/src/modules/ofono/e_mod_main.c
@@ -504,13 +504,13 @@ _gc_orient(E_Gadcon_Client       *gcc,
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _(_e_ofono_Name);
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__,
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__,
          Evas                               *evas)
 {
    Evas_Object *o;
@@ -521,7 +521,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__,
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    E_Ofono_Module_Context *ctxt;
    Eina_List *instances;
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 599e51eaa..d8791722b 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -5,9 +5,9 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void             _gc_shutdown(E_Gadcon_Client *gcc);
 static void             _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__);
-static const char      *_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__);
-static Evas_Object     *_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas);
-static const char      *_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__);
+static const char      *_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__);
+static Evas_Object     *_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas);
+static const char      *_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__);
 
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
@@ -253,13 +253,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Pager");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[PATH_MAX];
@@ -272,7 +272,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class)
+_gc_id_new(const E_Gadcon_Client_Class *client_class)
 {
    static char buf[PATH_MAX];
 
diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c
index 0af991f77..a35e5e033 100644
--- a/src/modules/start/e_mod_main.c
+++ b/src/modules/start/e_mod_main.c
@@ -5,9 +5,9 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class);
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
 {
@@ -97,13 +97,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
    
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Start");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[PATH_MAX];
@@ -116,7 +116,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _gadcon_class.name;
 }
diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c
index 5ea502186..c256bb5ec 100644
--- a/src/modules/systray/e_mod_main.c
+++ b/src/modules/systray/e_mod_main.c
@@ -1134,13 +1134,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Systray");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
 
@@ -1150,7 +1150,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _name;
 }
diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c
index fb42b7976..04534db6e 100644
--- a/src/modules/tasks/e_mod_main.c
+++ b/src/modules/tasks/e_mod_main.c
@@ -7,9 +7,9 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void             _gc_shutdown(E_Gadcon_Client *gcc);
 static void             _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char      *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object     *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char      *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static const char      *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object     *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char      *_gc_id_new(const E_Gadcon_Client_Class *client_class);
 
 /* and actually define the gadcon class that this module provides (just 1) */
 static E_Gadcon_Client_Class _gadcon_class = {
@@ -303,13 +303,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Tasks");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[4096];
@@ -322,7 +322,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    Config_Item *config;
 
diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c
index b5b2fb14e..99d1df773 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -17,9 +17,9 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *client_class);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
+static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class);
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
 {
@@ -171,13 +171,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Temperature");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 {
    Evas_Object *o;
    char buf[PATH_MAX];
@@ -190,7 +190,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    Config_Face *inst;
    char id[128];
diff --git a/src/modules/wl_screenshot/e_mod_main.c b/src/modules/wl_screenshot/e_mod_main.c
index f87e26d29..4b5785a32 100644
--- a/src/modules/wl_screenshot/e_mod_main.c
+++ b/src/modules/wl_screenshot/e_mod_main.c
@@ -11,9 +11,9 @@ struct _Instance
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *cc);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
-static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
+static const char *_gc_label(const E_Gadcon_Client_Class *cc);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *cc, Evas *evas);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *cc);
 static void _cb_btn_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event);
 static void _cb_handle_global(struct wl_display *disp, unsigned int id, const char *interface, unsigned int version __UNUSED__, void *data);
 static struct wl_buffer *_create_shm_buffer(struct wl_shm *_shm, int width, int height, void **data_out);
@@ -137,13 +137,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *cc)
+_gc_label(const E_Gadcon_Client_Class *cc)
 {
    return _("Screenshooter");
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *cc, Evas *evas)
 {
    Evas_Object *o;
    char buf[PATH_MAX];
@@ -155,7 +155,7 @@ _gc_icon(E_Gadcon_Client_Class *cc, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *cc)
+_gc_id_new(const E_Gadcon_Client_Class *cc)
 {
    return _gc.name;
 }
diff --git a/src/modules/xkbswitch/e_mod_main.c b/src/modules/xkbswitch/e_mod_main.c
index c25f38faa..a2b2f0f68 100644
--- a/src/modules/xkbswitch/e_mod_main.c
+++ b/src/modules/xkbswitch/e_mod_main.c
@@ -6,9 +6,9 @@
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
 static void _gc_shutdown(E_Gadcon_Client *gcc);
 static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(E_Gadcon_Client_Class *client_class);
-static const char *_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__);
-static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
 
 /* EVENTS */
 static Eina_Bool _xkb_changed(void *data, int type, void *event_info);
@@ -249,13 +249,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
 }
 
 static const char *
-_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
 {
    return _("Keyboard");
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class) 
+_gc_id_new(const E_Gadcon_Client_Class *client_class) 
 {
    static char buf[PATH_MAX];
 
@@ -265,7 +265,7 @@ _gc_id_new(E_Gadcon_Client_Class *client_class)
 }
 
 static Evas_Object *
-_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) 
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) 
 {
    Evas_Object *o;
    char buf[PATH_MAX];