diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index af1a24928b..470c218265 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -1,5 +1,4 @@
 import elm_general;
-import elm_icon;
 import elm_entry;
 
 struct Efl.Ui.Text.Anchor_Info
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index b0c30d17a4..fa0aa8cb2c 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -1,5 +1,4 @@
 import elm_general;
-import elm_icon;
 
 type Elm_Entry_Item_Provider_Cb: __undefined_type; [[Elementary entry item provider callback type]]
 type Elm_Entry_Filter_Cb: __undefined_type; [[Elementary entry filter callback type]]
diff --git a/src/lib/elementary/elm_general.eot b/src/lib/elementary/elm_general.eot
index 57cdd6d2e1..059c775870 100644
--- a/src/lib/elementary/elm_general.eot
+++ b/src/lib/elementary/elm_general.eot
@@ -277,3 +277,12 @@ enum Efl.Ui.Softcursor_Mode
    on,   [[Always use a softcursor.]]
    off   [[Never use a softcursor.]]
 }
+
+enum Elm.Icon.Type
+{
+   [[Elementary icon types]]
+   legacy: elm_icon;
+   none, [[Icon has no type set]]
+   file, [[Icon is of type file]]
+   standard [[Icon is of type standard]]
+}
\ No newline at end of file
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index ba15074505..99508246be 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -1,4 +1,5 @@
-import elm_icon;
+import elm_general;
+
 class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable,
                     Efl.Ui.Clickable,
                     Elm.Interface.Atspi_Widget_Action)
diff --git a/src/lib/elementary/elm_hoversel_item.eo b/src/lib/elementary/elm_hoversel_item.eo
index 7cc349e1db..551c85cfcc 100644
--- a/src/lib/elementary/elm_hoversel_item.eo
+++ b/src/lib/elementary/elm_hoversel_item.eo
@@ -1,4 +1,4 @@
-import elm_icon;
+import elm_general;
 
 class Elm.Hoversel.Item(Elm.Widget.Item)
 {
diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo
index 3dac011e02..496b1c8ce6 100644
--- a/src/lib/elementary/elm_icon.eo
+++ b/src/lib/elementary/elm_icon.eo
@@ -1,12 +1,3 @@
-enum Elm.Icon.Type
-{
-   [[Elementary icon types]]
-   legacy: elm_icon;
-   none, [[Icon has no type set]]
-   file, [[Icon is of type file]]
-   standard [[Icon is of type standard]]
-}
-
 class Elm.Icon (Efl.Ui.Image)
 {
    [[Elementary Icon Class]]
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index ba9fede090..a7c1bb8658 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -1,5 +1,4 @@
 import elm_general;
-import elm_icon;
 
 enum Elm.Toolbar.Shrink_Mode
 {