diff --git a/src/lib/elementary/elc_multibuttonentry.h b/src/lib/elementary/elc_multibuttonentry.h
index 75fe7a1b99..e17c1c946f 100644
--- a/src/lib/elementary/elc_multibuttonentry.h
+++ b/src/lib/elementary/elc_multibuttonentry.h
@@ -58,9 +58,6 @@
  */
 
 #include "elc_multibuttonentry_common.h"
-#ifdef EFL_EO_API_SUPPORT
-#include "elc_multibuttonentry_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elc_multibuttonentry_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_button.h b/src/lib/elementary/elm_button.h
index 49053e54f1..47385657af 100644
--- a/src/lib/elementary/elm_button.h
+++ b/src/lib/elementary/elm_button.h
@@ -67,9 +67,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "efl_ui_button_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_button_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_check.h b/src/lib/elementary/elm_check.h
index b0e404e8bc..056dee46a8 100644
--- a/src/lib/elementary/elm_check.h
+++ b/src/lib/elementary/elm_check.h
@@ -60,7 +60,6 @@
  */
 
 #ifdef EFL_EO_API_SUPPORT
-#include "efl_ui_check_eo.h"
 #define EFL_UI_CHECK_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
 #endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
diff --git a/src/lib/elementary/elm_check_legacy.h b/src/lib/elementary/elm_check_legacy.h
index b4192e74e4..075203693e 100644
--- a/src/lib/elementary/elm_check_legacy.h
+++ b/src/lib/elementary/elm_check_legacy.h
@@ -51,6 +51,4 @@ EAPI void                        elm_check_state_set(Evas_Object *obj, Eina_Bool
  */
 EAPI void                        elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep);
 
-#ifdef EFL_EO_API_SUPPORT
 # include "efl_ui_check_eo.legacy.h"
-#endif
diff --git a/src/lib/elementary/elm_flip.h b/src/lib/elementary/elm_flip.h
index cbac3689ae..475ce98220 100644
--- a/src/lib/elementary/elm_flip.h
+++ b/src/lib/elementary/elm_flip.h
@@ -35,9 +35,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "efl_ui_flip_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "efl_ui_flip_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_frame.h b/src/lib/elementary/elm_frame.h
index ee20193983..3ae891cb98 100644
--- a/src/lib/elementary/elm_frame.h
+++ b/src/lib/elementary/elm_frame.h
@@ -48,9 +48,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "efl_ui_frame_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "efl_ui_frame_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_image.h b/src/lib/elementary/elm_image.h
index 45329a35d9..ab3f7b59d9 100644
--- a/src/lib/elementary/elm_image.h
+++ b/src/lib/elementary/elm_image.h
@@ -67,9 +67,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include <elm_image_eo.h>
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include <elm_image_legacy.h>
 #endif
diff --git a/src/lib/elementary/elm_interface_fileselector.h b/src/lib/elementary/elm_interface_fileselector.h
index 2e01555324..d8867f618c 100644
--- a/src/lib/elementary/elm_interface_fileselector.h
+++ b/src/lib/elementary/elm_interface_fileselector.h
@@ -1,9 +1,6 @@
 #ifndef ELM_INTEFARCE_FILESELECTOR_H
 #define ELM_INTEFARCE_FILESELECTOR_H
 
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_interface_fileselector_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_interface_fileselector_eo.legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_layout.h b/src/lib/elementary/elm_layout.h
index 2947f169f8..475ac1c54c 100644
--- a/src/lib/elementary/elm_layout.h
+++ b/src/lib/elementary/elm_layout.h
@@ -167,10 +167,6 @@
  */
 
 #include <elm_layout_common.h>
-#ifdef EFL_EO_API_SUPPORT
-#include <efl_ui_layout_base.eo.h>
-#include <efl_ui_layout.eo.h>
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include <elm_layout_legacy.h>
 #endif
diff --git a/src/lib/elementary/elm_panes.h b/src/lib/elementary/elm_panes.h
index 10eaf35e4e..9704b39c4d 100644
--- a/src/lib/elementary/elm_panes.h
+++ b/src/lib/elementary/elm_panes.h
@@ -54,10 +54,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "efl_ui_panes_eo.h"
-#include "efl_ui_panes_part.eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_panes_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_photocam.h b/src/lib/elementary/elm_photocam.h
index 54ffb6d463..7286366711 100644
--- a/src/lib/elementary/elm_photocam.h
+++ b/src/lib/elementary/elm_photocam.h
@@ -80,9 +80,6 @@ struct _Elm_Photocam_Error
    Eina_Bool open_error;
 };
 
-#ifdef EFL_EO_API_SUPPORT
-#include "efl_ui_image_zoomable_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_photocam_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_progressbar.h b/src/lib/elementary/elm_progressbar.h
index 7df3b3e052..8c57fcf76a 100644
--- a/src/lib/elementary/elm_progressbar.h
+++ b/src/lib/elementary/elm_progressbar.h
@@ -63,9 +63,6 @@
  */
 
 #include "elm_progressbar_common.h"
-#ifdef EFL_EO_API_SUPPORT
-#include "efl_ui_progressbar_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_progressbar_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_radio.h b/src/lib/elementary/elm_radio.h
index 4a58cac81d..dfedb190c9 100644
--- a/src/lib/elementary/elm_radio.h
+++ b/src/lib/elementary/elm_radio.h
@@ -64,10 +64,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "efl_ui_radio_eo.h"
-#define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_radio_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_slider.h b/src/lib/elementary/elm_slider.h
index 40aab8301d..2895342fcd 100644
--- a/src/lib/elementary/elm_slider.h
+++ b/src/lib/elementary/elm_slider.h
@@ -75,10 +75,6 @@
  */
 
 #include "elm_slider_common.h"
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_slider_eo.h"
-#include "elm_slider_part_indicator_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_slider_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_spinner.h b/src/lib/elementary/elm_spinner.h
index 6da9976379..bbfe2f2fa4 100644
--- a/src/lib/elementary/elm_spinner.h
+++ b/src/lib/elementary/elm_spinner.h
@@ -57,9 +57,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_spinner_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_spinner_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_textpath.h b/src/lib/elementary/elm_textpath.h
index 780f1fa222..064c865bf3 100644
--- a/src/lib/elementary/elm_textpath.h
+++ b/src/lib/elementary/elm_textpath.h
@@ -3,10 +3,6 @@
  * @ingroup Elementary
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "efl_ui_textpath.eo.h"
-#define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_textpath_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_toolbar.h b/src/lib/elementary/elm_toolbar.h
index 9e9ec74d37..5dcfaa838f 100644
--- a/src/lib/elementary/elm_toolbar.h
+++ b/src/lib/elementary/elm_toolbar.h
@@ -69,10 +69,6 @@
  */
 
 #include <elm_toolbar_common.h>
-#ifdef EFL_EO_API_SUPPORT
-#include <elm_toolbar_eo.h>
-#include <elm_toolbar_item_eo.h>
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include <elm_toolbar_legacy.h>
 #endif
diff --git a/src/lib/elementary/elm_web.h b/src/lib/elementary/elm_web.h
index 226677ef2e..3ec5e9a42a 100644
--- a/src/lib/elementary/elm_web.h
+++ b/src/lib/elementary/elm_web.h
@@ -93,15 +93,6 @@
  */
 
 #include "elm_web_common.h"
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_web_eo.h"
-
-#undef ELM_WEB_CLASS
-#define ELM_WEB_CLASS elm_web_real_class_get()
-
-EAPI const Efl_Class *elm_web_real_class_get(void);
-
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_web_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_win.h b/src/lib/elementary/elm_win.h
index 7720b980cb..3e45dd15ff 100644
--- a/src/lib/elementary/elm_win.h
+++ b/src/lib/elementary/elm_win.h
@@ -104,13 +104,11 @@
  */
 
 #include <elm_win_common.h>
-#ifdef EFL_EO_API_SUPPORT
-#include <elm_win_eo.h>
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include <elm_win_legacy.h>
 #endif
-
+/* FIXME: what the actual fuck. */
+# include <elm_win_eo.h>
 /**
  * @}
  */