diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index f189cf50a..e3527a30e 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -39,6 +39,7 @@ void ProcessWorkQueue(void);
 void ProcessWorkQueueZombies(void);
 
 void CloseDownClient(ClientPtr client);
+ClientPtr GetCurrentClient(void);
 
 /* lookup builtin color by name */
 Bool dixLookupBuiltinColor(int screen,
diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 7447de102..65f9e6311 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -29,6 +29,8 @@
 #include <linux/input.h>
 #include <sys/mman.h>
 
+#include "dix/dix_priv.h"
+
 #include <inputstr.h>
 #include <exevents.h>
 #include <xkbsrv.h>
diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
index f77ba8278..6e263dde6 100644
--- a/hw/xwayland/xwayland-output.c
+++ b/hw/xwayland/xwayland-output.c
@@ -28,7 +28,9 @@
 #include <math.h>
 
 #include <X11/Xatom.h>
-#include "randrstr_priv.h"
+
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
 
 #include "xwayland-cvt.h"
 #include "xwayland-output.h"
diff --git a/hw/xwayland/xwayland-vidmode.c b/hw/xwayland/xwayland-vidmode.c
index eed60256e..77e57b1e4 100644
--- a/hw/xwayland/xwayland-vidmode.c
+++ b/hw/xwayland/xwayland-vidmode.c
@@ -30,6 +30,9 @@
 #endif
 
 #include <X11/X.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "extinit.h"
diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c
index 89de93afc..756a6d8f7 100644
--- a/hw/xwayland/xwayland-xtest.c
+++ b/hw/xwayland/xwayland-xtest.c
@@ -25,13 +25,15 @@
 
 #include <xwayland-config.h>
 
+#include <errno.h>
+#include <unistd.h>
+#include <libgen.h>
+#include <libei.h>
+
+#include "dix/dix_priv.h"
+
 #include <inputstr.h>
 #include <inpututils.h>
-#include <libgen.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <libei.h>
 
 #ifdef XWL_HAS_EI_PORTAL
 #include "liboeffis.h"
diff --git a/include/dix.h b/include/dix.h
index 8a7ecd345..e3fdddede 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -155,8 +155,6 @@ typedef int HWEventQueueType;
 typedef HWEventQueueType *HWEventQueuePtr;
 
 /* dispatch.c */
-extern _X_EXPORT ClientPtr GetCurrentClient(void);
-
 extern _X_EXPORT void SetInputCheck(HWEventQueuePtr /*c0 */ ,
                                     HWEventQueuePtr /*c1 */ );