diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index e31252a380..28b7af2d08 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -274,7 +274,10 @@
 
 #include <Eina.h>
 #include <Eo.h>
+
+#ifdef EFL_BETA_API_SUPPORT
 #include <Efl.h>
+#endif
 
 #ifdef EAPI
 # undef EAPI
diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h
index 6ae81904ea..ab82063bef 100644
--- a/src/lib/ecore/Efl_Core.h
+++ b/src/lib/ecore/Efl_Core.h
@@ -5,8 +5,9 @@
 
 #include <Eina.h>
 #include <Eo.h>
+#ifdef EFL_BETA_API_SUPPORT
 #include <Efl.h>
-
+#endif
 #ifdef EAPI
 # undef EAPI
 #endif
diff --git a/src/lib/ector/Ector.h b/src/lib/ector/Ector.h
index e2268f3ad8..729f4e5280 100644
--- a/src/lib/ector/Ector.h
+++ b/src/lib/ector/Ector.h
@@ -3,8 +3,9 @@
 
 #include <Eina.h>
 #include <Eo.h>
+#ifdef EFL_BETA_API_SUPPORT
 #include <Efl.h>
-
+#endif
 #ifdef EAPI
 # undef EAPI
 #endif
diff --git a/src/lib/eldbus/Eldbus.h b/src/lib/eldbus/Eldbus.h
index ac88fd51cf..c69c056c41 100644
--- a/src/lib/eldbus/Eldbus.h
+++ b/src/lib/eldbus/Eldbus.h
@@ -80,8 +80,9 @@
 #include <stdarg.h>
 #include <Efl_Config.h>
 #include <Eo.h>
+#ifdef EFL_BETA_API_SUPPORT
 #include <Efl.h>
-
+#endif
 #ifdef EAPI
 # undef EAPI
 #endif
diff --git a/src/lib/eldbus/Eldbus_Model.h b/src/lib/eldbus/Eldbus_Model.h
index 4f4aca2576..0bf925c2d4 100644
--- a/src/lib/eldbus/Eldbus_Model.h
+++ b/src/lib/eldbus/Eldbus_Model.h
@@ -2,7 +2,6 @@
 #define _ELDBUS_MODEL_H
 
 #include <Eldbus.h>
-#include <Efl.h>
 #include <Eo.h>
 
 #ifdef __cplusplus
@@ -10,7 +9,7 @@ extern "C" {
 #endif
 
 #ifdef EFL_BETA_API_SUPPORT
-
+#include <Efl.h>
 #include <eldbus_model_connection.eo.h>
 #include <eldbus_model_object.eo.h>
 #include <eldbus_model_proxy.eo.h>
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 60bd21fa7f..85919a321f 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -70,7 +70,6 @@
 #include <Efreet_Mime.h>
 #include <Efreet_Trash.h>
 #include <Ethumb_Client.h>
-#include <Efl.h>
 
 #ifdef ELM_ELOCATION
 #include <Elocation.h>
@@ -148,6 +147,7 @@ EAPI extern Elm_Version *elm_version;
 #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
 # define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index ad3f16fe4a..67cdfa262e 100644
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -168,10 +168,11 @@
 
 #include <Eina.h>
 
-/* This include has been added to support Eo in Evas */
 #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>
 
@@ -209,7 +210,9 @@ extern "C" {
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include <Evas_Legacy.h>
 #endif
+#ifdef EFL_BETA_API_SUPPORT
 #include <Evas_Eo.h>
+#endif
 
 #ifdef __cplusplus
 }