diff --git a/dix/dispatch.c b/dix/dispatch.c
index de372ca0c..3b4349732 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -109,6 +109,7 @@ Equipment Corporation.
 #include "dix/input_priv.h"
 #include "dix/gc_priv.h"
 #include "dix/registry_priv.h"
+#include "dix/resource_priv.h"
 #include "dix/screenint_priv.h"
 #include "include/resource.h"
 #include "os/auth.h"
diff --git a/dix/gestures.c b/dix/gestures.c
index 31179a9f7..974c46593 100644
--- a/dix/gestures.c
+++ b/dix/gestures.c
@@ -29,6 +29,7 @@
 #include "dix/dixgrabs_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/input_priv.h"
+#include "dix/resource_priv.h"
 #include "mi/mi_priv.h"
 #include "os/bug_priv.h"
 
diff --git a/dix/resource_priv.h b/dix/resource_priv.h
index 5c2509db7..20a09ec0c 100644
--- a/dix/resource_priv.h
+++ b/dix/resource_priv.h
@@ -6,6 +6,7 @@
 #define _XSERVER_DIX_RESOURCE_PRIV_H
 
 #include "include/dix.h"
+#include "include/resource.h"
 
 #define SameClient(obj,client) \
         (CLIENT_BITS((obj)->resource) == (client)->clientAsMask)
@@ -16,6 +17,9 @@
  */
 #define SERVER_BIT           (Mask)0x40000000        /* use illegal bit */
 
+/* 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)
 
diff --git a/include/resource.h b/include/resource.h
index 1d2e84f01..4031587db 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -105,8 +105,6 @@ extern _X_EXPORT unsigned int ResourceClientBits(void);
 #define CLIENTOFFSET	    (RESOURCE_AND_CLIENT_COUNT - ResourceClientBits())
 /* resource field */
 #define RESOURCE_ID_MASK	((1 << CLIENTOFFSET) - 1)
-/* client field */
-#define RESOURCE_CLIENT_MASK	(((1 << ResourceClientBits()) - 1) << CLIENTOFFSET)
 
 #ifdef INVALID
 #undef INVALID                  /* needed on HP/UX */
diff --git a/xfixes/saveset.c b/xfixes/saveset.c
index 145c146df..c8036e2de 100644
--- a/xfixes/saveset.c
+++ b/xfixes/saveset.c
@@ -23,6 +23,7 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "dix/resource_priv.h"
 
 #include "xfixesint.h"