diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index cb7af9e8f1..b53766dade 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -192,7 +192,6 @@ elm_legacy_eolian_files = \
 	lib/elementary/efl_ui_win_legacy.eo \
 	lib/elementary/efl_ui_progressbar_legacy.eo \
 	lib/elementary/efl_ui_clock_legacy.eo \
-	lib/elementary/efl_ui_layout_legacy.eo \
 	lib/elementary/elm_code_widget_legacy.eo \
 	lib/elementary/efl_ui_win_socket_legacy.eo \
 	lib/elementary/efl_ui_win_inlined_legacy.eo \
@@ -326,6 +325,7 @@ lib/elementary/efl_ui_frame_legacy_eo.c \
 lib/elementary/efl_ui_image_legacy_eo.c \
 lib/elementary/efl_ui_image_zoomable_eo.legacy.c \
 lib/elementary/efl_ui_image_zoomable_legacy_eo.c \
+lib/elementary/efl_ui_layout_legacy_eo.c \
 lib/elementary/elm_hoversel_eo.c \
 lib/elementary/elm_hoversel_eo.legacy.c \
 lib/elementary/elm_hoversel_item_eo.c \
@@ -352,6 +352,8 @@ lib/elementary/efl_ui_image_legacy_eo.legacy.h \
 lib/elementary/efl_ui_image_zoomable_eo.legacy.h \
 lib/elementary/efl_ui_image_zoomable_legacy_eo.h \
 lib/elementary/efl_ui_image_zoomable_legacy_eo.legacy.h \
+lib/elementary/efl_ui_layout_legacy_eo.h \
+lib/elementary/efl_ui_layout_legacy_eo.legacy.h \
 lib/elementary/elm_hoversel_eo.h \
 lib/elementary/elm_hoversel_eo.legacy.h \
 lib/elementary/elm_hoversel_item_eo.h \
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 1662adca69..543a0176c9 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -2632,7 +2632,7 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
 #include "efl_ui_layout_base.eo.c"
 #include "efl_ui_layout.eo.c"
 
-#include "efl_ui_layout_legacy.eo.h"
+#include "efl_ui_layout_legacy_eo.h"
 
 
 EOLIAN static Eo *
@@ -2950,4 +2950,4 @@ elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, con
    return (theme_apply_ret != EFL_UI_THEME_APPLY_ERROR_GENERIC);
 }
 
-#include "efl_ui_layout_legacy.eo.c"
+#include "efl_ui_layout_legacy_eo.c"
diff --git a/src/lib/elementary/efl_ui_layout_legacy.eo b/src/lib/elementary/efl_ui_layout_legacy.eo
deleted file mode 100644
index 6f43fc18e7..0000000000
--- a/src/lib/elementary/efl_ui_layout_legacy.eo
+++ /dev/null
@@ -1,8 +0,0 @@
-class @beta Efl.Ui.Layout_Legacy extends Efl.Ui.Layout implements Efl.Ui.Legacy
-{
-   [[Elementary layout class]]
-   data: null;
-   implements {
-      Efl.Object.constructor;
-   }
-}
diff --git a/src/lib/elementary/efl_ui_layout_legacy_eo.c b/src/lib/elementary/efl_ui_layout_legacy_eo.c
new file mode 100644
index 0000000000..6bec4f9f78
--- /dev/null
+++ b/src/lib/elementary/efl_ui_layout_legacy_eo.c
@@ -0,0 +1,35 @@
+
+Efl_Object *_efl_ui_layout_legacy_efl_object_constructor(Eo *obj, void *pd);
+
+
+static Eina_Bool
+_efl_ui_layout_legacy_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef EFL_UI_LAYOUT_LEGACY_EXTRA_OPS
+#define EFL_UI_LAYOUT_LEGACY_EXTRA_OPS
+#endif
+
+   EFL_OPS_DEFINE(ops,
+      EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_layout_legacy_efl_object_constructor),
+      EFL_UI_LAYOUT_LEGACY_EXTRA_OPS
+   );
+   opsp = &ops;
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _efl_ui_layout_legacy_class_desc = {
+   EO_VERSION,
+   "Efl.Ui.Layout_Legacy",
+   EFL_CLASS_TYPE_REGULAR,
+   0,
+   _efl_ui_layout_legacy_class_initializer,
+   NULL,
+   NULL
+};
+
+EFL_DEFINE_CLASS(efl_ui_layout_legacy_class_get, &_efl_ui_layout_legacy_class_desc, EFL_UI_LAYOUT_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_layout_legacy_eo.h b/src/lib/elementary/efl_ui_layout_legacy_eo.h
new file mode 100644
index 0000000000..3ad5c08573
--- /dev/null
+++ b/src/lib/elementary/efl_ui_layout_legacy_eo.h
@@ -0,0 +1,26 @@
+#ifndef _EFL_UI_LAYOUT_LEGACY_EO_H_
+#define _EFL_UI_LAYOUT_LEGACY_EO_H_
+
+#ifndef _EFL_UI_LAYOUT_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_LAYOUT_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Layout_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_LAYOUT_LEGACY_EO_TYPES
+#define _EFL_UI_LAYOUT_LEGACY_EO_TYPES
+
+
+#endif
+#ifdef EFL_BETA_API_SUPPORT
+/** Elementary layout class
+ *
+ * @ingroup Efl_Ui_Layout_Legacy
+ */
+#define EFL_UI_LAYOUT_LEGACY_CLASS efl_ui_layout_legacy_class_get()
+
+EWAPI const Efl_Class *efl_ui_layout_legacy_class_get(void);
+#endif /* EFL_BETA_API_SUPPORT */
+
+#endif
diff --git a/src/lib/elementary/efl_ui_layout_legacy_eo.legacy.h b/src/lib/elementary/efl_ui_layout_legacy_eo.legacy.h
new file mode 100644
index 0000000000..06a8f751e0
--- /dev/null
+++ b/src/lib/elementary/efl_ui_layout_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
+#ifndef _EFL_UI_LAYOUT_LEGACY_EO_LEGACY_H_
+#define _EFL_UI_LAYOUT_LEGACY_EO_LEGACY_H_
+
+#ifndef _EFL_UI_LAYOUT_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_LAYOUT_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Layout_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_LAYOUT_LEGACY_EO_TYPES
+#define _EFL_UI_LAYOUT_LEGACY_EO_TYPES
+
+
+#endif
+
+#endif
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 904bd99fdb..722b2817ae 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -5,7 +5,6 @@ pub_legacy_eo_files = [
   'efl_ui_win_legacy.eo',
   'efl_ui_progressbar_legacy.eo',
   'efl_ui_clock_legacy.eo',
-  'efl_ui_layout_legacy.eo',
   'elm_code_widget_legacy.eo',
   'efl_ui_win_socket_legacy.eo',
   'efl_ui_win_inlined_legacy.eo',
@@ -708,6 +707,8 @@ elementary_pub_headers = [
   'efl_ui_image_zoomable_eo.legacy.h',
   'efl_ui_image_zoomable_legacy_eo.h',
   'efl_ui_image_zoomable_legacy_eo.legacy.h',
+  'efl_ui_layout_legacy_eo.h',
+  'efl_ui_layout_legacy_eo.legacy.h',
   'elm_hoversel_eo.h',
   'elm_hoversel_eo.legacy.h',
   'elm_hoversel_item_eo.h',