efl: remove EFL_EO_API_SUPPORT macro

Summary:
Since we're now going to be shipping some eo classes as stable,
there is no point in keeping the eo api behind a macro, and it
should be enabled by default. Another case is beta classes, but
those are behind the EFL_BETA_API_SUPPORT guard.

This also changes includes around the place where things are
clearly broken (such as an included header needing something
from another header but that other header being guarded, notably
efl_ui_widget.h needing focus manager but focus manager being
behind beta in Elementary.h)

Reviewers: zmike, cedric, bu5hm4n, stefan_schmidt, segfaultxavi

Reviewed By: cedric, segfaultxavi

Subscribers: segfaultxavi, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8322

32 files changed, 16 insertions, 135 deletions

diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index 28b7af2d08..cfc6dd7660 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -274,10 +274,7 @@
 
 #include <Eina.h>
 #include <Eo.h>
-
-#ifdef EFL_BETA_API_SUPPORT
 #include <Efl.h>
-#endif
 
 #ifdef EAPI
 # undef EAPI
@@ -333,9 +330,7 @@ extern "C" {
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "Ecore_Legacy.h"
 #endif
-#ifdef EFL_EO_API_SUPPORT
 #include "Ecore_Eo.h"
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/edje/Edje.h b/src/lib/edje/Edje.h
index 4d747fc9ea..d8c32dc8c1 100644
--- a/src/lib/edje/Edje.h
+++ b/src/lib/edje/Edje.h
@@ -253,9 +253,7 @@ extern "C" {
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "Edje_Legacy.h"
 #endif
-#ifdef EFL_EO_API_SUPPORT
 #include "Edje_Eo.h"
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/efl/Efl_Config.h.cmake b/src/lib/efl/Efl_Config.h.cmake
index 4f7a03ac1f..5c7a420dae 100644
--- a/src/lib/efl/Efl_Config.h.cmake
+++ b/src/lib/efl/Efl_Config.h.cmake
@@ -3,16 +3,12 @@
 
 /* Add -DEFL_API_OVERRIDE ot your CFLAGS to override the default
  * installed api set and then fter that -DEFL_NOLEGACY_API_SUPPORT
- * and/or -DEFL_EO_API_SUPPORT as desired
+ * as desired
  */
 #ifndef EFL_API_OVERRIDE
 
 #cmakedefine EFL_API_LEGACY_DEF
 #cmakedefine EFL_BETA_API_SUPPORT
-/* You can't disable Eo API anymore as EFL use it everywhere internally
-   and we don't want to expose it publicly just yet, so keep it hidden
-   and require an explicit request to get it. */
-/* #define EFL_EO_API_SUPPORT */
 #endif
 
 #define EFL_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
diff --git a/src/lib/efl/Efl_Config.h.in b/src/lib/efl/Efl_Config.h.in
index 25420d0c4e..1673cd04e9 100644
--- a/src/lib/efl/Efl_Config.h.in
+++ b/src/lib/efl/Efl_Config.h.in
@@ -3,14 +3,10 @@
 
 /* Add -DEFL_API_OVERRIDE ot your CFLAGS to override the default
  * installed api set and then fter that -DEFL_NOLEGACY_API_SUPPORT
- * and/or -DEFL_EO_API_SUPPORT as desired
+ * as desired
  */
 #ifndef EFL_API_OVERRIDE 
 @EFL_API_LEGACY_DEF@
-/* You can't disable Eo API anymore as EFL use it everywhere internally
-   and we don't want to expose it publicly just yet, so keep it hidden
-   and require an explicit request to get it. */
-/* @EFL_API_EO_DEF@ */
 #endif
 
 #define EFL_VERSION_MAJOR @EFL_VERSION_MAJOR@
diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index cc986938dd..fb0fc64813 100644
--- a/src/lib/eio/Eio.h
+++ b/src/lib/eio/Eio.h
@@ -76,9 +76,7 @@ typedef Eina_Bool (*Eio_Filter_Direct_Cb)(void *data, Eio_File *handler, const E
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "Eio_Legacy.h"
 #endif
-#ifdef EFL_EO_API_SUPPORT
 #include "Eio_Eo.h"
-#endif
 
 /**
  * @brief get access time from a Eina_Stat
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 9dee04cc75..22e446a998 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -4,10 +4,6 @@
 #include <Efl_Config.h>
 #include <Elementary_Options.h>
 
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
-
 /* FIXME: wtf? */
 #ifndef EFL_UI_RADIO_EVENT_CHANGED
 # define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index c494bf4751..119a3edfaa 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -146,7 +146,6 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_config.h>
 #include <elm_focus.h>
 
-#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT)
 #include <Efl.h>
 /* FIXME: wtf? */
 #ifndef EFL_UI_RADIO_EVENT_CHANGED
@@ -160,7 +159,6 @@ typedef Eo Efl_Ui_Focus_Manager;
 
 # include <efl_ui_focus_object.eo.h>
 # include <efl_ui_focus_manager.eo.h>
-EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
 # include <efl_ui_focus_manager_window_root.eo.h>
 # include <efl_ui_focus_manager_calc.eo.h>
 # include <efl_ui_focus_manager_sub.eo.h>
@@ -169,6 +167,8 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
 # include <efl_ui_l10n.eo.h>
 # include <efl_ui_focus_composition.eo.h>
 # include <efl_ui_focus_layer.eo.h>
+
+#ifdef EFL_BETA_API_SUPPORT
 # include <elm_interface_scrollable.h>
 # include <elm_interface_scrollable.eo.h>
 #endif
@@ -284,7 +284,6 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
 #include <elm_web.h>
 #include <elm_win.h>
 
-#ifdef EFL_EO_API_SUPPORT
 # include <efl_ui_selection_types.eot.h>
 # include <efl_ui_theme.eo.h>
 # include <efl_config_global.eo.h>
@@ -375,7 +374,6 @@ typedef Eo Efl_Ui_Pager;
 # include <efl_ui_tab_page.eo.h>
 # include <efl_ui_tab_page_part_tab.eo.h>
 # include <efl_ui_tab_pager.eo.h>
-#endif
 
 /* include deprecated calls last of all */
 #include <elm_deprecated.h>
diff --git a/src/lib/elementary/Elementary.hh b/src/lib/elementary/Elementary.hh
index 36a31ef700..e5e1036e0c 100644
--- a/src/lib/elementary/Elementary.hh
+++ b/src/lib/elementary/Elementary.hh
@@ -7,9 +7,6 @@
 #ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
 #endif
-#ifndef EFL_EO_API_SUPPORT
-#define EFL_EO_API_SUPPORT
-#endif
 #ifndef ELM_INTERNAL_API_ARGESFSDFEFC
 #define ELM_INTERNAL_API_ARGESFSDFEFC
 #endif
diff --git a/src/lib/elementary/efl_access_object.h b/src/lib/elementary/efl_access_object.h
index b42db31f7f..4ad1ede4e5 100644
--- a/src/lib/elementary/efl_access_object.h
+++ b/src/lib/elementary/efl_access_object.h
@@ -2,13 +2,7 @@
 #define EFL_ACCESS_H
 
 #ifdef EFL_BETA_API_SUPPORT
-
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_access_object.eo.h"
-#endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#include "efl_access_object.eo.legacy.h"
-#endif
 
 /*
  * Sets a particilar state type for given state set.
@@ -36,8 +30,6 @@ EAPI void efl_access_attributes_list_free(Eina_List *list);
 EAPI void
 efl_access_attribute_free(Efl_Access_Attribute *attr);
 
-#ifdef EFL_EO_API_SUPPORT
-
 /**
  * Emits Accessible 'StateChanged' signal.
  */
@@ -131,6 +123,4 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
    efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL);
 
 #endif
-
-#endif
 #endif
diff --git a/src/lib/elementary/efl_access_text.h b/src/lib/elementary/efl_access_text.h
index f5cecc01bd..a1dfec0a0c 100644
--- a/src/lib/elementary/efl_access_text.h
+++ b/src/lib/elementary/efl_access_text.h
@@ -2,13 +2,7 @@
 #define ELM_INTERFACE_ATSPI_TEXT_H
 
 #ifdef EFL_BETA_API_SUPPORT
-
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_access_text.eo.h"
-#endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#include "efl_access_text.eo.legacy.h"
-#endif
 
 /**
  * @brief Free Efl_Access_Text_Attribute structure
diff --git a/src/lib/elementary/efl_access_widget_action.h b/src/lib/elementary/efl_access_widget_action.h
index 62caf4f5ae..86df79c8cc 100644
--- a/src/lib/elementary/efl_access_widget_action.h
+++ b/src/lib/elementary/efl_access_widget_action.h
@@ -13,12 +13,7 @@ struct _Efl_Access_Action_Data
 
 typedef struct _Efl_Access_Action_Data Efl_Access_Action_Data;
 
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_access_widget_action.eo.h"
-#endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#include "efl_access_widget_action.eo.legacy.h"
-#endif
 
 #endif
 #endif
diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h
index c4b3d3c398..739d9f025d 100644
--- a/src/lib/elementary/efl_access_window.h
+++ b/src/lib/elementary/efl_access_window.h
@@ -2,13 +2,7 @@
 #define EFL_ACCESS_WINDOW_H
 
 #ifdef EFL_BETA_API_SUPPORT
-#ifdef EFL_EO_API_SUPPORT
-
 #include "efl_access_window.eo.h"
-#endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#include "efl_access_window.eo.legacy.h"
-#endif
 
 /**
  * Emits 'Window:Activated' accessible signal.
diff --git a/src/lib/elementary/efl_ui_calendar.h b/src/lib/elementary/efl_ui_calendar.h
index f80dce28d5..c3c8f6ae89 100644
--- a/src/lib/elementary/efl_ui_calendar.h
+++ b/src/lib/elementary/efl_ui_calendar.h
@@ -48,9 +48,8 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_ui_calendar.eo.h"
-#endif
+
 /**
  * @}
  */
diff --git a/src/lib/elementary/efl_ui_clock.h b/src/lib/elementary/efl_ui_clock.h
index b882cd77a5..1115faaf45 100644
--- a/src/lib/elementary/efl_ui_clock.h
+++ b/src/lib/elementary/efl_ui_clock.h
@@ -196,9 +196,8 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_ui_clock.eo.h"
-#endif
+
 /**
  * @}
  */
diff --git a/src/lib/elementary/efl_ui_nstate.h b/src/lib/elementary/efl_ui_nstate.h
index 5e69c19dce..1d16c1f1c4 100644
--- a/src/lib/elementary/efl_ui_nstate.h
+++ b/src/lib/elementary/efl_ui_nstate.h
@@ -21,6 +21,4 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_ui_nstate.eo.h"
-#endif
diff --git a/src/lib/elementary/efl_ui_video.h b/src/lib/elementary/efl_ui_video.h
index d015d1c0d7..c4cfc55815 100644
--- a/src/lib/elementary/efl_ui_video.h
+++ b/src/lib/elementary/efl_ui_video.h
@@ -54,9 +54,7 @@
  * ELM_PLAYER_CLASS
  */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_ui_video_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "efl_ui_video_legacy.h"
 #endif
diff --git a/src/lib/elementary/elc_fileselector_common.h b/src/lib/elementary/elc_fileselector_common.h
index c20e2a37c5..df4f831268 100644
--- a/src/lib/elementary/elc_fileselector_common.h
+++ b/src/lib/elementary/elc_fileselector_common.h
@@ -1,7 +1,6 @@
 typedef Eina_Bool (*Elm_Fileselector_Filter_Func)(const char *path, /**< File path */
                                                   Eina_Bool dir, /**< A flag to show if path is a directory or not. True if the path is a directory. */
                                                   void *data /**< A user data that was given by elm_fileselector_custom_filter_append. */);
-#ifdef EFL_EO_API_SUPPORT
+
 EAPI extern Eina_Error ELM_FILESELECTOR_ERROR_UNKNOWN;
 EAPI extern Eina_Error ELM_FILESELECTOR_ERROR_INVALID_MODEL;
-#endif
diff --git a/src/lib/elementary/elm_atspi_app_object.h b/src/lib/elementary/elm_atspi_app_object.h
index 3d66198215..f460ffd83e 100644
--- a/src/lib/elementary/elm_atspi_app_object.h
+++ b/src/lib/elementary/elm_atspi_app_object.h
@@ -1,3 +1 @@
-#ifdef EFL_EO_API_SUPPORT
 #include "elm_atspi_app_object.eo.h"
-#endif
diff --git a/src/lib/elementary/elm_atspi_bridge.h b/src/lib/elementary/elm_atspi_bridge.h
index 80a476df36..5e5673b2b0 100644
--- a/src/lib/elementary/elm_atspi_bridge.h
+++ b/src/lib/elementary/elm_atspi_bridge.h
@@ -1,5 +1,3 @@
 #ifdef EFL_BETA_API_SUPPORT
-#ifdef EFL_EO_API_SUPPORT
 #include "elm_atspi_bridge.eo.h"
 #endif
-#endif
diff --git a/src/lib/elementary/elm_check.h b/src/lib/elementary/elm_check.h
index 056dee46a8..492494a2f8 100644
--- a/src/lib/elementary/elm_check.h
+++ b/src/lib/elementary/elm_check.h
@@ -59,9 +59,8 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
 #define EFL_UI_CHECK_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
-#endif
+
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_check_legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_config.h b/src/lib/elementary/elm_config.h
index c9c65c5db6..260d1dfa49 100644
--- a/src/lib/elementary/elm_config.h
+++ b/src/lib/elementary/elm_config.h
@@ -2356,7 +2356,8 @@ EAPI void elm_config_drag_anim_duration_set(double set);
 
 /* new efl.config interface helpers in C */
 
-#ifdef EFL_EO_API_SUPPORT
+/* FIXME these depend on stuff from Efl.h but this is included before that */
+#ifdef EFL_BETA_API_SUPPORT
 
 static inline Eina_Bool
 efl_config_bool_set(Efl_Config *obj, const char * name, Eina_Bool val)
diff --git a/src/lib/elementary/elm_helper.h b/src/lib/elementary/elm_helper.h
index 2cc350e869..488372939a 100644
--- a/src/lib/elementary/elm_helper.h
+++ b/src/lib/elementary/elm_helper.h
@@ -77,7 +77,7 @@ elm_validator_regexp_free(Elm_Validator_Regexp *validator) EINA_ARG_NONNULL(1);
 EAPI Elm_Regexp_Status
 elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNULL(1);
 
-#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
+#if defined(EFL_BETA_API_SUPPORT)
 /**
  * @brief The regex validator. Used as callback to validate event.
  *
diff --git a/src/lib/elementary/elm_interface_scrollable.h b/src/lib/elementary/elm_interface_scrollable.h
index 3f2a0862a4..cf9806f501 100644
--- a/src/lib/elementary/elm_interface_scrollable.h
+++ b/src/lib/elementary/elm_interface_scrollable.h
@@ -58,12 +58,7 @@ typedef void      (*Elm_Interface_Scrollable_Resize_Cb)(Evas_Object *obj, Evas_C
 typedef struct _Elm_Scrollable_Smart_Interface_Data
   Elm_Scrollable_Smart_Interface_Data;
 
-#ifdef EFL_EO_API_SUPPORT
 #include "elm_interface_scrollable.eo.h"
-#endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#include "elm_interface_scrollable.eo.legacy.h"
-#endif
 
 struct _Elm_Scrollable_Smart_Interface_Data
 {
@@ -247,7 +242,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
        return __VA_ARGS__;                                                   \
     }
 
-#if defined(EFL_EO_API_SUPPORT) && defined(EFL_BETA_API_SUPPORT)
+#ifdef EFL_BETA_API_SUPPORT
 EAPI void elm_pan_gravity_set(Elm_Pan *, double x, double) EINA_DEPRECATED;
 EAPI void elm_pan_gravity_get(const Elm_Pan *, double *, double *) EINA_DEPRECATED;
 #endif
diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h
index bcbe8e646f..2c0f33a260 100644
--- a/src/lib/elementary/elm_interfaces.h
+++ b/src/lib/elementary/elm_interfaces.h
@@ -3,13 +3,7 @@
 #include "efl_access_widget_action.h"
 #include "efl_access_window.h"
 
-// FIXME FIXME FIXME -- Still required because of photocam
-#ifdef EFL_EO_API_SUPPORT
-# include "elm_interface_scrollable.h"
-#endif
-
 #ifdef EFL_BETA_API_SUPPORT
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_access_action.eo.h"
 #include "efl_access_component.eo.h"
 #include "efl_access_editable_text.eo.h"
@@ -17,12 +11,3 @@
 #include "efl_access_value.eo.h"
 #include "efl_ui_legacy.eo.h"
 #endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#include "efl_access_action.eo.legacy.h"
-#include "efl_access_component.eo.legacy.h"
-#include "efl_access_editable_text.eo.legacy.h"
-#include "efl_access_selection.eo.legacy.h"
-#include "efl_access_value.eo.legacy.h"
-#include "efl_ui_legacy.eo.legacy.h"
-#endif
-#endif
diff --git a/src/lib/elementary/elm_view_form.h b/src/lib/elementary/elm_view_form.h
index e97ca6c6e7..fc35e48644 100644
--- a/src/lib/elementary/elm_view_form.h
+++ b/src/lib/elementary/elm_view_form.h
@@ -1,5 +1,5 @@
 
-#ifdef EFL_EO_API_SUPPORT
+#ifdef EFL_BETA_API_SUPPORT
 #ifndef ELM_VIEW_FORM_H
 #define ELM_VIEW_FORM_H
 
diff --git a/src/lib/elementary/elm_view_list.h b/src/lib/elementary/elm_view_list.h
index 4ad048e106..7f7ef5a553 100644
--- a/src/lib/elementary/elm_view_list.h
+++ b/src/lib/elementary/elm_view_list.h
@@ -1,5 +1,5 @@
 
-#ifdef EFL_EO_API_SUPPORT
+#ifdef EFL_BETA_API_SUPPORT
 #ifndef ELM_VIEW_LIST_H
 #define ELM_VIEW_LIST_H
 
diff --git a/src/lib/elementary/elm_win_eo.h b/src/lib/elementary/elm_win_eo.h
index 51eaee9010..39ec8eb4b1 100644
--- a/src/lib/elementary/elm_win_eo.h
+++ b/src/lib/elementary/elm_win_eo.h
@@ -11,7 +11,7 @@
 
 EAPI void elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel);
 EAPI Eina_Bool elm_win_autodel_get(const Evas_Object *obj);
-#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT)
+#ifdef EFL_BETA_API_SUPPORT
 /**
  * @brief Set the window's autodel state.
  *
diff --git a/src/lib/emotion/Emotion.h b/src/lib/emotion/Emotion.h
index d7eef3c090..d8eb052f93 100644
--- a/src/lib/emotion/Emotion.h
+++ b/src/lib/emotion/Emotion.h
@@ -127,9 +127,7 @@ extern "C" {
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "Emotion_Legacy.h"
 #endif
-#ifdef EFL_EO_API_SUPPORT
 #include "Emotion_Eo.h"
-#endif
 
 /**
  * @file Emotion.h
diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index 525ca7d785..9044398971 100644
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -169,10 +169,8 @@
 #include <Eina.h>
 
 #include <Eo.h>
-#ifdef EFL_BETA_API_SUPPORT
 /* This include has been added to support Eo in Evas */
 #include <Efl.h>
-#endif
 
 #include <Evas_Loader.h>
 
diff --git a/src/lib/evas/Evas.hh b/src/lib/evas/Evas.hh
index 064d8c184e..ac9b6509ed 100644
--- a/src/lib/evas/Evas.hh
+++ b/src/lib/evas/Evas.hh
@@ -8,9 +8,6 @@
 #ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
 #endif
-#ifndef EFL_EO_API_SUPPORT
-#define EFL_EO_API_SUPPORT
-#endif
 
 #include <Efl.hh>
 
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index bb710a9825..661d7f5c6b 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -89,7 +89,7 @@ EAPI extern Evas_Version * evas_version;
  * @since 1.1
  */
 // Support not having eo available
-#if defined (EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
+#ifdef EFL_BETA_API_SUPPORT
 typedef Efl_Callback_Priority Evas_Callback_Priority;
 #else
 typedef short Evas_Callback_Priority;
@@ -3490,21 +3490,9 @@ typedef unsigned int Efl_Input_Device_Type;
 
 #endif
 
-#ifndef _EFL_H
-#define _EFL_H
-typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
-typedef struct tm Efl_Time;
-#endif
-
 #ifndef _EFL_TEXT_CURSOR_EO_H_
 #define _EFL_TEXT_CURSOR_EO_H_
 
-#ifndef _EFL_TEXT_CURSOR_EO_CLASS_TYPE
-#define _EFL_TEXT_CURSOR_EO_CLASS_TYPE
-#endif
-typedef Eo Efl_Text_Cursor;
-typedef Eo Efl_Text_Cursor_Cursor;
-
 #endif
 #ifndef _EFL_GFX_ENTITY_EO_H_
 #define _EFL_GFX_ENTITY_EO_H_
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index a2c3e5c9e6..a4f611e201 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -2,8 +2,6 @@
 # error You shall not include this header directly
 #endif
 
-#ifdef EFL_EO_API_SUPPORT
-
 #ifndef _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
 #define _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
 
@@ -200,11 +198,6 @@ struct _Efl_Canvas_Object_Animation_Event
 #include "canvas/efl_canvas_animation_group_parallel.eo.h"
 #include "canvas/efl_canvas_animation_group_sequential.eo.h"
 #include "canvas/efl_canvas_animation_player.eo.h"
-
-#endif /* EFL_EO_API_SUPPORT */
-
-#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
-
 #include "canvas/efl_canvas_event_grabber.eo.h"
 
  /**
@@ -418,17 +411,13 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
 #include "canvas/evas_canvas3d_scene.eo.h"
 
 #include "canvas/efl_canvas_scene3d.eo.h"
-#endif /* EFL_BETA_API_SUPPORT */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "canvas/efl_canvas_image_internal.eo.h"
 #include "canvas/efl_canvas_image.eo.h"
 #include "canvas/efl_canvas_snapshot.eo.h"
 #include "canvas/efl_canvas_proxy.eo.h"
 #include "canvas/efl_gfx_mapping.eo.h"
-#endif /* EFL_EO_API_SUPPORT */
 
-#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
 /**
  * @ingroup Evas_Object_VG
  *
@@ -445,9 +434,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
 #include "canvas/efl_canvas_vg_gradient.eo.h"
 #include "canvas/efl_canvas_vg_gradient_linear.eo.h"
 #include "canvas/efl_canvas_vg_gradient_radial.eo.h"
-#endif /* EFL_BETA_API_SUPPORT */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "canvas/efl_input_state.eo.h"
 #include "canvas/efl_input_event.eo.h"
 #include "canvas/efl_input_pointer.eo.h"
@@ -455,9 +442,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
 #include "canvas/efl_input_hold.eo.h"
 #include "canvas/efl_input_interface.eo.h"
 #include "canvas/efl_input_focus.eo.h"
-#endif /* EFL_EO_API_SUPPORT */
 
-#ifdef EFL_EO_API_SUPPORT
 # include "gesture/efl_canvas_gesture_types.eot.h"
 # include "gesture/efl_canvas_gesture_touch.eo.h"
 # include "gesture/efl_canvas_gesture.eo.h"
@@ -465,4 +450,3 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
 # include "gesture/efl_canvas_gesture_long_tap.eo.h"
 # include "gesture/efl_canvas_gesture_recognizer.eo.h"
 # include "gesture/efl_canvas_gesture_manager.eo.h"
-#endif /* EFL_EO_API_SUPPORT */