diff --git a/legacy/elementary/src/lib/elm_entry.eo b/legacy/elementary/src/lib/elm_entry.eo
index 49b5c42d36..45afea3d69 100644
--- a/legacy/elementary/src/lib/elm_entry.eo
+++ b/legacy/elementary/src/lib/elm_entry.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
 enum Elm.Text_Format
 {
    [[Text Format types.
@@ -7,23 +9,6 @@ enum Elm.Text_Format
    markup_utf8 [[ Markup UTF8 type ]]
 }
 
-enum Elm.Wrap.Type
-{
-   [[
-     @addtogroup Entry
-     Line wrapping types.
-     Type of word or character wrapping to use.
-     @see elm_entry_line_wrap_set()
-   ]]
-
-   legacy: elm_wrap;
-   none = 0, [[No wrap - value is zero.]]
-   char,     [[Char wrap - wrap between characters.]]
-   word,     [[Word wrap - wrap in allowed wrapping points (as defined in the unicode standard).]]
-   mixed,    [[Mixed wrap - Word wrap, and if that fails, char wrap.]]
-   last
-}
-
 enum Elm.Input.Panel.Layout
 {
    [[
diff --git a/legacy/elementary/src/lib/elm_general.eot b/legacy/elementary/src/lib/elm_general.eot
index 9b7fe19b93..f946536f71 100644
--- a/legacy/elementary/src/lib/elm_general.eot
+++ b/legacy/elementary/src/lib/elm_general.eot
@@ -88,3 +88,22 @@ enum Elm.Object.Multi_Select_Mode
          ELM_OBJECT_MULTI_SELECT_MODE_MAX is forbidden.]]
 }
 
+enum Elm.Wrap.Type
+{
+   [[
+     @addtogroup Entry
+     Line wrapping types.
+     Type of word or character wrapping to use.
+     @see elm_entry_line_wrap_set()
+     @see elm_popup_content_text_wrap_type_set
+     @see elm_label_line_wrap_set()
+   ]]
+
+   legacy: elm_wrap;
+   none = 0, [[No wrap - value is zero.]]
+   char,     [[Char wrap - wrap between characters.]]
+   word,     [[Word wrap - wrap in allowed wrapping points (as defined in the unicode standard).]]
+   mixed,    [[Mixed wrap - Word wrap, and if that fails, char wrap.]]
+   last
+}
+
diff --git a/legacy/elementary/src/lib/elm_label.eo b/legacy/elementary/src/lib/elm_label.eo
index 4ec9d496b5..27bd910e93 100644
--- a/legacy/elementary/src/lib/elm_label.eo
+++ b/legacy/elementary/src/lib/elm_label.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
 enum Elm.Label.Slide_Mode
 {
    [[
@@ -155,7 +157,7 @@ class Elm.Label (Elm.Layout)
             @ingroup Label */
          }
          values {
-            wrap: Elm_Wrap_Type; /*@ To wrap text or not */
+            wrap: Elm.Wrap.Type; /*@ To wrap text or not */
          }
       }
       @property ellipsis {
diff --git a/legacy/elementary/src/lib/elm_popup.eo b/legacy/elementary/src/lib/elm_popup.eo
index d3c16b2beb..68d219d033 100644
--- a/legacy/elementary/src/lib/elm_popup.eo
+++ b/legacy/elementary/src/lib/elm_popup.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
 enum Elm.Popup.Orient
 {
    [[
@@ -96,7 +98,7 @@ class Elm.Popup (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
             @see elm_popup_content_text_wrap_type_set */
          }
          values {
-            wrap: Elm_Wrap_Type; /*@ wrapping type of type Elm_Wrap_Type */
+            wrap: Elm.Wrap.Type; /*@ wrapping type of type Elm_Wrap_Type */
          }
       }
       @property orient {