diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index 4d5556339a..c81be31808 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -1380,6 +1380,8 @@ typedef enum _Ecore_X_Illume_Window_State
    ECORE_X_ILLUME_WINDOW_STATE_FLOATING
 } Ecore_X_Illume_Window_State;
 
+#ifdef EFL_BETA_API_SUPPORT
+// XXX: FIXME: re-evaluate this after looking at xdg foreign in wayland
 typedef enum _Ecore_X_Stack_Type
 {
    ECORE_X_STACK_NONE = 0,
@@ -1396,6 +1398,7 @@ typedef enum _Ecore_X_Stack_Position
    ECORE_X_STACK_POSITION_TOP,
    ECORE_X_STACK_POSITION_LAST
 } Ecore_X_Stack_Position;
+#endif
 
 /* Window layer constants */
 #define ECORE_X_WINDOW_LAYER_BELOW  2
@@ -2757,10 +2760,13 @@ EAPI Eina_Bool                             ecore_x_window_keygrab_unset(Ecore_X_
 EAPI void                                  ecore_x_e_keyrouter_set(Ecore_X_Window root, Eina_Bool on); /**< @since 1.15 */ //Key router set keyrouter flag using this
 EAPI Eina_Bool                             ecore_x_e_keyrouter_get(Ecore_X_Window root); /**< @since 1.15 */ //Client check the existance of keyrouter using this
 
-EAPI void                                  ecore_x_e_stack_type_set(Ecore_X_Window win, Ecore_X_Stack_Type stack_type); /**< @since 1.19 */
-EAPI Ecore_X_Stack_Type                    ecore_x_e_stack_type_get(Ecore_X_Window win); /**< @since 1.19 */
-EAPI void                                  ecore_x_e_stack_position_set(Ecore_X_Window win, Ecore_X_Stack_Position stack_position); /**< @since 1.19 */
-EAPI Ecore_X_Stack_Position                ecore_x_e_stack_position_get(Ecore_X_Window win); /**< @since 1.19 */
+#ifdef EFL_BETA_API_SUPPORT
+// XXX: FIXME: re-evaluate this after looking at xdg foreign in wayland
+EAPI void                                  ecore_x_e_stack_type_set(Ecore_X_Window win, Ecore_X_Stack_Type stack_type);
+EAPI Ecore_X_Stack_Type                    ecore_x_e_stack_type_get(Ecore_X_Window win);
+EAPI void                                  ecore_x_e_stack_position_set(Ecore_X_Window win, Ecore_X_Stack_Position stack_position);
+EAPI Ecore_X_Stack_Position                ecore_x_e_stack_position_get(Ecore_X_Window win);
+#endif
 
 #include <Ecore_X_Atoms.h>
 #include <Ecore_X_Cursor.h>
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 4097f66816..d1ece4ba8e 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -748,7 +748,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
               a series of dialogs or questions one after the other and
               that you may go back through history.
 
-              @since 1.19]]
+              WARNING: This API is not stable - do not use yet]]
          }
          values {
             id: string; [[An opaque string that has no specific format,
@@ -765,7 +765,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
               before the first time the window is shown and should never
               be changed after that point in time ever again.
 
-              @since 1.19]]
+              WARNING: This API is not stable - do not use yet]]
          }
          get {
             [[Get the stack master Id that has been set.]]
@@ -787,8 +787,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
            This state should be set before a window is shown for the
            first time and never changed again after that.
 
-           @since 1.19
-         ]]
+           WARNING: This API is not stable - do not use yet]]
 
          set {}
          get {}
@@ -803,7 +802,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
            This will try and delete all the windows in the stack that
            are above the window.
 
-           @since 1.19]]
+           WARNING: This API is not stable - do not use yet]]
       }
       socket_listen {
          [[Create a socket to provide the service for Plug widget.]]