diff --git a/src/lib/ecore/efl_cubic_bezier_interpolator.eo b/src/lib/ecore/efl_cubic_bezier_interpolator.eo
index 4c67204783..02de6741d3 100644
--- a/src/lib/ecore/efl_cubic_bezier_interpolator.eo
+++ b/src/lib/ecore/efl_cubic_bezier_interpolator.eo
@@ -1,3 +1,5 @@
+import eina_types;
+
 class Efl.Cubic_Bezier_Interpolator extends Efl.Object implements Efl.Interpolator
 {
    [[Cubic Bezier interpolator. It starts slow, then moves quickly and then slows down
diff --git a/src/lib/ecore/efl_loop_consumer.eo b/src/lib/ecore/efl_loop_consumer.eo
index e384240c0b..a028e5aff1 100644
--- a/src/lib/ecore/efl_loop_consumer.eo
+++ b/src/lib/ecore/efl_loop_consumer.eo
@@ -1,3 +1,5 @@
+import eina_types;
+
 abstract Efl.Loop_Consumer extends Efl.Object
 {
    [[An @Efl.Loop_Consumer is a class which requires one of the parents to provide
diff --git a/src/lib/ecore/efl_threadio.eo b/src/lib/ecore/efl_threadio.eo
index 58629fd7b4..80b4f5b653 100644
--- a/src/lib/ecore/efl_threadio.eo
+++ b/src/lib/ecore/efl_threadio.eo
@@ -1,5 +1,3 @@
-import efl_object;
-
 function @beta EflThreadIOCall {
    [[A Function to be called asynchronously on a different thread.]]
    params {
diff --git a/src/lib/ecore_con/efl_net_http_types.eot b/src/lib/ecore_con/efl_net_http_types.eot
index 63784f86e9..15b84f5203 100644
--- a/src/lib/ecore_con/efl_net_http_types.eot
+++ b/src/lib/ecore_con/efl_net_http_types.eot
@@ -1,5 +1,3 @@
-import eina_types;
-
 enum @beta Efl.Net.Http.Version {
     [[HTTP protocol versions]]
 
diff --git a/src/lib/ecore_con/efl_net_types.eot b/src/lib/ecore_con/efl_net_types.eot
index 36d8bba1ec..1d3cbb3da5 100644
--- a/src/lib/ecore_con/efl_net_types.eot
+++ b/src/lib/ecore_con/efl_net_types.eot
@@ -1,3 +1 @@
-import eina_types;
-
 error @beta Efl.Net.Error.COULDNT_RESOLVE_HOST = "Couldn't resolve host name"; [[Could not resolve the given host name]]
diff --git a/src/lib/ector/ector_renderer_image.eo b/src/lib/ector/ector_renderer_image.eo
index 9c2e7b3448..ff84bc8adf 100644
--- a/src/lib/ector/ector_renderer_image.eo
+++ b/src/lib/ector/ector_renderer_image.eo
@@ -1,5 +1,3 @@
-import ector_renderer;
-
 mixin @beta Ector.Renderer.Image
 {
    [[Ector image renderer mixin]]
diff --git a/src/lib/edje/efl_canvas_layout_part.eo b/src/lib/edje/efl_canvas_layout_part.eo
index 102f180b41..20a1443ab5 100644
--- a/src/lib/edje/efl_canvas_layout_part.eo
+++ b/src/lib/edje/efl_canvas_layout_part.eo
@@ -1,5 +1,3 @@
-import efl_canvas_layout_types;
-
 class @beta Efl.Canvas.Layout_Part extends Efl.Object implements Efl.Gfx.Entity, Efl.Ui.Drag, Efl.Canvas.Layout_Part_Type_Provider
 {
    [[Common class for part proxy objects for @Efl.Canvas.Layout.
diff --git a/src/lib/efl/interfaces/efl_file_save.eo b/src/lib/efl/interfaces/efl_file_save.eo
index 2340de9c77..e53908f182 100644
--- a/src/lib/efl/interfaces/efl_file_save.eo
+++ b/src/lib/efl/interfaces/efl_file_save.eo
@@ -1,6 +1,3 @@
-import eina_types;
-
-
 struct Efl.File_Save_Info
 {
    [[Info used to determine various attributes when saving a file.
diff --git a/src/lib/efl/interfaces/efl_gfx_color.eo b/src/lib/efl/interfaces/efl_gfx_color.eo
index e507440ace..b457bba039 100644
--- a/src/lib/efl/interfaces/efl_gfx_color.eo
+++ b/src/lib/efl/interfaces/efl_gfx_color.eo
@@ -1,5 +1,3 @@
-import efl_gfx_types;
-
 mixin Efl.Gfx.Color
 {
    [[Efl Gfx Color mixin class
diff --git a/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo b/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo
index 9352244439..477b7f8276 100644
--- a/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo
@@ -1,5 +1,4 @@
 import eina_types;
-import efl_gfx_types;
 
 /*
 enum @beta Efl.Gfx.Image_Load_Controller_State
diff --git a/src/lib/efl/interfaces/efl_observable.eo b/src/lib/efl/interfaces/efl_observable.eo
index d551f6fd91..45b05b0984 100644
--- a/src/lib/efl/interfaces/efl_observable.eo
+++ b/src/lib/efl/interfaces/efl_observable.eo
@@ -1,5 +1,3 @@
-import efl_types;
-
 struct @beta @free(efl_observable_tuple_free) Efl.Observable_Tuple
 {
    [[This type describes an observable touple]]
diff --git a/src/lib/efl/interfaces/efl_ui_factory_bind.eo b/src/lib/efl/interfaces/efl_ui_factory_bind.eo
index 74717e595f..4e1a42556c 100644
--- a/src/lib/efl/interfaces/efl_ui_factory_bind.eo
+++ b/src/lib/efl/interfaces/efl_ui_factory_bind.eo
@@ -1,3 +1,5 @@
+import eina_types;
+
 interface Efl.Ui.Factory_Bind
 {
    [[Efl UI Property interface.
diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index f3e70dee40..d077eaa481 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -1,3 +1,5 @@
+import eina_types;
+
 enum @beta Efl.Access.Type
 {
    [[Type of accessibility object]]
diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot
index ddabd19802..f8be696cc0 100644
--- a/src/lib/elementary/efl_ui.eot
+++ b/src/lib/elementary/efl_ui.eot
@@ -1,5 +1,4 @@
 /* Efl.Ui enum and struct types */
-import eina_types;
 
 /* FIXME: find a better way to express this */
 error @extern Efl.Ui.Theme.Apply_Error.NONE = "Succcess"; [[Successfully applied the requested style from the current theme.]]
diff --git a/src/lib/elementary/efl_ui_format.eo b/src/lib/elementary/efl_ui_format.eo
index 3e2bd287bb..e711537492 100644
--- a/src/lib/elementary/efl_ui_format.eo
+++ b/src/lib/elementary/efl_ui_format.eo
@@ -1,5 +1,3 @@
-import eina_types;
-
 function Efl.Ui.Format_Func
 {
    [[A function taking an @Eina.Value and producing its textual representation.
diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index f8ff7a9e39..39a10b4a99 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,5 +1,3 @@
-import efl_ui;
-
 class Efl.Ui.Layout extends Efl.Ui.Layout_Base implements Efl.File
 {
    [[EFL layout widget class.
diff --git a/src/lib/elementary/efl_ui_layout_base.eo b/src/lib/elementary/efl_ui_layout_base.eo
index 91b4f49049..6cd8425276 100644
--- a/src/lib/elementary/efl_ui_layout_base.eo
+++ b/src/lib/elementary/efl_ui_layout_base.eo
@@ -1,5 +1,3 @@
-import efl_ui;
-
 abstract Efl.Ui.Layout_Base extends Efl.Ui.Widget implements Efl.Container,
                      Efl.Ui.Factory_Bind,
                      Efl.Layout.Calc, Efl.Layout.Signal,
diff --git a/src/lib/elementary/efl_ui_multi_selectable_index_range.eo b/src/lib/elementary/efl_ui_multi_selectable_index_range.eo
index fd683fbd06..1a538beca3 100644
--- a/src/lib/elementary/efl_ui_multi_selectable_index_range.eo
+++ b/src/lib/elementary/efl_ui_multi_selectable_index_range.eo
@@ -1,5 +1,3 @@
-import efl_ui;
-
 interface Efl.Ui.Multi_Selectable_Index_Range extends Efl.Ui.Multi_Selectable
 {
    [[Interface for getting access to a range of selected items through their indices.
diff --git a/src/lib/elementary/efl_ui_multi_selectable_object_range.eo b/src/lib/elementary/efl_ui_multi_selectable_object_range.eo
index 1f7db5e67a..deae601834 100644
--- a/src/lib/elementary/efl_ui_multi_selectable_object_range.eo
+++ b/src/lib/elementary/efl_ui_multi_selectable_object_range.eo
@@ -1,5 +1,3 @@
-import efl_ui;
-
 interface Efl.Ui.Multi_Selectable_Object_Range extends Efl.Ui.Multi_Selectable
 {
    [[Interface for getting access to a range of selected items.
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index b336a4ee65..1bf1ea5e58 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -1,5 +1,3 @@
-import eina_types;
-
 struct Efl.Event_Description {
     [[This struct holds the description of a specific event.
 
diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo
index 2be31b7e16..e819d0df09 100644
--- a/src/lib/evas/canvas/efl_canvas_textblock.eo
+++ b/src/lib/evas/canvas/efl_canvas_textblock.eo
@@ -1,5 +1,3 @@
-import efl_text_types;
-
 class Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
                        Efl.Canvas.Filter.Internal, Efl.Text_Font_Properties,
                        Efl.Text_Style, Efl.Text_Format,
diff --git a/src/lib/evas/canvas/efl_gfx_vg_value_provider.eo b/src/lib/evas/canvas/efl_gfx_vg_value_provider.eo
index 43eb555a45..7712acd4a8 100644
--- a/src/lib/evas/canvas/efl_gfx_vg_value_provider.eo
+++ b/src/lib/evas/canvas/efl_gfx_vg_value_provider.eo
@@ -1,3 +1,5 @@
+import eina_types;
+
 class @beta Efl.Gfx.Vg.Value_Provider extends Efl.Object
 {
    [[Efl Vector Value Provider class.
diff --git a/src/lib/evas/canvas/efl_input_pointer.eo b/src/lib/evas/canvas/efl_input_pointer.eo
index a9558def3d..32d5d4a84d 100644
--- a/src/lib/evas/canvas/efl_input_pointer.eo
+++ b/src/lib/evas/canvas/efl_input_pointer.eo
@@ -1,4 +1,5 @@
 import efl_input_types;
+import eina_types;
 
 class Efl.Input.Pointer extends Efl.Object implements Efl.Input.Event, Efl.Input.State
 {
diff --git a/src/lib/evas/canvas/efl_text_formatter.eo b/src/lib/evas/canvas/efl_text_formatter.eo
index 9e4d025c72..a34ce640f5 100644
--- a/src/lib/evas/canvas/efl_text_formatter.eo
+++ b/src/lib/evas/canvas/efl_text_formatter.eo
@@ -1,5 +1,3 @@
-import efl_text_types;
-
 abstract Efl.Text_Formatter extends Efl.Object {
     [[Text Formatter API to manage text formatting(attributes).
      Use it to insert and remove style attributes (font, size, color, ...) using @Efl.Text_Cursor.Object on EFL Widgets.
diff --git a/src/lib/evas/gesture/efl_canvas_gesture.eo b/src/lib/evas/gesture/efl_canvas_gesture.eo
index 222b30dff2..9166f71ca2 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture.eo
@@ -1,5 +1,5 @@
 import efl_canvas_gesture_types;
-import efl_canvas_gesture_events;
+parse efl_canvas_gesture_events;
 
 abstract @beta Efl.Canvas.Gesture extends Efl.Object
 {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_custom.eo b/src/lib/evas/gesture/efl_canvas_gesture_custom.eo
index 0e21099481..c8fe7ad909 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_custom.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_custom.eo
@@ -1,4 +1,3 @@
-import eina_types;
 parse efl_canvas_gesture_recognizer;
 
 class @beta Efl.Canvas.Gesture_Custom extends Efl.Canvas.Gesture
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
index dc5ad82862..7ae66a5af2 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
@@ -1,5 +1,3 @@
-import efl_canvas_gesture_types;
-
 class @beta Efl.Canvas.Gesture_Manager extends Efl.Object
 {
    [[This class keeps track of active @Efl.Canvas.Gesture_Recognizer objects.
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
index 24d12a224c..94f633afc7 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
@@ -1,5 +1,4 @@
 import efl_canvas_gesture_types;
-import efl_input_types;
 
 /* FIXME: This class lacks a lot of useful helpers. */
 
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_types.eot b/src/lib/evas/gesture/efl_canvas_gesture_types.eot
index 030ad68b58..dde4924154 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_types.eot
+++ b/src/lib/evas/gesture/efl_canvas_gesture_types.eot
@@ -1,6 +1,5 @@
 import eina_types;
 import efl_input_types;
-import efl_canvas_gesture_events;
 
 enum @beta Efl.Canvas.Gesture_Touch_State
 {