diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index ff20dfe20e..67be66536d 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -246,7 +246,7 @@ main(void)
    image = evas_object_image_filled_add(evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
-   evas_object_focus_set(image, image, EINA_TRUE);
+   evas_object_focus_set(image, EINA_TRUE);
 
    /* Set the image object as render target for 3D scene. */
    evas_obj_image_scene_set(image, data.scene);
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c
index 9ea9ceb1a4..2e83fd8e6d 100644
--- a/src/examples/evas/shooter/evas-3d-shooter.c
+++ b/src/examples/evas/shooter/evas-3d-shooter.c
@@ -250,13 +250,19 @@ _key_down(void *data,
           }
      }
    else if (!strcmp(ev->key, "F1"))
-     evas_canvas3d_node_position_set(scene->camera_node, 0.0, 80.0, 30.0);
-     evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
+     {
+        evas_canvas3d_node_position_set(scene->camera_node, 0.0, 80.0, 30.0);
+        evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
+     }
    else if (!strcmp(ev->key, "F2"))
-     evas_canvas3d_node_position_set(scene->camera_node, -2.0, 0.0, 4.0);
+     {
+        evas_canvas3d_node_position_set(scene->camera_node, -2.0, 0.0, 4.0);
      evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -100.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
+     }
    else if (!strcmp(ev->key, "A"))
-     aabb_index++;
+     {
+        aabb_index++;
+     }
 }
 
 static void
@@ -831,8 +837,10 @@ _mesh_setup_wall(Scene_Data *data, int index)
 
    /* placing of wall carpet on the floor grid */
    if (index == 0)
-     evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 20.0, 2.0);
-     evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 18.6 * 3, 0.0, -60.3);
+     {
+        evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 20.0, 2.0);
+        evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 18.6 * 3, 0.0, -60.3);
+     }
    else if (index == 1)
      {
         evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 5 * 19.5, 20.0, 2.0);
@@ -840,8 +848,10 @@ _mesh_setup_wall(Scene_Data *data, int index)
         evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_wall[index], 90, 0, 1.0, 0.0);
      }
    else if (index == 2)
-     evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 20.0, 2.0);
-     evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 18.6*3, 0.0, 35.3);
+     {
+        evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 20.0, 2.0);
+        evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 18.6*3, 0.0, 35.3);
+     }
    else if (index == 3)
      {
         evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 5* 19.5, 20.0, 2.0);
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 8dd9d822cc..ba1a575fad 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -108,7 +108,6 @@ static void        _ecore_con_lookup_done(void *data,
 static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr);
 
 #define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
-     Eina_Bool finalized; \
      if (eo_finalized_get(obj)) \
        { \
           ERR("This function is only allowed during construction."); \
@@ -556,7 +555,6 @@ _efl_network_server_efl_network_base_timeout_set(Eo *obj, Efl_Network_Server_Dat
 EAPI double
 ecore_con_server_timeout_get(const Ecore_Con *obj)
 {
-   double ret;
    return efl_network_base_timeout_get((Ecore_Con *)obj);
 }
 
@@ -610,7 +608,6 @@ ecore_con_server_data_set(Ecore_Con_Server *obj,
 EAPI Eina_Bool
 ecore_con_server_connected_get(const Ecore_Con *obj)
 {
-   Eina_Bool ret;
    return efl_network_base_connected_get((Ecore_Con *)obj);
 }
 
@@ -660,7 +657,6 @@ _efl_network_server_name_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
 EAPI int
 ecore_con_server_port_get(const Ecore_Con *obj)
 {
-   int ret;
    return efl_network_base_port_get((Ecore_Con *)obj);
 }
 
@@ -681,7 +677,6 @@ _efl_network_server_efl_network_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_S
 EAPI int
 ecore_con_server_send(Ecore_Con *obj, const void *data, int size)
 {
-   int ret;
    return efl_network_base_send((Ecore_Con *)obj, data, size);
 }
 
@@ -738,7 +733,6 @@ _efl_network_server_client_limit_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Dat
 EAPI const char *
 ecore_con_server_ip_get(const Ecore_Con *obj)
 {
-   const char *ret;
    return efl_network_base_ip_get(obj);
 }
 
@@ -751,7 +745,6 @@ _efl_network_server_efl_network_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Ser
 EAPI double
 ecore_con_server_uptime_get(const Ecore_Con *obj)
 {
-   double ret;
    return efl_network_base_uptime_get(obj);
 }
 
@@ -793,7 +786,6 @@ _efl_network_server_efl_network_base_flush(Eo *obj, Efl_Network_Server_Data *svr
 EAPI int
 ecore_con_client_send(Ecore_Con *obj, const void *data, int size)
 {
-   int ret;
    return efl_network_base_send((Ecore_Con *)obj, data, size);
 }
 
@@ -861,7 +853,6 @@ _efl_network_client_efl_network_base_connected_get(Eo *obj EINA_UNUSED, Efl_Netw
 EAPI Eina_Bool
 ecore_con_client_connected_get(const Ecore_Con *obj)
 {
-   Eina_Bool ret;
    return efl_network_base_connected_get((Ecore_Con *)obj);
 }
 
@@ -888,7 +879,6 @@ _efl_network_client_efl_network_base_timeout_get(Eo *obj EINA_UNUSED, Efl_Networ
 EAPI double
 ecore_con_client_timeout_get(const Ecore_Con *obj)
 {
-   double ret;
    return efl_network_base_timeout_get((Ecore_Con *)obj);
 }
 
@@ -940,7 +930,6 @@ _efl_network_client_efl_network_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Cli
 EAPI const char *
 ecore_con_client_ip_get(const Ecore_Con *obj)
 {
-   const char *ret;
    return efl_network_base_ip_get(obj);
 }
 
@@ -968,7 +957,6 @@ _efl_network_client_efl_network_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_C
 EAPI int
 ecore_con_client_port_get(const Ecore_Con *obj)
 {
-   int ret;
    return efl_network_base_port_get((Ecore_Con *)obj);
 }
 
@@ -981,7 +969,6 @@ _efl_network_client_efl_network_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network
 EAPI double
 ecore_con_client_uptime_get(const Ecore_Con *obj)
 {
-   double ret;
    return efl_network_base_uptime_get(obj);
 }
 
@@ -1000,7 +987,6 @@ ecore_con_client_flush(Ecore_Con *obj)
 EAPI int
 ecore_con_server_fd_get(const Ecore_Con *obj)
 {
-   int ret;
    return efl_network_base_fd_get((Ecore_Con *)obj);
 }
 
@@ -1021,7 +1007,6 @@ _efl_network_client_efl_network_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Cli
 EAPI int
 ecore_con_client_fd_get(const Ecore_Con *obj)
 {
-   int ret;
    return efl_network_base_fd_get((Ecore_Con *)obj);
 }
 
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index 800770c636..59a5b211c4 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -924,8 +924,6 @@ ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data)
 EAPI const void *
 ecore_con_eet_data_get(Ecore_Con_Eet *ece)
 {
-   const void *temp;
-
    return eo_key_data_get(ece, ECORE_CON_EET_DATA_KEY);
 }
 
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index e571ecf48a..ab42445257 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -401,8 +401,6 @@ _edje_object_efl_file_mmap_get(Eo *obj EINA_UNUSED, Edje *pd,
 EAPI Eina_Bool
 edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group)
 {
-   Eina_Bool ret;
-
    return efl_file_mmap_set(obj, file, group);
 }
 
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 231a81efac..d0b0f327f8 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -349,7 +349,6 @@ _emotion_object_engine_set(Eo *obj, Emotion_Object_Data *pd, const char *engine)
 EAPI Eina_Bool
 emotion_object_file_set(Evas_Object *obj, const char *file)
 {
-   Eina_Bool ret;
    return efl_file_set(obj, file, NULL);
 }
 
@@ -648,7 +647,6 @@ _emotion_object_efl_player_play_set(Eo *obj, Emotion_Object_Data *sd, Eina_Bool
 EAPI Eina_Bool
 emotion_object_play_get(const Evas_Object *obj)
 {
-   Eina_Bool ret;
    return efl_player_play_get(obj);
 }
 
@@ -687,7 +685,6 @@ _emotion_object_efl_player_position_set(Eo *obj, Emotion_Object_Data *sd, double
 EAPI double
 emotion_object_position_get(const Evas_Object *obj)
 {
-   double ret;
    return efl_player_position_get(obj);
 }
 
@@ -712,7 +709,6 @@ emotion_object_buffer_size_get(const Evas_Object *obj)
 EAPI Eina_Bool
 emotion_object_seekable_get(const Evas_Object *obj)
 {
-   Eina_Bool ret;
    return efl_player_seekable_get(obj);
 }
 
@@ -739,7 +735,6 @@ emotion_object_audio_handled_get(const Evas_Object *obj)
 EAPI double
 emotion_object_play_length_get(const Evas_Object *obj)
 {
-   double ret;
    return efl_player_length_get(obj);
 }
 
@@ -774,7 +769,6 @@ _emotion_object_efl_image_smooth_scale_set(Eo *obj EINA_UNUSED, Emotion_Object_D
 EAPI Eina_Bool
 emotion_object_smooth_scale_get(const Evas_Object *obj)
 {
-   Eina_Bool ret;
    return efl_image_smooth_scale_get(obj);
 }
 
@@ -787,7 +781,6 @@ _emotion_object_efl_image_smooth_scale_get(Eo *obj EINA_UNUSED, Emotion_Object_D
 EAPI double
 emotion_object_ratio_get(const Evas_Object *obj)
 {
-   double ret;
    return efl_image_ratio_get(obj);
 }
 
@@ -828,7 +821,6 @@ _emotion_object_efl_player_audio_volume_set(Eo *obj EINA_UNUSED, Emotion_Object_
 EAPI double
 emotion_object_audio_volume_get(const Evas_Object *obj)
 {
-   double ret;
    return efl_player_audio_volume_get(obj);
 }
 
@@ -856,7 +848,6 @@ _emotion_object_efl_player_audio_mute_set(Eo *obj EINA_UNUSED, Emotion_Object_Da
 EAPI Eina_Bool
 emotion_object_audio_mute_get(const Evas_Object *obj)
 {
-   Eina_Bool ret;
    return efl_player_audio_mute_get(obj);
 }
 
@@ -1147,7 +1138,6 @@ emotion_object_progress_info_get(const Evas_Object *obj)
 EAPI double
 emotion_object_progress_status_get(const Evas_Object *obj)
 {
-   double ret;
    return efl_player_progress_get(obj);
 }
 
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 5af26b38b3..065c77eae8 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -99,7 +99,6 @@ _eo_base_key_data_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *key)
 EOLIAN static void
 _eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id)
 {
-   Eina_Bool tmp;
    if (pd->parent == parent_id)
      return;
 
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index 010d161201..5e0944d929 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -969,7 +969,6 @@ evas_canvas3d_node_color_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
              list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(node);
              EINA_LIST_FOREACH(list_meshes, l, mesh)
                {
-                 Eina_Bool tmp;
                  if (evas_canvas3d_mesh_color_pick_enable_get(mesh))
                    {
                       color = calloc(1, sizeof(Evas_Color));
@@ -1207,7 +1206,7 @@ _evas_canvas3d_node_position_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Eva
      }
    else if (space == EVAS_CANVAS3D_SPACE_WORLD)
      {
-        evas_canvas3d_object_update(obj);
+        evas_canvas3d_object_update((Eo *) obj);
 
         if (x) *x = pd->position_world.x;
         if (y) *y = pd->position_world.y;
@@ -1235,7 +1234,7 @@ _evas_canvas3d_node_orientation_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd,
      }
    else if (space == EVAS_CANVAS3D_SPACE_WORLD)
      {
-        evas_canvas3d_object_update(obj);
+        evas_canvas3d_object_update((Eo *) obj);
 
         if (x) *x = pd->orientation_world.x;
         if (y) *y = pd->orientation_world.y;
@@ -1263,7 +1262,7 @@ _evas_canvas3d_node_scale_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_C
      }
    else if (space == EVAS_CANVAS3D_SPACE_WORLD)
      {
-        evas_canvas3d_object_update(obj);
+        evas_canvas3d_object_update((Eo *) obj);
 
         if (x) *x = pd->scale_world.x;
         if (y) *y = pd->scale_world.y;
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c
index c7b229e8ac..1b9ea30b00 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.c
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.c
@@ -691,7 +691,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
         return EINA_FALSE;
      }
    /* Update the scene graph. */
-   evas_canvas3d_object_update(obj);
+   evas_canvas3d_object_update((Eo *) obj);
    pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
    pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
    eina_matrix4_multiply(&data.matrix_vp,
@@ -737,7 +737,7 @@ _evas_canvas3d_scene_exist(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Rea
    data.t      = 0.0;
 
    /* Update the scene graph. */
-   evas_canvas3d_object_update(obj);
+   evas_canvas3d_object_update((Eo *) obj);
    pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
    pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
    eina_matrix4_multiply(&data.matrix_vp,
@@ -773,7 +773,6 @@ _evas_canvas3d_scene_pick_member_list_get(const Eo *obj, Evas_Canvas3D_Scene_Dat
 
    EINA_LIST_FOREACH(list, l, node)
      {
-        Evas_Canvas3D_Node *exists;
         if (evas_canvas3d_scene_exist(obj, x, y, node))
           picked_nodes = eina_list_append(picked_nodes, l);
      }
diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c
index 8412bcc93a..7d6ff67cbf 100644
--- a/src/lib/evas/canvas/evas_layer.c
+++ b/src/lib/evas/canvas/evas_layer.c
@@ -247,8 +247,6 @@ _evas_object_efl_gfx_stack_layer_set(Eo *eo_obj,
 EAPI short
 evas_object_layer_get(const Evas_Object *obj)
 {
-   short ret;
-
    return efl_gfx_stack_layer_get((Evas_Object *)obj);
 }
 
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index fc4a68010c..f3b1d7797a 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1064,8 +1064,6 @@ _evas_image_efl_gfx_fill_fill_spread_set(Eo *eo_obj, Evas_Image_Data *o,
 EAPI Evas_Fill_Spread
 evas_object_image_fill_spread_get(const Evas_Image *obj)
 {
-   Evas_Fill_Spread ret;
-
    return efl_gfx_fill_spread_get((Evas_Image *)obj);
 }
 
@@ -4937,14 +4935,12 @@ evas_object_image_mmap_get(const Evas_Image *obj, const Eina_File **f, const cha
 EAPI Eina_Bool
 evas_object_image_save(const Eo *obj, const char *file, const char *key, const char *flags)
 {
-   Eina_Bool ret;
    return efl_file_save((Eo *) obj, file, key, flags);
 }
 
 EAPI Eina_Bool
 evas_object_image_animated_get(const Eo *obj)
 {
-   Eina_Bool ret;
    return efl_image_animated_get((Eo *) obj);
 }
 
@@ -4969,7 +4965,6 @@ evas_object_image_smooth_scale_set(Eo *obj, Eina_Bool smooth_scale)
 EAPI Eina_Bool
 evas_object_image_smooth_scale_get(const Eo *obj)
 {
-   Eina_Bool ret;
    return efl_image_smooth_scale_get((Eo *) obj);
 }
 
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 2536973828..b72d5fd060 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1301,8 +1301,6 @@ evas_object_hide(Evas_Object *eo_obj)
 EAPI Eina_Bool
 evas_object_visible_get(const Evas_Object *obj)
 {
-   Eina_Bool ret;
-
    return efl_gfx_visible_get((Evas_Object *)obj);
 }
 
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 419dd491f9..7efb37f01b 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -2327,7 +2327,6 @@ evas_object_text_text_set(Eo *obj, const char *text)
 EAPI const char *
 evas_object_text_text_get(const Eo *obj)
 {
-   const char *ret;
    return efl_text_get((Eo *) obj);
 }
 
diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c
index b5de2463d5..b9d7b3965f 100644
--- a/src/lib/evas/canvas/evas_stack.c
+++ b/src/lib/evas/canvas/evas_stack.c
@@ -311,8 +311,6 @@ _evas_object_efl_gfx_stack_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *o
 EAPI Evas_Object *
 evas_object_above_get(const Evas_Object *obj)
 {
-   Evas_Object *ret;
-
    return efl_gfx_stack_above_get((Evas_Object *)obj);
 }
 
@@ -342,8 +340,6 @@ _evas_object_efl_gfx_stack_above_get(Eo *eo_obj EINA_UNUSED,
 EAPI Evas_Object *
 evas_object_below_get(const Evas_Object *obj)
 {
-   Evas_Object *ret;
-
    return efl_gfx_stack_below_get((Evas_Object *)obj);
 }
 
diff --git a/src/lib/evas/canvas/evas_vg_gradient.c b/src/lib/evas/canvas/evas_vg_gradient.c
index 047ba72e7e..d4a64b7235 100644
--- a/src/lib/evas/canvas/evas_vg_gradient.c
+++ b/src/lib/evas/canvas/evas_vg_gradient.c
@@ -130,8 +130,6 @@ evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s)
 EAPI Efl_Gfx_Gradient_Spread
 evas_vg_gradient_spread_get(Eo *obj)
 {
-   Efl_Gfx_Gradient_Spread ret;
-
    return efl_gfx_gradient_spread_get(obj);
 }
 
diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c
index 84d00bf7bb..91e5c6509d 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c
@@ -206,8 +206,6 @@ evas_vg_gradient_radial_radius_set(Eo *obj, double r)
 EAPI double
 evas_vg_gradient_radial_radius_get(Eo *obj)
 {
-   double ret;
-
    return efl_gfx_gradient_radial_radius_get(obj);
 }
 
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index d9c561ba6c..3a80b63594 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -795,8 +795,6 @@ _efl_vg_base_dup(Eo *obj, Efl_VG_Base_Data *pd, const Efl_VG_Base *from)
 EAPI Eina_Bool
 evas_vg_node_visible_get(Eo *obj)
 {
-   Eina_Bool ret;
-
    return efl_gfx_visible_get(obj);
 }
 
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 906f2420db..312953a46f 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -254,8 +254,6 @@ _efl_vg_shape_efl_vg_base_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const
 EAPI double
 evas_vg_shape_stroke_scale_get(Eo *obj)
 {
-   double ret;
-
    return efl_gfx_shape_stroke_scale_get(obj);
 }
 
@@ -280,8 +278,6 @@ evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a)
 EAPI double
 evas_vg_shape_stroke_width_get(Eo *obj)
 {
-   double ret;
-
    return efl_gfx_shape_stroke_width_get(obj);
 }
 
@@ -294,8 +290,6 @@ evas_vg_shape_stroke_width_set(Eo *obj, double w)
 EAPI double
 evas_vg_shape_stroke_location_get(Eo *obj)
 {
-   double ret;
-
    return efl_gfx_shape_stroke_location_get(obj);
 }
 
@@ -320,8 +314,6 @@ evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int le
 EAPI Efl_Gfx_Cap
 evas_vg_shape_stroke_cap_get(Eo *obj)
 {
-   Efl_Gfx_Cap ret;
-
    return efl_gfx_shape_stroke_cap_get(obj);
 }
 
@@ -334,8 +326,6 @@ evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c)
 EAPI Efl_Gfx_Join
 evas_vg_shape_stroke_join_get(Eo *obj)
 {
-   Efl_Gfx_Join ret;
-
    return efl_gfx_shape_stroke_join_get(obj);
 }
 
@@ -456,16 +446,12 @@ evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data)
 EAPI Eina_Bool
 evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map)
 {
-   Eina_Bool ret;
-
    return efl_gfx_shape_interpolate(obj, from, to, pos_map);
 }
 
 EAPI Eina_Bool
 evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with)
 {
-   Eina_Bool ret;
-
    return efl_gfx_shape_equal_commands(obj, with);
 }
 
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
index 73c66a3d53..2e34d4edf6 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
@@ -31,7 +31,6 @@ _evas_ector_gl_rgbaimage_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas
                                                                    Evas *evas, void *image)
 {
    RGBA_Image *im = image;
-   Eina_Bool b;
 
    EINA_SAFETY_ON_NULL_RETURN(image);
    if (eo_finalized_get(obj))
diff --git a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
index bf00a1b2b3..2a9f17d502 100644
--- a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
+++ b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
@@ -25,7 +25,6 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect
                                                                Evas *evas, void *image)
 {
    RGBA_Image *im = image;
-   Eina_Bool b;
 
    EINA_SAFETY_ON_NULL_RETURN(image);
    if (eo_finalized_get(obj))
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index e28329f1dd..f8aea4a7b9 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -178,7 +178,6 @@ START_TEST(edje_test_masking)
    Evas *evas = EDJE_TEST_INIT_EVAS();
    const Evas_Object *sub, *clip2, *clip;
    Evas_Object *obj;
-   Eina_Bool b;
 
    obj = edje_object_add(evas);
    fail_unless(edje_object_file_set(obj, test_layout_get("test_masking.edj"), "test_group"));
@@ -213,7 +212,6 @@ START_TEST(edje_test_filters)
    const Evas_Object *text, *sub;
    Evas_Object *obj, *src = NULL;
    const char *prg, *name;
-   Eina_Bool b;
 
    setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1);
 
@@ -254,7 +252,6 @@ START_TEST(edje_test_snapshot)
    Evas *evas = EDJE_TEST_INIT_EVAS();
    const Evas_Object *sub;
    Evas_Object *obj;
-   Eina_Bool b;
 
    setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1);
 
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index 59ab9560dc..51824a9a98 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -24,7 +24,6 @@ _a_get(Eo *obj, void *class_data EINA_UNUSED)
 static Eo *
 _constructor(Eo *obj, void *class_data EINA_UNUSED)
 {
-   Eina_Bool tmp;
    obj = eo_constructor(eo_super(obj, MY_CLASS));
 
    Eo *simple = eo_add(SIMPLE_CLASS, obj);
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index 9e90eb412a..6f9e914415 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -26,7 +26,6 @@ _a_changed_cb(void *data, const Eo_Event *event)
 int
 main(int argc, char *argv[])
 {
-   Eina_Bool tmp;
    (void) argc;
    (void) argv;
    eo_init();
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index 57942f7efe..1e0a6a27f1 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -53,8 +53,8 @@ _class_print2(Eo_Class *klass, void *class_data EINA_UNUSED)
 
 EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
 EAPI EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
-EAPI EO_FUNC_BODY(simple_class_print, Eina_Bool, EINA_FALSE);
-EAPI EO_FUNC_BODY(simple_class_print2, Eina_Bool, EINA_FALSE);
+EAPI EO_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE);
+EAPI EO_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE);
 
 static Eo_Op_Description op_descs[] = {
      EO_OP_FUNC(simple_a_set, _a_set),
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.h b/src/tests/eo/function_overrides/function_overrides_simple.h
index 3c54d74dd4..9128c90d34 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.h
+++ b/src/tests/eo/function_overrides/function_overrides_simple.h
@@ -8,8 +8,8 @@ typedef struct
 
 EAPI void simple_a_set(Eo *obj, int a);
 EAPI Eina_Bool simple_a_print(Eo *obj);
-EAPI Eina_Bool simple_class_print(Eo *obj);
-EAPI Eina_Bool simple_class_print2(Eo *obj);
+EAPI Eina_Bool simple_class_print(const Eo *obj);
+EAPI Eina_Bool simple_class_print2(const Eo *obj);
 
 extern const Eo_Event_Description _SIG_A_CHANGED;
 #define SIG_A_CHANGED (&(_SIG_A_CHANGED))
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 8a70f5fca2..458b95c008 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -27,7 +27,7 @@ _a_set(Eo *obj, void *class_data, int a)
 }
 
 Eina_Bool
-_cb_added(void *data, const Eo_Event *event)
+_cb_added(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS);
    const Eo_Callback_Array_Item *callback_array = event->event_info;
@@ -42,7 +42,7 @@ _cb_added(void *data, const Eo_Event *event)
 }
 
 Eina_Bool
-_cb_deled(void *data, const Eo_Event *event)
+_cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS);
    const Eo_Callback_Array_Item *callback_array = event->event_info;
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 1fe449a002..224e80a290 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -84,7 +84,7 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, Eo_Dbg_Info *root)
 EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
 EO_FUNC_BODY(simple_a_get, int, 0);
 EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
-EO_FUNC_BODY(simple_class_hi_print, Eina_Bool, EINA_FALSE);
+EO_FUNC_BODY_CONST(simple_class_hi_print, Eina_Bool, EINA_FALSE);
 EO_VOID_FUNC_BODY(simple_pure_virtual);
 EO_VOID_FUNC_BODY(simple_no_implementation);
 
diff --git a/src/tests/eo/suite/eo_test_class_simple.h b/src/tests/eo/suite/eo_test_class_simple.h
index 43cdd28bf6..3360ea887b 100644
--- a/src/tests/eo/suite/eo_test_class_simple.h
+++ b/src/tests/eo/suite/eo_test_class_simple.h
@@ -9,7 +9,7 @@ typedef struct
 EAPI void simple_a_set(Eo *obj, int a);
 EAPI int simple_a_get(Eo *obj);
 EAPI Eina_Bool simple_a_print(Eo *obj);
-EAPI Eina_Bool simple_class_hi_print(Eo *obj);
+EAPI Eina_Bool simple_class_hi_print(const Eo *obj);
 EAPI void simple_recursive(Eo *obj, int n);
 EAPI void simple_pure_virtual(Eo *obj);
 EAPI void simple_no_implementation(Eo *obj);
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 4800872ef3..b87f37a01c 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -284,7 +284,6 @@ END_TEST
 
 START_TEST(eo_composite_tests)
 {
-   Eina_Bool tmp;
    eo_init();
 
    Eo *obj = eo_add(SIMPLE_CLASS, NULL);
@@ -735,7 +734,7 @@ _class_hi_print(Eo_Class *klass EINA_UNUSED, void *class_data EINA_UNUSED)
 }
 
 EO_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE);
-EO_FUNC_BODY(multi_class_hi_print, Eina_Bool, EINA_FALSE);
+EO_FUNC_BODY_CONST(multi_class_hi_print, Eina_Bool, EINA_FALSE);
 
 static Eo_Op_Description _multi_do_op_descs[] = {
      EO_OP_FUNC(multi_a_print, _a_print),