diff --git a/src/frames/meson.build b/src/frames/meson.build
index 1ddccff23..8c00996c0 100644
--- a/src/frames/meson.build
+++ b/src/frames/meson.build
@@ -18,7 +18,7 @@ x11_frames = executable('mutter-x11-frames',
   c_args: [
     '-DG_LOG_DOMAIN="mutter-x11-frames"',
   ],
-  include_directories: top_includepath,
+  include_directories: mutter_includes,
   install: true,
   install_dir: get_option('libexecdir'),
 )
diff --git a/src/frames/meta-frame.c b/src/frames/meta-frame.c
index f17fe982c..7b55e74e5 100644
--- a/src/frames/meta-frame.c
+++ b/src/frames/meta-frame.c
@@ -27,29 +27,14 @@
 #include <gdk/x11/gdkx.h>
 #include <X11/Xatom.h>
 
+#include "x11/motif-wm-hints.h"
+
 struct _MetaFrame
 {
   GtkWindow parent_instance;
   GtkWidget *content;
 };
 
-typedef struct
-{
-  unsigned long flags;
-  unsigned long functions;
-  unsigned long decorations;
-  long input_mode;
-  unsigned long status;
-} MotifWmHints;
-
-#define MWM_HINTS_FUNCTIONS (1L << 0)
-
-#define MWM_FUNC_ALL (1L << 0)
-#define MWM_FUNC_RESIZE (1L << 1)
-#define MWM_FUNC_MINIMIZE (1L << 3)
-#define MWM_FUNC_MAXIMIZE (1L << 4)
-#define MWM_FUNC_CLOSE (1L << 5)
-
 G_DEFINE_TYPE (MetaFrame, meta_frame, GTK_TYPE_WINDOW)
 
 static void
diff --git a/src/x11/motif-wm-hints.h b/src/x11/motif-wm-hints.h
new file mode 100644
index 000000000..231aa106a
--- /dev/null
+++ b/src/x11/motif-wm-hints.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2001 Havoc Pennington
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Copied from Lesstif by way of GTK. Rudimentary docs can be
+ * found in some Motif reference guides online.
+ */
+
+typedef struct {
+    uint32_t flags;
+    uint32_t functions;
+    uint32_t decorations;
+    uint32_t input_mode;
+    uint32_t status;
+} MotifWmHints, MwmHints;
+
+#define MWM_HINTS_FUNCTIONS     (1L << 0)
+#define MWM_HINTS_DECORATIONS   (1L << 1)
+#define MWM_HINTS_INPUT_MODE    (1L << 2)
+#define MWM_HINTS_STATUS        (1L << 3)
+
+#define MWM_FUNC_ALL            (1L << 0)
+#define MWM_FUNC_RESIZE         (1L << 1)
+#define MWM_FUNC_MOVE           (1L << 2)
+#define MWM_FUNC_MINIMIZE       (1L << 3)
+#define MWM_FUNC_MAXIMIZE       (1L << 4)
+#define MWM_FUNC_CLOSE          (1L << 5)
+
+#define MWM_DECOR_ALL           (1L << 0)
+#define MWM_DECOR_BORDER        (1L << 1)
+#define MWM_DECOR_RESIZEH       (1L << 2)
+#define MWM_DECOR_TITLE         (1L << 3)
+#define MWM_DECOR_MENU          (1L << 4)
+#define MWM_DECOR_MINIMIZE      (1L << 5)
+#define MWM_DECOR_MAXIMIZE      (1L << 6)
+
+#define MWM_INPUT_MODELESS 0
+#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
+#define MWM_INPUT_SYSTEM_MODAL 2
+#define MWM_INPUT_FULL_APPLICATION_MODAL 3
+#define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
+
+#define MWM_TEAROFF_WINDOW	(1L<<0)
diff --git a/src/x11/xprops.h b/src/x11/xprops.h
index f55d80baa..e21d97d19 100644
--- a/src/x11/xprops.h
+++ b/src/x11/xprops.h
@@ -26,45 +26,7 @@
 #include <X11/extensions/sync.h>
 
 #include "meta/display.h"
-
-/* Copied from Lesstif by way of GTK. Rudimentary docs can be
- * found in some Motif reference guides online.
- */
-typedef struct {
-    uint32_t flags;
-    uint32_t functions;
-    uint32_t decorations;
-    uint32_t input_mode;
-    uint32_t status;
-} MotifWmHints, MwmHints;
-
-#define MWM_HINTS_FUNCTIONS     (1L << 0)
-#define MWM_HINTS_DECORATIONS   (1L << 1)
-#define MWM_HINTS_INPUT_MODE    (1L << 2)
-#define MWM_HINTS_STATUS        (1L << 3)
-
-#define MWM_FUNC_ALL            (1L << 0)
-#define MWM_FUNC_RESIZE         (1L << 1)
-#define MWM_FUNC_MOVE           (1L << 2)
-#define MWM_FUNC_MINIMIZE       (1L << 3)
-#define MWM_FUNC_MAXIMIZE       (1L << 4)
-#define MWM_FUNC_CLOSE          (1L << 5)
-
-#define MWM_DECOR_ALL           (1L << 0)
-#define MWM_DECOR_BORDER        (1L << 1)
-#define MWM_DECOR_RESIZEH       (1L << 2)
-#define MWM_DECOR_TITLE         (1L << 3)
-#define MWM_DECOR_MENU          (1L << 4)
-#define MWM_DECOR_MINIMIZE      (1L << 5)
-#define MWM_DECOR_MAXIMIZE      (1L << 6)
-
-#define MWM_INPUT_MODELESS 0
-#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
-#define MWM_INPUT_SYSTEM_MODAL 2
-#define MWM_INPUT_FULL_APPLICATION_MODAL 3
-#define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
-
-#define MWM_TEAROFF_WINDOW	(1L<<0)
+#include "motif-wm-hints.h"
 
 /* These all return the memory from Xlib, so require an XFree()
  * when they return TRUE. They return TRUE on success.