diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index 7969edcbc..a7dc78389 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -27,6 +27,7 @@ Xwayland_SOURCES =				\
 	xwayland-output.c			\
 	xwayland-output.h			\
 	xwayland-cvt.c				\
+	xwayland-cvt.h				\
 	xwayland-vidmode.c			\
 	xwayland-window.c			\
 	xwayland-window.h			\
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index 1718e8883..e6da62a88 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -16,6 +16,7 @@ srcs = [
     'xwayland-output.c',
     'xwayland-output.h',
     'xwayland-cvt.c',
+    'xwayland-cvt.h',
     'xwayland-vidmode.c',
     'xwayland-window.c',
     'xwayland-window.h',
diff --git a/hw/xwayland/xwayland-cvt.c b/hw/xwayland/xwayland-cvt.c
index 8564fdbae..9eafacf75 100644
--- a/hw/xwayland/xwayland-cvt.c
+++ b/hw/xwayland/xwayland-cvt.c
@@ -29,14 +29,14 @@
  * code is shared directly.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
+#include <xwayland-config.h>
 
 #include <string.h>
 #include <randrstr.h>
 #include "xwayland.h"
 
+#include "xwayland-cvt.h"
+
 /*
  * Generate a CVT standard mode from HDisplay, VDisplay and VRefresh.
  *
diff --git a/hw/xwayland/xwayland-cvt.h b/hw/xwayland/xwayland-cvt.h
new file mode 100644
index 000000000..64ff41e35
--- /dev/null
+++ b/hw/xwayland/xwayland-cvt.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2005-2006 Luc Verhaegen.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef XWAYLAND_CVT_H
+#define XWAYLAND_CVT_H
+
+#include <xwayland-config.h>
+
+#include <dix.h>
+#include <randrstr.h>
+
+RRModePtr xwayland_cvt(int HDisplay, int VDisplay,
+                       float VRefresh, Bool Reduced, Bool Interlaced);
+
+#endif /* XWAYLAND_CVT_H */
diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
index 9778f881a..6ed8ef3d6 100644
--- a/hw/xwayland/xwayland-output.c
+++ b/hw/xwayland/xwayland-output.c
@@ -29,6 +29,7 @@
 #include <X11/Xatom.h>
 
 #include "xwayland.h"
+#include "xwayland-cvt.h"
 #include "xwayland-output.h"
 #include "xwayland-screen.h"
 #include "xwayland-window.h"
diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
index b084845fc..bee09330a 100644
--- a/hw/xwayland/xwayland.h
+++ b/hw/xwayland/xwayland.h
@@ -38,7 +38,6 @@
 
 #include <fb.h>
 #include <dix.h>
-#include <randrstr.h>
 #include <exevents.h>
 
 #include "relative-pointer-unstable-v1-client-protocol.h"
@@ -51,9 +50,6 @@
 
 #define MODIFIER_META 0x01
 
-RRModePtr xwayland_cvt(int HDisplay, int VDisplay,
-                       float VRefresh, Bool Reduced, Bool Interlaced);
-
 #ifdef XF86VIDMODE
 void xwlVidModeExtensionInit(void);
 #endif