diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index 99e8a275b..5bb088f80 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -35,7 +35,6 @@ Xwayland_SOURCES =				\
 	xwayland-window.h			\
 	xwayland-window-buffers.c		\
 	xwayland-window-buffers.h		\
-	xwayland.h				\
 	$(top_srcdir)/Xi/stubs.c		\
 	$(top_srcdir)/mi/miinitext.c
 
diff --git a/hw/xwayland/xwayland-cursor.c b/hw/xwayland/xwayland-cursor.c
index 44ed1fa41..91728f1c1 100644
--- a/hw/xwayland/xwayland-cursor.c
+++ b/hw/xwayland/xwayland-cursor.c
@@ -32,7 +32,6 @@
 #include "inputstr.h"
 #include "mipointer.h"
 
-#include "xwayland.h"
 #include "xwayland-cursor.h"
 #include "xwayland-input.h"
 #include "xwayland-screen.h"
diff --git a/hw/xwayland/xwayland-cvt.c b/hw/xwayland/xwayland-cvt.c
index 9eafacf75..1bc3cec92 100644
--- a/hw/xwayland/xwayland-cvt.c
+++ b/hw/xwayland/xwayland-cvt.c
@@ -33,7 +33,6 @@
 
 #include <string.h>
 #include <randrstr.h>
-#include "xwayland.h"
 
 #include "xwayland-cvt.h"
 
diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
index 27190e4a4..81947a6ba 100644
--- a/hw/xwayland/xwayland-glamor-eglstream.c
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
@@ -40,7 +40,6 @@
 
 #include <epoxy/egl.h>
 
-#include "xwayland.h"
 #include "xwayland-glamor.h"
 #include "xwayland-pixmap.h"
 #include "xwayland-screen.h"
diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index 6f624f773..80655fd16 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -46,7 +46,6 @@
 #include <dri3.h>
 #include "drm-client-protocol.h"
 
-#include "xwayland.h"
 #include "xwayland-glamor.h"
 #include "xwayland-pixmap.h"
 #include "xwayland-screen.h"
diff --git a/hw/xwayland/xwayland-glamor-xv.c b/hw/xwayland/xwayland-glamor-xv.c
index fe6849cc3..23e7100e4 100644
--- a/hw/xwayland/xwayland-glamor-xv.c
+++ b/hw/xwayland/xwayland-glamor-xv.c
@@ -36,7 +36,6 @@
 
 #include <X11/extensions/Xv.h>
 
-#include "xwayland.h"
 #include "xwayland-glamor.h"
 
 #define NUM_FORMATS    3
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index f18196cec..d9523b0a7 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -23,9 +23,7 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
+#include <xwayland-config.h>
 
 #define MESA_EGL_NO_X11_HEADERS
 #define EGL_NO_X11
@@ -37,7 +35,6 @@
 #include "glx_extinit.h"
 #endif
 
-#include "xwayland.h"
 #include "xwayland-glamor.h"
 #include "xwayland-glx.h"
 #include "xwayland-screen.h"
diff --git a/hw/xwayland/xwayland-glamor.h b/hw/xwayland/xwayland-glamor.h
index 78e0d6ddd..e9896bfef 100644
--- a/hw/xwayland/xwayland-glamor.h
+++ b/hw/xwayland/xwayland-glamor.h
@@ -28,6 +28,8 @@
 
 #include <xwayland-config.h>
 
+#include <wayland-client.h>
+
 #include "xwayland-types.h"
 
 struct xwl_egl_backend {
diff --git a/hw/xwayland/xwayland-glx.c b/hw/xwayland/xwayland-glx.c
index c5c634c08..4fd3e6905 100644
--- a/hw/xwayland/xwayland-glx.c
+++ b/hw/xwayland/xwayland-glx.c
@@ -31,7 +31,7 @@
  */
 
 #include <xwayland-config.h>
-#include "xwayland.h"
+
 #define MESA_EGL_NO_X11_HEADERS
 #define EGL_NO_X11
 // #include <EGL/egl.h>
diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index a7be75d41..beaac192f 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -39,7 +39,6 @@
 #include <mipointrst.h>
 #include <misc.h>
 
-#include "xwayland.h"
 #include "xwayland-cursor.h"
 #include "xwayland-input.h"
 #include "xwayland-window.h"
diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
index 6ed8ef3d6..fab47fe35 100644
--- a/hw/xwayland/xwayland-output.c
+++ b/hw/xwayland/xwayland-output.c
@@ -28,7 +28,6 @@
 #include <randrstr.h>
 #include <X11/Xatom.h>
 
-#include "xwayland.h"
 #include "xwayland-cvt.h"
 #include "xwayland-output.h"
 #include "xwayland-screen.h"
diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c
index 5b9ee201f..09fa66a6a 100644
--- a/hw/xwayland/xwayland-present.c
+++ b/hw/xwayland/xwayland-present.c
@@ -23,14 +23,11 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
+#include <xwayland-config.h>
 
 #include <windowstr.h>
 #include <present.h>
 
-#include "xwayland.h"
 #include "xwayland-present.h"
 #include "xwayland-screen.h"
 #include "xwayland-window.h"
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 4932d2cdd..b84252306 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -47,7 +47,6 @@
 #include "xwayland-pixmap.h"
 #include "xwayland-present.h"
 #include "xwayland-shm.h"
-#include "xwayland.h"
 
 #include "xdg-output-unstable-v1-client-protocol.h"
 #include "viewporter-client-protocol.h"
diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c
index 388e0f0f2..84d58874a 100644
--- a/hw/xwayland/xwayland-shm.c
+++ b/hw/xwayland/xwayland-shm.c
@@ -40,7 +40,6 @@
 #include "os.h"
 #include "pixmapstr.h"
 
-#include "xwayland.h"
 #include "xwayland-pixmap.h"
 #include "xwayland-screen.h"
 #include "xwayland-shm.h"
diff --git a/hw/xwayland/xwayland-vidmode.c b/hw/xwayland/xwayland-vidmode.c
index 137200250..100ccb411 100644
--- a/hw/xwayland/xwayland-vidmode.c
+++ b/hw/xwayland/xwayland-vidmode.c
@@ -35,7 +35,7 @@
 #include "extinit.h"
 
 #ifdef XF86VIDMODE
-#include "xwayland.h"
+
 #include "randrstr.h"
 #include "vidmodestr.h"
 
diff --git a/hw/xwayland/xwayland-window-buffers.h b/hw/xwayland/xwayland-window-buffers.h
index c6b2092e3..8031f24d5 100644
--- a/hw/xwayland/xwayland-window-buffers.h
+++ b/hw/xwayland/xwayland-window-buffers.h
@@ -24,11 +24,14 @@
  *      Olivier Fourdan <ofourdan@redhat.com>
  */
 
-#include "xwayland.h"
-
 #ifndef XWAYLAND_WINDOW_BUFFERS_H
 #define XWAYLAND_WINDOW_BUFFERS_H
 
+#include <xwayland-config.h>
+
+#include "xwayland-types.h"
+#include "regionstr.h"
+
 void xwl_window_buffers_init(struct xwl_window *xwl_window);
 void xwl_window_buffers_recycle(struct xwl_window *xwl_window);
 void xwl_window_buffers_dispose(struct xwl_window *xwl_window);
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index fee49c11e..a9128fb3d 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -42,7 +42,6 @@
 #include "xwayland-window.h"
 #include "xwayland-window-buffers.h"
 #include "xwayland-shm.h"
-#include "xwayland.h"
 
 #include "viewporter-client-protocol.h"
 
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index ff85ebbd8..608163101 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -23,6 +23,8 @@
  * SOFTWARE.
  */
 
+#include <xwayland-config.h>
+
 #include <stdio.h>
 
 #include <X11/Xatom.h>
@@ -36,7 +38,6 @@
 #include <xserver_poll.h>
 #include <propertyst.h>
 
-#include "xwayland.h"
 #include "xwayland-screen.h"
 #include "xwayland-vidmode.h"
 
diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
deleted file mode 100644
index f6552978a..000000000
--- a/hw/xwayland/xwayland.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright © 2014 Intel Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of the
- * copyright holders not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#ifndef XWAYLAND_H
-#define XWAYLAND_H
-
-#include <xwayland-config.h>
-
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <wayland-client.h>
-
-#include <X11/X.h>
-
-#include <fb.h>
-#include <dix.h>
-#include <exevents.h>
-
-#include "relative-pointer-unstable-v1-client-protocol.h"
-#include "pointer-constraints-unstable-v1-client-protocol.h"
-#include "tablet-unstable-v2-client-protocol.h"
-#include "xwayland-keyboard-grab-unstable-v1-client-protocol.h"
-#include "linux-dmabuf-unstable-v1-client-protocol.h"
-
-#include "xwayland-types.h"
-
-#endif