diff --git a/dix/resource_priv.h b/dix/resource_priv.h
index 4fb85afb4..5c2509db7 100644
--- a/dix/resource_priv.h
+++ b/dix/resource_priv.h
@@ -16,6 +16,9 @@
  */
 #define SERVER_BIT           (Mask)0x40000000        /* use illegal bit */
 
+/* extract the client mask from an XID */
+#define CLIENT_BITS(id) ((id) & RESOURCE_CLIENT_MASK)
+
 /*
  * @brief retrieve client that owns given window
  *
diff --git a/include/resource.h b/include/resource.h
index 4dc7893ae..1d2e84f01 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -107,8 +107,6 @@ extern _X_EXPORT unsigned int ResourceClientBits(void);
 #define RESOURCE_ID_MASK	((1 << CLIENTOFFSET) - 1)
 /* client field */
 #define RESOURCE_CLIENT_MASK	(((1 << ResourceClientBits()) - 1) << CLIENTOFFSET)
-/* extract the client mask from an XID */
-#define CLIENT_BITS(id) ((id) & RESOURCE_CLIENT_MASK)
 
 #ifdef INVALID
 #undef INVALID                  /* needed on HP/UX */