diff --git a/src/bin/elementary/test_ui_box_stack.c b/src/bin/elementary/test_ui_box_stack.c
index 1b5d579d1c..0e876b3324 100644
--- a/src/bin/elementary/test_ui_box_stack.c
+++ b/src/bin/elementary/test_ui_box_stack.c
@@ -2,6 +2,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 void
diff --git a/src/lib/elementary/efl_access_action.c b/src/lib/elementary/efl_access_action.c
index da5cd1b4e2..cae9e5c066 100644
--- a/src/lib/elementary/efl_access_action.c
+++ b/src/lib/elementary/efl_access_action.c
@@ -4,8 +4,6 @@
 
 #define EFL_ACCESS_ACTION_PROTECTED
 
-#include <Elementary.h>
-#include "elm_widget.h"
 #include "elm_priv.h"
 
 EOLIAN const char *
diff --git a/src/lib/elementary/efl_access_component.c b/src/lib/elementary/efl_access_component.c
index 83f7640249..9566db017d 100644
--- a/src/lib/elementary/efl_access_component.c
+++ b/src/lib/elementary/efl_access_component.c
@@ -5,8 +5,6 @@
 #define EFL_ACCESS_COMPONENT_PROTECTED
 #define EFL_ACCESS_OBJECT_PROTECTED
 
-#include <Elementary.h>
-
 #include "elm_priv.h"
 
 
diff --git a/src/lib/elementary/efl_access_editable_text.c b/src/lib/elementary/efl_access_editable_text.c
index bd03d6613e..4f3af3342f 100644
--- a/src/lib/elementary/efl_access_editable_text.c
+++ b/src/lib/elementary/efl_access_editable_text.c
@@ -4,8 +4,6 @@
 
 #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
 
-#include <Elementary.h>
-#include "elm_widget.h"
 #include "elm_priv.h"
 
 #include "efl_access_editable_text.eo.c"
diff --git a/src/lib/elementary/efl_access_object.c b/src/lib/elementary/efl_access_object.c
index 6bb3b2e882..c30b313cf4 100644
--- a/src/lib/elementary/efl_access_object.c
+++ b/src/lib/elementary/efl_access_object.c
@@ -4,8 +4,6 @@
 
 #define EFL_ACCESS_OBJECT_PROTECTED
 
-#include <Elementary.h>
-#include "elm_widget.h"
 #include "elm_priv.h"
 
 const char* Access_Name[] = {
diff --git a/src/lib/elementary/efl_access_selection.c b/src/lib/elementary/efl_access_selection.c
index f239a04dea..73ff5c8387 100644
--- a/src/lib/elementary/efl_access_selection.c
+++ b/src/lib/elementary/efl_access_selection.c
@@ -4,8 +4,6 @@
 
 #define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
 
-#include <Elementary.h>
-#include "elm_widget.h"
 #include "elm_priv.h"
 
 #include "efl_access_selection.eo.c"
diff --git a/src/lib/elementary/efl_access_text.c b/src/lib/elementary/efl_access_text.c
index fa3798523a..6f35f71471 100644
--- a/src/lib/elementary/efl_access_text.c
+++ b/src/lib/elementary/efl_access_text.c
@@ -4,8 +4,6 @@
 
 #define EFL_ACCESS_TEXT_PROTECTED
 
-#include <Elementary.h>
-#include "elm_widget.h"
 #include "elm_priv.h"
 
 void
diff --git a/src/lib/elementary/efl_access_value.c b/src/lib/elementary/efl_access_value.c
index 76e52864a8..646c9d049e 100644
--- a/src/lib/elementary/efl_access_value.c
+++ b/src/lib/elementary/efl_access_value.c
@@ -4,8 +4,6 @@
 
 #define EFL_ACCESS_VALUE_PROTECTED
 
-#include <Elementary.h>
-#include "elm_widget.h"
 #include "elm_priv.h"
 
 #include "efl_access_value.eo.c"
diff --git a/src/lib/elementary/efl_access_widget_action.c b/src/lib/elementary/efl_access_widget_action.c
index 47b2f2724a..be6e59ab4c 100644
--- a/src/lib/elementary/efl_access_widget_action.c
+++ b/src/lib/elementary/efl_access_widget_action.c
@@ -5,8 +5,6 @@
 #define EFL_ACCESS_ACTION_PROTECTED
 #define EFL_ACCESS_WIDGET_ACTION_PROTECTED
 
-#include <Elementary.h>
-#include "elm_widget.h"
 #include "elm_priv.h"
 
 extern Eina_Hash *_elm_key_bindings;
diff --git a/src/lib/elementary/efl_access_window.c b/src/lib/elementary/efl_access_window.c
index 48d0dfd2c2..250d894219 100644
--- a/src/lib/elementary/efl_access_window.c
+++ b/src/lib/elementary/efl_access_window.c
@@ -2,8 +2,6 @@
   #include "elementary_config.h"
 #endif
 
-#include <Elementary.h>
-#include "elm_widget.h"
 #include "elm_priv.h"
 
 #include "efl_access_window.eo.c"
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 9d7fdedf6f..f66f3b7656 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#include <Elementary.h>
+#include "elm_priv.h"
 #include "efl_ui_internal_text_interactive.h"
 
 #define MY_CLASS EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index 224f51a2fc..341396c58f 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -8,7 +8,7 @@
 #define EFL_UI_FOCUS_COMPOSITION_PROTECTED
 #define EFL_UI_WIDGET_FOCUS_MANAGER_PROTECTED
 
-#include <Elementary.h>
+#include "elm_priv.h"
 #include "efl_ui_list_view_private.h"
 #include "efl_ui_list_view_precise_layouter.eo.h"
 
diff --git a/src/lib/elementary/efl_ui_list_view_seg_array.c b/src/lib/elementary/efl_ui_list_view_seg_array.c
index 89dba53011..50f33b340b 100644
--- a/src/lib/elementary/efl_ui_list_view_seg_array.c
+++ b/src/lib/elementary/efl_ui_list_view_seg_array.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#include <Efl.h>
+#include "elm_priv.h"
 #include <assert.h>
 
 #include "efl_ui_list_view_private.h"
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index ccee479500..dc3696a9af 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -2,16 +2,13 @@
 # include "elementary_config.h"
 #endif
 
-#include <Emotion.h>
-
 #define EFL_ACCESS_OBJECT_PROTECTED
 #define EFL_ACCESS_WIDGET_ACTION_PROTECTED
 
-#include <Elementary.h>
 
+#include "elm_priv.h"
 #include "elm_widget_layout.h"
 #include "efl_ui_video_private.h"
-#include "elm_priv.h"
 
 /* TODO: add buffering support to Emotion and display buffering
  * progress in the theme when needed */
diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c
index e1ef62ac91..cc68cf0492 100644
--- a/src/lib/elementary/elm_atspi_app_object.c
+++ b/src/lib/elementary/elm_atspi_app_object.c
@@ -4,8 +4,6 @@
 
 #define EFL_ACCESS_OBJECT_PROTECTED
 
-#include <Elementary.h>
-#include "elm_widget.h"
 #include "elm_priv.h"
 
 extern Eina_List *_elm_win_list;