diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 54239b5f95..5a3de811ac 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -2,12 +2,9 @@
 ### Library
 
 elm_public_eolian_files = \
-	lib/elementary/elm_access.eo \
-	lib/elementary/elm_actionslider.eo \
 	lib/elementary/elm_atspi_bridge.eo \
 	lib/elementary/elm_atspi_app_object.eo \
 	lib/elementary/elm_bg.eo \
-	lib/elementary/elm_bubble.eo \
 	lib/elementary/elm_button.eo \
 	lib/elementary/elm_calendar.eo \
 	lib/elementary/elm_check.eo \
@@ -18,14 +15,10 @@ elm_public_eolian_files = \
 	lib/elementary/elm_ctxpopup.eo \
 	lib/elementary/elm_datetime.eo \
 	lib/elementary/elm_dayselector.eo \
-	lib/elementary/elm_diskselector.eo \
 	lib/elementary/elm_entry.eo \
 	lib/elementary/elm_fileselector.eo \
-	lib/elementary/elm_fileselector_button.eo \
-	lib/elementary/elm_fileselector_entry.eo \
 	lib/elementary/efl_ui_flip.eo \
 	lib/elementary/efl_ui_flip_internal_part.eo \
-	lib/elementary/elm_flipselector.eo \
 	lib/elementary/efl_ui_frame.eo \
 	lib/elementary/elm_gengrid.eo \
 	lib/elementary/elm_gengrid_pan.eo \
@@ -34,8 +27,6 @@ elm_public_eolian_files = \
 	lib/elementary/elm_gesture_layer.eo \
 	lib/elementary/elm_glview.eo \
 	lib/elementary/elm_hover.eo \
-	lib/elementary/elm_hoversel.eo \
-	lib/elementary/elm_icon.eo \
 	lib/elementary/efl_ui_image.eo \
 	lib/elementary/elm_index.eo \
 	lib/elementary/elm_interface_atspi_accessible.eo \
@@ -50,7 +41,6 @@ elm_public_eolian_files = \
 	lib/elementary/elm_interface_atspi_window.eo \
 	lib/elementary/elm_interface_fileselector.eo \
 	lib/elementary/elm_interface_scrollable.eo \
-	lib/elementary/elm_inwin.eo \
 	lib/elementary/elm_label.eo \
 	lib/elementary/elm_layout.eo \
 	lib/elementary/elm_list.eo \
@@ -58,33 +48,26 @@ elm_public_eolian_files = \
 	lib/elementary/elm_map_pan.eo \
 	lib/elementary/elm_menu.eo \
 	lib/elementary/elm_multibuttonentry.eo \
-	lib/elementary/elm_naviframe.eo \
 	lib/elementary/elm_notify.eo \
 	lib/elementary/efl_ui_nstate.eo \
 	lib/elementary/elm_pan.eo \
 	lib/elementary/elm_panel.eo \
 	lib/elementary/elm_panes.eo \
-	lib/elementary/elm_photo.eo \
 	lib/elementary/elm_photocam.eo \
 	lib/elementary/elm_photocam_pan.eo \
 	lib/elementary/elm_player.eo \
 	lib/elementary/elm_plug.eo \
 	lib/elementary/elm_popup.eo \
-	lib/elementary/elm_prefs.eo \
 	lib/elementary/elm_progressbar.eo \
 	lib/elementary/elm_radio.eo \
 	lib/elementary/elm_route.eo \
 	lib/elementary/elm_scroller.eo \
-	lib/elementary/elm_segment_control.eo \
-	lib/elementary/elm_separator.eo \
 	lib/elementary/elm_slider.eo \
-	lib/elementary/elm_slideshow.eo \
 	lib/elementary/elm_spinner.eo \
 	lib/elementary/elm_sys_notify_interface.eo \
 	lib/elementary/elm_sys_notify.eo \
 	lib/elementary/elm_sys_notify_dbus.eo \
 	lib/elementary/elm_systray.eo \
-	lib/elementary/elm_thumb.eo \
 	lib/elementary/elm_toolbar.eo \
 	lib/elementary/efl_ui_video.eo \
 	lib/elementary/elm_view_list.eo \
@@ -96,20 +79,15 @@ elm_public_eolian_files = \
 	lib/elementary/elm_widget_item.eo \
 	lib/elementary/elm_color_item.eo \
 	lib/elementary/elm_dayselector_item.eo \
-	lib/elementary/elm_hoversel_item.eo \
-	lib/elementary/elm_segment_control_item.eo \
-	lib/elementary/elm_slideshow_item.eo \
 	lib/elementary/elm_flipselector_item.eo \
 	lib/elementary/elm_menu_item.eo \
 	lib/elementary/elm_ctxpopup_item.eo \
 	lib/elementary/elm_index_item.eo \
 	lib/elementary/elm_multibuttonentry_item.eo \
-	lib/elementary/elm_naviframe_item.eo \
 	lib/elementary/elm_genlist_item.eo \
 	lib/elementary/elm_gengrid_item.eo \
 	lib/elementary/elm_list_item.eo \
 	lib/elementary/elm_toolbar_item.eo \
-	lib/elementary/elm_diskselector_item.eo \
 	lib/elementary/elm_popup_item.eo \
 	lib/elementary/efl_ui_box.eo \
 	lib/elementary/efl_ui_box_flow.eo \
@@ -147,10 +125,32 @@ elm_private_eolian_files = \
 
 # Legacy classes - not part of public EO API
 elm_legacy_eolian_files = \
+	lib/elementary/elm_access.eo \
+	lib/elementary/elm_actionslider.eo \
 	lib/elementary/elm_box.eo \
+	lib/elementary/elm_bubble.eo \
+	lib/elementary/elm_diskselector.eo \
+	lib/elementary/elm_diskselector_item.eo \
+	lib/elementary/elm_fileselector_button.eo \
+	lib/elementary/elm_fileselector_entry.eo \
+	lib/elementary/elm_flipselector.eo \
 	lib/elementary/elm_grid.eo \
-	lib/elementary/elm_table.eo \
+	lib/elementary/elm_hoversel.eo \
+	lib/elementary/elm_hoversel_item.eo \
+	lib/elementary/elm_icon.eo \
+	lib/elementary/elm_inwin.eo \
 	lib/elementary/elm_mapbuf.eo \
+	lib/elementary/elm_naviframe.eo \
+	lib/elementary/elm_naviframe_item.eo \
+	lib/elementary/elm_photo.eo \
+	lib/elementary/elm_prefs.eo \
+	lib/elementary/elm_segment_control.eo \
+	lib/elementary/elm_segment_control_item.eo \
+	lib/elementary/elm_separator.eo \
+	lib/elementary/elm_slideshow.eo \
+	lib/elementary/elm_slideshow_item.eo \
+	lib/elementary/elm_table.eo \
+	lib/elementary/elm_thumb.eo \
 	$(NULL)
 
 elm_eolian_type_files = \
@@ -298,14 +298,12 @@ includesub_HEADERS = \
 	lib/elementary/elc_fileselector_entry_eo.h \
 	lib/elementary/elc_fileselector_entry_legacy.h \
 	lib/elementary/elc_hoversel.h \
-	lib/elementary/elc_hoversel_eo.h \
 	lib/elementary/elc_hoversel_legacy.h \
 	lib/elementary/elc_multibuttonentry.h \
 	lib/elementary/elc_multibuttonentry_eo.h \
 	lib/elementary/elc_multibuttonentry_legacy.h \
 	lib/elementary/elc_multibuttonentry_common.h \
 	lib/elementary/elc_naviframe.h \
-	lib/elementary/elc_naviframe_eo.h \
 	lib/elementary/elc_naviframe_legacy.h \
 	lib/elementary/elc_naviframe_common.h \
 	lib/elementary/elc_popup.h \
@@ -313,7 +311,6 @@ includesub_HEADERS = \
 	lib/elementary/elc_popup_legacy.h \
 	lib/elementary/elm_access.h \
 	lib/elementary/elm_actionslider.h \
-	lib/elementary/elm_actionslider_eo.h \
 	lib/elementary/elm_actionslider_legacy.h \
 	lib/elementary/elm_app.h \
 	lib/elementary/elm_atspi_app_object.h \
@@ -325,7 +322,6 @@ includesub_HEADERS = \
 	lib/elementary/elm_box_legacy.h \
 	lib/elementary/elm_box_common.h \
 	lib/elementary/elm_bubble.h \
-	lib/elementary/elm_bubble_eo.h \
 	lib/elementary/elm_bubble_legacy.h \
 	lib/elementary/elm_button.h \
 	lib/elementary/elm_button_eo.h \
@@ -374,7 +370,6 @@ includesub_HEADERS = \
 	lib/elementary/efl_ui_flip_eo.h \
 	lib/elementary/efl_ui_flip_legacy.h \
 	lib/elementary/elm_flipselector.h \
-	lib/elementary/elm_flipselector_eo.h \
 	lib/elementary/elm_flipselector_legacy.h \
 	lib/elementary/elm_focus.h \
 	lib/elementary/elm_focus_item.h \
@@ -407,7 +402,6 @@ includesub_HEADERS = \
 	lib/elementary/elm_hover_eo.h \
 	lib/elementary/elm_hover_legacy.h \
 	lib/elementary/elm_icon.h \
-	lib/elementary/elm_icon_eo.h \
 	lib/elementary/elm_icon_legacy.h \
 	lib/elementary/elm_image.h \
 	lib/elementary/elm_image_eo.h \
@@ -417,7 +411,6 @@ includesub_HEADERS = \
 	lib/elementary/elm_index_legacy.h \
 	${top_builddir}/elm_intro.h \
 	lib/elementary/elm_inwin.h \
-	lib/elementary/elm_inwin_eo.h \
 	lib/elementary/elm_inwin_legacy.h \
 	lib/elementary/elm_label.h \
 	lib/elementary/elm_label_eo.h \
@@ -456,7 +449,6 @@ includesub_HEADERS = \
 	lib/elementary/elm_panes_eo.h \
 	lib/elementary/elm_panes_legacy.h \
 	lib/elementary/elm_photo.h \
-	lib/elementary/elm_photo_eo.h \
 	lib/elementary/elm_photo_legacy.h \
 	lib/elementary/elm_photocam.h \
 	lib/elementary/elm_photocam_eo.h \
@@ -466,7 +458,6 @@ includesub_HEADERS = \
 	lib/elementary/elm_plug_legacy.h \
 	lib/elementary/elm_prefs.h \
 	lib/elementary/elm_prefs_common.h \
-	lib/elementary/elm_prefs_eo.h \
 	lib/elementary/elm_prefs_legacy.h \
 	lib/elementary/elm_prefs_data.h \
 	lib/elementary/elm_progressbar.h \
@@ -512,7 +503,6 @@ includesub_HEADERS = \
 	lib/elementary/elm_theme.h \
 	lib/elementary/elm_thumb.h \
 	lib/elementary/elm_thumb_common.h \
-	lib/elementary/elm_thumb_eo.h \
 	lib/elementary/elm_thumb_legacy.h \
 	lib/elementary/elm_toolbar.h \
 	lib/elementary/elm_toolbar_common.h \
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 52ebe1134d..7e8fabb785 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -19,6 +19,7 @@
 #include "elm_entry_common.h"
 #include "elm_widget_entry.h"
 #include "efl_ui_text.eo.h"
+#include "elm_hoversel.eo.h"
 
 typedef struct _Efl_Ui_Text_Data        Efl_Ui_Text_Data;
 typedef struct _Efl_Ui_Text_Rectangle   Efl_Ui_Text_Rectangle;
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 5e052f9351..28ada3b398 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -9,6 +9,8 @@
 #define ELM_WIDGET_ITEM_PROTECTED
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "elm_hoversel.eo.h"
+#include "elm_hoversel_item.eo.h"
 #include "elm_widget_hoversel.h"
 
 #define MY_CLASS ELM_HOVERSEL_CLASS
diff --git a/src/lib/elementary/elc_hoversel.h b/src/lib/elementary/elc_hoversel.h
index 50a7899de0..523bd98e61 100644
--- a/src/lib/elementary/elc_hoversel.h
+++ b/src/lib/elementary/elc_hoversel.h
@@ -57,9 +57,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "elc_hoversel_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elc_hoversel_legacy.h"
 #endif
diff --git a/src/lib/elementary/elc_hoversel_eo.h b/src/lib/elementary/elc_hoversel_eo.h
deleted file mode 100644
index 9a07aa0d4f..0000000000
--- a/src/lib/elementary/elc_hoversel_eo.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "elm_hoversel_item.eo.h"
-#include "elm_hoversel.eo.h"
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 86e65cc983..959354e987 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -8,6 +8,8 @@
 
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "elm_naviframe.eo.h"
+#include "elm_naviframe_item.eo.h"
 #include "elm_widget_naviframe.h"
 #include "elm_widget_container.h"
 
diff --git a/src/lib/elementary/elc_naviframe.h b/src/lib/elementary/elc_naviframe.h
index d99c842817..71f213de85 100644
--- a/src/lib/elementary/elc_naviframe.h
+++ b/src/lib/elementary/elc_naviframe.h
@@ -90,9 +90,6 @@
  */
 
 #include "elc_naviframe_common.h"
-#ifdef EFL_EO_API_SUPPORT
-#include "elc_naviframe_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elc_naviframe_legacy.h"
 #endif
diff --git a/src/lib/elementary/elc_naviframe_eo.h b/src/lib/elementary/elc_naviframe_eo.h
deleted file mode 100644
index 29093b7dbc..0000000000
--- a/src/lib/elementary/elc_naviframe_eo.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @ingroup Elm_Naviframe
- *
- * @{
- */
-
-#include "elm_naviframe_item.eo.h"
-#include "elm_naviframe.eo.h"
-
-/**
- * @}
- */
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index c4e5ee6796..0694daaa3e 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -11,6 +11,8 @@
 #include "elm_widget_actionslider.h"
 #include "elm_widget_layout.h"
 
+#include "elm_actionslider.eo.h"
+
 #define MY_CLASS ELM_ACTIONSLIDER_CLASS
 
 #define MY_CLASS_NAME "Elm_Actionslider"
diff --git a/src/lib/elementary/elm_actionslider.h b/src/lib/elementary/elm_actionslider.h
index 74f3967c07..55abc02138 100644
--- a/src/lib/elementary/elm_actionslider.h
+++ b/src/lib/elementary/elm_actionslider.h
@@ -50,9 +50,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_actionslider_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_actionslider_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_actionslider_eo.h b/src/lib/elementary/elm_actionslider_eo.h
deleted file mode 100644
index 4012fd699d..0000000000
--- a/src/lib/elementary/elm_actionslider_eo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "elm_actionslider.eo.h"
\ No newline at end of file
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index 9f92fc6e35..5da0b3c203 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -7,6 +7,7 @@
 
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "elm_bubble.eo.h"
 #include "elm_widget_bubble.h"
 #include "elm_widget_layout.h"
 
diff --git a/src/lib/elementary/elm_bubble.h b/src/lib/elementary/elm_bubble.h
index f96308b913..328540d9bb 100644
--- a/src/lib/elementary/elm_bubble.h
+++ b/src/lib/elementary/elm_bubble.h
@@ -61,9 +61,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_bubble_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_bubble_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_bubble_eo.h b/src/lib/elementary/elm_bubble_eo.h
deleted file mode 100644
index d4003f6c8f..0000000000
--- a/src/lib/elementary/elm_bubble_eo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "elm_bubble.eo.h"
\ No newline at end of file
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index f5634327a3..e243bf9d8e 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -9,6 +9,9 @@
 #include "elm_code_private.h"
 #include "elm_code_widget_private.h"
 
+/* FIXME: hoversel is deprecated in EO APIs */
+#include "elm_hoversel.eo.h"
+
 #define MY_CLASS ELM_CODE_WIDGET_CLASS
 
 typedef enum {
diff --git a/src/lib/elementary/elm_dbus_menu.c b/src/lib/elementary/elm_dbus_menu.c
index 13fab003dd..61b8fd504f 100644
--- a/src/lib/elementary/elm_dbus_menu.c
+++ b/src/lib/elementary/elm_dbus_menu.c
@@ -5,6 +5,7 @@
 #include <Elementary.h>
 #include <stdint.h>
 #include "elm_priv.h"
+#include "elm_icon.eo.h"
 #include "elm_widget_menu.h"
 #include "elm_widget_icon.h"
 
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 2f5e353ae1..78a3209cfd 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -14,6 +14,7 @@
 
 #include "elm_entry_internal_part.eo.h"
 #include "elm_part_helper.h"
+#include "elm_hoversel.eo.h"
 
 #define MY_CLASS ELM_ENTRY_CLASS
 
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index fd7b6d6154..ba57fe8f24 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -10,6 +10,9 @@
 #include "elm_priv.h"
 #include "elm_widget_flipselector.h"
 
+#include "elm_flipselector.eo.h"
+#include "elm_flipselector_item.eo.h"
+
 #define MY_CLASS ELM_FLIPSELECTOR_CLASS
 
 #define MY_CLASS_NAME "Elm_Flipselector"
diff --git a/src/lib/elementary/elm_flipselector.h b/src/lib/elementary/elm_flipselector.h
index ee9d76591c..966901e084 100644
--- a/src/lib/elementary/elm_flipselector.h
+++ b/src/lib/elementary/elm_flipselector.h
@@ -59,9 +59,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_flipselector_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_flipselector_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_flipselector_eo.h b/src/lib/elementary/elm_flipselector_eo.h
deleted file mode 100644
index 052fdabcb3..0000000000
--- a/src/lib/elementary/elm_flipselector_eo.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "elm_flipselector_item.eo.h"
-#include "elm_flipselector.eo.h"
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index 4e5cd7fef6..3e0904b0b7 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -9,6 +9,7 @@
 #include "elm_priv.h"
 #include "elm_widget_icon.h"
 #include "efl_ui_widget_image.h"
+#include "elm_icon.eo.h"
 
 #define NON_EXISTING (void *)-1
 
diff --git a/src/lib/elementary/elm_icon.h b/src/lib/elementary/elm_icon.h
index bdf77c1f8f..a5ca41feb5 100644
--- a/src/lib/elementary/elm_icon.h
+++ b/src/lib/elementary/elm_icon.h
@@ -151,9 +151,6 @@
  * @li @ref tutorial_icon
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_icon_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_icon_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_icon_eo.h b/src/lib/elementary/elm_icon_eo.h
deleted file mode 100644
index 849b4e795a..0000000000
--- a/src/lib/elementary/elm_icon_eo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "elm_icon.eo.h"
\ No newline at end of file
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index ae60d4fbef..306cd5ab75 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -9,6 +9,7 @@
 #include <Elementary.h>
 
 #include "elm_priv.h"
+#include "elm_inwin.eo.h"
 #include "elm_widget_inwin.h"
 #include "elm_widget_layout.h"
 
diff --git a/src/lib/elementary/elm_inwin.h b/src/lib/elementary/elm_inwin.h
index a4448a1587..d5fba32e52 100644
--- a/src/lib/elementary/elm_inwin.h
+++ b/src/lib/elementary/elm_inwin.h
@@ -44,9 +44,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_inwin_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_inwin_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_inwin_eo.h b/src/lib/elementary/elm_inwin_eo.h
deleted file mode 100644
index 768cd270bb..0000000000
--- a/src/lib/elementary/elm_inwin_eo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "elm_inwin.eo.h"
\ No newline at end of file
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 0a2022e57c..8c07315600 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -8,6 +8,8 @@
 
 #include "elm_priv.h"
 #include "elm_widget_photo.h"
+#include "elm_photo.eo.h"
+#include "elm_icon.eo.h"
 
 #define MY_CLASS ELM_PHOTO_CLASS
 
diff --git a/src/lib/elementary/elm_photo.h b/src/lib/elementary/elm_photo.h
index 60a8806ffb..7a7f698346 100644
--- a/src/lib/elementary/elm_photo.h
+++ b/src/lib/elementary/elm_photo.h
@@ -24,9 +24,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include <elm_photo_eo.h>
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include <elm_photo_legacy.h>
 #endif
diff --git a/src/lib/elementary/elm_photo_eo.h b/src/lib/elementary/elm_photo_eo.h
deleted file mode 100644
index f89beb7254..0000000000
--- a/src/lib/elementary/elm_photo_eo.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @ingroup Elm_Photo
- *
- * @{
- */
-
-#include "elm_photo.eo.h"
-
-/**
- * @}
- */
diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c
index 03b88c5ee5..35a8fd58d5 100644
--- a/src/lib/elementary/elm_prefs.c
+++ b/src/lib/elementary/elm_prefs.c
@@ -7,11 +7,10 @@
 #include <Elementary.h>
 
 #include "elm_priv.h"
+#include "elm_prefs.eo.h"
 #include "elm_widget_prefs.h"
 #include "elm_prefs_edd.x"
 
-#include "Eo.h"
-
 #define MY_CLASS ELM_PREFS_CLASS
 
 #define MY_CLASS_NAME "Elm_Prefs"
diff --git a/src/lib/elementary/elm_prefs.h b/src/lib/elementary/elm_prefs.h
index 66a049a484..37f76e57d6 100644
--- a/src/lib/elementary/elm_prefs.h
+++ b/src/lib/elementary/elm_prefs.h
@@ -74,9 +74,6 @@
  */
 
 #include "elm_prefs_common.h"
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_prefs_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_prefs_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_prefs_eo.h b/src/lib/elementary/elm_prefs_eo.h
deleted file mode 100644
index 657fbd3fd3..0000000000
--- a/src/lib/elementary/elm_prefs_eo.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @ingroup Elm_Prefs
- *
- * @{
- */
-
-#include "elm_prefs.eo.h"
-
-/**
- * @}
- */
diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c
index e292cbc5d8..b57e20d008 100644
--- a/src/lib/elementary/elm_theme.c
+++ b/src/lib/elementary/elm_theme.c
@@ -5,6 +5,7 @@
 #include <Elementary.h>
 
 #include "elm_priv.h"
+#include "elm_icon.eo.h"
 
 static Elm_Theme theme_default =
 {
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index 09ce80bf56..9332c237d0 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -7,6 +7,7 @@
 #include <Elementary.h>
 
 #include "elm_priv.h"
+#include "elm_thumb.eo.h"
 #include "elm_widget_thumb.h"
 
 #define MY_CLASS_NAME "Elm_Thumb"
diff --git a/src/lib/elementary/elm_thumb.h b/src/lib/elementary/elm_thumb.h
index 6b5039df65..f2b1ef36b4 100644
--- a/src/lib/elementary/elm_thumb.h
+++ b/src/lib/elementary/elm_thumb.h
@@ -56,9 +56,6 @@
  */
 
 #include "elm_thumb_common.h"
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_thumb_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_thumb_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_thumb_eo.h b/src/lib/elementary/elm_thumb_eo.h
deleted file mode 100644
index f446b3a679..0000000000
--- a/src/lib/elementary/elm_thumb_eo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "elm_thumb.eo.h"
\ No newline at end of file
diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c
index 6c9230e29e..3e8a710939 100644
--- a/src/lib/elementary/elm_view_form.c
+++ b/src/lib/elementary/elm_view_form.c
@@ -9,6 +9,8 @@
 #include "elm_view_list.h"
 
 #include "elm_priv.h"
+#include "elm_thumb.eo.h"
+
 #include <assert.h>
 
 #define MY_CLASS ELM_VIEW_FORM_CLASS
diff --git a/src/lib/elementary/elm_widget_naviframe.h b/src/lib/elementary/elm_widget_naviframe.h
index 95ce2630ad..3a9ad20317 100644
--- a/src/lib/elementary/elm_widget_naviframe.h
+++ b/src/lib/elementary/elm_widget_naviframe.h
@@ -2,6 +2,8 @@
 #define ELM_WIDGET_NAVIFRAME_H
 
 #include "Elementary.h"
+#include "elm_naviframe.eo.h"
+#include "elm_naviframe_item.eo.h"
 
 /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
  * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/elm_widget_prefs.h b/src/lib/elementary/elm_widget_prefs.h
index 4b5f1263ec..d9e2e0d081 100644
--- a/src/lib/elementary/elm_widget_prefs.h
+++ b/src/lib/elementary/elm_widget_prefs.h
@@ -2,6 +2,7 @@
 #define ELM_WIDGET_PREFS_H
 
 #include "Elementary.h"
+#include "elm_prefs.eo.h"
 
 /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
  * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT