diff --git a/composite/compext.c b/composite/compext.c
index fa4719ca7..605d19ce3 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -43,6 +43,8 @@
 
 #include <dix-config.h>
 
+#include "dix/dix_priv.h"
+
 #include "compint.h"
 #include "xace.h"
 #include "protocol-versions.h"
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 3a355f5f4..7de9ada0f 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -29,6 +29,14 @@
 #include "include/resource.h"
 #include "include/window.h"
 
+#define LEGAL_NEW_RESOURCE(id,client)           \
+    do {                                        \
+        if (!LegalNewID((id), (client))) {      \
+            (client)->errorValue = (id);        \
+            return BadIDChoice;                 \
+        }                                       \
+    } while (0)
+
 /* server setting: maximum size for big requests */
 #define MAX_BIG_REQUEST_SIZE 4194303
 extern long maxBigRequestSize;
diff --git a/glx/glxext.c b/glx/glxext.c
index 216dea98d..c8a8b2161 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -32,6 +32,7 @@
 
 #include <string.h>
 
+#include "dix/dix_priv.h"
 #include "os/client_priv.h"
 
 #include "glxserver.h"
diff --git a/glx/vnd_dispatch_stubs.c b/glx/vnd_dispatch_stubs.c
index 629160fe7..6de071ee0 100644
--- a/glx/vnd_dispatch_stubs.c
+++ b/glx/vnd_dispatch_stubs.c
@@ -1,5 +1,8 @@
 
 #include <dix-config.h>
+
+#include "dix/dix_priv.h"
+
 #include <dix.h>
 #include "vndserver.h"
 
diff --git a/include/dix.h b/include/dix.h
index b3c0705a6..350e39828 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -92,14 +92,6 @@ SOFTWARE.
             return(BadLength);                                          \
     } while (0)
 
-#define LEGAL_NEW_RESOURCE(id,client)           \
-    do {                                        \
-        if (!LegalNewID((id), (client))) {      \
-            (client)->errorValue = (id);        \
-            return BadIDChoice;                 \
-        }                                       \
-    } while (0)
-
 #define WriteReplyToClient(pClient, size, pReply)                       \
     do {                                                                \
         if ((pClient)->swapped)                                         \
diff --git a/present/present_event.c b/present/present_event.c
index 59945cf3e..3ef9e4563 100644
--- a/present/present_event.c
+++ b/present/present_event.c
@@ -21,6 +21,7 @@
  */
 #include <dix-config.h>
 
+#include "dix/dix_priv.h"
 #include "Xext/geext_priv.h"
 
 #include "present_priv.h"
diff --git a/record/record.c b/record/record.c
index 687e5e1d1..bc6ba3cda 100644
--- a/record/record.c
+++ b/record/record.c
@@ -34,6 +34,12 @@ and Jim Haggerty of Metheus.
 
 #include <dix-config.h>
 
+#include <stdio.h>
+#include <assert.h>
+#include <X11/Xmd.h>
+#include <X11/extensions/recordproto.h>
+
+#include "dix/dix_priv.h"
 #include "dix/cursor_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/input_priv.h"
@@ -43,15 +49,11 @@ and Jim Haggerty of Metheus.
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "extinit_priv.h"
-#include <X11/extensions/recordproto.h>
 #include "set.h"
 #include "swaprep.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
 
-#include <stdio.h>
-#include <assert.h>
-
 #ifdef XINERAMA
 #include "globals.h"
 #include "panoramiX.h"