diff --git a/src/lib/elementary/elm_win.c b/src/lib/elementary/elm_win.c
index dbc05cb25d..4053f6b791 100644
--- a/src/lib/elementary/elm_win.c
+++ b/src/lib/elementary/elm_win.c
@@ -5023,27 +5023,6 @@ _elm_win_wm_available_rotations_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int *
    return EINA_TRUE;
 }
 
-EOLIAN static void
-_elm_win_wm_manual_rotation_done_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool set)
-{
-   if (!sd->wm_rot.use) return;
-   ecore_evas_wm_rotation_manual_rotation_done_set(sd->ee, set);
-}
-
-EOLIAN static Eina_Bool
-_elm_win_wm_manual_rotation_done_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
-{
-   if (!sd->wm_rot.use) return EINA_FALSE;
-   return ecore_evas_wm_rotation_manual_rotation_done_get(sd->ee);
-}
-
-EOLIAN static void
-_elm_win_wm_manual_rotation_done_manual(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
-{
-   if (!sd->wm_rot.use) return;
-   ecore_evas_wm_rotation_manual_rotation_done(sd->ee);
-}
-
 EOLIAN static void
 _elm_win_sticky_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool sticky)
 {
@@ -6143,4 +6122,34 @@ elm_win_conformant_get(const Evas_Object *obj)
    return EINA_FALSE;
 }
 
+EAPI void
+elm_win_wm_manual_rotation_done_set(Evas_Object *obj, Eina_Bool set)
+{
+   ELM_WIN_CHECK(obj);
+   ELM_WIN_DATA_GET_OR_RETURN(obj, sd);
+
+   if (!sd->wm_rot.use) return;
+   ecore_evas_wm_rotation_manual_rotation_done_set(sd->ee, set);
+}
+
+EAPI Eina_Bool
+elm_win_wm_manual_rotation_done_get(const Evas_Object *obj)
+{
+   ELM_WIN_CHECK(obj) EINA_FALSE;
+   ELM_WIN_DATA_GET_OR_RETURN(obj, sd, EINA_FALSE);
+
+   if (!sd->wm_rot.use) return EINA_FALSE;
+   return ecore_evas_wm_rotation_manual_rotation_done_get(sd->ee);
+}
+
+EAPI void
+elm_win_wm_manual_rotation_done_manual(Evas_Object *obj)
+{
+   ELM_WIN_CHECK(obj);
+   ELM_WIN_DATA_GET_OR_RETURN(obj, sd);
+
+   if (!sd->wm_rot.use) return;
+   ecore_evas_wm_rotation_manual_rotation_done(sd->ee);
+}
+
 #include "elm_win.eo.c"
diff --git a/src/lib/elementary/elm_win.eo b/src/lib/elementary/elm_win.eo
index e7519b0fd9..e6dbedb47b 100644
--- a/src/lib/elementary/elm_win.eo
+++ b/src/lib/elementary/elm_win.eo
@@ -727,34 +727,6 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
             fullscreen: bool; [[If $true, the window is fullscreen.]]
          }
       }
-      @property wm_manual_rotation_done {
-         set {
-            [[Set the manual rotation done mode.
-
-              This function is used to set or reset the manual rotation
-              done mode. the message of rotation done is sent to WM after
-              rendering its canvas in Ecore_Evas. but if set the manual
-              rotation done mode, it's disabled and user should call
-              this explicitly to sends the message.
-
-              @since 1.9
-            ]]
-            legacy: elm_win_wm_rotation_manual_rotation_done_set;
-         }
-         get {
-            [[Get the state of manual rotation done mode.
-
-              This function is used to get the state of manual rotation
-              done mode.
-
-              @since 1.9
-            ]]
-            legacy: elm_win_wm_rotation_manual_rotation_done_get;
-         }
-         values {
-            set: bool; [[$true to set manual rotation done mode, $false otherwise.]]
-         }
-      }
       @property size_base {
          set {
             [[Set the base window size used with stepping calculation
@@ -831,8 +803,7 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
               synchronized rotation for the multiple application windows
               at same time.
 
-              See also @.wm_preferred_rotation, @.wm_available_rotations,
-              @.wm_manual_rotation_done.
+              See also @.wm_preferred_rotation, @.wm_available_rotations.
 
               @since 1.9
             ]]
@@ -983,15 +954,6 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
                 oee: Ecore_Evas *;
            }
       }
-      wm_manual_rotation_done_manual {
-         [[To notify the rotation done to WM manually.
-
-           This function is used to notify the rotation done to WM manually.
-
-           @since 1.9
-         ]]
-         legacy: elm_win_wm_rotation_manual_rotation_done;
-      }
       socket_listen {
          [[Create a socket to provide the service for Plug widget.]]
          return: bool;
diff --git a/src/lib/elementary/elm_win_legacy.h b/src/lib/elementary/elm_win_legacy.h
index 0de904c383..04cc8c835b 100644
--- a/src/lib/elementary/elm_win_legacy.h
+++ b/src/lib/elementary/elm_win_legacy.h
@@ -566,3 +566,43 @@ EAPI void elm_win_conformant_set(Evas_Object *obj, Eina_Bool conformant);
  */
 EAPI Eina_Bool elm_win_conformant_get(const Evas_Object *obj);
 
+/**
+ * @brief Set the manual rotation done mode.
+ *
+ * This function is used to set or reset the manual rotation done mode. the
+ * message of rotation done is sent to WM after rendering its canvas in
+ * Ecore_Evas. but if set the manual rotation done mode, it's disabled and user
+ * should call this explicitly to sends the message.
+ *
+ * @param[in] set @c true to set manual rotation done mode, @c false otherwise.
+ *
+ * @since 1.9
+ *
+ * @ingroup Elm_Win
+ */
+EAPI void elm_win_wm_rotation_manual_rotation_done_set(Evas_Object *obj, Eina_Bool set);
+
+/**
+ * @brief Get the state of manual rotation done mode.
+ *
+ * This function is used to get the state of manual rotation done mode.
+ *
+ * @return @c true to set manual rotation done mode, @c false otherwise.
+ *
+ * @since 1.9
+ *
+ * @ingroup Elm_Win
+ */
+EAPI Eina_Bool elm_win_wm_rotation_manual_rotation_done_get(const Evas_Object *obj);
+
+/**
+ * @brief To notify the rotation done to WM manually.
+ *
+ * This function is used to notify the rotation done to WM manually.
+ *
+ * @since 1.9
+ *
+ * @ingroup Elm_Win
+ */
+EAPI void elm_win_wm_rotation_manual_rotation_done(Evas_Object *obj);
+