diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index 7fdb5d5e0..9c4d1b1b8 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -57,6 +57,7 @@ SOFTWARE.
 
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "dix/resource_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "XIstubs.h"
diff --git a/Xi/closedev.c b/Xi/closedev.c
index 15099d054..7979facd2 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -52,11 +52,14 @@ SOFTWARE.
 
 #include <dix-config.h>
 
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+
+#include "dix/resource_priv.h"
+
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "scrnintstr.h"         /* screen structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "exglobals.h"
 
diff --git a/Xi/getselev.c b/Xi/getselev.c
index f7d6670a0..237198c11 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -55,7 +55,7 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 
-#include "dix/dix_priv.h"
+#include "dix/resource_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window struct     */
diff --git a/Xi/setdval.c b/Xi/setdval.c
index 2127e6afe..9092c0fe1 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -56,6 +56,7 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 
 #include "dix/input_priv.h"
+#include "dix/resource_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "XIstubs.h"
diff --git a/Xi/setmode.c b/Xi/setmode.c
index 9c9476134..9d0af9869 100644
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@@ -56,6 +56,7 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 
 #include "dix/input_priv.h"
+#include "dix/resource_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "XIstubs.h"
diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c
index e64d3b99c..511f39202 100644
--- a/Xi/ungrdev.c
+++ b/Xi/ungrdev.c
@@ -52,11 +52,13 @@ SOFTWARE.
 
 #include <dix-config.h>
 
+#include <X11/extensions/XIproto.h>
+
+#include "dix/resource_priv.h"
+
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
-#include <X11/extensions/XIproto.h>
 #include "exglobals.h"
-
 #include "ungrdev.h"
 
 /***********************************************************************
diff --git a/Xi/xigrabdev.c b/Xi/xigrabdev.c
index 3093114ae..39607c141 100644
--- a/Xi/xigrabdev.c
+++ b/Xi/xigrabdev.c
@@ -36,6 +36,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "dix/resource_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
diff --git a/dix/devices.c b/dix/devices.c
index b856ca5f8..4377c5f9e 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -60,6 +60,7 @@ SOFTWARE.
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
 #include "dix/ptrveloc_priv.h"
+#include "dix/resource_priv.h"
 #include "mi/mi_priv.h"
 #include "os/bug_priv.h"
 #include "os/osdep.h"
diff --git a/dix/resource_priv.h b/dix/resource_priv.h
index cdbb377c4..d118d13fd 100644
--- a/dix/resource_priv.h
+++ b/dix/resource_priv.h
@@ -7,6 +7,9 @@
 
 #include "include/dix.h"
 
+#define SameClient(obj,client) \
+        (CLIENT_BITS((obj)->resource) == (client)->clientAsMask)
+
 /*
  * @brief retrieve client that owns given window
  *
diff --git a/include/inputstr.h b/include/inputstr.h
index 6ed2d928d..3652b0d32 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -65,9 +65,6 @@ extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev,
 #define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))
 extern _X_EXPORT int CountBits(const uint8_t * mask, int len);
 
-#define SameClient(obj,client) \
-	(CLIENT_BITS((obj)->resource) == (client)->clientAsMask)
-
 #define EMASKSIZE	(MAXDEVICES + 2)
 
 /* This is the last XI2 event supported by the server. If you add