diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index f9b3dee410..e5b5b6b00b 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -327,28 +327,18 @@ typedef Eo Efl_Ui_Spotlight_Indicator;
 # include "efl_ui_list_view_types.eot.h"
 # include <efl_ui_list_view.eo.h>
 # include <efl_ui_list_view_model.eo.h>
-# include <efl_ui_list_view_precise_layouter.eo.h>
-# include <efl_ui_list_view_relayout.eo.h>
-# include <efl_ui_list_view_pan.eo.h>
 # include <efl_ui_view_model.eo.h>
-# include <efl_ui_size_model.eo.h>
-# include <efl_ui_homogeneous_model.eo.h>
-# include <efl_ui_exact_model.eo.h>
-# include <efl_ui_average_model.eo.h>
+
 
 # include <efl_ui_scroller.eo.h>
 # include <efl_ui_pan.eo.h>
 # include <efl_ui_scroll_manager.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>
 # include <efl_ui_selection.eo.h>
 # include <efl_ui_dnd.eo.h>
 # include <efl_ui_dnd_container.eo.h>
-# include <efl_ui_selection_manager.eo.h>
 
-# include <efl_datetime_manager.eo.h>
 # include <efl_ui_timepicker.eo.h>
 # include <efl_ui_datepicker.eo.h>
 # include <efl_ui_calendar.eo.h>
diff --git a/src/lib/elementary/efl_ui_list_view_private.h b/src/lib/elementary/efl_ui_list_view_private.h
index 6b1c632d60..2443cf4438 100644
--- a/src/lib/elementary/efl_ui_list_view_private.h
+++ b/src/lib/elementary/efl_ui_list_view_private.h
@@ -7,6 +7,7 @@
 
 #include <Elementary.h>
 #include "efl_ui_list_view_relayout.eo.h"
+#include "efl_ui_list_view_pan.eo.h"
 #include "elm_priv.h"
 
 typedef struct _Efl_Ui_List_View_Data Efl_Ui_List_View_Data;
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 86f4066810..b94322c004 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -156,7 +156,15 @@
 
 
 #include "efl_ui_layout_legacy_eo.h"
+# include "efl_ui_size_model.eo.h"
+# include "efl_ui_homogeneous_model.eo.h"
+# include "efl_ui_exact_model.eo.h"
+# include "efl_ui_average_model.eo.h"
 
+# include "efl_ui_focus_parent_provider.eo.h"
+# include "efl_ui_focus_parent_provider_standard.eo.h"
+# include "efl_ui_selection_manager.eo.h"
+# include "efl_datetime_manager.eo.h"
 extern const char *_efl_model_property_itemw;
 extern const char *_efl_model_property_itemh;
 extern const char *_efl_model_property_selfw;