diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index f7e3f197d5..e39bea0065 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -17,6 +17,7 @@
 #include "elm_priv.h"
 #include "elm_widget_container.h"
 #include "elm_interface_scrollable.h"
+#include "elm_pan_eo.h"
 #include "elm_part_helper.h"
 #include "elm_widget_combobox.h"
 
diff --git a/src/lib/elementary/efl_ui_widget_common.c b/src/lib/elementary/efl_ui_widget_common.c
index 020848887b..519efe21bf 100644
--- a/src/lib/elementary/efl_ui_widget_common.c
+++ b/src/lib/elementary/efl_ui_widget_common.c
@@ -17,6 +17,7 @@
 #include "elm_priv.h"
 #include "elm_widget_container.h"
 #include "elm_interface_scrollable.h"
+#include "elm_pan_eo.h"
 #include "elm_part_helper.h"
 #include "elm_widget_combobox.h"
 
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index bbaa7e6505..373b398dc2 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -13,6 +13,7 @@
 #include "elm_diskselector_item_eo.h"
 #include "elm_widget_diskselector.h"
 #include "elm_interface_scrollable.h"
+#include "elm_pan_eo.h"
 
 #define DISPLAY_ITEM_NUM_MIN 3
 
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index f2ba6c5aa7..c08e2f4807 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -13,6 +13,7 @@
 #include "elm_priv.h"
 #include "elm_widget_gengrid.h"
 #include "elm_interface_scrollable.h"
+#include "elm_pan_eo.h"
 #include "efl_ui_focus_parent_provider_gen_eo.h"
 #include "efl_ui_focus_composition_adapter.eo.h"
 #include "elm_gengrid_item_eo.h"
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 2be903d0a3..2ba846e00d 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -16,6 +16,7 @@
 #include "elm_priv.h"
 #include "elm_widget_genlist.h"
 #include "elm_interface_scrollable.h"
+#include "elm_pan_eo.h"
 #include "efl_ui_focus_parent_provider_gen_eo.h"
 #include "efl_ui_focus_composition_adapter.eo.h"
 #include "elm_genlist_item_eo.h"
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index e40ab07949..6ac896e242 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -8,6 +8,7 @@
 
 #include "elm_priv.h"
 #include "elm_interface_scrollable.h"
+#include "elm_pan_eo.h"
 
 #define MY_PAN_CLASS ELM_PAN_CLASS
 
diff --git a/src/lib/elementary/elm_interface_scrollable.h b/src/lib/elementary/elm_interface_scrollable.h
index 64e6f88209..3f2a0862a4 100644
--- a/src/lib/elementary/elm_interface_scrollable.h
+++ b/src/lib/elementary/elm_interface_scrollable.h
@@ -31,9 +31,6 @@
  * Elm_Scrollable_Smart_Interface::extern_pan_set.
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_pan_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_pan_eo.legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index f705436627..17b2b93746 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -13,6 +13,7 @@
 #include "elm_priv.h"
 #include "elm_widget_list.h"
 #include "elm_interface_scrollable.h"
+#include "elm_pan_eo.h"
 
 #define MY_CLASS ELM_LIST_CLASS
 
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index cf2a6fafb0..ce403942ad 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -23,6 +23,7 @@
 
 #include "elm_priv.h"
 #include "elm_interface_scrollable.h"
+#include "elm_pan_eo.h"
 
 //we need those for legacy compatible code
 #include "elm_genlist_eo.h"
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 364d491614..2e14abf2b8 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -10,6 +10,7 @@
 #include "elm_priv.h"
 #include "elm_widget_map.h"
 #include "elm_interface_scrollable.h"
+#include "elm_pan_eo.h"
 #include "elm_map_pan_eo.h"
 #include "elm_map_eo.h"
 
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 925f805273..f70ec39adc 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -10,6 +10,7 @@
 
 #include "elm_priv.h"
 #include "elm_interface_scrollable.h"
+#include "elm_pan_eo.h"
 #include "elm_widget_layout.h"
 #include "elm_widget_scroller.h"
 
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index fd1ab52057..8affc3c597 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -15,6 +15,7 @@
 #include "elm_priv.h"
 #include "elm_widget_toolbar.h"
 #include "els_box.h"
+#include "elm_pan_eo.h"
 
 #define MY_CLASS ELM_TOOLBAR_CLASS