diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index fd09b4148..4c33fac53 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -37,7 +37,7 @@ static void _menu_cb_post(void *data, E_Menu *m);
 static void _cpufreq_set_governor(const char *governor);
 static void _cpufreq_set_frequency(int frequency);
 static Eina_Bool _cpufreq_cb_check(void *data);
-static Status *_cpufreq_status_new();
+static Status *_cpufreq_status_new(void);
 static void _cpufreq_status_free(Status *s);
 static int _cpufreq_status_check_available(Status *s);
 static int _cpufreq_status_check_current(Status *s);
@@ -505,7 +505,7 @@ _cpufreq_cb_check(void *data __UNUSED__)
 }
 
 static Status *
-_cpufreq_status_new()
+_cpufreq_status_new(void)
 {
    Status *s;
 
diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index a85712455..101b8d1cc 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -2817,8 +2817,10 @@ _evry_matches_update(Evry_Selector *sel, int async)
 
         EINA_LIST_FOREACH (s->plugins, l, p)
           {
+             size_t len;
+
              if (!p->config->trigger) continue;
-             size_t len = strlen(p->config->trigger);
+             len = strlen(p->config->trigger);
 
              if (len_trigger && len != len_trigger)
                continue;
diff --git a/src/modules/everything/evry_plugin.c b/src/modules/everything/evry_plugin.c
index 939aa5121..9972b3bc3 100644
--- a/src/modules/everything/evry_plugin.c
+++ b/src/modules/everything/evry_plugin.c
@@ -201,9 +201,10 @@ evry_plugin_register(Evry_Plugin *p, int type, int priority)
 void
 evry_plugin_unregister(Evry_Plugin *p)
 {
-   DBG("%s", p->name);
    Eina_List *l = evry_conf->conf_subjects;
 
+   DBG("%s", p->name);
+
    if (l && eina_list_data_find_list(l, p->config))
      {
         char buf[256];
diff --git a/src/modules/fileman/e_mod_dbus.c b/src/modules/fileman/e_mod_dbus.c
index ec49a2684..8f20d16cb 100644
--- a/src/modules/fileman/e_mod_dbus.c
+++ b/src/modules/fileman/e_mod_dbus.c
@@ -166,6 +166,16 @@ _e_fileman_dbus_daemon_request_name_cb(void        *data,
 static E_Fileman_DBus_Daemon *
 _e_fileman_dbus_daemon_new(void)
 {
+   const struct
+   {
+      const char      *method;
+      const char      *signature;
+      const char      *ret_signature;
+      E_DBus_Method_Cb func;
+   } *itr, desc[] = {
+      {"OpenDirectory", "s", "", _e_fileman_dbus_daemon_open_directory_cb},
+      {NULL, NULL, NULL, NULL}
+   };
    E_Fileman_DBus_Daemon *d;
 
    d = calloc(1, sizeof(*d));
@@ -189,17 +199,6 @@ _e_fileman_dbus_daemon_new(void)
    if (!d->pending.request_name)
      goto error;
 
-   const struct
-   {
-      const char      *method;
-      const char      *signature;
-      const char      *ret_signature;
-      E_DBus_Method_Cb func;
-   } *itr, desc[] = {
-      {"OpenDirectory", "s", "", _e_fileman_dbus_daemon_open_directory_cb},
-      {NULL, NULL, NULL, NULL}
-   };
-
    for (itr = desc; itr->method; itr++)
      e_dbus_interface_method_add
        (d->iface, itr->method, itr->signature, itr->ret_signature, itr->func);
diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index 61a23ae48..f1601a4e1 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -346,6 +346,7 @@ _e_mod_menu_generate(void *data __UNUSED__,
    E_Menu_Item *mi;
    E_Volume *vol;
    const Eina_List *l;
+   Eina_Bool need_separator;
 
    /* Home */
    mi = e_menu_item_new(m);
@@ -377,7 +378,7 @@ _e_mod_menu_generate(void *data __UNUSED__,
    e_util_menu_item_theme_icon_set(mi, "computer");
    e_menu_item_callback_set(mi, _e_mod_menu_virtual_cb, "/");
 
-   Eina_Bool need_separator = 1;
+   need_separator = 1;
 
    /* Volumes */
    Eina_Bool volumes_visible = 0;
diff --git a/src/modules/mixer/conf_gadget.c b/src/modules/mixer/conf_gadget.c
index 574660740..d204e53f1 100644
--- a/src/modules/mixer/conf_gadget.c
+++ b/src/modules/mixer/conf_gadget.c
@@ -218,7 +218,7 @@ _clear_channels(E_Config_Dialog_Data *cfdata)
 static void
 _fill_channels(Evas *evas, E_Config_Dialog_Data *cfdata)
 {
-   struct mixer_config_ui_channels *ui = &cfdata->ui.channels;;
+   struct mixer_config_ui_channels *ui = &cfdata->ui.channels;
    Evas_Object *selected;
    Evas_Coord mw, mh;
    const char *name;
diff --git a/src/modules/mixer/e_mod_main.h b/src/modules/mixer/e_mod_main.h
index ab8a18813..aab76479c 100644
--- a/src/modules/mixer/e_mod_main.h
+++ b/src/modules/mixer/e_mod_main.h
@@ -84,7 +84,7 @@ typedef int (*E_Mixer_Mute_Get_Cb)(E_Mixer_System *, E_Mixer_Channel *, int *);
 typedef int (*E_Mixer_Mute_Set_Cb)(E_Mixer_System *, E_Mixer_Channel *, int);
 typedef int (*E_Mixer_State_Get_Cb)(E_Mixer_System *, E_Mixer_Channel *, E_Mixer_Channel_State *);
 typedef int (*E_Mixer_Capture_Cb)(E_Mixer_System *, E_Mixer_Channel *);
-typedef void *(*E_Mixer_Cb)();
+typedef void *(*E_Mixer_Cb)(void);
 
 EAPI extern E_Module_Api e_modapi;
 EAPI void *e_modapi_init(E_Module *m);
diff --git a/src/modules/mixer/pa.c b/src/modules/mixer/pa.c
index 3abcbeca1..158300f52 100644
--- a/src/modules/mixer/pa.c
+++ b/src/modules/mixer/pa.c
@@ -619,7 +619,7 @@ pulse_new(void)
 {
    Pulse *conn;
    Eina_Iterator *it;
-   const char *prev = NULL, *buf = NULL;;
+   const char *prev = NULL, *buf = NULL;
    time_t t = 0;
    char *home, h[4096];
    const Eina_File_Direct_Info *info;
diff --git a/src/modules/notification/e_mod_popup.c b/src/modules/notification/e_mod_popup.c
index 2d900a139..42fec5dc8 100644
--- a/src/modules/notification/e_mod_popup.c
+++ b/src/modules/notification/e_mod_popup.c
@@ -368,7 +368,7 @@ _notification_popup_place(Popup_Data *popup,
 }
 
 static void
-_notification_popups_place()
+_notification_popups_place(void)
 {
    Popup_Data *popup;
    Eina_List *l;
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 10f611207..baeade7cc 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -158,7 +158,7 @@ static Pager_Popup *_pager_popup_find(E_Zone *zone);
 static E_Config_Dialog *_pager_config_dialog(E_Container *con, const char *params);
 
 /* functions for pager popup on key actions */
-static int _pager_popup_show();
+static int _pager_popup_show(void);
 static void _pager_popup_hide(int switch_desk);
 static Eina_Bool _pager_popup_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event);
 static Eina_Bool _pager_popup_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event);
@@ -2317,7 +2317,7 @@ _pager_popup_cb_timeout(void *data)
 /************************************************************************/
 /* popup-on-keyaction functions */
 static int
-_pager_popup_show()
+_pager_popup_show(void)
 {
    E_Zone *zone;
    int x, y, w, h;