diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index dff21efb1..acbe61421 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -28,18 +28,20 @@ from The Open Group.
 
 #include <dix-config.h>
 
+#include <stdint.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/xcmiscproto.h>
+
+#include "dix/resource_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
-#include <X11/extensions/xcmiscproto.h>
 #include "extinit_priv.h"
 
-#include <stdint.h>
-
 static int
 ProcXCMiscGetVersion(ClientPtr client)
 {
diff --git a/dix/resource_priv.h b/dix/resource_priv.h
index 4e641e583..fb8c7256d 100644
--- a/dix/resource_priv.h
+++ b/dix/resource_priv.h
@@ -5,6 +5,8 @@
 #ifndef _XSERVER_DIX_RESOURCE_PRIV_H
 #define _XSERVER_DIX_RESOURCE_PRIV_H
 
+#include <X11/Xdefs.h>
+
 #include "include/dix.h"
 #include "include/resource.h"
 
@@ -129,4 +131,16 @@ static inline Bool dixResouceIsServerOwned(XID xid) {
  */
 int HashResourceID(XID id, unsigned int numBits);
 
+/*
+ * @brief scan for free XIDs for client
+ *
+ * @param pClient the client to scan
+ * @param count maximum size of items to return
+ * @param pids pointer to XID where to return found free XIDs
+ * @result number of free XIDs
+ */
+unsigned int GetXIDList(ClientPtr pClient,
+                        unsigned int count,
+                        XID *pids);
+
 #endif /* _XSERVER_DIX_RESOURCE_PRIV_H */
diff --git a/include/resource.h b/include/resource.h
index 4742f6add..52358e6b4 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -252,10 +252,6 @@ extern _X_EXPORT void GetXIDRange(int /*client */ ,
                                   XID * /*minp */ ,
                                   XID * /*maxp */ );
 
-extern _X_EXPORT unsigned int GetXIDList(ClientPtr /*client */ ,
-                                         unsigned int /*count */ ,
-                                         XID * /*pids */ );
-
 extern _X_EXPORT RESTYPE lastResourceType;
 extern _X_EXPORT RESTYPE TypeMask;