diff --git a/src/meson.build b/src/meson.build
index 90d80734f..db63ed317 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -330,8 +330,6 @@ mutter_sources = [
   'core/boxes-private.h',
   'core/constraints.c',
   'core/constraints.h',
-  'core/core.c',
-  'core/core.h',
   'core/delete.c',
   'core/display.c',
   'core/display-private.h',
@@ -414,6 +412,8 @@ mutter_sources = [
   'x11/meta-x11-selection-output-stream-private.h',
   'x11/meta-x11-stack.c',
   'x11/meta-x11-stack-private.h',
+  'x11/meta-x11-window-control.c',
+  'x11/meta-x11-window-control.h',
   'x11/mutter-Xatomtype.h',
   'x11/session.c',
   'x11/session.h',
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 1cb46f7eb..39e2f2653 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -27,7 +27,6 @@
 #include <math.h>
 #include <string.h>
 
-#include "core/core.h"
 #include "core/frame.h"
 #include "core/window-private.h"
 #include "meta/boxes.h"
@@ -36,6 +35,7 @@
 #include "meta/util.h"
 #include "ui/ui.h"
 #include "ui/frames.h"
+#include "x11/meta-x11-window-control.h"
 #include "x11/window-x11-private.h"
 #include "x11/window-x11.h"
 
diff --git a/src/ui/ui.c b/src/ui/ui.c
index e96fe86fd..f716dea11 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -25,13 +25,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "core/core.h"
 #include "meta/prefs.h"
 #include "meta/util.h"
 #include "ui/frames.h"
 #include "ui/theme-private.h"
 #include "ui/ui.h"
 #include "x11/meta-x11-display-private.h"
+#include "x11/meta-x11-window-control.h"
 
 struct _MetaUI
 {
diff --git a/src/core/core.c b/src/x11/meta-x11-window-control.c
similarity index 99%
rename from src/core/core.c
rename to src/x11/meta-x11-window-control.c
index 81034b2ff..88840c179 100644
--- a/src/core/core.c
+++ b/src/x11/meta-x11-window-control.c
@@ -23,7 +23,8 @@
 
 #include "config.h"
 
-#include "core/core.h"
+#include "x11/meta-x11-window-control.h"
+
 #include "core/frame.h"
 #include "core/meta-workspace-manager-private.h"
 #include "core/util-private.h"
diff --git a/src/core/core.h b/src/x11/meta-x11-window-control.h
similarity index 96%
rename from src/core/core.h
rename to src/x11/meta-x11-window-control.h
index fa547f847..067d42918 100644
--- a/src/core/core.h
+++ b/src/x11/meta-x11-window-control.h
@@ -20,8 +20,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef META_CORE_H
-#define META_CORE_H
+#ifndef META_X11_WINDOW__CONTROL_H
+#define META_X11_WINDOW__CONTROL_H
 
 #include <gdk/gdkx.h>
 
@@ -77,4 +77,4 @@ void       meta_core_set_screen_cursor (Display *xdisplay,
                                         Window   frame_on_screen,
                                         MetaCursor cursor);
 
-#endif
+#endif /* META_X11_WINDOW_CONTROL_H */