diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index bfba69ae58..2131bd8edf 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -22,8 +22,11 @@
 # include <Eio.h>
 
 // Evas internal EO APIs
+# include "Evas.h"
 # include "Evas_Internal.h"
 
+#include "Elementary.h"
+#include "Efl_Ui.h"
 # ifdef EAPI
 #  undef EAPI
 # endif
@@ -61,8 +64,93 @@
 # define EWAPI EAPI EAPI_WEAK
 
 # include "elm_widget.h"
-# include "elm_access_eo.h"
 # include "elm_code_private.h"
+#include "elm_access_eo.h"
+#include "elm_actionslider_eo.h"
+#include "elm_box_eo.h"
+#include "elm_bubble_eo.h"
+#include "elm_calendar_eo.h"
+#include "elm_calendar_item_eo.h"
+#include "elm_clock_eo.h"
+#include "elm_code_widget_legacy_eo.h"
+#include "elm_color_item_eo.h"
+#include "elm_colorselector_eo.h"
+#include "elm_conformant_eo.h"
+#include "elm_ctxpopup_eo.h"
+#include "elm_ctxpopup_item_eo.h"
+#include "elm_dayselector_eo.h"
+#include "elm_dayselector_item_eo.h"
+#include "elm_diskselector_eo.h"
+#include "elm_diskselector_item_eo.h"
+#include "elm_entry_eo.h"
+#include "elm_fileselector_button_eo.h"
+#include "elm_fileselector_entry_eo.h"
+#include "elm_fileselector_eo.h"
+#include "elm_flipselector_eo.h"
+#include "elm_flipselector_item_eo.h"
+#include "elm_gengrid_eo.h"
+#include "elm_gengrid_item_eo.h"
+#include "elm_gengrid_pan_eo.h"
+#include "elm_genlist_eo.h"
+#include "elm_genlist_item_eo.h"
+#include "elm_genlist_pan_eo.h"
+#include "elm_gesture_layer_eo.h"
+#include "elm_glview_eo.h"
+#include "elm_grid_eo.h"
+#include "elm_hover_eo.h"
+#include "elm_hoversel_eo.h"
+#include "elm_hoversel_item_eo.h"
+#include "elm_icon_eo.h"
+#include "elm_image_eo.h"
+#include "elm_index_eo.h"
+#include "elm_index_item_eo.h"
+#include "elm_interface_fileselector_eo.h"
+#include "elm_inwin_eo.h"
+#include "elm_label_eo.h"
+#include "elm_list_eo.h"
+#include "elm_list_item_eo.h"
+#include "elm_mapbuf_eo.h"
+#include "elm_map_eo.h"
+#include "elm_map_pan_eo.h"
+#include "elm_menu_eo.h"
+#include "elm_menu_item_eo.h"
+#include "elm_multibuttonentry_eo.h"
+#include "elm_multibuttonentry_item_eo.h"
+#include "elm_naviframe_eo.h"
+#include "elm_naviframe_item_eo.h"
+#include "elm_notify_eo.h"
+#include "elm_panel_eo.h"
+#include "elm_pan_eo.h"
+#include "elm_photo_eo.h"
+#include "elm_player_eo.h"
+#include "elm_plug_eo.h"
+#include "elm_popup_eo.h"
+#include "elm_popup_item_eo.h"
+#include "elm_prefs_eo.h"
+#include "elm_route_eo.h"
+#include "elm_scroller_eo.h"
+#include "elm_segment_control_eo.h"
+#include "elm_segment_control_item_eo.h"
+#include "elm_separator_eo.h"
+#include "elm_slider_eo.h"
+#include "elm_slider_part_indicator_eo.h"
+#include "elm_slideshow_eo.h"
+#include "elm_slideshow_item_eo.h"
+#include "elm_spinner_eo.h"
+#include "elm_sys_notify_dbus_eo.h"
+#include "elm_sys_notify_eo.h"
+#include "elm_sys_notify_interface_eo.h"
+#include "elm_systray_eo.h"
+#include "elm_table_eo.h"
+#include "elm_thumb_eo.h"
+#include "elm_toolbar_eo.h"
+#include "elm_toolbar_item_eo.h"
+#include "elm_web_eo.h"
+#include "elm_widget_item_container_eo.h"
+#include "elm_widget_item_eo.h"
+#include "elm_widget_item_static_focus_eo.h"
+#include "elm_win_eo.h"
+
 # include "efl_ui_focus_parent_provider.eo.h"
 # include "efl_ui_widget_focus_manager.eo.h"
 # include "efl_ui_focus_parent_provider_standard.eo.h"