diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 71471e2647..24d77a1596 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -185,11 +185,8 @@ elm_private_eolian_files = \
 
 # Legacy classes - not part of public EO API
 elm_legacy_eolian_files = \
-	lib/elementary/efl_ui_win_legacy.eo \
 	lib/elementary/efl_ui_clock_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 \
 	lib/elementary/elm_interface_fileselector.eo \
 	lib/elementary/elm_calendar.eo \
 	lib/elementary/elm_calendar_item.eo \
@@ -331,6 +328,9 @@ lib/elementary/efl_ui_textpath_legacy_eo.c \
 lib/elementary/efl_ui_video_eo.legacy.c \
 lib/elementary/efl_ui_video_legacy_eo.c \
 lib/elementary/efl_ui_widget_eo.legacy.c \
+lib/elementary/efl_ui_win_inlined_legacy_eo.c \
+lib/elementary/efl_ui_win_legacy_eo.c \
+lib/elementary/efl_ui_win_socket_legacy_eo.c \
 lib/elementary/elm_hoversel_eo.c \
 lib/elementary/elm_hoversel_eo.legacy.c \
 lib/elementary/elm_hoversel_item_eo.c \
@@ -374,6 +374,12 @@ lib/elementary/efl_ui_video_eo.legacy.h \
 lib/elementary/efl_ui_video_legacy_eo.h \
 lib/elementary/efl_ui_video_legacy_eo.legacy.h \
 lib/elementary/efl_ui_widget_eo.legacy.h \
+lib/elementary/efl_ui_win_inlined_legacy_eo.h \
+lib/elementary/efl_ui_win_inlined_legacy_eo.legacy.h \
+lib/elementary/efl_ui_win_legacy_eo.h \
+lib/elementary/efl_ui_win_legacy_eo.legacy.h \
+lib/elementary/efl_ui_win_socket_legacy_eo.h \
+lib/elementary/efl_ui_win_socket_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_win.c b/src/lib/elementary/efl_ui_win.c
index 1458d9a7fe..410eeb8f66 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -32,9 +32,9 @@
 #include "elm_part_helper.h"
 #include "efl_ui_win_part.eo.h"
 #include "elm_plug.eo.h"
-#include "efl_ui_win_legacy.eo.h"
-#include "efl_ui_win_socket_legacy.eo.h"
-#include "efl_ui_win_inlined_legacy.eo.h"
+#include "efl_ui_win_legacy_eo.h"
+#include "efl_ui_win_socket_legacy_eo.h"
+#include "efl_ui_win_inlined_legacy_eo.h"
 #include "efl_ui_widget_common.h"
 
 #define MY_CLASS EFL_UI_WIN_CLASS
diff --git a/src/lib/elementary/efl_ui_win_inlined.c b/src/lib/elementary/efl_ui_win_inlined.c
index 403dde50cc..f654b43b4d 100644
--- a/src/lib/elementary/efl_ui_win_inlined.c
+++ b/src/lib/elementary/efl_ui_win_inlined.c
@@ -8,7 +8,7 @@
 #include <Elementary.h>
 
 #include "elm_priv.h"
-#include "efl_ui_win_inlined_legacy.eo.h"
+#include "efl_ui_win_inlined_legacy_eo.h"
 
 #define MY_CLASS EFL_UI_WIN_INLINED_CLASS
 #define MY_CLASS_NAME "Efl.Ui.Win_Inlined"
@@ -58,4 +58,4 @@ _efl_ui_win_inlined_legacy_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
    return obj;
 }
 
-#include "efl_ui_win_inlined_legacy.eo.c"
+#include "efl_ui_win_inlined_legacy_eo.c"
diff --git a/src/lib/elementary/efl_ui_win_inlined_legacy.eo b/src/lib/elementary/efl_ui_win_inlined_legacy.eo
deleted file mode 100644
index 817160a2ea..0000000000
--- a/src/lib/elementary/efl_ui_win_inlined_legacy.eo
+++ /dev/null
@@ -1,9 +0,0 @@
-class @beta Efl.Ui.Win_Inlined_Legacy extends Efl.Ui.Win_Inlined implements Efl.Ui.Legacy
-{
-   [[Elementary window inlined class]]
-   data: null;
-   implements {
-      class.constructor;
-      Efl.Object.finalize;
-   }
-}
diff --git a/src/lib/elementary/efl_ui_win_inlined_legacy_eo.c b/src/lib/elementary/efl_ui_win_inlined_legacy_eo.c
new file mode 100644
index 0000000000..640f020431
--- /dev/null
+++ b/src/lib/elementary/efl_ui_win_inlined_legacy_eo.c
@@ -0,0 +1,35 @@
+
+Efl_Object *_efl_ui_win_inlined_legacy_efl_object_finalize(Eo *obj, void *pd);
+
+
+static Eina_Bool
+_efl_ui_win_inlined_legacy_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef EFL_UI_WIN_INLINED_LEGACY_EXTRA_OPS
+#define EFL_UI_WIN_INLINED_LEGACY_EXTRA_OPS
+#endif
+
+   EFL_OPS_DEFINE(ops,
+      EFL_OBJECT_OP_FUNC(efl_finalize, _efl_ui_win_inlined_legacy_efl_object_finalize),
+      EFL_UI_WIN_INLINED_LEGACY_EXTRA_OPS
+   );
+   opsp = &ops;
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _efl_ui_win_inlined_legacy_class_desc = {
+   EO_VERSION,
+   "Efl.Ui.Win_Inlined_Legacy",
+   EFL_CLASS_TYPE_REGULAR,
+   0,
+   _efl_ui_win_inlined_legacy_class_initializer,
+   _efl_ui_win_inlined_legacy_class_constructor,
+   NULL
+};
+
+EFL_DEFINE_CLASS(efl_ui_win_inlined_legacy_class_get, &_efl_ui_win_inlined_legacy_class_desc, EFL_UI_WIN_INLINED_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_win_inlined_legacy_eo.h b/src/lib/elementary/efl_ui_win_inlined_legacy_eo.h
new file mode 100644
index 0000000000..acacc7be02
--- /dev/null
+++ b/src/lib/elementary/efl_ui_win_inlined_legacy_eo.h
@@ -0,0 +1,26 @@
+#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_H_
+#define _EFL_UI_WIN_INLINED_LEGACY_EO_H_
+
+#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_WIN_INLINED_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Win_Inlined_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_TYPES
+#define _EFL_UI_WIN_INLINED_LEGACY_EO_TYPES
+
+
+#endif
+#ifdef EFL_BETA_API_SUPPORT
+/** Elementary window inlined class
+ *
+ * @ingroup Efl_Ui_Win_Inlined_Legacy
+ */
+#define EFL_UI_WIN_INLINED_LEGACY_CLASS efl_ui_win_inlined_legacy_class_get()
+
+EWAPI const Efl_Class *efl_ui_win_inlined_legacy_class_get(void);
+#endif /* EFL_BETA_API_SUPPORT */
+
+#endif
diff --git a/src/lib/elementary/efl_ui_win_inlined_legacy_eo.legacy.h b/src/lib/elementary/efl_ui_win_inlined_legacy_eo.legacy.h
new file mode 100644
index 0000000000..8d26a3bf18
--- /dev/null
+++ b/src/lib/elementary/efl_ui_win_inlined_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
+#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_LEGACY_H_
+#define _EFL_UI_WIN_INLINED_LEGACY_EO_LEGACY_H_
+
+#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_WIN_INLINED_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Win_Inlined_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_TYPES
+#define _EFL_UI_WIN_INLINED_LEGACY_EO_TYPES
+
+
+#endif
+
+#endif
diff --git a/src/lib/elementary/efl_ui_win_legacy.eo b/src/lib/elementary/efl_ui_win_legacy.eo
deleted file mode 100644
index 24d3143009..0000000000
--- a/src/lib/elementary/efl_ui_win_legacy.eo
+++ /dev/null
@@ -1,9 +0,0 @@
-class @beta Efl.Ui.Win_Legacy extends Efl.Ui.Win implements Efl.Ui.Legacy
-{
-   [[Efl UI window class]]
-   data: null;
-   implements {
-      class.constructor;
-      Efl.Object.finalize;
-   }
-}
diff --git a/src/lib/elementary/efl_ui_win_legacy_eo.c b/src/lib/elementary/efl_ui_win_legacy_eo.c
new file mode 100644
index 0000000000..8be8c6892b
--- /dev/null
+++ b/src/lib/elementary/efl_ui_win_legacy_eo.c
@@ -0,0 +1,35 @@
+
+Efl_Object *_efl_ui_win_legacy_efl_object_finalize(Eo *obj, void *pd);
+
+
+static Eina_Bool
+_efl_ui_win_legacy_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef EFL_UI_WIN_LEGACY_EXTRA_OPS
+#define EFL_UI_WIN_LEGACY_EXTRA_OPS
+#endif
+
+   EFL_OPS_DEFINE(ops,
+      EFL_OBJECT_OP_FUNC(efl_finalize, _efl_ui_win_legacy_efl_object_finalize),
+      EFL_UI_WIN_LEGACY_EXTRA_OPS
+   );
+   opsp = &ops;
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _efl_ui_win_legacy_class_desc = {
+   EO_VERSION,
+   "Efl.Ui.Win_Legacy",
+   EFL_CLASS_TYPE_REGULAR,
+   0,
+   _efl_ui_win_legacy_class_initializer,
+   _efl_ui_win_legacy_class_constructor,
+   NULL
+};
+
+EFL_DEFINE_CLASS(efl_ui_win_legacy_class_get, &_efl_ui_win_legacy_class_desc, EFL_UI_WIN_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_win_legacy_eo.h b/src/lib/elementary/efl_ui_win_legacy_eo.h
new file mode 100644
index 0000000000..70563cd14f
--- /dev/null
+++ b/src/lib/elementary/efl_ui_win_legacy_eo.h
@@ -0,0 +1,26 @@
+#ifndef _EFL_UI_WIN_LEGACY_EO_H_
+#define _EFL_UI_WIN_LEGACY_EO_H_
+
+#ifndef _EFL_UI_WIN_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_WIN_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Win_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_WIN_LEGACY_EO_TYPES
+#define _EFL_UI_WIN_LEGACY_EO_TYPES
+
+
+#endif
+#ifdef EFL_BETA_API_SUPPORT
+/** Efl UI window class
+ *
+ * @ingroup Efl_Ui_Win_Legacy
+ */
+#define EFL_UI_WIN_LEGACY_CLASS efl_ui_win_legacy_class_get()
+
+EWAPI const Efl_Class *efl_ui_win_legacy_class_get(void);
+#endif /* EFL_BETA_API_SUPPORT */
+
+#endif
diff --git a/src/lib/elementary/efl_ui_win_legacy_eo.legacy.h b/src/lib/elementary/efl_ui_win_legacy_eo.legacy.h
new file mode 100644
index 0000000000..a5d82e6e89
--- /dev/null
+++ b/src/lib/elementary/efl_ui_win_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
+#ifndef _EFL_UI_WIN_LEGACY_EO_LEGACY_H_
+#define _EFL_UI_WIN_LEGACY_EO_LEGACY_H_
+
+#ifndef _EFL_UI_WIN_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_WIN_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Win_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_WIN_LEGACY_EO_TYPES
+#define _EFL_UI_WIN_LEGACY_EO_TYPES
+
+
+#endif
+
+#endif
diff --git a/src/lib/elementary/efl_ui_win_socket.c b/src/lib/elementary/efl_ui_win_socket.c
index 544eddefbc..6e27d917c4 100644
--- a/src/lib/elementary/efl_ui_win_socket.c
+++ b/src/lib/elementary/efl_ui_win_socket.c
@@ -8,7 +8,7 @@
 #include <Elementary.h>
 
 #include "elm_priv.h"
-#include "efl_ui_win_socket_legacy.eo.h"
+#include "efl_ui_win_socket_legacy_eo.h"
 
 #define MY_CLASS EFL_UI_WIN_SOCKET_CLASS
 #define MY_CLASS_NAME "Efl.Ui.Win_Socket"
@@ -52,4 +52,4 @@ _efl_ui_win_socket_legacy_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
    return obj;
 }
 
-#include "efl_ui_win_socket_legacy.eo.c"
+#include "efl_ui_win_socket_legacy_eo.c"
diff --git a/src/lib/elementary/efl_ui_win_socket_legacy.eo b/src/lib/elementary/efl_ui_win_socket_legacy.eo
deleted file mode 100644
index 91e601908b..0000000000
--- a/src/lib/elementary/efl_ui_win_socket_legacy.eo
+++ /dev/null
@@ -1,9 +0,0 @@
-class @beta Efl.Ui.Win_Socket_Legacy extends Efl.Ui.Win_Socket implements Efl.Ui.Legacy
-{
-   [[Elementary window socket class]]
-   data: null;
-   implements {
-      class.constructor;
-      Efl.Object.finalize;
-   }
-}
diff --git a/src/lib/elementary/efl_ui_win_socket_legacy_eo.c b/src/lib/elementary/efl_ui_win_socket_legacy_eo.c
new file mode 100644
index 0000000000..4f2fcbd803
--- /dev/null
+++ b/src/lib/elementary/efl_ui_win_socket_legacy_eo.c
@@ -0,0 +1,35 @@
+
+Efl_Object *_efl_ui_win_socket_legacy_efl_object_finalize(Eo *obj, void *pd);
+
+
+static Eina_Bool
+_efl_ui_win_socket_legacy_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef EFL_UI_WIN_SOCKET_LEGACY_EXTRA_OPS
+#define EFL_UI_WIN_SOCKET_LEGACY_EXTRA_OPS
+#endif
+
+   EFL_OPS_DEFINE(ops,
+      EFL_OBJECT_OP_FUNC(efl_finalize, _efl_ui_win_socket_legacy_efl_object_finalize),
+      EFL_UI_WIN_SOCKET_LEGACY_EXTRA_OPS
+   );
+   opsp = &ops;
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _efl_ui_win_socket_legacy_class_desc = {
+   EO_VERSION,
+   "Efl.Ui.Win_Socket_Legacy",
+   EFL_CLASS_TYPE_REGULAR,
+   0,
+   _efl_ui_win_socket_legacy_class_initializer,
+   _efl_ui_win_socket_legacy_class_constructor,
+   NULL
+};
+
+EFL_DEFINE_CLASS(efl_ui_win_socket_legacy_class_get, &_efl_ui_win_socket_legacy_class_desc, EFL_UI_WIN_SOCKET_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_win_socket_legacy_eo.h b/src/lib/elementary/efl_ui_win_socket_legacy_eo.h
new file mode 100644
index 0000000000..b89a58aad1
--- /dev/null
+++ b/src/lib/elementary/efl_ui_win_socket_legacy_eo.h
@@ -0,0 +1,26 @@
+#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_H_
+#define _EFL_UI_WIN_SOCKET_LEGACY_EO_H_
+
+#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_WIN_SOCKET_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Win_Socket_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_TYPES
+#define _EFL_UI_WIN_SOCKET_LEGACY_EO_TYPES
+
+
+#endif
+#ifdef EFL_BETA_API_SUPPORT
+/** Elementary window socket class
+ *
+ * @ingroup Efl_Ui_Win_Socket_Legacy
+ */
+#define EFL_UI_WIN_SOCKET_LEGACY_CLASS efl_ui_win_socket_legacy_class_get()
+
+EWAPI const Efl_Class *efl_ui_win_socket_legacy_class_get(void);
+#endif /* EFL_BETA_API_SUPPORT */
+
+#endif
diff --git a/src/lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h b/src/lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h
new file mode 100644
index 0000000000..fce153c49b
--- /dev/null
+++ b/src/lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
+#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_LEGACY_H_
+#define _EFL_UI_WIN_SOCKET_LEGACY_EO_LEGACY_H_
+
+#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_WIN_SOCKET_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Win_Socket_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_TYPES
+#define _EFL_UI_WIN_SOCKET_LEGACY_EO_TYPES
+
+
+#endif
+
+#endif
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 83a02b1791..1758e54be9 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -1,9 +1,6 @@
 pub_legacy_eo_files = [
-  'efl_ui_win_legacy.eo',
   'efl_ui_clock_legacy.eo',
   'elm_code_widget_legacy.eo',
-  'efl_ui_win_socket_legacy.eo',
-  'efl_ui_win_inlined_legacy.eo',
   'elm_interface_fileselector.eo',
   'elm_calendar.eo',
   'elm_calendar_item.eo',
@@ -719,6 +716,12 @@ elementary_pub_headers = [
   'efl_ui_video_legacy_eo.h',
   'efl_ui_video_legacy_eo.legacy.h',
   'efl_ui_widget_eo.legacy.h',
+  'efl_ui_win_inlined_legacy_eo.h',
+  'efl_ui_win_inlined_legacy_eo.legacy.h',
+  'efl_ui_win_legacy_eo.h',
+  'efl_ui_win_legacy_eo.legacy.h',
+  'efl_ui_win_socket_legacy_eo.h',
+  'efl_ui_win_socket_legacy_eo.legacy.h',
   'elm_hoversel_eo.h',
   'elm_hoversel_eo.legacy.h',
   'elm_hoversel_item_eo.h',