diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 8abe670c20..135d0540a8 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -47,6 +47,9 @@
 # endif
 #endif /* ! _WIN32 */
 
+// Evas internal EO APIs
+#include "Evas_Internal.h"
+
 #include "elm_widget.h"
 #include "elm_access.eo.h"
 #include "elm_code_private.h"
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 0cfa31787b..e7ba4a829c 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -14,6 +14,8 @@
 # include <Eio.h>
 #endif
 
+#include <Evas_Internal.h>
+
 #include "Emotion.h"
 #include "emotion_private.h"
 
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index e4985b0e20..29d3e06ea0 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -49,6 +49,7 @@ EAPI Eina_Bool efl_canvas_output_unlock(Efl_Canvas_Output *output);
 
 /* Internal EO APIs */
 EOAPI void efl_canvas_object_legacy_ctor(Eo *obj);
+EOAPI void efl_canvas_object_type_set(Eo *obj, const char *type);
 
 
 #ifdef __cplusplus
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index fde562b529..687cc8b1db 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -8,15 +8,6 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
    legacy_prefix: evas_object;
    data: Evas_Object_Protected_Data;
    methods {
-      @property type @protected {
-         set {
-            [[Sets the legacy type name of this Evas object.]]
-            legacy: null;
-         }
-         values {
-            type: string; [[The type of the object.]]
-         }
-      }
       @property pointer_mode_by_device {
          [[Low-level pointer behaviour by device.
            See @.pointer_mode.get and @.pointer_mode.set for more explanation.
@@ -616,9 +607,6 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
          }
       }
    }
-   constructors {
-      .type;
-   }
    implements {
       Efl.Object.constructor;
       Efl.Object.destructor;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 11ae1b7559..b0baadbfa8 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2563,11 +2563,13 @@ evas_object_size_hint_display_mode_get(const Evas_Object *obj)
 /* Internal EO APIs and hidden overrides */
 
 EOAPI EFL_VOID_FUNC_BODY(efl_canvas_object_legacy_ctor)
+EOAPI EFL_VOID_FUNC_BODYV(efl_canvas_object_type_set, EFL_FUNC_CALL(type), const char *type)
 
 #define EFL_CANVAS_OBJECT_EXTRA_OPS \
    EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_object_efl_object_dbg_info_get), \
    EFL_OBJECT_OP_FUNC(efl_event_callback_legacy_call, _efl_canvas_object_efl_object_event_callback_legacy_call), \
    EFL_OBJECT_OP_FUNC(efl_event_callback_call, _efl_canvas_object_efl_object_event_callback_call), \
-   EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_canvas_object_legacy_ctor)
+   EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_canvas_object_legacy_ctor), \
+   EFL_OBJECT_OP_FUNC(efl_canvas_object_type_set, _efl_canvas_object_type_set)
 
 #include "canvas/efl_canvas_object.eo.c"