summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-11-01 15:16:30 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-01 21:23:31 +0900
commit824792f09d8c824d628cde95a1078b712da5db03 (patch)
treeb7d73bf4e1c6608ec1e6abc3360abb3825a54461 /src/lib/elementary
parentf851fa511e5b4fabac2002185b426445fc6ae208 (diff)
elm: Major cleanup of EO files
This prevents legacy EO classes from being exposed through .eo.h headers or .eo in share/eolian/includes. Also removes a slew of useless xxx_eo.h intermediate headers. Notes: - elm_systray has no proper API: it's not clear if the EO API should be released (in which case it needs to be renamed to efl_something) and there is no legacy API to create a systray object. - Some files have been placed in a "FIXME" section, as I believe they are necessary within EO land, but at the same time still don't conform to the interfaces (eg. name starts with elm_). - elm_interface_scrollable is required by photocam. This means photocam needs to be adapted to fit the EO scroller API (still to be completed, I believe). Bugs: - This breaks most C++ examples. I KNOW. And I'm working on it. Ref T5301
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_pan.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout.c1
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry.c2
-rw-r--r--src/lib/elementary/efl_ui_video_eo.h1
-rw-r--r--src/lib/elementary/elc_combobox.c4
-rw-r--r--src/lib/elementary/elc_combobox.h3
-rw-r--r--src/lib/elementary/elc_ctxpopup.c2
-rw-r--r--src/lib/elementary/elc_ctxpopup.h3
-rw-r--r--src/lib/elementary/elc_ctxpopup_eo.h2
-rw-r--r--src/lib/elementary/elc_fileselector.c4
-rw-r--r--src/lib/elementary/elc_fileselector.h3
-rw-r--r--src/lib/elementary/elc_fileselector_button.c1
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c2
-rw-r--r--src/lib/elementary/elc_fileselector_eo.h11
-rw-r--r--src/lib/elementary/elc_popup.c2
-rw-r--r--src/lib/elementary/elc_popup.h3
-rw-r--r--src/lib/elementary/elc_popup_eo.h12
-rw-r--r--src/lib/elementary/elm_calendar.c1
-rw-r--r--src/lib/elementary/elm_calendar.h3
-rw-r--r--src/lib/elementary/elm_calendar_eo.h1
-rw-r--r--src/lib/elementary/elm_clock.h3
-rw-r--r--src/lib/elementary/elm_color_class.c1
-rw-r--r--src/lib/elementary/elm_colorselector.c1
-rw-r--r--src/lib/elementary/elm_colorselector.h3
-rw-r--r--src/lib/elementary/elm_colorselector_eo.h1
-rw-r--r--src/lib/elementary/elm_conform.c4
-rw-r--r--src/lib/elementary/elm_conform.h3
-rw-r--r--src/lib/elementary/elm_conform_eo.h11
-rw-r--r--src/lib/elementary/elm_dayselector.h3
-rw-r--r--src/lib/elementary/elm_dayselector_eo.h1
-rw-r--r--src/lib/elementary/elm_entry.h3
-rw-r--r--src/lib/elementary/elm_gengrid.c3
-rw-r--r--src/lib/elementary/elm_gengrid.h3
-rw-r--r--src/lib/elementary/elm_gengrid_eo.h14
-rw-r--r--src/lib/elementary/elm_genlist.c3
-rw-r--r--src/lib/elementary/elm_genlist.h3
-rw-r--r--src/lib/elementary/elm_genlist_eo.h14
-rw-r--r--src/lib/elementary/elm_gesture_layer.c1
-rw-r--r--src/lib/elementary/elm_gesture_layer.h3
-rw-r--r--src/lib/elementary/elm_gesture_layer_eo.h1
-rw-r--r--src/lib/elementary/elm_glview.h3
-rw-r--r--src/lib/elementary/elm_glview_eo.h1
-rw-r--r--src/lib/elementary/elm_hover.h3
-rw-r--r--src/lib/elementary/elm_hover_eo.h1
-rw-r--r--src/lib/elementary/elm_index.h3
-rw-r--r--src/lib/elementary/elm_index_eo.h12
-rw-r--r--src/lib/elementary/elm_interfaces.h8
-rw-r--r--src/lib/elementary/elm_label.h3
-rw-r--r--src/lib/elementary/elm_label_eo.h11
-rw-r--r--src/lib/elementary/elm_list.h3
-rw-r--r--src/lib/elementary/elm_list_eo.h12
-rw-r--r--src/lib/elementary/elm_main.c1
-rw-r--r--src/lib/elementary/elm_map.c2
-rw-r--r--src/lib/elementary/elm_map.h3
-rw-r--r--src/lib/elementary/elm_map_eo.h2
-rw-r--r--src/lib/elementary/elm_menu.h3
-rw-r--r--src/lib/elementary/elm_menu_eo.h2
-rw-r--r--src/lib/elementary/elm_notify.h3
-rw-r--r--src/lib/elementary/elm_notify_eo.h11
-rw-r--r--src/lib/elementary/elm_object_item.h3
-rw-r--r--src/lib/elementary/elm_panel.h3
-rw-r--r--src/lib/elementary/elm_panel_eo.h1
-rw-r--r--src/lib/elementary/elm_plug.h3
-rw-r--r--src/lib/elementary/elm_plug_eo.h1
-rw-r--r--src/lib/elementary/elm_route.h3
-rw-r--r--src/lib/elementary/elm_route_eo.h1
-rw-r--r--src/lib/elementary/elm_scroller.c1
-rw-r--r--src/lib/elementary/elm_scroller.h3
-rw-r--r--src/lib/elementary/elm_scroller_eo.h11
-rw-r--r--src/lib/elementary/elm_spinner.c1
-rw-r--r--src/lib/elementary/elm_spinner.h2
-rw-r--r--src/lib/elementary/elm_spinner_eo.h1
-rw-r--r--src/lib/elementary/elm_store.c1
-rw-r--r--src/lib/elementary/elm_sys_notify.c2
-rw-r--r--src/lib/elementary/elm_sys_notify.h4
-rw-r--r--src/lib/elementary/elm_sys_notify_dbus.c2
-rw-r--r--src/lib/elementary/elm_systray.c4
-rw-r--r--src/lib/elementary/elm_systray.h7
-rw-r--r--src/lib/elementary/elm_systray_eo.h11
-rw-r--r--src/lib/elementary/elm_view_form.c2
-rw-r--r--src/lib/elementary/elm_view_list.c2
-rw-r--r--src/lib/elementary/elm_widget.c1
-rw-r--r--src/lib/elementary/elm_widget_clock.h2
-rw-r--r--src/lib/elementary/elm_widget_colorselector.h2
-rw-r--r--src/lib/elementary/elm_widget_dayselector.h1
-rw-r--r--src/lib/elementary/elm_widget_entry.h1
-rw-r--r--src/lib/elementary/elm_widget_glview.h1
-rw-r--r--src/lib/elementary/elm_widget_hover.h1
-rw-r--r--src/lib/elementary/elm_widget_index.h3
-rw-r--r--src/lib/elementary/elm_widget_label.h2
-rw-r--r--src/lib/elementary/elm_widget_list.h2
-rw-r--r--src/lib/elementary/elm_widget_menu.h4
-rw-r--r--src/lib/elementary/elm_widget_notify.h2
-rw-r--r--src/lib/elementary/elm_widget_panel.h1
-rw-r--r--src/lib/elementary/elm_widget_player.h2
-rw-r--r--src/lib/elementary/elm_widget_plug.h1
-rw-r--r--src/lib/elementary/elm_widget_popup.h3
-rw-r--r--src/lib/elementary/elm_widget_route.h2
98 files changed, 85 insertions, 244 deletions
diff --git a/src/lib/elementary/efl_ui_image_zoomable_pan.eo b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
index ffab6c0393..e448a144bf 100644
--- a/src/lib/elementary/efl_ui_image_zoomable_pan.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
@@ -2,8 +2,6 @@ class Efl.Ui.Image_Zoomable_Pan (Elm.Pan)
2{ 2{
3 [[Elementary photocom pan class]] 3 [[Elementary photocom pan class]]
4 legacy_prefix: elm_photocam_pan; 4 legacy_prefix: elm_photocam_pan;
5 //eo_prefix: elm_obj_photocam_pan;
6 //event_prefix: elm_photocam_pan;
7 implements { 5 implements {
8 class.constructor; 6 class.constructor;
9 Efl.Object.destructor; 7 Efl.Object.destructor;
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 6ae329897c..f61d72b96d 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -10,6 +10,7 @@
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
12#include "elm_part_helper.h" 12#include "elm_part_helper.h"
13#include "elm_entry.eo.h"
13 14
14#define MY_CLASS EFL_UI_LAYOUT_CLASS 15#define MY_CLASS EFL_UI_LAYOUT_CLASS
15#define MY_CLASS_PFX efl_ui_layout 16#define MY_CLASS_PFX efl_ui_layout
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c
index b8c23e3489..ee019f4ac8 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -10,8 +10,8 @@
10#include <Elementary.h> 10#include <Elementary.h>
11#include "elm_priv.h" 11#include "elm_priv.h"
12#include "efl_ui_multibuttonentry_private.h" 12#include "efl_ui_multibuttonentry_private.h"
13
14#include "efl_ui_multibuttonentry_part.eo.h" 13#include "efl_ui_multibuttonentry_part.eo.h"
14#include "elm_entry.eo.h"
15#include "elm_part_helper.h" 15#include "elm_part_helper.h"
16 16
17#define MY_CLASS EFL_UI_MULTIBUTTONENTRY_CLASS 17#define MY_CLASS EFL_UI_MULTIBUTTONENTRY_CLASS
diff --git a/src/lib/elementary/efl_ui_video_eo.h b/src/lib/elementary/efl_ui_video_eo.h
index 3b8e559249..6df8edb474 100644
--- a/src/lib/elementary/efl_ui_video_eo.h
+++ b/src/lib/elementary/efl_ui_video_eo.h
@@ -1,2 +1 @@
1#include "elm_player.eo.h"
2#include "efl_ui_video.eo.h" #include "efl_ui_video.eo.h"
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index ba39421750..a7b9e5a375 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -10,6 +10,10 @@
10#include <Elementary.h> 10#include <Elementary.h>
11#include "elm_priv.h" 11#include "elm_priv.h"
12#include "elm_widget_combobox.h" 12#include "elm_widget_combobox.h"
13#include "elm_entry.eo.h"
14#include "elm_combobox.eo.h"
15#include "elm_genlist.eo.h"
16#include "elm_hover.eo.h"
13 17
14#define MY_CLASS ELM_COMBOBOX_CLASS 18#define MY_CLASS ELM_COMBOBOX_CLASS
15 19
diff --git a/src/lib/elementary/elc_combobox.h b/src/lib/elementary/elc_combobox.h
index 006280b716..b51cf0aa8c 100644
--- a/src/lib/elementary/elc_combobox.h
+++ b/src/lib/elementary/elc_combobox.h
@@ -53,9 +53,6 @@
53 * @{ 53 * @{
54 */ 54 */
55 55
56#ifdef EFL_EO_API_SUPPORT
57#include "elm_combobox.eo.h"
58#endif
59#ifndef EFL_NOLEGACY_API_SUPPORT 56#ifndef EFL_NOLEGACY_API_SUPPORT
60#include "elc_combobox_legacy.h" 57#include "elc_combobox_legacy.h"
61#endif 58#endif
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index a440163544..c392d8fcc7 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -12,6 +12,8 @@
12 12
13#include "elm_priv.h" 13#include "elm_priv.h"
14#include "elm_widget_ctxpopup.h" 14#include "elm_widget_ctxpopup.h"
15#include "elm_ctxpopup_item.eo.h"
16#include "elm_ctxpopup.eo.h"
15 17
16#include "elm_ctxpopup_part.eo.h" 18#include "elm_ctxpopup_part.eo.h"
17#include "elm_part_helper.h" 19#include "elm_part_helper.h"
diff --git a/src/lib/elementary/elc_ctxpopup.h b/src/lib/elementary/elc_ctxpopup.h
index 7d05a6882f..6663f7e863 100644
--- a/src/lib/elementary/elc_ctxpopup.h
+++ b/src/lib/elementary/elc_ctxpopup.h
@@ -63,9 +63,6 @@
63 * @{ 63 * @{
64 */ 64 */
65 65
66#ifdef EFL_EO_API_SUPPORT
67#include "elc_ctxpopup_eo.h"
68#endif
69#ifndef EFL_NOLEGACY_API_SUPPORT 66#ifndef EFL_NOLEGACY_API_SUPPORT
70#include "elc_ctxpopup_legacy.h" 67#include "elc_ctxpopup_legacy.h"
71#endif 68#endif
diff --git a/src/lib/elementary/elc_ctxpopup_eo.h b/src/lib/elementary/elc_ctxpopup_eo.h
deleted file mode 100644
index e3ff124d09..0000000000
--- a/src/lib/elementary/elc_ctxpopup_eo.h
+++ /dev/null
@@ -1,2 +0,0 @@
1#include "elm_ctxpopup_item.eo.h"
2#include "elm_ctxpopup.eo.h"
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 5e4e93a9da..a9b8d41879 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -18,6 +18,10 @@
18#include "elm_fileselector_entry.eo.h" 18#include "elm_fileselector_entry.eo.h"
19#include "elm_interface_fileselector.h" 19#include "elm_interface_fileselector.h"
20#include "elm_widget_fileselector.h" 20#include "elm_widget_fileselector.h"
21#include "elm_entry.eo.h"
22#include "elm_fileselector.eo.h"
23#include "elm_genlist.eo.h"
24#include "elm_gengrid.eo.h"
21 25
22#include "elm_fileselector_part.eo.h" 26#include "elm_fileselector_part.eo.h"
23#include "elm_part_helper.h" 27#include "elm_part_helper.h"
diff --git a/src/lib/elementary/elc_fileselector.h b/src/lib/elementary/elc_fileselector.h
index a2c3e19916..32b8b566a0 100644
--- a/src/lib/elementary/elc_fileselector.h
+++ b/src/lib/elementary/elc_fileselector.h
@@ -69,9 +69,6 @@
69 */ 69 */
70 70
71#include "elc_fileselector_common.h" 71#include "elc_fileselector_common.h"
72#ifdef EFL_EO_API_SUPPORT
73#include "elc_fileselector_eo.h"
74#endif
75#ifndef EFL_NOLEGACY_API_SUPPORT 72#ifndef EFL_NOLEGACY_API_SUPPORT
76#include "elc_fileselector_legacy.h" 73#include "elc_fileselector_legacy.h"
77#endif 74#endif
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index d26b8429b5..ef4cd0012a 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -10,6 +10,7 @@
10#include "elm_fileselector_entry.eo.h" 10#include "elm_fileselector_entry.eo.h"
11#include "elm_interface_fileselector.h" 11#include "elm_interface_fileselector.h"
12#include "elm_widget_fileselector_button.h" 12#include "elm_widget_fileselector_button.h"
13#include "elm_fileselector.eo.h"
13 14
14#define MY_CLASS ELM_FILESELECTOR_BUTTON_CLASS 15#define MY_CLASS ELM_FILESELECTOR_BUTTON_CLASS
15 16
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index f6c6fec54c..d752e49ea1 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -11,6 +11,8 @@
11#include "elm_fileselector_entry.eo.h" 11#include "elm_fileselector_entry.eo.h"
12#include "elm_interface_fileselector.h" 12#include "elm_interface_fileselector.h"
13#include "elm_widget_fileselector_entry.h" 13#include "elm_widget_fileselector_entry.h"
14#include "elm_entry.eo.h"
15#include "elm_fileselector.eo.h"
14 16
15#include "elm_fileselector_entry_part.eo.h" 17#include "elm_fileselector_entry_part.eo.h"
16#include "elm_part_helper.h" 18#include "elm_part_helper.h"
diff --git a/src/lib/elementary/elc_fileselector_eo.h b/src/lib/elementary/elc_fileselector_eo.h
deleted file mode 100644
index 68277bca5c..0000000000
--- a/src/lib/elementary/elc_fileselector_eo.h
+++ /dev/null
@@ -1,11 +0,0 @@
1/**
2 * @ingroup Elm_Fileselector
3 *
4 * @{
5 */
6
7#include "elm_fileselector.eo.h"
8
9/**
10 * @}
11 */
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index fa2a625184..fc4f6a4a08 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -12,8 +12,6 @@
12#include "elm_priv.h" 12#include "elm_priv.h"
13#include "elm_widget_popup.h" 13#include "elm_widget_popup.h"
14 14
15#include "elm_popup_item.eo.h"
16
17#include "elm_popup_part.eo.h" 15#include "elm_popup_part.eo.h"
18#include "elm_part_helper.h" 16#include "elm_part_helper.h"
19 17
diff --git a/src/lib/elementary/elc_popup.h b/src/lib/elementary/elc_popup.h
index b0028181c7..5671369ab8 100644
--- a/src/lib/elementary/elc_popup.h
+++ b/src/lib/elementary/elc_popup.h
@@ -125,9 +125,6 @@
125 * @li @ref popup_example_03_c 125 * @li @ref popup_example_03_c
126 */ 126 */
127 127
128#ifdef EFL_EO_API_SUPPORT
129#include "elc_popup_eo.h"
130#endif
131#ifndef EFL_NOLEGACY_API_SUPPORT 128#ifndef EFL_NOLEGACY_API_SUPPORT
132#include "elc_popup_legacy.h" 129#include "elc_popup_legacy.h"
133#endif 130#endif
diff --git a/src/lib/elementary/elc_popup_eo.h b/src/lib/elementary/elc_popup_eo.h
deleted file mode 100644
index ae3657bb8e..0000000000
--- a/src/lib/elementary/elc_popup_eo.h
+++ /dev/null
@@ -1,12 +0,0 @@
1/**
2 * @ingroup Elm_Popup
3 *
4 * @{
5 */
6
7#include "elm_popup_item.eo.h"
8#include "elm_popup.eo.h"
9
10/**
11 * @}
12 */
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index a96b44db52..5155389c6d 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -9,6 +9,7 @@
9#include <Elementary.h> 9#include <Elementary.h>
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "elm_widget_calendar.h" 11#include "elm_widget_calendar.h"
12#include "elm_calendar.eo.h"
12#include "elm_calendar_item.eo.h" 13#include "elm_calendar_item.eo.h"
13 14
14#define MY_CLASS ELM_CALENDAR_CLASS 15#define MY_CLASS ELM_CALENDAR_CLASS
diff --git a/src/lib/elementary/elm_calendar.h b/src/lib/elementary/elm_calendar.h
index f67daf5ee2..ea95fb7207 100644
--- a/src/lib/elementary/elm_calendar.h
+++ b/src/lib/elementary/elm_calendar.h
@@ -49,9 +49,6 @@
49 */ 49 */
50 50
51#include "elm_calendar_common.h" 51#include "elm_calendar_common.h"
52#ifdef EFL_EO_API_SUPPORT
53#include "elm_calendar_eo.h"
54#endif
55#ifndef EFL_NOLEGACY_API_SUPPORT 52#ifndef EFL_NOLEGACY_API_SUPPORT
56#include "elm_calendar_legacy.h" 53#include "elm_calendar_legacy.h"
57#endif 54#endif
diff --git a/src/lib/elementary/elm_calendar_eo.h b/src/lib/elementary/elm_calendar_eo.h
deleted file mode 100644
index 9d4bf05581..0000000000
--- a/src/lib/elementary/elm_calendar_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_calendar.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_clock.h b/src/lib/elementary/elm_clock.h
index 138d39caa7..8d6bff54e7 100644
--- a/src/lib/elementary/elm_clock.h
+++ b/src/lib/elementary/elm_clock.h
@@ -57,9 +57,6 @@
57 * @{ 57 * @{
58 */ 58 */
59 59
60#ifdef EFL_EO_API_SUPPORT
61#include "elm_clock_eo.h"
62#endif
63#ifndef EFL_NOLEGACY_API_SUPPORT 60#ifndef EFL_NOLEGACY_API_SUPPORT
64#include "elm_clock_legacy.h" 61#include "elm_clock_legacy.h"
65#endif 62#endif
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index d0102dc69c..54b6f5686c 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -5,6 +5,7 @@
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "elm_color_class.h" 7#include "elm_color_class.h"
8#include "elm_colorselector.eo.h"
8 9
9//static Eldbus_Proxy *cc_proxy; 10//static Eldbus_Proxy *cc_proxy;
10//static Ecore_Event_Handler *h1; 11//static Ecore_Event_Handler *h1;
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 933b79f328..710c3378f4 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -10,6 +10,7 @@
10#include <Elementary.h> 10#include <Elementary.h>
11#include "elm_priv.h" 11#include "elm_priv.h"
12#include "elm_widget_colorselector.h" 12#include "elm_widget_colorselector.h"
13#include "elm_widget_spinner.h"
13 14
14#define MY_CLASS ELM_COLORSELECTOR_CLASS 15#define MY_CLASS ELM_COLORSELECTOR_CLASS
15 16
diff --git a/src/lib/elementary/elm_colorselector.h b/src/lib/elementary/elm_colorselector.h
index bc13bc4cf2..e31669069d 100644
--- a/src/lib/elementary/elm_colorselector.h
+++ b/src/lib/elementary/elm_colorselector.h
@@ -37,9 +37,6 @@
37 */ 37 */
38 38
39#include "elm_colorselector_common.h" 39#include "elm_colorselector_common.h"
40#ifdef EFL_EO_API_SUPPORT
41#include "elm_colorselector_eo.h"
42#endif
43#ifndef EFL_NOLEGACY_API_SUPPORT 40#ifndef EFL_NOLEGACY_API_SUPPORT
44#include "elm_colorselector_legacy.h" 41#include "elm_colorselector_legacy.h"
45#endif 42#endif
diff --git a/src/lib/elementary/elm_colorselector_eo.h b/src/lib/elementary/elm_colorselector_eo.h
deleted file mode 100644
index 0a120da4d0..0000000000
--- a/src/lib/elementary/elm_colorselector_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_colorselector.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index e54bab47da..4e88196bd4 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -10,6 +10,10 @@
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "elm_widget_conform.h" 11#include "elm_widget_conform.h"
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13#include "elm_widget_plug.h"
14#include "elm_scroller.eo.h"
15#include "elm_genlist.eo.h"
16#include "elm_conformant.eo.h"
13 17
14#define MY_CLASS ELM_CONFORMANT_CLASS 18#define MY_CLASS ELM_CONFORMANT_CLASS
15#define MY_CLASS_PFX elm_conformant 19#define MY_CLASS_PFX elm_conformant
diff --git a/src/lib/elementary/elm_conform.h b/src/lib/elementary/elm_conform.h
index c1c822fca5..0c021b1713 100644
--- a/src/lib/elementary/elm_conform.h
+++ b/src/lib/elementary/elm_conform.h
@@ -50,9 +50,6 @@
50 * @{ 50 * @{
51 */ 51 */
52 52
53#ifdef EFL_EO_API_SUPPORT
54#include "elm_conform_eo.h"
55#endif
56#ifndef EFL_NOLEGACY_API_SUPPORT 53#ifndef EFL_NOLEGACY_API_SUPPORT
57#include "elm_conform_legacy.h" 54#include "elm_conform_legacy.h"
58#endif 55#endif
diff --git a/src/lib/elementary/elm_conform_eo.h b/src/lib/elementary/elm_conform_eo.h
deleted file mode 100644
index e711842db7..0000000000
--- a/src/lib/elementary/elm_conform_eo.h
+++ /dev/null
@@ -1,11 +0,0 @@
1/**
2 * @ingroup Elm_Conformant
3 *
4 * @{
5 */
6
7#include "elm_conformant.eo.h"
8
9/**
10 * @}
11 */
diff --git a/src/lib/elementary/elm_dayselector.h b/src/lib/elementary/elm_dayselector.h
index 75371fb401..b96967d194 100644
--- a/src/lib/elementary/elm_dayselector.h
+++ b/src/lib/elementary/elm_dayselector.h
@@ -75,9 +75,6 @@
75 * @{ 75 * @{
76 */ 76 */
77 77
78#ifdef EFL_EO_API_SUPPORT
79#include "elm_dayselector_eo.h"
80#endif
81#ifndef EFL_NOLEGACY_API_SUPPORT 78#ifndef EFL_NOLEGACY_API_SUPPORT
82#include "elm_dayselector_legacy.h" 79#include "elm_dayselector_legacy.h"
83#endif 80#endif
diff --git a/src/lib/elementary/elm_dayselector_eo.h b/src/lib/elementary/elm_dayselector_eo.h
deleted file mode 100644
index c049b7b873..0000000000
--- a/src/lib/elementary/elm_dayselector_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_dayselector.eo.h"
diff --git a/src/lib/elementary/elm_entry.h b/src/lib/elementary/elm_entry.h
index d4b8832d44..861ca6e331 100644
--- a/src/lib/elementary/elm_entry.h
+++ b/src/lib/elementary/elm_entry.h
@@ -304,9 +304,6 @@
304 */ 304 */
305 305
306#include "elm_entry_common.h" 306#include "elm_entry_common.h"
307#ifdef EFL_EO_API_SUPPORT
308#include "elm_entry_eo.h"
309#endif
310#ifndef EFL_NOLEGACY_API_SUPPORT 307#ifndef EFL_NOLEGACY_API_SUPPORT
311#include "elm_entry_legacy.h" 308#include "elm_entry_legacy.h"
312#endif 309#endif
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index a4ae02ac4c..42ab62b5fb 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -15,6 +15,9 @@
15#include "elm_interface_scrollable.h" 15#include "elm_interface_scrollable.h"
16#include "efl_ui_focus_parent_provider_gen.eo.h" 16#include "efl_ui_focus_parent_provider_gen.eo.h"
17#include "efl_ui_focus_composition_adapter.eo.h" 17#include "efl_ui_focus_composition_adapter.eo.h"
18#include "elm_gengrid_item.eo.h"
19#include "elm_gengrid_pan.eo.h"
20#include "elm_gengrid.eo.h"
18 21
19#define MY_PAN_CLASS ELM_GENGRID_PAN_CLASS 22#define MY_PAN_CLASS ELM_GENGRID_PAN_CLASS
20 23
diff --git a/src/lib/elementary/elm_gengrid.h b/src/lib/elementary/elm_gengrid.h
index 0f6bc68360..9485b7781e 100644
--- a/src/lib/elementary/elm_gengrid.h
+++ b/src/lib/elementary/elm_gengrid.h
@@ -276,9 +276,6 @@
276 */ 276 */
277 277
278#include <elm_gengrid_common.h> 278#include <elm_gengrid_common.h>
279#ifdef EFL_EO_API_SUPPORT
280#include <elm_gengrid_eo.h>
281#endif
282#ifndef EFL_NOLEGACY_API_SUPPORT 279#ifndef EFL_NOLEGACY_API_SUPPORT
283#include <elm_gengrid_legacy.h> 280#include <elm_gengrid_legacy.h>
284#endif 281#endif
diff --git a/src/lib/elementary/elm_gengrid_eo.h b/src/lib/elementary/elm_gengrid_eo.h
deleted file mode 100644
index c319243228..0000000000
--- a/src/lib/elementary/elm_gengrid_eo.h
+++ /dev/null
@@ -1,14 +0,0 @@
1/**
2 * @ingroup Elm_Gengrid
3 *
4 * @{
5 */
6
7#include "elm_gengrid_item.eo.h"
8#include "elm_gengrid_pan.eo.h"
9#include "elm_gengrid.eo.h"
10
11/**
12 * @}
13 */
14
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 19e2a0c02b..8edbe023a8 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -15,6 +15,9 @@
15#include "elm_priv.h" 15#include "elm_priv.h"
16#include "elm_widget_genlist.h" 16#include "elm_widget_genlist.h"
17#include "elm_interface_scrollable.h" 17#include "elm_interface_scrollable.h"
18#include "elm_genlist_item.eo.h"
19#include "elm_genlist_pan.eo.h"
20#include "elm_genlist.eo.h"
18 21
19#define MY_PAN_CLASS ELM_GENLIST_PAN_CLASS 22#define MY_PAN_CLASS ELM_GENLIST_PAN_CLASS
20 23
diff --git a/src/lib/elementary/elm_genlist.h b/src/lib/elementary/elm_genlist.h
index 8f0cf93d32..7c271267b9 100644
--- a/src/lib/elementary/elm_genlist.h
+++ b/src/lib/elementary/elm_genlist.h
@@ -398,9 +398,6 @@
398 */ 398 */
399 399
400#include <elm_genlist_common.h> 400#include <elm_genlist_common.h>
401#ifdef EFL_EO_API_SUPPORT
402#include <elm_genlist_eo.h>
403#endif
404#ifndef EFL_NOLEGACY_API_SUPPORT 401#ifndef EFL_NOLEGACY_API_SUPPORT
405#include <elm_genlist_legacy.h> 402#include <elm_genlist_legacy.h>
406#endif 403#endif
diff --git a/src/lib/elementary/elm_genlist_eo.h b/src/lib/elementary/elm_genlist_eo.h
deleted file mode 100644
index 1eab46374a..0000000000
--- a/src/lib/elementary/elm_genlist_eo.h
+++ /dev/null
@@ -1,14 +0,0 @@
1/**
2 * @ingroup Elm_Genlist
3 *
4 * @{
5 */
6
7#include "elm_genlist_item.eo.h"
8#include "elm_genlist_pan.eo.h"
9#include "elm_genlist.eo.h"
10
11/**
12 * @}
13 */
14
diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c
index 92c561ab7a..ef286049b8 100644
--- a/src/lib/elementary/elm_gesture_layer.c
+++ b/src/lib/elementary/elm_gesture_layer.c
@@ -4,6 +4,7 @@
4 4
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "elm_gesture_layer.eo.h"
7 8
8#define MY_CLASS ELM_GESTURE_LAYER_CLASS 9#define MY_CLASS ELM_GESTURE_LAYER_CLASS
9 10
diff --git a/src/lib/elementary/elm_gesture_layer.h b/src/lib/elementary/elm_gesture_layer.h
index adf7dc09a9..5987f89765 100644
--- a/src/lib/elementary/elm_gesture_layer.h
+++ b/src/lib/elementary/elm_gesture_layer.h
@@ -68,9 +68,6 @@
68 */ 68 */
69 69
70#include "elm_gesture_layer_common.h" 70#include "elm_gesture_layer_common.h"
71#ifdef EFL_EO_API_SUPPORT
72#include "elm_gesture_layer_eo.h"
73#endif
74#ifndef EFL_NOLEGACY_API_SUPPORT 71#ifndef EFL_NOLEGACY_API_SUPPORT
75#include "elm_gesture_layer_legacy.h" 72#include "elm_gesture_layer_legacy.h"
76#endif 73#endif
diff --git a/src/lib/elementary/elm_gesture_layer_eo.h b/src/lib/elementary/elm_gesture_layer_eo.h
deleted file mode 100644
index b043033d2a..0000000000
--- a/src/lib/elementary/elm_gesture_layer_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_gesture_layer.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_glview.h b/src/lib/elementary/elm_glview.h
index d1c6672d3b..5829354760 100644
--- a/src/lib/elementary/elm_glview.h
+++ b/src/lib/elementary/elm_glview.h
@@ -27,9 +27,6 @@
27 */ 27 */
28 28
29#include "elm_glview_common.h" 29#include "elm_glview_common.h"
30#ifdef EFL_EO_API_SUPPORT
31#include "elm_glview_eo.h"
32#endif
33#ifndef EFL_NOLEGACY_API_SUPPORT 30#ifndef EFL_NOLEGACY_API_SUPPORT
34#include "elm_glview_legacy.h" 31#include "elm_glview_legacy.h"
35#endif 32#endif
diff --git a/src/lib/elementary/elm_glview_eo.h b/src/lib/elementary/elm_glview_eo.h
deleted file mode 100644
index c2bc9d848a..0000000000
--- a/src/lib/elementary/elm_glview_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_glview.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_hover.h b/src/lib/elementary/elm_hover.h
index 7e4f3f3ea0..342b3e3ba6 100644
--- a/src/lib/elementary/elm_hover.h
+++ b/src/lib/elementary/elm_hover.h
@@ -80,9 +80,6 @@
80 * @{ 80 * @{
81 */ 81 */
82 82
83#ifdef EFL_EO_API_SUPPORT
84#include "elm_hover_eo.h"
85#endif
86#ifndef EFL_NOLEGACY_API_SUPPORT 83#ifndef EFL_NOLEGACY_API_SUPPORT
87#include "elm_hover_legacy.h" 84#include "elm_hover_legacy.h"
88#endif 85#endif
diff --git a/src/lib/elementary/elm_hover_eo.h b/src/lib/elementary/elm_hover_eo.h
deleted file mode 100644
index 59fef4be2b..0000000000
--- a/src/lib/elementary/elm_hover_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_hover.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_index.h b/src/lib/elementary/elm_index.h
index 4b124eab6c..6ede67b8d5 100644
--- a/src/lib/elementary/elm_index.h
+++ b/src/lib/elementary/elm_index.h
@@ -59,9 +59,6 @@
59 * @{ 59 * @{
60 */ 60 */
61 61
62#ifdef EFL_EO_API_SUPPORT
63#include <elm_index_eo.h>
64#endif
65#ifndef EFL_NOLEGACY_API_SUPPORT 62#ifndef EFL_NOLEGACY_API_SUPPORT
66#include <elm_index_legacy.h> 63#include <elm_index_legacy.h>
67#endif 64#endif
diff --git a/src/lib/elementary/elm_index_eo.h b/src/lib/elementary/elm_index_eo.h
deleted file mode 100644
index 9ca64187f8..0000000000
--- a/src/lib/elementary/elm_index_eo.h
+++ /dev/null
@@ -1,12 +0,0 @@
1/**
2 * @ingroup Elm_Index
3 *
4 * @{
5 */
6
7#include "elm_index_item.eo.h"
8#include "elm_index.eo.h"
9
10/**
11 * @}
12 */
diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h
index b2025b30a2..e746e1ded6 100644
--- a/src/lib/elementary/elm_interfaces.h
+++ b/src/lib/elementary/elm_interfaces.h
@@ -3,9 +3,13 @@
3#include "elm_interface_atspi_widget_action.h" 3#include "elm_interface_atspi_widget_action.h"
4#include "efl_access_window.h" 4#include "efl_access_window.h"
5 5
6// FIXME FIXME FIXME -- Still required because of photocam
6#ifdef EFL_EO_API_SUPPORT 7#ifdef EFL_EO_API_SUPPORT
7#include "elm_interface_scrollable.h" 8# include "elm_interface_scrollable.h"
9#endif
10
8#ifdef EFL_BETA_API_SUPPORT 11#ifdef EFL_BETA_API_SUPPORT
12#ifdef EFL_EO_API_SUPPORT
9#include "efl_access_action.eo.h" 13#include "efl_access_action.eo.h"
10#include "efl_access_component.eo.h" 14#include "efl_access_component.eo.h"
11#include "efl_access_editable_text.eo.h" 15#include "efl_access_editable_text.eo.h"
@@ -13,9 +17,7 @@
13#include "efl_access_selection.eo.h" 17#include "efl_access_selection.eo.h"
14#include "efl_access_value.eo.h" 18#include "efl_access_value.eo.h"
15#endif 19#endif
16#endif
17#ifndef EFL_NOLEGACY_API_SUPPORT 20#ifndef EFL_NOLEGACY_API_SUPPORT
18#ifdef EFL_BETA_API_SUPPORT
19#include "efl_access_action.eo.legacy.h" 21#include "efl_access_action.eo.legacy.h"
20#include "efl_access_component.eo.legacy.h" 22#include "efl_access_component.eo.legacy.h"
21#include "efl_access_editable_text.eo.legacy.h" 23#include "efl_access_editable_text.eo.legacy.h"
diff --git a/src/lib/elementary/elm_label.h b/src/lib/elementary/elm_label.h
index 83e497f156..13b52124dc 100644
--- a/src/lib/elementary/elm_label.h
+++ b/src/lib/elementary/elm_label.h
@@ -39,9 +39,6 @@
39 * See @ref tutorial_label for a demonstration of how to use a label widget. 39 * See @ref tutorial_label for a demonstration of how to use a label widget.
40 * @{ 40 * @{
41 */ 41 */
42#ifdef EFL_EO_API_SUPPORT
43#include "elm_label_eo.h"
44#endif
45#ifndef EFL_NOLEGACY_API_SUPPORT 42#ifndef EFL_NOLEGACY_API_SUPPORT
46#include "elm_label_legacy.h" 43#include "elm_label_legacy.h"
47#endif 44#endif
diff --git a/src/lib/elementary/elm_label_eo.h b/src/lib/elementary/elm_label_eo.h
deleted file mode 100644
index 266675820c..0000000000
--- a/src/lib/elementary/elm_label_eo.h
+++ /dev/null
@@ -1,11 +0,0 @@
1/**
2 * @ingroup Elm_Label
3 *
4 * @{
5 */
6
7#include "elm_label.eo.h"
8
9/**
10 * @}
11 */
diff --git a/src/lib/elementary/elm_list.h b/src/lib/elementary/elm_list.h
index b9e90007bd..72f5a1084f 100644
--- a/src/lib/elementary/elm_list.h
+++ b/src/lib/elementary/elm_list.h
@@ -96,9 +96,6 @@
96 * @{ 96 * @{
97 */ 97 */
98 98
99#ifdef EFL_EO_API_SUPPORT
100#include <elm_list_eo.h>
101#endif
102#ifndef EFL_NOLEGACY_API_SUPPORT 99#ifndef EFL_NOLEGACY_API_SUPPORT
103#include <elm_list_legacy.h> 100#include <elm_list_legacy.h>
104#endif 101#endif
diff --git a/src/lib/elementary/elm_list_eo.h b/src/lib/elementary/elm_list_eo.h
deleted file mode 100644
index d243e2b60f..0000000000
--- a/src/lib/elementary/elm_list_eo.h
+++ /dev/null
@@ -1,12 +0,0 @@
1/**
2 * @ingroup Elm_List
3 *
4 * @{
5 */
6
7#include "elm_list_item.eo.h"
8#include "elm_list.eo.h"
9
10/**
11 * @}
12 */
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index faf2ecaee1..cb96aa5b50 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -19,6 +19,7 @@
19#include <Elementary.h> 19#include <Elementary.h>
20#include "elm_priv.h" 20#include "elm_priv.h"
21#include "ecore_internal.h" 21#include "ecore_internal.h"
22#include "elm_interface_scrollable.h"
22 23
23#define SEMI_BROKEN_QUICKLAUNCH 1 24#define SEMI_BROKEN_QUICKLAUNCH 1
24 25
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index bf01cc4991..5093e9db0e 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -10,6 +10,8 @@
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "elm_widget_map.h" 11#include "elm_widget_map.h"
12#include "elm_interface_scrollable.h" 12#include "elm_interface_scrollable.h"
13#include "elm_map_pan.eo.h"
14#include "elm_map.eo.h"
13 15
14#define MY_PAN_CLASS ELM_MAP_PAN_CLASS 16#define MY_PAN_CLASS ELM_MAP_PAN_CLASS
15 17
diff --git a/src/lib/elementary/elm_map.h b/src/lib/elementary/elm_map.h
index f1b24b4cb4..bf257309ef 100644
--- a/src/lib/elementary/elm_map.h
+++ b/src/lib/elementary/elm_map.h
@@ -71,9 +71,6 @@
71 */ 71 */
72 72
73#include "elm_map_common.h" 73#include "elm_map_common.h"
74#ifdef EFL_EO_API_SUPPORT
75#include "elm_map_eo.h"
76#endif
77#ifndef EFL_NOLEGACY_API_SUPPORT 74#ifndef EFL_NOLEGACY_API_SUPPORT
78#include "elm_map_legacy.h" 75#include "elm_map_legacy.h"
79#endif 76#endif
diff --git a/src/lib/elementary/elm_map_eo.h b/src/lib/elementary/elm_map_eo.h
deleted file mode 100644
index db537555e6..0000000000
--- a/src/lib/elementary/elm_map_eo.h
+++ /dev/null
@@ -1,2 +0,0 @@
1#include "elm_map_pan.eo.h"
2#include "elm_map.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_menu.h b/src/lib/elementary/elm_menu.h
index 1afb076329..bd4a5a35d3 100644
--- a/src/lib/elementary/elm_menu.h
+++ b/src/lib/elementary/elm_menu.h
@@ -38,9 +38,6 @@
38 * @{ 38 * @{
39 */ 39 */
40 40
41#ifdef EFL_EO_API_SUPPORT
42#include "elm_menu_eo.h"
43#endif
44#ifndef EFL_NOLEGACY_API_SUPPORT 41#ifndef EFL_NOLEGACY_API_SUPPORT
45#include "elm_menu_legacy.h" 42#include "elm_menu_legacy.h"
46#endif 43#endif
diff --git a/src/lib/elementary/elm_menu_eo.h b/src/lib/elementary/elm_menu_eo.h
deleted file mode 100644
index 72aebb339a..0000000000
--- a/src/lib/elementary/elm_menu_eo.h
+++ /dev/null
@@ -1,2 +0,0 @@
1#include "elm_menu_item.eo.h"
2#include "elm_menu.eo.h"
diff --git a/src/lib/elementary/elm_notify.h b/src/lib/elementary/elm_notify.h
index 0d4e5da2da..88a2c5cfd3 100644
--- a/src/lib/elementary/elm_notify.h
+++ b/src/lib/elementary/elm_notify.h
@@ -33,9 +33,6 @@
33 */ 33 */
34 34
35#include <elm_notify_common.h> 35#include <elm_notify_common.h>
36#ifdef EFL_EO_API_SUPPORT
37#include <elm_notify_eo.h>
38#endif
39#ifndef EFL_NOLEGACY_API_SUPPORT 36#ifndef EFL_NOLEGACY_API_SUPPORT
40#include <elm_notify_legacy.h> 37#include <elm_notify_legacy.h>
41#endif 38#endif
diff --git a/src/lib/elementary/elm_notify_eo.h b/src/lib/elementary/elm_notify_eo.h
deleted file mode 100644
index e1382c3bf9..0000000000
--- a/src/lib/elementary/elm_notify_eo.h
+++ /dev/null
@@ -1,11 +0,0 @@
1/**
2 * @ingroup Elm_Notify
3 *
4 * @{
5 */
6
7#include "elm_notify.eo.h"
8
9/**
10 * @}
11 */
diff --git a/src/lib/elementary/elm_object_item.h b/src/lib/elementary/elm_object_item.h
index 095c77af32..0bda61e1b5 100644
--- a/src/lib/elementary/elm_object_item.h
+++ b/src/lib/elementary/elm_object_item.h
@@ -21,9 +21,6 @@ typedef Eo Elm_Object_Item;
21 */ 21 */
22typedef void (*Elm_Object_Item_Signal_Cb)(void *data, Elm_Object_Item *it, const char *emission, const char *source); 22typedef void (*Elm_Object_Item_Signal_Cb)(void *data, Elm_Object_Item *it, const char *emission, const char *source);
23 23
24#ifdef EFL_EO_API_SUPPORT
25#include "elm_widget_item.eo.h"
26#endif
27#ifndef EFL_NOLEGACY_API_SUPPORT 24#ifndef EFL_NOLEGACY_API_SUPPORT
28#include "elm_widget_item.eo.legacy.h" 25#include "elm_widget_item.eo.legacy.h"
29#endif 26#endif
diff --git a/src/lib/elementary/elm_panel.h b/src/lib/elementary/elm_panel.h
index 9dde7785f4..c94d9fc584 100644
--- a/src/lib/elementary/elm_panel.h
+++ b/src/lib/elementary/elm_panel.h
@@ -38,9 +38,6 @@
38 */ 38 */
39 39
40#include "elm_panel_common.h" 40#include "elm_panel_common.h"
41#ifdef EFL_EO_API_SUPPORT
42#include "elm_panel_eo.h"
43#endif
44#ifndef EFL_NOLEGACY_API_SUPPORT 41#ifndef EFL_NOLEGACY_API_SUPPORT
45#include "elm_panel_legacy.h" 42#include "elm_panel_legacy.h"
46#endif 43#endif
diff --git a/src/lib/elementary/elm_panel_eo.h b/src/lib/elementary/elm_panel_eo.h
deleted file mode 100644
index 25846a3f51..0000000000
--- a/src/lib/elementary/elm_panel_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_panel.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_plug.h b/src/lib/elementary/elm_plug.h
index 17ba2962f9..88ff450217 100644
--- a/src/lib/elementary/elm_plug.h
+++ b/src/lib/elementary/elm_plug.h
@@ -31,9 +31,6 @@
31 * @{ 31 * @{
32 */ 32 */
33 33
34#ifdef EFL_EO_API_SUPPORT
35#include "elm_plug_eo.h"
36#endif
37#ifndef EFL_NOLEGACY_API_SUPPORT 34#ifndef EFL_NOLEGACY_API_SUPPORT
38#include "elm_plug_legacy.h" 35#include "elm_plug_legacy.h"
39#endif 36#endif
diff --git a/src/lib/elementary/elm_plug_eo.h b/src/lib/elementary/elm_plug_eo.h
deleted file mode 100644
index 4230de1d9d..0000000000
--- a/src/lib/elementary/elm_plug_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_plug.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_route.h b/src/lib/elementary/elm_route.h
index 74a4cb092e..858ab69c63 100644
--- a/src/lib/elementary/elm_route.h
+++ b/src/lib/elementary/elm_route.h
@@ -10,9 +10,6 @@
10 * @{ 10 * @{
11 */ 11 */
12 12
13#ifdef EFL_EO_API_SUPPORT
14#include "elm_route_eo.h"
15#endif
16#ifndef EFL_NOLEGACY_API_SUPPORT 13#ifndef EFL_NOLEGACY_API_SUPPORT
17#include "elm_route_legacy.h" 14#include "elm_route_legacy.h"
18#endif 15#endif
diff --git a/src/lib/elementary/elm_route_eo.h b/src/lib/elementary/elm_route_eo.h
deleted file mode 100644
index b722adbfea..0000000000
--- a/src/lib/elementary/elm_route_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_route.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index b365e78101..9fe6f14565 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -12,6 +12,7 @@
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13#include "elm_widget_scroller.h" 13#include "elm_widget_scroller.h"
14 14
15#include "elm_scroller.eo.h"
15#include "elm_scroller_part.eo.h" 16#include "elm_scroller_part.eo.h"
16#include "elm_part_helper.h" 17#include "elm_part_helper.h"
17 18
diff --git a/src/lib/elementary/elm_scroller.h b/src/lib/elementary/elm_scroller.h
index fb1569695f..b12de04b6c 100644
--- a/src/lib/elementary/elm_scroller.h
+++ b/src/lib/elementary/elm_scroller.h
@@ -64,9 +64,6 @@
64 * @{ 64 * @{
65 */ 65 */
66 66
67#ifdef EFL_EO_API_SUPPORT
68#include <elm_scroller_eo.h>
69#endif
70#ifndef EFL_NOLEGACY_API_SUPPORT 67#ifndef EFL_NOLEGACY_API_SUPPORT
71#include <elm_scroller_legacy.h> 68#include <elm_scroller_legacy.h>
72#endif 69#endif
diff --git a/src/lib/elementary/elm_scroller_eo.h b/src/lib/elementary/elm_scroller_eo.h
deleted file mode 100644
index fde88dfd97..0000000000
--- a/src/lib/elementary/elm_scroller_eo.h
+++ /dev/null
@@ -1,11 +0,0 @@
1/**
2 * @ingroup Elm_Scroller
3 *
4 * @{
5 */
6
7#include "elm_scroller.eo.h"
8
9/**
10 * @}
11 */
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 69f8244cda..ac41e98a6f 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -12,6 +12,7 @@
12 12
13#include "elm_priv.h" 13#include "elm_priv.h"
14#include "elm_widget_spinner.h" 14#include "elm_widget_spinner.h"
15#include "elm_entry.eo.h"
15 16
16#include "Eo.h" 17#include "Eo.h"
17 18
diff --git a/src/lib/elementary/elm_spinner.h b/src/lib/elementary/elm_spinner.h
index 6da9976379..16c040a3e7 100644
--- a/src/lib/elementary/elm_spinner.h
+++ b/src/lib/elementary/elm_spinner.h
@@ -58,7 +58,7 @@
58 */ 58 */
59 59
60#ifdef EFL_EO_API_SUPPORT 60#ifdef EFL_EO_API_SUPPORT
61#include "elm_spinner_eo.h" 61#include "elm_spinner.eo.h"
62#endif 62#endif
63#ifndef EFL_NOLEGACY_API_SUPPORT 63#ifndef EFL_NOLEGACY_API_SUPPORT
64#include "elm_spinner_legacy.h" 64#include "elm_spinner_legacy.h"
diff --git a/src/lib/elementary/elm_spinner_eo.h b/src/lib/elementary/elm_spinner_eo.h
deleted file mode 100644
index 8c6d57dfd5..0000000000
--- a/src/lib/elementary/elm_spinner_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_spinner.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_store.c b/src/lib/elementary/elm_store.c
index ec27b8905e..59ab8aa03d 100644
--- a/src/lib/elementary/elm_store.c
+++ b/src/lib/elementary/elm_store.c
@@ -6,6 +6,7 @@
6#include <Elementary_Cursor.h> 6#include <Elementary_Cursor.h>
7 7
8#include "elm_priv.h" 8#include "elm_priv.h"
9#include "elm_genlist.eo.h"
9 10
10typedef struct _Elm_Store_Filesystem Elm_Store_Filesystem; 11typedef struct _Elm_Store_Filesystem Elm_Store_Filesystem;
11typedef struct _Elm_Store_Item_Filesystem Elm_Store_Item_Filesystem; 12typedef struct _Elm_Store_Item_Filesystem Elm_Store_Item_Filesystem;
diff --git a/src/lib/elementary/elm_sys_notify.c b/src/lib/elementary/elm_sys_notify.c
index c7a2dcbd06..4d1db56af8 100644
--- a/src/lib/elementary/elm_sys_notify.c
+++ b/src/lib/elementary/elm_sys_notify.c
@@ -6,6 +6,8 @@
6 6
7#include "elm_priv.h" 7#include "elm_priv.h"
8 8
9#include "elm_sys_notify_interface.eo.h"
10#include "elm_sys_notify.eo.h"
9#include "elm_sys_notify_dbus.eo.h" 11#include "elm_sys_notify_dbus.eo.h"
10#include "elm_sys_notify_dbus.eo.legacy.h" 12#include "elm_sys_notify_dbus.eo.legacy.h"
11 13
diff --git a/src/lib/elementary/elm_sys_notify.h b/src/lib/elementary/elm_sys_notify.h
index 30f5c9bb16..429ae92f9f 100644
--- a/src/lib/elementary/elm_sys_notify.h
+++ b/src/lib/elementary/elm_sys_notify.h
@@ -3,10 +3,6 @@
3 3
4typedef void (*Elm_Sys_Notify_Send_Cb)(void *data, unsigned int id); 4typedef void (*Elm_Sys_Notify_Send_Cb)(void *data, unsigned int id);
5 5
6#ifdef EFL_EO_API_SUPPORT
7#include "elm_sys_notify_interface.eo.h"
8#include "elm_sys_notify.eo.h"
9#endif
10#ifndef EFL_NOLEGACY_API_SUPPORT 6#ifndef EFL_NOLEGACY_API_SUPPORT
11#include "elm_sys_notify_interface.eo.legacy.h" 7#include "elm_sys_notify_interface.eo.legacy.h"
12#include "elm_sys_notify.eo.legacy.h" 8#include "elm_sys_notify.eo.legacy.h"
diff --git a/src/lib/elementary/elm_sys_notify_dbus.c b/src/lib/elementary/elm_sys_notify_dbus.c
index 0fa412aef7..e2784cd0c7 100644
--- a/src/lib/elementary/elm_sys_notify_dbus.c
+++ b/src/lib/elementary/elm_sys_notify_dbus.c
@@ -6,6 +6,8 @@
6 6
7#include "elm_priv.h" 7#include "elm_priv.h"
8 8
9#include "elm_sys_notify_interface.eo.h"
10#include "elm_sys_notify.eo.h"
9#include "elm_sys_notify_dbus.eo.h" 11#include "elm_sys_notify_dbus.eo.h"
10#include "elm_sys_notify_dbus.eo.legacy.h" 12#include "elm_sys_notify_dbus.eo.legacy.h"
11 13
diff --git a/src/lib/elementary/elm_systray.c b/src/lib/elementary/elm_systray.c
index d8158241c1..fadd7a29f0 100644
--- a/src/lib/elementary/elm_systray.c
+++ b/src/lib/elementary/elm_systray.c
@@ -5,9 +5,7 @@
5#include <Elementary.h> 5#include <Elementary.h>
6 6
7#include "elm_priv.h" 7#include "elm_priv.h"
8 8#include "elm_systray.eo.h"
9#include "Eo.h"
10
11#include "elm_systray_watcher.h" 9#include "elm_systray_watcher.h"
12 10
13EAPI int ELM_EVENT_SYSTRAY_READY = 0; 11EAPI int ELM_EVENT_SYSTRAY_READY = 0;
diff --git a/src/lib/elementary/elm_systray.h b/src/lib/elementary/elm_systray.h
index 5c149d3580..0e1953b472 100644
--- a/src/lib/elementary/elm_systray.h
+++ b/src/lib/elementary/elm_systray.h
@@ -1,4 +1,7 @@
1#include "elm_systray_common.h" 1#include "elm_systray_common.h"
2#ifdef EFL_EO_API_SUPPORT 2
3#include "elm_systray_eo.h" 3#ifdef EFL_BETA_API_SUPPORT
4# ifndef EFL_NOLEGACY_API_SUPPORT
5# include "elm_systray.eo.legacy.h"
6# endif
4#endif 7#endif
diff --git a/src/lib/elementary/elm_systray_eo.h b/src/lib/elementary/elm_systray_eo.h
deleted file mode 100644
index 5e124f3955..0000000000
--- a/src/lib/elementary/elm_systray_eo.h
+++ /dev/null
@@ -1,11 +0,0 @@
1/**
2 * @ingroup Systray
3 *
4 * @{
5 */
6
7#include "elm_systray.eo.h"
8
9/**
10 * @}
11 */
diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c
index 3e8a710939..3055339659 100644
--- a/src/lib/elementary/elm_view_form.c
+++ b/src/lib/elementary/elm_view_form.c
@@ -9,7 +9,9 @@
9#include "elm_view_list.h" 9#include "elm_view_list.h"
10 10
11#include "elm_priv.h" 11#include "elm_priv.h"
12#include "elm_entry.eo.h"
12#include "elm_thumb.eo.h" 13#include "elm_thumb.eo.h"
14#include "elm_label.eo.h"
13 15
14#include <assert.h> 16#include <assert.h>
15 17
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index b0069dc628..fdcf8baa07 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -6,6 +6,8 @@
6#include <Elementary.h> 6#include <Elementary.h>
7 7
8#include "elm_priv.h" 8#include "elm_priv.h"
9#include "elm_genlist.eo.h"
10
9#include <assert.h> 11#include <assert.h>
10 12
11#define MY_CLASS ELM_VIEW_LIST_CLASS 13#define MY_CLASS ELM_VIEW_LIST_CLASS
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index c7af125ba0..421ccf6060 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -16,6 +16,7 @@
16#include "elm_widget_container.h" 16#include "elm_widget_container.h"
17#include "elm_interface_scrollable.h" 17#include "elm_interface_scrollable.h"
18#include "elm_part_helper.h" 18#include "elm_part_helper.h"
19#include "elm_combobox.eo.h"
19 20
20/* FIXME: remove this when we don't rely on evas event structs anymore */ 21/* FIXME: remove this when we don't rely on evas event structs anymore */
21#define EFL_INTERNAL_UNSTABLE 22#define EFL_INTERNAL_UNSTABLE
diff --git a/src/lib/elementary/elm_widget_clock.h b/src/lib/elementary/elm_widget_clock.h
index 3ca5c0e9e7..4aec62d3c7 100644
--- a/src/lib/elementary/elm_widget_clock.h
+++ b/src/lib/elementary/elm_widget_clock.h
@@ -5,6 +5,8 @@
5 5
6#include <Eio.h> 6#include <Eio.h>
7 7
8#include "elm_clock.eo.h"
9
8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 10/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 11 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
10 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK 12 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK
diff --git a/src/lib/elementary/elm_widget_colorselector.h b/src/lib/elementary/elm_widget_colorselector.h
index a6bd8d38d6..d92d95c50d 100644
--- a/src/lib/elementary/elm_widget_colorselector.h
+++ b/src/lib/elementary/elm_widget_colorselector.h
@@ -3,7 +3,7 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5#include "elm_color_item.eo.h" 5#include "elm_color_item.eo.h"
6 6#include "elm_colorselector.eo.h"
7 7
8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/elm_widget_dayselector.h b/src/lib/elementary/elm_widget_dayselector.h
index 544a162244..9dd8784b26 100644
--- a/src/lib/elementary/elm_widget_dayselector.h
+++ b/src/lib/elementary/elm_widget_dayselector.h
@@ -3,6 +3,7 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5#include "elm_dayselector_item.eo.h" 5#include "elm_dayselector_item.eo.h"
6#include "elm_dayselector.eo.h"
6 7
7 8
8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 9/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
diff --git a/src/lib/elementary/elm_widget_entry.h b/src/lib/elementary/elm_widget_entry.h
index 2ef453928f..896bd99883 100644
--- a/src/lib/elementary/elm_widget_entry.h
+++ b/src/lib/elementary/elm_widget_entry.h
@@ -3,6 +3,7 @@
3 3
4#include "elm_interface_scrollable.h" 4#include "elm_interface_scrollable.h"
5#include "elm_widget_layout.h" 5#include "elm_widget_layout.h"
6#include "elm_entry.eo.h"
6 7
7/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
8 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/elm_widget_glview.h b/src/lib/elementary/elm_widget_glview.h
index 3ad104f616..cee7603990 100644
--- a/src/lib/elementary/elm_widget_glview.h
+++ b/src/lib/elementary/elm_widget_glview.h
@@ -2,6 +2,7 @@
2#define ELM_WIDGET_GLVIEW_H 2#define ELM_WIDGET_GLVIEW_H
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5#include "elm_glview.eo.h"
5 6
6/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 7/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
7 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 8 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/elm_widget_hover.h b/src/lib/elementary/elm_widget_hover.h
index 05b531c371..41bc3151ef 100644
--- a/src/lib/elementary/elm_widget_hover.h
+++ b/src/lib/elementary/elm_widget_hover.h
@@ -3,6 +3,7 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5#include "elm_widget_layout.h" 5#include "elm_widget_layout.h"
6#include "elm_hover.eo.h"
6 7
7/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
8 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/elm_widget_index.h b/src/lib/elementary/elm_widget_index.h
index af6cf3717c..1b6c1a3d8d 100644
--- a/src/lib/elementary/elm_widget_index.h
+++ b/src/lib/elementary/elm_widget_index.h
@@ -3,6 +3,9 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
6#include "elm_index_item.eo.h"
7#include "elm_index.eo.h"
8
6/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 9/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
7 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 10 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
8 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK 11 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK
diff --git a/src/lib/elementary/elm_widget_label.h b/src/lib/elementary/elm_widget_label.h
index e9927f57a5..1cbc99cf45 100644
--- a/src/lib/elementary/elm_widget_label.h
+++ b/src/lib/elementary/elm_widget_label.h
@@ -5,6 +5,8 @@
5 5
6#include <Eio.h> 6#include <Eio.h>
7 7
8#include "elm_label.eo.h"
9
8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 10/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 11 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
10 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK 12 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK
diff --git a/src/lib/elementary/elm_widget_list.h b/src/lib/elementary/elm_widget_list.h
index aeba701d57..fc98f142e7 100644
--- a/src/lib/elementary/elm_widget_list.h
+++ b/src/lib/elementary/elm_widget_list.h
@@ -3,6 +3,8 @@
3 3
4#include "elm_interface_scrollable.h" 4#include "elm_interface_scrollable.h"
5#include "elm_widget_layout.h" 5#include "elm_widget_layout.h"
6#include "elm_list.eo.h"
7#include "elm_list_item.eo.h"
6 8
7/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 9/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
8 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 10 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/elm_widget_menu.h b/src/lib/elementary/elm_widget_menu.h
index bcd1cea21b..0403a67480 100644
--- a/src/lib/elementary/elm_widget_menu.h
+++ b/src/lib/elementary/elm_widget_menu.h
@@ -3,6 +3,10 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
6#include "elm_menu.eo.h"
7#include "elm_menu_item.eo.h"
8#include "elm_hover.eo.h"
9
6/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 10/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
7 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 11 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
8 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK 12 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK
diff --git a/src/lib/elementary/elm_widget_notify.h b/src/lib/elementary/elm_widget_notify.h
index 6d570a5748..71ffd184d4 100644
--- a/src/lib/elementary/elm_widget_notify.h
+++ b/src/lib/elementary/elm_widget_notify.h
@@ -3,6 +3,8 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
6#include <elm_notify.eo.h>
7
6/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
7 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
8 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK 10 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK
diff --git a/src/lib/elementary/elm_widget_panel.h b/src/lib/elementary/elm_widget_panel.h
index a558335e0f..16847480a6 100644
--- a/src/lib/elementary/elm_widget_panel.h
+++ b/src/lib/elementary/elm_widget_panel.h
@@ -3,6 +3,7 @@
3 3
4#include "elm_interface_scrollable.h" 4#include "elm_interface_scrollable.h"
5#include "elm_widget_layout.h" 5#include "elm_widget_layout.h"
6#include "elm_panel.eo.h"
6 7
7/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
8 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/elm_widget_player.h b/src/lib/elementary/elm_widget_player.h
index 6f2ab427e4..ea540684ee 100644
--- a/src/lib/elementary/elm_widget_player.h
+++ b/src/lib/elementary/elm_widget_player.h
@@ -3,6 +3,8 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
6#include "elm_player.eo.h"
7
6/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
7 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
8 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK 10 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK
diff --git a/src/lib/elementary/elm_widget_plug.h b/src/lib/elementary/elm_widget_plug.h
index 4ab72ef4ff..bc5e6da5cf 100644
--- a/src/lib/elementary/elm_widget_plug.h
+++ b/src/lib/elementary/elm_widget_plug.h
@@ -2,6 +2,7 @@
2#define ELM_WIDGET_PLUG_H 2#define ELM_WIDGET_PLUG_H
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5#include "elm_plug.eo.h"
5 6
6/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 7/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
7 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 8 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/elm_widget_popup.h b/src/lib/elementary/elm_widget_popup.h
index f11c268531..330b074d29 100644
--- a/src/lib/elementary/elm_widget_popup.h
+++ b/src/lib/elementary/elm_widget_popup.h
@@ -3,6 +3,9 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5#include "elm_widget_layout.h" 5#include "elm_widget_layout.h"
6#include "elm_notify.eo.h"
7#include "elm_popup_item.eo.h"
8#include "elm_popup.eo.h"
6 9
7/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 10/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
8 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 11 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/elm_widget_route.h b/src/lib/elementary/elm_widget_route.h
index 6eaf39c1e6..f8e099f17a 100644
--- a/src/lib/elementary/elm_widget_route.h
+++ b/src/lib/elementary/elm_widget_route.h
@@ -1,6 +1,8 @@
1#ifndef ELM_WIDGET_ROUTE_H 1#ifndef ELM_WIDGET_ROUTE_H
2#define ELM_WIDGET_ROUTE_H 2#define ELM_WIDGET_ROUTE_H
3 3
4#include "elm_route.eo.h"
5
4/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 6/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
5 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 7 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
6 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK 8 * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK