diff --git a/dix/resource_priv.h b/dix/resource_priv.h
index 81ee48c8a..c398ecdba 100644
--- a/dix/resource_priv.h
+++ b/dix/resource_priv.h
@@ -20,6 +20,10 @@
 /* client field */
 #define RESOURCE_CLIENT_MASK   (((1 << ResourceClientBits()) - 1) << CLIENTOFFSET)
 
+/* bits and fields within a resource id */
+#define RESOURCE_AND_CLIENT_COUNT   29  /* 29 bits for XIDs */
+#define CLIENTOFFSET     (RESOURCE_AND_CLIENT_COUNT - ResourceClientBits())
+
 /* extract the client mask from an XID */
 #define CLIENT_BITS(id) ((id) & RESOURCE_CLIENT_MASK)
 
diff --git a/include/resource.h b/include/resource.h
index fa04c0fd9..3451eb5d2 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -100,9 +100,6 @@ typedef uint32_t RESTYPE;
 
 
 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())
 
 #ifdef INVALID
 #undef INVALID                  /* needed on HP/UX */
diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h
index c3485a432..88c0bc864 100644
--- a/test/xi2/protocol-common.h
+++ b/test/xi2/protocol-common.h
@@ -25,6 +25,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/resource_priv.h"
+
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "exevents.h"