diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 2a3012cf7..ae1ad2ed9 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -30,14 +30,12 @@ from The Open Group.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/extensions/bigreqsproto.h>
-
-#include "dix/dix_priv.h"
-
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
+#include "dix_priv.h"
 #include "extnsionst.h"
+#include <X11/extensions/bigreqsproto.h>
 #include "opaque.h"
 #include "extinit_priv.h"
 
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 15dbcc80c..0a9c2dc20 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -100,6 +100,9 @@ Equipment Corporation.
 #include <version-config.h>
 
 #include <stddef.h>
+#include "dix/registry_priv.h"
+
+#include "windowstr.h"
 #include <X11/fonts/fontstruct.h>
 #include <X11/fonts/libxfont2.h>
 
@@ -117,6 +120,7 @@ Equipment Corporation.
 
 #include "windowstr.h"
 #include "dixfontstr.h"
+#include "dix_priv.h"
 #include "gcstruct.h"
 #include "selection.h"
 #include "colormapst.h"
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index bb2773a24..683feac9a 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -29,21 +29,9 @@
 #define MAX_BIG_REQUEST_SIZE 4194303
 extern long maxBigRequestSize;
 
-extern char dispatchExceptionAtReset;
-extern int terminateDelay;
-extern Bool touchEmulatePointer;
-
-extern HWEventQueuePtr checkForInput[2];
-
  /* -retro mode */
 extern Bool party_like_its_1989;
 
-static inline _X_NOTSAN Bool
-InputCheckPending(void)
-{
-    return (*checkForInput[0] != *checkForInput[1]);
-}
-
 void ClearWorkQueue(void);
 void ProcessWorkQueue(void);
 void ProcessWorkQueueZombies(void);
diff --git a/dix/globals.c b/dix/globals.c
index 309b67a0c..b92476c7a 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -48,15 +48,13 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
-
-#include "dix/dix_priv.h"
-
 #include "misc.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "input.h"
 #include "dixfont.h"
 #include "dixstruct.h"
+#include "dix_priv.h"
 #include "os.h"
 
 ScreenInfo screenInfo;
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 1ff032287..426aa4edf 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -35,7 +35,6 @@
 #include <X11/Xatom.h>
 #include <X11/Xfuncproto.h>
 
-#include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
 #include "os/cmdline.h"
 #include "os/client_priv.h"
diff --git a/include/dix.h b/include/dix.h
index 65e66e06c..c81480624 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -130,15 +130,26 @@ typedef struct _WorkQueue *WorkQueuePtr;
 extern _X_EXPORT ClientPtr clients[MAXCLIENTS];
 extern _X_EXPORT ClientPtr serverClient;
 extern _X_EXPORT int currentMaxClients;
+extern _X_EXPORT char dispatchExceptionAtReset;
+extern _X_EXPORT int terminateDelay;
+extern _X_EXPORT Bool touchEmulatePointer;
+
+typedef int HWEventQueueType;
+typedef HWEventQueueType *HWEventQueuePtr;
+
+extern _X_EXPORT HWEventQueuePtr checkForInput[2];
+
+static inline _X_NOTSAN Bool
+InputCheckPending(void)
+{
+    return (*checkForInput[0] != *checkForInput[1]);
+}
 
 typedef struct _TimeStamp {
     CARD32 months;              /* really ~49.7 days */
     CARD32 milliseconds;
 } TimeStamp;
 
-typedef int HWEventQueueType;
-typedef HWEventQueueType *HWEventQueuePtr;
-
 /* dispatch.c */
 extern _X_EXPORT void SetInputCheck(HWEventQueuePtr /*c0 */ ,
                                     HWEventQueuePtr /*c1 */ );
diff --git a/os/WaitFor.c b/os/WaitFor.c
index e7cbf81e0..aa307ba55 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -54,12 +54,12 @@ SOFTWARE.
 
 #include <dix-config.h>
 
-#include <errno.h>
-#include <stdio.h>
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
 #include <X11/Xos.h>            /* for strings, fcntl, time */
+#include <errno.h>
+#include <stdio.h>
 #include <X11/X.h>
 
 #include "dix/dix_priv.h"
diff --git a/os/io.c b/os/io.c
index 167b40a72..9438cd722 100644
--- a/os/io.c
+++ b/os/io.c
@@ -80,6 +80,7 @@ SOFTWARE.
 #include "os.h"
 #include "opaque.h"
 #include "dixstruct.h"
+#include "dix_priv.h"
 #include "misc.h"
 
 CallbackListPtr ReplyCallback;
diff --git a/os/utils.c b/os/utils.c
index 2a847e2c3..d2cb23ada 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -112,6 +112,7 @@ __stdcall unsigned long GetTickCount(void);
 #include "os/osdep.h"
 
 #include "dixstruct.h"
+#include "dix_priv.h"
 #include "xkbsrv.h"
 #include "picture.h"
 #include "miinitext.h"
diff --git a/xfixes/disconnect.c b/xfixes/disconnect.c
index 41be12d95..4bd93fb61 100644
--- a/xfixes/disconnect.c
+++ b/xfixes/disconnect.c
@@ -44,8 +44,6 @@
 
 #include <dix-config.h>
 
-#include "dix/dix_priv.h"
-
 #include "xfixesint.h"
 #include "opaque.h"