elm: explicitly include Efl_Ui.h in binaries

it looks like people have been relying on Elementary.h to include
eo apis even though this obviously makes no sense

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D8223

70 files changed, 72 insertions, 1 deletions

diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 65d6632a3e..91fe009a66 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -3,6 +3,7 @@
 #endif
 
 #include <string.h>
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include "test.h"
 #include "test_explode.h"
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index 73a5a90ce7..68e2ba9315 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -2,6 +2,7 @@
 # include "elementary_config.h"
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include "elm_colorselector_eo.h"
 
diff --git a/src/bin/elementary/test_box.c b/src/bin/elementary/test_box.c
index c5c596cc00..2d0e6affd3 100644
--- a/src/bin/elementary/test_box.c
+++ b/src/bin/elementary/test_box.c
@@ -2,6 +2,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 #define ICON_MAX 24
diff --git a/src/bin/elementary/test_calendar.c b/src/bin/elementary/test_calendar.c
index ba37407c0f..9a5de374ee 100644
--- a/src/bin/elementary/test_calendar.c
+++ b/src/bin/elementary/test_calendar.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 struct _api_data
diff --git a/src/bin/elementary/test_code.c b/src/bin/elementary/test_code.c
index 846dc613a3..076ef6d27d 100644
--- a/src/bin/elementary/test_code.c
+++ b/src/bin/elementary/test_code.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static Evas_Object *_test_code_win_create(const char *id, const char *name)
diff --git a/src/bin/elementary/test_efl_gfx_mapping.c b/src/bin/elementary/test_efl_gfx_mapping.c
index cb780d7ba8..c4080c1b94 100644
--- a/src/bin/elementary/test_efl_gfx_mapping.c
+++ b/src/bin/elementary/test_efl_gfx_mapping.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index f8863b1201..120eca7a81 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -2,6 +2,7 @@
 # include "elementary_config.h"
 #endif
 #define EO_BETA_API
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_evas_map.c b/src/bin/elementary/test_evas_map.c
index 3b3e66a56f..3cabe96061 100644
--- a/src/bin/elementary/test_evas_map.c
+++ b/src/bin/elementary/test_evas_map.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c
index 39a91e155b..223d657b4c 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -2,6 +2,7 @@
 # include "elementary_config.h"
 #endif
 #include <Elementary.h>
+#include <Efl_Ui.h>
 
 
 static Evas_Object *
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index 70791e6705..855c33a949 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 #define TABLE_SIZE 10
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 1eba66c2dc..e81fca52e2 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 #define EFL_INTERNAL_UNSTABLE
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 32513b7c41..49372190d6 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -3,7 +3,8 @@
 #endif
 
 #include <Elementary.h>
-#include "elm_colorselector_eo.h"
+#include <Efl_Ui.h>
+#include "elm_spinner_eo.h"
 
 static const int default_font_size = 48;
 
diff --git a/src/bin/elementary/test_glview.c b/src/bin/elementary/test_glview.c
index 2a42b95652..d71e371965 100644
--- a/src/bin/elementary/test_glview.c
+++ b/src/bin/elementary/test_glview.c
@@ -1,8 +1,10 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #ifndef M_PI
 #define M_PI 3.14159265
diff --git a/src/bin/elementary/test_image.c b/src/bin/elementary/test_image.c
index c6d5f7a888..986767b1bb 100644
--- a/src/bin/elementary/test_image.c
+++ b/src/bin/elementary/test_image.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static const struct {
diff --git a/src/bin/elementary/test_nstate.c b/src/bin/elementary/test_nstate.c
index 4da3b21ac9..717828eb40 100644
--- a/src/bin/elementary/test_nstate.c
+++ b/src/bin/elementary/test_nstate.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index 04e436a061..2724870f24 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 #define MAX_NUM_OF_CONTENT 18
diff --git a/src/bin/elementary/test_part_shadow.c b/src/bin/elementary/test_part_shadow.c
index 07aeb8d3b1..a0e1165a7a 100644
--- a/src/bin/elementary/test_part_shadow.c
+++ b/src/bin/elementary/test_part_shadow.c
@@ -3,6 +3,7 @@
 #endif
 
 #define EFL_UI_WIDGET_PROTECTED
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 typedef struct Test_Data
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index 44da46a18d..cbfb79a43e 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static const struct {
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index d3cfc1c412..c5b9db8d56 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -4,6 +4,7 @@
 #endif
 
 #define EFL_PACK_LAYOUT_PROTECTED
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include <assert.h>
 
diff --git a/src/bin/elementary/test_ui_button.c b/src/bin/elementary/test_ui_button.c
index 7c5cce3c34..1696a6d9ee 100644
--- a/src/bin/elementary/test_ui_button.c
+++ b/src/bin/elementary/test_ui_button.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c
index d759250ef2..936efd1d3b 100644
--- a/src/bin/elementary/test_ui_clock.c
+++ b/src/bin/elementary/test_ui_clock.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 /* A simple test, just displaying clock in its default format */
diff --git a/src/bin/elementary/test_ui_datepicker.c b/src/bin/elementary/test_ui_datepicker.c
index 6c2e631e41..3fe625101c 100644
--- a/src/bin/elementary/test_ui_datepicker.c
+++ b/src/bin/elementary/test_ui_datepicker.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c
index a5714ec5a1..9a51699f77 100644
--- a/src/bin/elementary/test_ui_pager.c
+++ b/src/bin/elementary/test_ui_pager.c
@@ -4,6 +4,7 @@
 #define EO_BETA_API
 #define EFL_UI_WIDGET_PROTECTED
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 
diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c
index 33c24be5b0..f062a9d802 100644
--- a/src/bin/elementary/test_ui_pager_scroll.c
+++ b/src/bin/elementary/test_ui_pager_scroll.c
@@ -4,6 +4,7 @@
 #define EO_BETA_API
 #define EFL_UI_WIDGET_PROTECTED
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 
diff --git a/src/bin/elementary/test_ui_panel.c b/src/bin/elementary/test_ui_panel.c
index 6b612e49fb..a9c3cafbf8 100644
--- a/src/bin/elementary/test_ui_panel.c
+++ b/src/bin/elementary/test_ui_panel.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 void
diff --git a/src/bin/elementary/test_ui_panes.c b/src/bin/elementary/test_ui_panes.c
index 2c3e274f9b..a9d0c80606 100644
--- a/src/bin/elementary/test_ui_panes.c
+++ b/src/bin/elementary/test_ui_panes.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 void
diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c
index e4a7a89479..d70592c70a 100644
--- a/src/bin/elementary/test_ui_popup.c
+++ b/src/bin/elementary/test_ui_popup.c
@@ -4,6 +4,7 @@
 
 #define EFL_UI_ANCHOR_POPUP_BETA
 #define EFL_UI_SCROLL_ALERT_POPUP_BETA
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 #define POPUP_POINT_MAX 8
diff --git a/src/bin/elementary/test_ui_progressbar.c b/src/bin/elementary/test_ui_progressbar.c
index 3300a037e3..e85176998f 100644
--- a/src/bin/elementary/test_ui_progressbar.c
+++ b/src/bin/elementary/test_ui_progressbar.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 typedef struct _pbdata
diff --git a/src/bin/elementary/test_ui_relative_layout.c b/src/bin/elementary/test_ui_relative_layout.c
index 825af48e62..e6481ec97e 100644
--- a/src/bin/elementary/test_ui_relative_layout.c
+++ b/src/bin/elementary/test_ui_relative_layout.c
@@ -3,6 +3,7 @@
 # include "elementary_config.h"
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static Eo *layout, *btn1, *btn2, *btn3;
diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c
index ee751d2369..9864e77eb9 100644
--- a/src/bin/elementary/test_ui_scroller.c
+++ b/src/bin/elementary/test_ui_scroller.c
@@ -2,6 +2,7 @@
 # include "elementary_config.h"
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_ui_slider.c b/src/bin/elementary/test_ui_slider.c
index 661d63eb5b..305177f453 100644
--- a/src/bin/elementary/test_ui_slider.c
+++ b/src/bin/elementary/test_ui_slider.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static double
diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c
index 5fa9350d13..3e4bdcd2ee 100644
--- a/src/bin/elementary/test_ui_slider_interval.c
+++ b/src/bin/elementary/test_ui_slider_interval.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static double
diff --git a/src/bin/elementary/test_ui_spin.c b/src/bin/elementary/test_ui_spin.c
index 33826a0568..7c606069aa 100644
--- a/src/bin/elementary/test_ui_spin.c
+++ b/src/bin/elementary/test_ui_spin.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c
index 6015d32a60..b6e4381dff 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 #define NUM_OF_VALS 12
diff --git a/src/bin/elementary/test_ui_stack.c b/src/bin/elementary/test_ui_stack.c
index 1cb3041ce9..087e51f6ab 100644
--- a/src/bin/elementary/test_ui_stack.c
+++ b/src/bin/elementary/test_ui_stack.c
@@ -2,6 +2,7 @@
 # include "elementary_config.h"
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void _third_layout_push(void *data, const Efl_Event *ev EINA_UNUSED);
diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c
index 227963e62e..ef8ccae0f4 100644
--- a/src/bin/elementary/test_ui_tab_pager.c
+++ b/src/bin/elementary/test_ui_tab_pager.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 #define TAB_LABEL_COUNT 15
diff --git a/src/bin/elementary/test_ui_table.c b/src/bin/elementary/test_ui_table.c
index 2f698f103c..f0e63d2ac3 100644
--- a/src/bin/elementary/test_ui_table.c
+++ b/src/bin/elementary/test_ui_table.c
@@ -3,6 +3,7 @@
 #endif
 
 #define EFL_PACK_LAYOUT_PROTECTED
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void _custom_layout_update(Eo *pack, void *_pd EINA_UNUSED);
diff --git a/src/bin/elementary/test_ui_table_static.c b/src/bin/elementary/test_ui_table_static.c
index 369236fde7..d21d6b6c7d 100644
--- a/src/bin/elementary/test_ui_table_static.c
+++ b/src/bin/elementary/test_ui_table_static.c
@@ -2,6 +2,7 @@
 # include "elementary_config.h"
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 struct _Api_Data
diff --git a/src/bin/elementary/test_ui_tags.c b/src/bin/elementary/test_ui_tags.c
index 27153e0071..410c7b24cd 100644
--- a/src/bin/elementary/test_ui_tags.c
+++ b/src/bin/elementary/test_ui_tags.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_ui_textpath.c b/src/bin/elementary/test_ui_textpath.c
index 2f5542a17d..0042f2b6a2 100644
--- a/src/bin/elementary/test_ui_textpath.c
+++ b/src/bin/elementary/test_ui_textpath.c
@@ -3,6 +3,7 @@
 # include "elementary_config.h"
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 #define CX 180
diff --git a/src/bin/elementary/test_ui_timepicker.c b/src/bin/elementary/test_ui_timepicker.c
index 81f1e6f85f..60464d0b00 100644
--- a/src/bin/elementary/test_ui_timepicker.c
+++ b/src/bin/elementary/test_ui_timepicker.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c
index bbe82c87f1..ef8a67b133 100644
--- a/src/bin/elementary/test_win_dialog.c
+++ b/src/bin/elementary/test_win_dialog.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_win_indicator.c b/src/bin/elementary/test_win_indicator.c
index 71922302c1..0ebb30bf0f 100644
--- a/src/bin/elementary/test_win_indicator.c
+++ b/src/bin/elementary/test_win_indicator.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_win_inline.c b/src/bin/elementary/test_win_inline.c
index ea93f0bae6..122f2d474d 100644
--- a/src/bin/elementary/test_win_inline.c
+++ b/src/bin/elementary/test_win_inline.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static void
diff --git a/src/bin/elementary/test_win_stack.c b/src/bin/elementary/test_win_stack.c
index 85ee109a65..c16c07b037 100644
--- a/src/bin/elementary/test_win_stack.c
+++ b/src/bin/elementary/test_win_stack.c
@@ -4,6 +4,7 @@
 
 // Stack API is still beta (and EO only)
 #define EFL_UI_WIN_BETA
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 static int level = 0;
diff --git a/src/examples/elementary/button_cxx_example_01.cc b/src/examples/elementary/button_cxx_example_01.cc
index 8b0364744c..c818897fbb 100644
--- a/src/examples/elementary/button_cxx_example_01.cc
+++ b/src/examples/elementary/button_cxx_example_01.cc
@@ -1,6 +1,7 @@
 // g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` button_cxx_example_01.cc -o button_cxx_example_01
 
 #define EFL_CXXPERIMENTAL
+#include <Efl_Ui.h>
 #include <Elementary.hh>
 
 using efl::eo::instantiate;
diff --git a/src/examples/elementary/efl_canvas_layout_text.c b/src/examples/elementary/efl_canvas_layout_text.c
index bb4dc0f379..da0e089c01 100644
--- a/src/examples/elementary/efl_canvas_layout_text.c
+++ b/src/examples/elementary/efl_canvas_layout_text.c
@@ -10,6 +10,7 @@
 #endif
 
 #include <Efl.h>
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include <string.h>
 
diff --git a/src/examples/elementary/efl_ui_grid_example_1.c b/src/examples/elementary/efl_ui_grid_example_1.c
index 43ea195e14..92379fe6e4 100644
--- a/src/examples/elementary/efl_ui_grid_example_1.c
+++ b/src/examples/elementary/efl_ui_grid_example_1.c
@@ -7,6 +7,7 @@
 #define EFL_EO_API_SUPPORT 1
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include <Efl.h>
 #include <stdio.h>
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index 5893a59864..bf22dfb441 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -8,6 +8,7 @@
 # define EFL_EO_API_SUPPORT 1
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include <Efl.h>
 #include <Eio.h>
diff --git a/src/examples/elementary/efl_ui_list_view_example_1.c b/src/examples/elementary/efl_ui_list_view_example_1.c
index 597d6c3ed1..3943a7793b 100644
--- a/src/examples/elementary/efl_ui_list_view_example_1.c
+++ b/src/examples/elementary/efl_ui_list_view_example_1.c
@@ -7,6 +7,7 @@
 # define EFL_EO_API_SUPPORT 1
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include <Efl.h>
 #include <Eio.h>
diff --git a/src/examples/elementary/efl_ui_list_view_example_2.c b/src/examples/elementary/efl_ui_list_view_example_2.c
index 8721342fd6..8e47d9222a 100644
--- a/src/examples/elementary/efl_ui_list_view_example_2.c
+++ b/src/examples/elementary/efl_ui_list_view_example_2.c
@@ -7,6 +7,7 @@
 # define EFL_EO_API_SUPPORT 1
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include <Efl.h>
 #include <Eio.h>
diff --git a/src/examples/elementary/efl_ui_list_view_example_3.c b/src/examples/elementary/efl_ui_list_view_example_3.c
index 5c2b3a8217..9cc4c8efde 100644
--- a/src/examples/elementary/efl_ui_list_view_example_3.c
+++ b/src/examples/elementary/efl_ui_list_view_example_3.c
@@ -10,6 +10,7 @@
 #define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
 
 #include <Eo.h>
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include <Efl.h>
 #include <Eio.h>
diff --git a/src/examples/elementary/efl_ui_relative_layout_example_01.c b/src/examples/elementary/efl_ui_relative_layout_example_01.c
index 731eeb9d08..7ccec35651 100644
--- a/src/examples/elementary/efl_ui_relative_layout_example_01.c
+++ b/src/examples/elementary/efl_ui_relative_layout_example_01.c
@@ -7,6 +7,7 @@
 #define EFL_EO_API_SUPPORT 1
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include <Efl.h>
 
diff --git a/src/examples/elementary/efl_ui_relative_layout_example_02.c b/src/examples/elementary/efl_ui_relative_layout_example_02.c
index a32da8d44e..14af786cd6 100644
--- a/src/examples/elementary/efl_ui_relative_layout_example_02.c
+++ b/src/examples/elementary/efl_ui_relative_layout_example_02.c
@@ -7,6 +7,7 @@
 #define EFL_EO_API_SUPPORT 1
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include <Efl.h>
 
diff --git a/src/examples/elementary/efl_ui_scroller_example.c b/src/examples/elementary/efl_ui_scroller_example.c
index e300b659b1..e76254d8aa 100644
--- a/src/examples/elementary/efl_ui_scroller_example.c
+++ b/src/examples/elementary/efl_ui_scroller_example.c
@@ -4,6 +4,7 @@
 #define EFL_BETA_API_SUPPORT
 #define EFL_EO_API_SUPPORT
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 EAPI_MAIN void
diff --git a/src/examples/elementary/efl_ui_theme_example_01.c b/src/examples/elementary/efl_ui_theme_example_01.c
index 3eda0342c0..29614c8f3b 100644
--- a/src/examples/elementary/efl_ui_theme_example_01.c
+++ b/src/examples/elementary/efl_ui_theme_example_01.c
@@ -6,6 +6,7 @@
 #define EFL_EO_API_SUPPORT 1
 
 #define EFL_UI_WIDGET_PROTECTED
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 #define EXAMPLE_EDJ_FILE_PATH "./efl_ui_theme_example.edj"
diff --git a/src/examples/elementary/efl_ui_theme_example_02.c b/src/examples/elementary/efl_ui_theme_example_02.c
index 4bc76d7203..b78dc73f0b 100644
--- a/src/examples/elementary/efl_ui_theme_example_02.c
+++ b/src/examples/elementary/efl_ui_theme_example_02.c
@@ -6,6 +6,7 @@
 #define EFL_EO_API_SUPPORT 1
 
 #define EFL_UI_WIDGET_PROTECTED
+#include <Efl_Ui.h>
 #include <Elementary.h>
 
 #define EXAMPLE_EDJ_FILE_PATH "./efl_ui_theme_example.edj"
diff --git a/src/examples/elementary/layout_property_bind.c b/src/examples/elementary/layout_property_bind.c
index a06e383b33..3277288c16 100644
--- a/src/examples/elementary/layout_property_bind.c
+++ b/src/examples/elementary/layout_property_bind.c
@@ -7,6 +7,7 @@
 # define EFL_EO_API_SUPPORT 1
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include <Efl.h>
 #include <Eio.h>
diff --git a/src/examples/elementary/popup_cxx_example.cc b/src/examples/elementary/popup_cxx_example.cc
index 6c323275f0..a6a29ed955 100644
--- a/src/examples/elementary/popup_cxx_example.cc
+++ b/src/examples/elementary/popup_cxx_example.cc
@@ -3,6 +3,7 @@
 #define EFL_CXXPERIMENTAL
 
 #include <Evas.hh>
+#include <Efl_Ui.h>
 #include <Elementary.hh>
 #include <iostream>
 
diff --git a/src/examples/elementary/radio_cxx_example_01.cc b/src/examples/elementary/radio_cxx_example_01.cc
index 5a3f30c75e..2ad30b2097 100644
--- a/src/examples/elementary/radio_cxx_example_01.cc
+++ b/src/examples/elementary/radio_cxx_example_01.cc
@@ -1,6 +1,7 @@
 // g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` radio_cxx_example_01.cc -o radio_cxx_example_01
 
 #define EFL_CXXPERIMENTAL
+#include <Efl_Ui.h>
 #include <Elementary.hh>
 #include <iostream>
 
diff --git a/src/examples/elementary/slider_cxx_example.cc b/src/examples/elementary/slider_cxx_example.cc
index ab37196352..1df1903bf5 100644
--- a/src/examples/elementary/slider_cxx_example.cc
+++ b/src/examples/elementary/slider_cxx_example.cc
@@ -2,6 +2,7 @@
 
 #define EFL_CXXPERIMENTAL
 
+#include <Efl_Ui.h>
 #include <Elementary.hh>
 
 using namespace std::placeholders;
diff --git a/src/examples/elementary/toolbar_cxx_example_01.cc b/src/examples/elementary/toolbar_cxx_example_01.cc
index c4bab13db8..77ad3eb569 100644
--- a/src/examples/elementary/toolbar_cxx_example_01.cc
+++ b/src/examples/elementary/toolbar_cxx_example_01.cc
@@ -7,6 +7,7 @@
 
 #warning This example requires yet unfinished EO APIs
 
+#include <Efl_Ui.h>
 #include <Elementary.hh>
 
 EAPI int
diff --git a/src/tests/elementary/efl_ui_test_atspi.c b/src/tests/elementary/efl_ui_test_atspi.c
index ed419a3cef..9aa046351c 100644
--- a/src/tests/elementary/efl_ui_test_atspi.c
+++ b/src/tests/elementary/efl_ui_test_atspi.c
@@ -6,6 +6,7 @@
 #define EFL_ACCESS_OBJECT_BETA
 #define EFL_ACCESS_OBJECT_PROTECTED
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include "elm_priv.h"
 #include "efl_ui_suite.h"
diff --git a/src/tests/elementary/efl_ui_test_box.c b/src/tests/elementary/efl_ui_test_box.c
index d29c666eb1..b1792c96a4 100644
--- a/src/tests/elementary/efl_ui_test_box.c
+++ b/src/tests/elementary/efl_ui_test_box.c
@@ -2,6 +2,7 @@
 # include "elementary_config.h"
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include "elm_suite.h"
 
diff --git a/src/tests/elementary/efl_ui_test_grid.c b/src/tests/elementary/efl_ui_test_grid.c
index 1ac7b960b3..1df8e4ad1b 100644
--- a/src/tests/elementary/efl_ui_test_grid.c
+++ b/src/tests/elementary/efl_ui_test_grid.c
@@ -3,6 +3,7 @@
 #endif
 
 #define EFL_ACCESS_OBJECT_BETA
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include "efl_ui_suite.h"
 
diff --git a/src/tests/elementary/efl_ui_test_relative_layout.c b/src/tests/elementary/efl_ui_test_relative_layout.c
index 540e77fa11..f769bf47ec 100644
--- a/src/tests/elementary/efl_ui_test_relative_layout.c
+++ b/src/tests/elementary/efl_ui_test_relative_layout.c
@@ -2,6 +2,7 @@
 # include "elementary_config.h"
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include "elm_suite.h"
 
diff --git a/src/tests/elementary/efl_ui_test_table.c b/src/tests/elementary/efl_ui_test_table.c
index c4fec94650..ac96db58e9 100644
--- a/src/tests/elementary/efl_ui_test_table.c
+++ b/src/tests/elementary/efl_ui_test_table.c
@@ -2,6 +2,7 @@
 # include "elementary_config.h"
 #endif
 
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include "elm_suite.h"
 
diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c
index 19ecbc5f64..636120f1df 100644
--- a/src/tests/elementary/elm_test_config.c
+++ b/src/tests/elementary/elm_test_config.c
@@ -3,6 +3,7 @@
 #endif
 
 #define EFL_ACCESS_OBJECT_PROTECTED
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include "elm_suite.h"
 
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index 7e95591fda..6d6ff52f6f 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -3,6 +3,7 @@
 #endif
 
 #define EFL_ACCESS_OBJECT_BETA
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include "elm_suite.h"
 
diff --git a/src/tests/elementary/elm_test_spinner.c b/src/tests/elementary/elm_test_spinner.c
index 4765d3284d..99c3696188 100644
--- a/src/tests/elementary/elm_test_spinner.c
+++ b/src/tests/elementary/elm_test_spinner.c
@@ -3,6 +3,7 @@
 #endif
 
 #define EFL_ACCESS_OBJECT_BETA
+#include <Efl_Ui.h>
 #include <Elementary.h>
 #include "elm_suite.h"