diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index c7623273b..2c8b158b9 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -3689,7 +3689,7 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
    E_Gadcon_Layout_Item *bi = NULL;
    Eina_List *l, *l2;
    Evas_Object *item, *item2;
-   int need, limit, reduce_total, reduce;
+   int need, limit = 0, reduce_total, reduce;
    int max_size, c;
 
    if (sd->w < cur)
@@ -3764,7 +3764,7 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
 		  c2 = c;
 		  EINA_LIST_REVERSE_FOREACH(sd->items, l2, item)
 		    { 
-		       if(!c2 || !need) break;
+		       if ((!c2) || (!need)) break;
 		       bi2 = evas_object_data_get(item, "e_gadcon_layout_data");
 		       bi2->ask.size2 -= reduce_by; 
 		       need -= reduce_by; 
@@ -3790,7 +3790,7 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
 	     c2 = c;
 	     EINA_LIST_FOREACH(sd->items, l2, item)
 	       {
-		  if(!c2 || !need) break;
+                  if ((!c2) || (!need)) break;
 		  bi2 = evas_object_data_get(item, "e_gadcon_layout_data");
 		  bi2->ask.size2 -= reduce_by; 
 		  need -= reduce_by;
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index b5e552142..6290c9829 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -929,19 +929,17 @@ _e_int_menus_clients_sort_z_order_cb(const void *d1, const void *d2)
 static void
 _e_int_menus_clients_menu_add_iconified(Eina_List *borders, E_Menu *m)
 {
-   Eina_List *l = NULL;
-   E_Border *bd;
-   E_Menu_Item *mi;
-
    if (eina_list_count(borders) > 0)
      { 
+        Eina_List *l = NULL;
+        E_Border *bd = NULL;
+        E_Menu_Item *mi = NULL;
+
 	mi = e_menu_item_new(m); 
 	e_menu_item_separator_set(mi, 1); 
 
 	EINA_LIST_FOREACH(borders, l, bd)
-	  { 
-	     _e_int_menus_clients_item_create(bd, m);
-	  }
+          _e_int_menus_clients_item_create(bd, m);
      }
 }
 
@@ -951,7 +949,7 @@ _e_int_menus_clients_add_by_class(Eina_List *borders, E_Menu *m)
    Eina_List *l = NULL, *ico = NULL;
    E_Border *bd; 
    E_Menu *subm = NULL;
-   E_Menu_Item *mi;
+   E_Menu_Item *mi = NULL;
    char *class = NULL;
 
    class = strdup("");
@@ -1002,7 +1000,7 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *
    Eina_List *l = NULL, *alt = NULL, *ico = NULL;
    E_Border *bd;
    E_Menu *subm;
-   E_Menu_Item *mi;
+   E_Menu_Item *mi = NULL;
 
    /* Deal with present desk first */
    EINA_LIST_FOREACH(borders, l, bd)
@@ -1093,7 +1091,7 @@ static void
 _e_int_menus_clients_pre_cb(void *data __UNUSED__, E_Menu *m)
 {
    E_Menu *subm;
-   E_Menu_Item *mi;
+   E_Menu_Item *mi = NULL;
    Eina_List *l = NULL, *borders = NULL;
    E_Border *border;
    E_Zone *zone = NULL;
diff --git a/src/modules/comp/e_mod_comp.c b/src/modules/comp/e_mod_comp.c
index 82c8664e0..d315d09f8 100644
--- a/src/modules/comp/e_mod_comp.c
+++ b/src/modules/comp/e_mod_comp.c
@@ -1541,14 +1541,11 @@ _e_mod_comp_win_shadow_setup(E_Comp_Win *cw)
 }
 
 static void
-_e_mod_comp_cb_win_mirror_del(void        *data,
-                              Evas        *e,
-                              Evas_Object *obj,
-                              void        *event_info)
+_e_mod_comp_cb_win_mirror_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
-   E_Comp_Win *cw = data;
+   E_Comp_Win *cw;
 
-   if (!cw) return;
+   if (!(cw = data)) return;
    cw->obj_mirror = eina_list_remove(cw->obj_mirror, obj);
 }