diff --git a/src/lib/elementary/efl_ui_flip_legacy.h b/src/lib/elementary/efl_ui_flip_legacy.h
index 5bbbaabc62..8470bb187d 100644
--- a/src/lib/elementary/efl_ui_flip_legacy.h
+++ b/src/lib/elementary/efl_ui_flip_legacy.h
@@ -1,5 +1,7 @@
 #include "efl_ui_flip.eo.legacy.h"
 
+typedef Eo Elm_Flip;
+
 typedef Efl_Ui_Flip_Interaction       Elm_Flip_Interaction;
 
 #define ELM_FLIP_INTERACTION_NONE     EFL_UI_FLIP_INTERACTION_NONE
diff --git a/src/lib/elementary/efl_ui_frame_legacy.h b/src/lib/elementary/efl_ui_frame_legacy.h
index 3a1f89b233..7e96f12e30 100644
--- a/src/lib/elementary/efl_ui_frame_legacy.h
+++ b/src/lib/elementary/efl_ui_frame_legacy.h
@@ -1,3 +1,5 @@
+typedef Eo Elm_Frame;
+
 /**
  * @brief Add a new frame to the parent
  *
@@ -8,4 +10,4 @@
  */
 EAPI Evas_Object                 *elm_frame_add(Evas_Object *parent);
 
-#include "efl_ui_frame.eo.legacy.h"
\ No newline at end of file
+#include "efl_ui_frame.eo.legacy.h"
diff --git a/src/lib/elementary/efl_ui_video_legacy.h b/src/lib/elementary/efl_ui_video_legacy.h
index a92a1e3284..70ac16a718 100644
--- a/src/lib/elementary/efl_ui_video_legacy.h
+++ b/src/lib/elementary/efl_ui_video_legacy.h
@@ -1,3 +1,5 @@
+typedef Eo Elm_Video;
+
 /**
  * @brief Add a new Elm_Player object to the given parent Elementary (container) object.
  *
diff --git a/src/lib/elementary/elc_multibuttonentry_legacy.h b/src/lib/elementary/elc_multibuttonentry_legacy.h
index 98b666b05a..c633be7cd0 100644
--- a/src/lib/elementary/elc_multibuttonentry_legacy.h
+++ b/src/lib/elementary/elc_multibuttonentry_legacy.h
@@ -1,3 +1,5 @@
+typedef Eo Elm_Multibuttonentry;
+
 /**
  * @brief Add a new multibuttonentry to the parent
  *
diff --git a/src/lib/elementary/elm_bg_legacy.h b/src/lib/elementary/elm_bg_legacy.h
index 394d96a24c..66f56e7501 100644
--- a/src/lib/elementary/elm_bg_legacy.h
+++ b/src/lib/elementary/elm_bg_legacy.h
@@ -1,3 +1,5 @@
+typedef Eo Elm_Bg;
+
 /**
  * @brief Identifiers on how a background widget is to display its image
  *
diff --git a/src/lib/elementary/elm_button_legacy.h b/src/lib/elementary/elm_button_legacy.h
index 05760f82db..be2beab1b1 100644
--- a/src/lib/elementary/elm_button_legacy.h
+++ b/src/lib/elementary/elm_button_legacy.h
@@ -1,3 +1,5 @@
+typedef Eo Elm_Button;
+
 /**
  * Add a new button to the parent's canvas
  *
diff --git a/src/lib/elementary/elm_check_legacy.h b/src/lib/elementary/elm_check_legacy.h
index 6cc2d05582..10240b57e2 100644
--- a/src/lib/elementary/elm_check_legacy.h
+++ b/src/lib/elementary/elm_check_legacy.h
@@ -1,3 +1,5 @@
+typedef Eo Elm_Check;
+
 /**
  * @brief Add a new Check object
  *
diff --git a/src/lib/elementary/elm_datetime.h b/src/lib/elementary/elm_datetime.h
index 9a111a1be9..cc47da298d 100644
--- a/src/lib/elementary/elm_datetime.h
+++ b/src/lib/elementary/elm_datetime.h
@@ -214,6 +214,8 @@ typedef enum
    ELM_DATETIME_AMPM = 5 /**< Indicates AM/PM field . */
 } Elm_Datetime_Field_Type;
 
+typedef Eo Elm_Datetime;
+
 /**
  * @brief Adds a new datetime Widget
  *
diff --git a/src/lib/elementary/elm_layout_legacy.h b/src/lib/elementary/elm_layout_legacy.h
index a9fb13d2e6..58dab5bcc9 100644
--- a/src/lib/elementary/elm_layout_legacy.h
+++ b/src/lib/elementary/elm_layout_legacy.h
@@ -25,6 +25,8 @@ struct _Elm_Layout_Part_Alias_Description
                           * with "elm.content.swallow" on this one */
 };
 
+typedef Eo Elm_Layout;
+
 typedef struct _Elm_Layout_Part_Alias_Description Elm_Layout_Part_Alias_Description;
 
 /**
diff --git a/src/lib/elementary/elm_panes_legacy.h b/src/lib/elementary/elm_panes_legacy.h
index 5f85a9ba72..b33bbf0361 100644
--- a/src/lib/elementary/elm_panes_legacy.h
+++ b/src/lib/elementary/elm_panes_legacy.h
@@ -1,3 +1,5 @@
+typedef Eo Elm_Panes;
+
 /**
  * Add a new panes widget to the given parent Elementary
  * (container) object.
diff --git a/src/lib/elementary/elm_photocam_legacy.h b/src/lib/elementary/elm_photocam_legacy.h
index 309644b066..b56f8b018b 100644
--- a/src/lib/elementary/elm_photocam_legacy.h
+++ b/src/lib/elementary/elm_photocam_legacy.h
@@ -1,5 +1,7 @@
 #include "interfaces/efl_ui_zoom.eo.legacy.h"
 
+typedef Eo Elm_Photocam;
+
 /**
  * @brief Add a new Photocam object
  *
diff --git a/src/lib/elementary/elm_progressbar_legacy.h b/src/lib/elementary/elm_progressbar_legacy.h
index 5068bc0dee..8eedf940e5 100644
--- a/src/lib/elementary/elm_progressbar_legacy.h
+++ b/src/lib/elementary/elm_progressbar_legacy.h
@@ -1,3 +1,5 @@
+typedef Eo Elm_Progressbar;
+
 /**
  * Add a new progress bar widget to the given parent Elementary
  * (container) object
@@ -283,4 +285,4 @@ EAPI void elm_progressbar_part_value_set(Evas_Object *obj, const char *part, dou
  */
 EAPI double elm_progressbar_part_value_get(const Evas_Object *obj, const char *part);
 
-#include "efl_ui_progressbar.eo.legacy.h"
\ No newline at end of file
+#include "efl_ui_progressbar.eo.legacy.h"
diff --git a/src/lib/elementary/elm_radio_legacy.h b/src/lib/elementary/elm_radio_legacy.h
index ef7735ef38..ba8b71c53e 100644
--- a/src/lib/elementary/elm_radio_legacy.h
+++ b/src/lib/elementary/elm_radio_legacy.h
@@ -1,3 +1,5 @@
+typedef Eo Elm_Radio;
+
 /**
  * @brief Add a new radio to the parent
  *
diff --git a/src/lib/elementary/elm_slider_legacy.h b/src/lib/elementary/elm_slider_legacy.h
index 37c04c0fb9..99c5097297 100644
--- a/src/lib/elementary/elm_slider_legacy.h
+++ b/src/lib/elementary/elm_slider_legacy.h
@@ -1,3 +1,5 @@
+typedef Eo Elm_Slider;
+
 /**
  * Add a new slider widget to the given parent Elementary
  * (container) object.