12 files changed, 17 insertions, 20 deletions

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index e95a40dc4b..58601aabdd 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -5,6 +5,11 @@ efl_eolian_legacy_files = \
         lib/efl/interfaces/efl_image.eo \
         lib/efl/interfaces/efl_image_animated.eo \
         lib/efl/interfaces/efl_input_device.eo \
+        lib/efl/interfaces/efl_ui_draggable.eo \
+        lib/efl/interfaces/efl_ui_clickable.eo \
+        lib/efl/interfaces/efl_ui_scrollable.eo \
+        lib/efl/interfaces/efl_ui_selectable.eo \
+        lib/efl/interfaces/efl_ui_zoom.eo \
         $(NULL)
 
 efl_eolian_files = \
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 37c31f62e2..61648bd8b4 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -10,11 +10,6 @@ evas_eolian_pub_files = \
         lib/evas/canvas/efl_canvas_group.eo \
         lib/evas/canvas/evas_canvas.eo \
         lib/evas/canvas/efl_canvas_image_internal.eo \
-        lib/evas/canvas/efl_ui_draggable.eo \
-        lib/evas/canvas/efl_ui_clickable.eo \
-        lib/evas/canvas/efl_ui_scrollable.eo \
-        lib/evas/canvas/efl_ui_selectable.eo \
-        lib/evas/canvas/efl_ui_zoom.eo \
         lib/evas/canvas/evas_canvas3d_camera.eo\
         lib/evas/canvas/evas_canvas3d_texture.eo\
         lib/evas/canvas/evas_canvas3d_material.eo\
@@ -154,7 +149,6 @@ lib/evas/main.c
 
 # Canvas
 lib_evas_libevas_la_SOURCES += \
-lib/evas/canvas/common_interfaces.c \
 lib/evas/canvas/evas_callbacks.c \
 lib/evas/canvas/evas_clip.c \
 lib/evas/canvas/evas_data.c \
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 8477574f70..82a1e3d460 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -95,6 +95,11 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 #include "interfaces/efl_ui_item.eo.h"
 #include "interfaces/efl_ui_menu.eo.h"
 #include "interfaces/efl_ui_autorepeat.eo.h"
+#include "interfaces/efl_ui_draggable.eo.h"
+#include "interfaces/efl_ui_clickable.eo.h"
+#include "interfaces/efl_ui_scrollable.eo.h"
+#include "interfaces/efl_ui_selectable.eo.h"
+#include "interfaces/efl_ui_zoom.eo.h"
 
 #include "interfaces/efl_screen.eo.h"
 
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index a4ca74e593..ded13b6ece 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -63,6 +63,12 @@
 #include "interfaces/efl_ui_factory.eo.c"
 #include "interfaces/efl_ui_model_factory_connect.eo.c"
 
+#include "interfaces/efl_ui_draggable.eo.c"
+#include "interfaces/efl_ui_clickable.eo.c"
+#include "interfaces/efl_ui_scrollable.eo.c"
+#include "interfaces/efl_ui_selectable.eo.c"
+#include "interfaces/efl_ui_zoom.eo.c"
+
 EAPI void
 __efl_internal_init(void)
 {
diff --git a/src/lib/evas/canvas/efl_ui_clickable.eo b/src/lib/efl/interfaces/efl_ui_clickable.eo
index 5cfaa89a35..5cfaa89a35 100644
--- a/src/lib/evas/canvas/efl_ui_clickable.eo
+++ b/src/lib/efl/interfaces/efl_ui_clickable.eo
diff --git a/src/lib/evas/canvas/efl_ui_draggable.eo b/src/lib/efl/interfaces/efl_ui_draggable.eo
index c3b8a68d3b..c3b8a68d3b 100644
--- a/src/lib/evas/canvas/efl_ui_draggable.eo
+++ b/src/lib/efl/interfaces/efl_ui_draggable.eo
diff --git a/src/lib/evas/canvas/efl_ui_scrollable.eo b/src/lib/efl/interfaces/efl_ui_scrollable.eo
index 366e2c02f9..366e2c02f9 100644
--- a/src/lib/evas/canvas/efl_ui_scrollable.eo
+++ b/src/lib/efl/interfaces/efl_ui_scrollable.eo
diff --git a/src/lib/evas/canvas/efl_ui_selectable.eo b/src/lib/efl/interfaces/efl_ui_selectable.eo
index b24772ee02..b24772ee02 100644
--- a/src/lib/evas/canvas/efl_ui_selectable.eo
+++ b/src/lib/efl/interfaces/efl_ui_selectable.eo
diff --git a/src/lib/evas/canvas/efl_ui_zoom.eo b/src/lib/efl/interfaces/efl_ui_zoom.eo
index 327c34d5e6..327c34d5e6 100644
--- a/src/lib/evas/canvas/efl_ui_zoom.eo
+++ b/src/lib/efl/interfaces/efl_ui_zoom.eo
diff --git a/src/lib/elementary/elm_photocam_legacy.h b/src/lib/elementary/elm_photocam_legacy.h
index c88a912660..d33005f564 100644
--- a/src/lib/elementary/elm_photocam_legacy.h
+++ b/src/lib/elementary/elm_photocam_legacy.h
@@ -1,4 +1,4 @@
-#include "canvas/efl_ui_zoom.eo.legacy.h"
+#include "interfaces/efl_ui_zoom.eo.legacy.h"
 
 /**
  * @brief Add a new Photocam object
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 7dd6b087db..bcd1b80dc0 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -3,11 +3,6 @@
 #endif
 
 #ifdef EFL_EO_API_SUPPORT
-#include "canvas/efl_ui_draggable.eo.h"
-#include "canvas/efl_ui_clickable.eo.h"
-#include "canvas/efl_ui_scrollable.eo.h"
-#include "canvas/efl_ui_selectable.eo.h"
-#include "canvas/efl_ui_zoom.eo.h"
 
 #include "canvas/evas_canvas.eo.h"
 
diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c
deleted file mode 100644
index e177ed5360..0000000000
--- a/src/lib/evas/canvas/common_interfaces.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "evas_common_private.h"
-#include "evas_private.h"
-
-#include "canvas/efl_ui_draggable.eo.c"
-#include "canvas/efl_ui_clickable.eo.c"
-#include "canvas/efl_ui_scrollable.eo.c"
-#include "canvas/efl_ui_selectable.eo.c"
-#include "canvas/efl_ui_zoom.eo.c"