diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c
index c72381495a..01782db8c3 100644
--- a/legacy/elementary/src/lib/elc_ctxpopup.c
+++ b/legacy/elementary/src/lib/elc_ctxpopup.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_ctxpopup.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_CTXPOPUP_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_CTXPOPUP_CLASS
diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c
index 2b002f2495..f065a393aa 100644
--- a/legacy/elementary/src/lib/elc_fileselector.c
+++ b/legacy/elementary/src/lib/elc_fileselector.c
@@ -14,8 +14,6 @@
 #include "elm_priv.h"
 #include "elm_widget_fileselector.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_FILESELECTOR_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_FILESELECTOR_CLASS
diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/legacy/elementary/src/lib/elc_fileselector_button.c
index 2b76a14e0c..076fa5c8ba 100644
--- a/legacy/elementary/src/lib/elc_fileselector_button.c
+++ b/legacy/elementary/src/lib/elc_fileselector_button.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_fileselector_button.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_FILESELECTOR_BUTTON_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_FILESELECTOR_BUTTON_CLASS
diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c
index 7fd1bd6897..20fb7efd4e 100644
--- a/legacy/elementary/src/lib/elc_fileselector_entry.c
+++ b/legacy/elementary/src/lib/elc_fileselector_entry.c
@@ -4,8 +4,6 @@
 #include "elm_priv.h"
 #include "elm_widget_fileselector_entry.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_FILESELECTOR_ENTRY_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_FILESELECTOR_ENTRY_CLASS
diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/legacy/elementary/src/lib/elc_hoversel.c
index 316a7d57e4..ef590c58f9 100644
--- a/legacy/elementary/src/lib/elc_hoversel.c
+++ b/legacy/elementary/src/lib/elc_hoversel.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_hoversel.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_HOVERSEL_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_HOVERSEL_CLASS
diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c
index 410f2ed1cf..dbafe49d77 100644
--- a/legacy/elementary/src/lib/elc_multibuttonentry.c
+++ b/legacy/elementary/src/lib/elc_multibuttonentry.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_multibuttonentry.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_MULTIBUTTONENTRY_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_MULTIBUTTONENTRY_CLASS
diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c
index c73e550de7..2b70147398 100644
--- a/legacy/elementary/src/lib/elc_naviframe.c
+++ b/legacy/elementary/src/lib/elc_naviframe.c
@@ -3,8 +3,6 @@
 #include "elm_widget_naviframe.h"
 #include "elm_widget_container.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_NAVIFRAME_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_NAVIFRAME_CLASS
diff --git a/legacy/elementary/src/lib/elc_player.c b/legacy/elementary/src/lib/elc_player.c
index 087aa888e7..adad97ddd5 100644
--- a/legacy/elementary/src/lib/elc_player.c
+++ b/legacy/elementary/src/lib/elc_player.c
@@ -7,8 +7,6 @@
 # include <Emotion.h>
 #endif
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_PLAYER_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_PLAYER_CLASS
diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c
index 31631f6838..b1ae86e058 100644
--- a/legacy/elementary/src/lib/elc_popup.c
+++ b/legacy/elementary/src/lib/elc_popup.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_popup.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_POPUP_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_POPUP_CLASS
diff --git a/legacy/elementary/src/lib/elm_access.c b/legacy/elementary/src/lib/elm_access.c
index 0c418aac25..d725ef81f7 100644
--- a/legacy/elementary/src/lib/elm_access.c
+++ b/legacy/elementary/src/lib/elm_access.c
@@ -1,8 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
-#include "Eo.h"
-
 const Eo_Class *elm_obj_access_class_get(void) EINA_CONST;
 
 #define ELM_OBJ_ACCESS_CLASS elm_obj_access_class_get()
diff --git a/legacy/elementary/src/lib/elm_actionslider.c b/legacy/elementary/src/lib/elm_actionslider.c
index 3c210ef5d7..ab4bb3cfde 100644
--- a/legacy/elementary/src/lib/elm_actionslider.c
+++ b/legacy/elementary/src/lib/elm_actionslider.c
@@ -4,8 +4,6 @@
 #include "elm_widget_actionslider.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_ACTIONSLIDER_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_ACTIONSLIDER_CLASS
diff --git a/legacy/elementary/src/lib/elm_bg.c b/legacy/elementary/src/lib/elm_bg.c
index eccfece65f..0927ac0736 100644
--- a/legacy/elementary/src/lib/elm_bg.c
+++ b/legacy/elementary/src/lib/elm_bg.c
@@ -3,8 +3,6 @@
 #include "elm_widget_bg.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_BG_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_BG_CLASS
diff --git a/legacy/elementary/src/lib/elm_box.c b/legacy/elementary/src/lib/elm_box.c
index 609b45b19a..8865d47be0 100644
--- a/legacy/elementary/src/lib/elm_box.c
+++ b/legacy/elementary/src/lib/elm_box.c
@@ -3,8 +3,6 @@
 #include "els_box.h"
 #include "elm_widget_box.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_BOX_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_BOX_CLASS
diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c
index bffa15c6f1..18ee459a64 100644
--- a/legacy/elementary/src/lib/elm_bubble.c
+++ b/legacy/elementary/src/lib/elm_bubble.c
@@ -3,8 +3,6 @@
 #include "elm_widget_bubble.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_BUBBLE_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_BUBBLE_CLASS
diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c
index 4316d74d50..acd3c87842 100644
--- a/legacy/elementary/src/lib/elm_button.c
+++ b/legacy/elementary/src/lib/elm_button.c
@@ -3,8 +3,6 @@
 #include "elm_widget_button.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_BUTTON_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_BUTTON_CLASS
diff --git a/legacy/elementary/src/lib/elm_calendar.c b/legacy/elementary/src/lib/elm_calendar.c
index 6c11e646b6..fba2138b57 100644
--- a/legacy/elementary/src/lib/elm_calendar.c
+++ b/legacy/elementary/src/lib/elm_calendar.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_calendar.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_CALENDAR_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_CALENDAR_CLASS
diff --git a/legacy/elementary/src/lib/elm_check.c b/legacy/elementary/src/lib/elm_check.c
index 2fbce08bb0..74099b4112 100644
--- a/legacy/elementary/src/lib/elm_check.c
+++ b/legacy/elementary/src/lib/elm_check.c
@@ -3,8 +3,6 @@
 #include "elm_widget_check.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_CHECK_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_CHECK_CLASS
diff --git a/legacy/elementary/src/lib/elm_clock.c b/legacy/elementary/src/lib/elm_clock.c
index f6a70d3642..cc22d78229 100644
--- a/legacy/elementary/src/lib/elm_clock.c
+++ b/legacy/elementary/src/lib/elm_clock.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_clock.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_CLOCK_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_CLOCK_CLASS
diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c
index 52a54f3813..1884e429b5 100644
--- a/legacy/elementary/src/lib/elm_colorselector.c
+++ b/legacy/elementary/src/lib/elm_colorselector.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_colorselector.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_COLORSELECTOR_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_COLORSELECTOR_CLASS
diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c
index 99d89bf8d3..0b68a30165 100644
--- a/legacy/elementary/src/lib/elm_conform.c
+++ b/legacy/elementary/src/lib/elm_conform.c
@@ -3,8 +3,6 @@
 #include "elm_widget_conform.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_CONFORMANT_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_CONFORMANT_CLASS
diff --git a/legacy/elementary/src/lib/elm_container.c b/legacy/elementary/src/lib/elm_container.c
index 987320811a..9b9d870d88 100644
--- a/legacy/elementary/src/lib/elm_container.c
+++ b/legacy/elementary/src/lib/elm_container.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_container.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_CONTAINER_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_CONTAINER_CLASS
diff --git a/legacy/elementary/src/lib/elm_datetime.c b/legacy/elementary/src/lib/elm_datetime.c
index 324c4729ba..e55ded80a0 100644
--- a/legacy/elementary/src/lib/elm_datetime.c
+++ b/legacy/elementary/src/lib/elm_datetime.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_datetime.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_DATETIME_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_DATETIME_CLASS
diff --git a/legacy/elementary/src/lib/elm_dayselector.c b/legacy/elementary/src/lib/elm_dayselector.c
index cdb151ae6f..0a77eb46e3 100644
--- a/legacy/elementary/src/lib/elm_dayselector.c
+++ b/legacy/elementary/src/lib/elm_dayselector.c
@@ -3,8 +3,6 @@
 #include "elm_widget_dayselector.h"
 #include "elm_widget_container.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_DAYSELECTOR_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_DAYSELECTOR_CLASS
diff --git a/legacy/elementary/src/lib/elm_flip.c b/legacy/elementary/src/lib/elm_flip.c
index 74face5818..c4cd1a2f0e 100644
--- a/legacy/elementary/src/lib/elm_flip.c
+++ b/legacy/elementary/src/lib/elm_flip.c
@@ -3,8 +3,6 @@
 #include "elm_widget_flip.h"
 #include "elm_widget_container.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_FLIP_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_FLIP_CLASS
diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/legacy/elementary/src/lib/elm_flipselector.c
index 65fe02e0b3..992ac9bf91 100644
--- a/legacy/elementary/src/lib/elm_flipselector.c
+++ b/legacy/elementary/src/lib/elm_flipselector.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_flipselector.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_FLIPSELECTOR_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_FLIPSELECTOR_CLASS
diff --git a/legacy/elementary/src/lib/elm_frame.c b/legacy/elementary/src/lib/elm_frame.c
index 984224c8b1..13e6fe903a 100644
--- a/legacy/elementary/src/lib/elm_frame.c
+++ b/legacy/elementary/src/lib/elm_frame.c
@@ -3,8 +3,6 @@
 #include "elm_widget_frame.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_FRAME_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_FRAME_CLASS
diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c
index 74e86b2fbd..fc57711b62 100644
--- a/legacy/elementary/src/lib/elm_gesture_layer.c
+++ b/legacy/elementary/src/lib/elm_gesture_layer.c
@@ -1,8 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_GESTURE_LAYER_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_GESTURE_LAYER_CLASS
diff --git a/legacy/elementary/src/lib/elm_glview.c b/legacy/elementary/src/lib/elm_glview.c
index c2689164ce..9fdbba9692 100644
--- a/legacy/elementary/src/lib/elm_glview.c
+++ b/legacy/elementary/src/lib/elm_glview.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_glview.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_GLVIEW_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_GLVIEW_CLASS
diff --git a/legacy/elementary/src/lib/elm_grid.c b/legacy/elementary/src/lib/elm_grid.c
index 2330535b84..fd83dd631a 100644
--- a/legacy/elementary/src/lib/elm_grid.c
+++ b/legacy/elementary/src/lib/elm_grid.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_grid.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_GRID_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_GRID_CLASS
diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c
index 020ae1c305..20a03b8f16 100644
--- a/legacy/elementary/src/lib/elm_hover.c
+++ b/legacy/elementary/src/lib/elm_hover.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_hover.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_HOVER_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_HOVER_CLASS
diff --git a/legacy/elementary/src/lib/elm_icon.c b/legacy/elementary/src/lib/elm_icon.c
index 882bf10ecf..d5c8aca52e 100644
--- a/legacy/elementary/src/lib/elm_icon.c
+++ b/legacy/elementary/src/lib/elm_icon.c
@@ -3,8 +3,6 @@
 #include "elm_widget_icon.h"
 #include "elm_widget_image.h"
 
-#include <Eo.h>
-
 #ifdef ELM_EFREET
 #define NON_EXISTING (void *)-1
 static const char *icon_theme = NULL;
diff --git a/legacy/elementary/src/lib/elm_image.c b/legacy/elementary/src/lib/elm_image.c
index ef0f62d949..7d7f0d7f40 100644
--- a/legacy/elementary/src/lib/elm_image.c
+++ b/legacy/elementary/src/lib/elm_image.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_image.h"
 
-#include <Eo.h>
-
 #ifdef _WIN32
 # define FMT_SIZE_T "%Iu"
 #else
diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c
index dcc59c50f1..355c258a6b 100644
--- a/legacy/elementary/src/lib/elm_index.c
+++ b/legacy/elementary/src/lib/elm_index.c
@@ -4,8 +4,6 @@
 #include "elm_widget_layout.h"
 #include "elm_widget_index.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_INDEX_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_INDEX_CLASS
diff --git a/legacy/elementary/src/lib/elm_inwin.c b/legacy/elementary/src/lib/elm_inwin.c
index 29265240fc..4bec922f21 100644
--- a/legacy/elementary/src/lib/elm_inwin.c
+++ b/legacy/elementary/src/lib/elm_inwin.c
@@ -4,8 +4,6 @@
 #include "elm_widget_inwin.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_WIN_INWIN_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_WIN_INWIN_CLASS
diff --git a/legacy/elementary/src/lib/elm_label.c b/legacy/elementary/src/lib/elm_label.c
index 88cd193de6..81af86e523 100644
--- a/legacy/elementary/src/lib/elm_label.c
+++ b/legacy/elementary/src/lib/elm_label.c
@@ -3,8 +3,6 @@
 #include "elm_widget_layout.h"
 #include "elm_widget_label.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_LABEL_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_LABEL_CLASS
diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c
index ae2c8f84de..c30489e83d 100644
--- a/legacy/elementary/src/lib/elm_layout.c
+++ b/legacy/elementary/src/lib/elm_layout.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_LAYOUT_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_LAYOUT_CLASS
diff --git a/legacy/elementary/src/lib/elm_mapbuf.c b/legacy/elementary/src/lib/elm_mapbuf.c
index 85581fee47..9ec58a4414 100644
--- a/legacy/elementary/src/lib/elm_mapbuf.c
+++ b/legacy/elementary/src/lib/elm_mapbuf.c
@@ -3,8 +3,6 @@
 #include "elm_widget_mapbuf.h"
 #include "elm_widget_container.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_MAPBUF_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_MAPBUF_CLASS
diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c
index d55891daa1..8aedb77ae6 100644
--- a/legacy/elementary/src/lib/elm_menu.c
+++ b/legacy/elementary/src/lib/elm_menu.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_menu.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_MENU_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_MENU_CLASS
diff --git a/legacy/elementary/src/lib/elm_notify.c b/legacy/elementary/src/lib/elm_notify.c
index 9a3a7bbe30..e78479f9ab 100644
--- a/legacy/elementary/src/lib/elm_notify.c
+++ b/legacy/elementary/src/lib/elm_notify.c
@@ -3,8 +3,6 @@
 #include "elm_widget_notify.h"
 #include "elm_widget_container.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_NOTIFY_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_NOTIFY_CLASS
diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c
index f43b6cb876..3fa94a85c1 100644
--- a/legacy/elementary/src/lib/elm_panel.c
+++ b/legacy/elementary/src/lib/elm_panel.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_panel.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_PANEL_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_PANEL_CLASS
diff --git a/legacy/elementary/src/lib/elm_panes.c b/legacy/elementary/src/lib/elm_panes.c
index c29164137b..582becb895 100644
--- a/legacy/elementary/src/lib/elm_panes.c
+++ b/legacy/elementary/src/lib/elm_panes.c
@@ -3,8 +3,6 @@
 #include "elm_widget_layout.h"
 #include "elm_widget_panes.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_PANES_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_PANES_CLASS
diff --git a/legacy/elementary/src/lib/elm_photo.c b/legacy/elementary/src/lib/elm_photo.c
index 0addae74f1..d683ec94d1 100644
--- a/legacy/elementary/src/lib/elm_photo.c
+++ b/legacy/elementary/src/lib/elm_photo.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_photo.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_PHOTO_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_PHOTO_CLASS
diff --git a/legacy/elementary/src/lib/elm_plug.c b/legacy/elementary/src/lib/elm_plug.c
index 88d3ec114a..a4b8a938c6 100644
--- a/legacy/elementary/src/lib/elm_plug.c
+++ b/legacy/elementary/src/lib/elm_plug.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_plug.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_PLUG_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_PLUG_CLASS
diff --git a/legacy/elementary/src/lib/elm_progressbar.c b/legacy/elementary/src/lib/elm_progressbar.c
index 9d6f784b03..80bca8570f 100644
--- a/legacy/elementary/src/lib/elm_progressbar.c
+++ b/legacy/elementary/src/lib/elm_progressbar.c
@@ -3,8 +3,6 @@
 #include "elm_widget_progressbar.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_PROGRESSBAR_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_PROGRESSBAR_CLASS
diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c
index 74a44067a2..e9a0b558c0 100644
--- a/legacy/elementary/src/lib/elm_radio.c
+++ b/legacy/elementary/src/lib/elm_radio.c
@@ -3,8 +3,6 @@
 #include "elm_widget_radio.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_RADIO_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_RADIO_CLASS
diff --git a/legacy/elementary/src/lib/elm_route.c b/legacy/elementary/src/lib/elm_route.c
index 8ece6f51e7..4222d9c3d2 100644
--- a/legacy/elementary/src/lib/elm_route.c
+++ b/legacy/elementary/src/lib/elm_route.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_route.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_ROUTE_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_ROUTE_CLASS
diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c
index 3b044fa508..e904fdded3 100644
--- a/legacy/elementary/src/lib/elm_scroller.c
+++ b/legacy/elementary/src/lib/elm_scroller.c
@@ -3,7 +3,6 @@
 #include "elm_interface_scrollable.h"
 #include "elm_widget_layout.h"
 #include "elm_widget_scroller.h"
-#include "Eo.h"
 
 EAPI Eo_Op ELM_OBJ_SCROLLER_BASE_ID = EO_NOOP;
 
diff --git a/legacy/elementary/src/lib/elm_segment_control.c b/legacy/elementary/src/lib/elm_segment_control.c
index e7cccbf384..7e05500780 100644
--- a/legacy/elementary/src/lib/elm_segment_control.c
+++ b/legacy/elementary/src/lib/elm_segment_control.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_segment_control.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_SEGMENT_CONTROL_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_SEGMENT_CONTROL_CLASS
diff --git a/legacy/elementary/src/lib/elm_separator.c b/legacy/elementary/src/lib/elm_separator.c
index 9b2f6c878e..4735f12984 100644
--- a/legacy/elementary/src/lib/elm_separator.c
+++ b/legacy/elementary/src/lib/elm_separator.c
@@ -3,8 +3,6 @@
 #include "elm_widget_separator.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_SEPARATOR_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_SEPARATOR_CLASS
diff --git a/legacy/elementary/src/lib/elm_slider.c b/legacy/elementary/src/lib/elm_slider.c
index 120c665278..6925140bb7 100644
--- a/legacy/elementary/src/lib/elm_slider.c
+++ b/legacy/elementary/src/lib/elm_slider.c
@@ -3,8 +3,6 @@
 #include "elm_widget_slider.h"
 #include "elm_widget_layout.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_SLIDER_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_SLIDER_CLASS
diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c
index 5e532ba415..07305846d0 100644
--- a/legacy/elementary/src/lib/elm_slideshow.c
+++ b/legacy/elementary/src/lib/elm_slideshow.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_slideshow.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_SLIDESHOW_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_SLIDESHOW_CLASS
diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c
index 898fbbe6fe..3b2602299e 100644
--- a/legacy/elementary/src/lib/elm_spinner.c
+++ b/legacy/elementary/src/lib/elm_spinner.c
@@ -3,8 +3,6 @@
 #include "elm_priv.h"
 #include "elm_widget_spinner.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_SPINNER_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_SPINNER_CLASS
diff --git a/legacy/elementary/src/lib/elm_table.c b/legacy/elementary/src/lib/elm_table.c
index 847789a93a..e965c15d27 100644
--- a/legacy/elementary/src/lib/elm_table.c
+++ b/legacy/elementary/src/lib/elm_table.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_table.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_TABLE_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_TABLE_CLASS
diff --git a/legacy/elementary/src/lib/elm_thumb.c b/legacy/elementary/src/lib/elm_thumb.c
index ae843cbc85..13f8dcbb8b 100644
--- a/legacy/elementary/src/lib/elm_thumb.c
+++ b/legacy/elementary/src/lib/elm_thumb.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_thumb.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_THUMB_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_THUMB_CLASS
diff --git a/legacy/elementary/src/lib/elm_video.c b/legacy/elementary/src/lib/elm_video.c
index 8568a88485..8136d97463 100644
--- a/legacy/elementary/src/lib/elm_video.c
+++ b/legacy/elementary/src/lib/elm_video.c
@@ -10,8 +10,6 @@
 /* TODO: add buffering support to Emotion and display buffering
  * progress in the theme when needed */
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_VIDEO_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_VIDEO_CLASS
diff --git a/legacy/elementary/src/lib/elm_web.c b/legacy/elementary/src/lib/elm_web.c
index 779dd9552f..929bb87d27 100644
--- a/legacy/elementary/src/lib/elm_web.c
+++ b/legacy/elementary/src/lib/elm_web.c
@@ -2,8 +2,6 @@
 #include "elm_priv.h"
 #include "elm_widget_web.h"
 
-#include "Eo.h"
-
 // TODO:
 //  1 - easy to use zoom like elm_photocam API
 //  2 - review scrolling to match elm_scroller. Maybe in future use
diff --git a/legacy/elementary/src/lib/elm_web2.c b/legacy/elementary/src/lib/elm_web2.c
index 896dfe6ab9..6a91399638 100644
--- a/legacy/elementary/src/lib/elm_web2.c
+++ b/legacy/elementary/src/lib/elm_web2.c
@@ -5,8 +5,6 @@
 #if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2)
 #include <EWebKit2.h>
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_WEB_CLASS
diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c
index 19ddd538cd..223e0782fe 100644
--- a/legacy/elementary/src/lib/elm_widget.c
+++ b/legacy/elementary/src/lib/elm_widget.c
@@ -3,8 +3,6 @@
 #include "elm_widget_container.h"
 #include "elm_interface_scrollable.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_WIDGET_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_WIDGET_CLASS
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 3481ef294e..c532b62236 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -2,8 +2,6 @@
 #include <Elementary_Cursor.h>
 #include "elm_priv.h"
 
-#include "Eo.h"
-
 EAPI Eo_Op ELM_OBJ_WIN_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_WIN_CLASS