diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c
index faa46c5e5d..21af58b9f3 100644
--- a/src/lib/evas/canvas/common_interfaces.c
+++ b/src/lib/evas/canvas/common_interfaces.c
@@ -1,8 +1,6 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 Eina_Hash* signals_hash_table = NULL;
 
 static const Eo_Event_Description *_evas_clickable_interface_event_desc[];
@@ -58,4 +56,4 @@ _evas_signal_interface_class_destructor(Eo_Class *klass EINA_UNUSED)
 #include "canvas/evas_clickable_interface.eo.c"
 #include "canvas/evas_scrollable_interface.eo.c"
 #include "canvas/evas_selectable_interface.eo.c"
-#include "canvas/evas_zoomable_interface.eo.c"
\ No newline at end of file
+#include "canvas/evas_zoomable_interface.eo.c"
diff --git a/src/lib/evas/canvas/evas_3d_camera.c b/src/lib/evas/canvas/evas_3d_camera.c
index 308c083ee4..896d563bd3 100644
--- a/src/lib/evas/canvas/evas_3d_camera.c
+++ b/src/lib/evas/canvas/evas_3d_camera.c
@@ -1,11 +1,8 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_3D_CAMERA_CLASS
 
-
 static Eina_Bool
 _camera_node_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key,
                         void *data EINA_UNUSED, void *fdata)
diff --git a/src/lib/evas/canvas/evas_3d_light.c b/src/lib/evas/canvas/evas_3d_light.c
index a91766111b..0e8600d9ec 100644
--- a/src/lib/evas/canvas/evas_3d_light.c
+++ b/src/lib/evas/canvas/evas_3d_light.c
@@ -1,17 +1,10 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <math.h>
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_3D_LIGHT_CLASS
 
-
 static Eina_Bool
 _light_node_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key,
                         void *data EINA_UNUSED, void *fdata)
diff --git a/src/lib/evas/canvas/evas_3d_material.c b/src/lib/evas/canvas/evas_3d_material.c
index d706f23df4..99d28f3942 100644
--- a/src/lib/evas/canvas/evas_3d_material.c
+++ b/src/lib/evas/canvas/evas_3d_material.c
@@ -1,13 +1,7 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdlib.h>
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_3D_MATERIAL_CLASS
 
 static Eina_Bool
diff --git a/src/lib/evas/canvas/evas_3d_mesh.c b/src/lib/evas/canvas/evas_3d_mesh.c
index 4007145680..e49b9a8e8c 100644
--- a/src/lib/evas/canvas/evas_3d_mesh.c
+++ b/src/lib/evas/canvas/evas_3d_mesh.c
@@ -1,13 +1,7 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdlib.h>
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_3D_MESH_CLASS
 
 static Evas_3D_Mesh_Frame *
diff --git a/src/lib/evas/canvas/evas_3d_node.c b/src/lib/evas/canvas/evas_3d_node.c
index b978da8798..27feb346c9 100644
--- a/src/lib/evas/canvas/evas_3d_node.c
+++ b/src/lib/evas/canvas/evas_3d_node.c
@@ -1,13 +1,7 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdlib.h>
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_3D_NODE_CLASS
 #define MY_CLASS_NAME "Evas_3D_Node"
 
diff --git a/src/lib/evas/canvas/evas_3d_object.c b/src/lib/evas/canvas/evas_3d_object.c
index 0ef842c210..8116d098c4 100644
--- a/src/lib/evas/canvas/evas_3d_object.c
+++ b/src/lib/evas/canvas/evas_3d_object.c
@@ -1,8 +1,6 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_3D_OBJECT_CLASS
 
 EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_3d_scene.c b/src/lib/evas/canvas/evas_3d_scene.c
index 966da9cb9b..ddff5be2fd 100644
--- a/src/lib/evas/canvas/evas_3d_scene.c
+++ b/src/lib/evas/canvas/evas_3d_scene.c
@@ -1,13 +1,7 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdlib.h>
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_3D_SCENE_CLASS
 
 void
diff --git a/src/lib/evas/canvas/evas_3d_texture.c b/src/lib/evas/canvas/evas_3d_texture.c
index 9cfaace27e..eae825698c 100644
--- a/src/lib/evas/canvas/evas_3d_texture.c
+++ b/src/lib/evas/canvas/evas_3d_texture.c
@@ -1,13 +1,7 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdlib.h>
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_3D_TEXTURE_CLASS
 
 static inline void
diff --git a/src/lib/evas/canvas/evas_common_interface.c b/src/lib/evas/canvas/evas_common_interface.c
index 2b205acbdd..eb90b0ba2f 100644
--- a/src/lib/evas/canvas/evas_common_interface.c
+++ b/src/lib/evas/canvas/evas_common_interface.c
@@ -1,6 +1,3 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
-
-#include "Eo.h"
-
-#include "canvas/evas_common_interface.eo.c"
\ No newline at end of file
+#include "canvas/evas_common_interface.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 903578f232..f4d99e1bcc 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -5,8 +5,6 @@
 # undef remove
 #endif
 
-#include <Eo.h>
-
 #define MY_CLASS_NAME "Evas_Box"
 #define MY_CLASS_NAME_LEGACY "Evas_Object_Box"
 
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 87f21e577f..7af3ad9994 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -2,8 +2,6 @@
 #include "evas_private.h"
 #include <errno.h>
 
-#include <Eo.h>
-
 #define MY_CLASS EVAS_OBJ_GRID_CLASS
 
 typedef struct _Evas_Grid_Data              Evas_Grid_Data;
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 7a82c1e0f6..062da1c288 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -20,8 +16,6 @@
 #include "../common/evas_convert_yuv.h"
 #include "evas_filter.h"
 
-#include <Eo.h>
-
 #define MY_CLASS EVAS_OBJ_IMAGE_CLASS
 
 #define MY_CLASS_NAME "Evas_Image"
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index 5968d8a001..247777a775 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -1,8 +1,6 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_OBJ_LINE_CLASS
 
 /* private magic number for line objects */
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 020914cca4..15a3a4ed83 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -3,8 +3,6 @@
 
 EVAS_MEMPOOL(_mp_sh);
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_OBJ_CLASS
 
 #define MY_CLASS_NAME "Evas_Object"
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index d38c9c8825..576de20554 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -1,8 +1,6 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_OBJ_POLYGON_CLASS
 
 /* private magic number for polygon objects */
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index 6903b3ae47..4859f82932 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -1,8 +1,6 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_OBJ_RECTANGLE_CLASS
 
 /* private magic number for rectangle objects */
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index d6c3ba2571..8e944497a9 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1,8 +1,6 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_OBJ_SMART_CLASS
 
 #define MY_CLASS_NAME "Evas_Smart"
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 057836e0a6..969a5ebe24 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -2,8 +2,6 @@
 #include "evas_private.h"
 #include <errno.h>
 
-#include <Eo.h>
-
 #define MY_CLASS EVAS_OBJ_TABLE_CLASS
 
 #define MY_CLASS_NAME "Evas_Table"
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 3c5b7f04ab..8e960da59d 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -2,8 +2,6 @@
 #include "evas_private.h"
 #include "evas_filter.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_OBJ_TEXT_CLASS
 
 #define MY_CLASS_NAME "Evas_Text"
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index f6042aebe3..14565e3d5d 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -65,8 +65,6 @@
 #include "evas_private.h"
 #include <stdlib.h>
 
-#include "Eo.h"
-
 //#define LYDBG(f, args...) printf(f, ##args)
 #define LYDBG(f, args...)
 
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index 6af6a89a80..5eeb8fcd3c 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -1,8 +1,6 @@
 #include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */
 #include "evas_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS EVAS_OBJ_TEXTGRID_CLASS
 
 #define MY_CLASS_NAME "Evas_Textgrid"
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index a77bed0788..9ef82cf59c 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -5,8 +5,6 @@
 #include "evas_cs2_private.h"
 #endif
 
-#include <Eo.h>
-
 #define MY_CLASS EVAS_OUT_CLASS
 typedef struct _Evas_Out_Data Evas_Out_Data;
 struct _Evas_Out_Data