diff --git a/Xext/hashtable.c b/Xext/hashtable.c
index 51f362c9a..d434969be 100644
--- a/Xext/hashtable.c
+++ b/Xext/hashtable.c
@@ -1,6 +1,9 @@
 #include <dix-config.h>
 
 #include <stdlib.h>
+
+#include "dix/resource_priv.h"
+
 #include "misc.h"
 #include "hashtable.h"
 
diff --git a/dix/resource_priv.h b/dix/resource_priv.h
index 20a09ec0c..81ee48c8a 100644
--- a/dix/resource_priv.h
+++ b/dix/resource_priv.h
@@ -23,6 +23,9 @@
 /* extract the client mask from an XID */
 #define CLIENT_BITS(id) ((id) & RESOURCE_CLIENT_MASK)
 
+/* resource field */
+#define RESOURCE_ID_MASK        ((1 << CLIENTOFFSET) - 1)
+
 /*
  * @brief retrieve client that owns given window
  *
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index ba5ab72d5..67b2278a1 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -50,6 +50,7 @@
 #include <sys/types.h>
 #include <grp.h>
 
+#include "dix/resource_priv.h"
 #include "os/osdep.h"
 
 #include "xf86.h"
diff --git a/include/resource.h b/include/resource.h
index 4031587db..fa04c0fd9 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -103,8 +103,6 @@ extern _X_EXPORT unsigned int ResourceClientBits(void);
 /* bits and fields within a resource id */
 #define RESOURCE_AND_CLIENT_COUNT   29  /* 29 bits for XIDs */
 #define CLIENTOFFSET	    (RESOURCE_AND_CLIENT_COUNT - ResourceClientBits())
-/* resource field */
-#define RESOURCE_ID_MASK	((1 << CLIENTOFFSET) - 1)
 
 #ifdef INVALID
 #undef INVALID                  /* needed on HP/UX */