diff --git a/src/core/frame.c b/src/core/frame.c
index 914b144b8..145f0b7bd 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -31,7 +31,7 @@
 #include "core/keybindings-private.h"
 #include "mtk/mtk-x11.h"
 #include "x11/meta-x11-display-private.h"
-#include "x11/window-x11.h"
+#include "x11/window-x11-private.h"
 #include "x11/window-props.h"
 
 #include <X11/Xatom.h>
@@ -59,8 +59,8 @@ meta_window_ensure_frame (MetaWindow *window)
 }
 
 void
-meta_window_set_frame_xwindow (MetaWindow *window,
-                               Window      xframe)
+meta_window_x11_set_frame_xwindow (MetaWindow *window,
+                                   Window      xframe)
 {
   MetaX11Display *x11_display = window->display->x11_display;
   XSetWindowAttributes attrs;
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 069280dc7..ed1b60a43 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -867,9 +867,6 @@ gboolean meta_window_calculate_bounds (MetaWindow *window,
                                        int        *bounds_width,
                                        int        *bounds_height);
 
-void meta_window_set_frame_xwindow (MetaWindow *window,
-                                    Window      xframe);
-
 void meta_window_maybe_apply_size_hints (MetaWindow   *window,
                                          MtkRectangle *target_rect);
 
diff --git a/src/x11/events.c b/src/x11/events.c
index 9f5c466df..03179e4af 100644
--- a/src/x11/events.c
+++ b/src/x11/events.c
@@ -1485,8 +1485,8 @@ handle_other_xevent (MetaX11Display *x11_display,
 
               if (window != NULL && window->decorated && !window->frame)
                 {
-                  meta_window_set_frame_xwindow (window,
-                                                 event->xmaprequest.window);
+                  meta_window_x11_set_frame_xwindow (window,
+                                                     event->xmaprequest.window);
                   meta_window_x11_initialize_state (window);
                   meta_window_update_visibility (window);
                 }
diff --git a/src/x11/window-x11-private.h b/src/x11/window-x11-private.h
index d8ab4dbd9..c947744ee 100644
--- a/src/x11/window-x11-private.h
+++ b/src/x11/window-x11-private.h
@@ -130,4 +130,6 @@ void meta_window_x11_shutdown_group (MetaWindow *window);
 META_EXPORT
 void meta_window_x11_group_leader_changed (MetaWindow *window);
 
+void meta_window_x11_set_frame_xwindow (MetaWindow *window,
+                                        Window      xframe);
 G_END_DECLS