diff --git a/Xi/exglobals.h b/Xi/exglobals.h
index ce66e6b503..fac08ddcae 100644
--- a/Xi/exglobals.h
+++ b/Xi/exglobals.h
@@ -51,7 +51,6 @@ extern const Mask DeviceButtonGrabMask;
 extern const Mask DeviceButtonMotionMask;
 extern const Mask DevicePresenceNotifyMask;
 extern const Mask DevicePropertyNotifyMask;
-extern const Mask XIAllMasks;
 
 extern int DeviceValuator;
 extern int DeviceKeyPress;
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 109695bf76..c2cac13bed 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -101,7 +101,6 @@ const Mask DeviceButtonGrabMask = (1L << 17);
 const Mask DeviceOwnerGrabButtonMask = (1L << 17);
 const Mask DevicePresenceNotifyMask = (1L << 18);
 const Mask DevicePropertyNotifyMask = (1L << 19);
-const Mask XIAllMasks = (1L << 20) - 1;
 
 int ExtEventIndex;
 
diff --git a/Xi/selectev.c b/Xi/selectev.c
index 6d99b08a3e..e36b09972b 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -65,6 +65,8 @@ SOFTWARE.
 #include "exglobals.h"
 #include "grabdev.h"
 
+#define XIAllMasks ((Mask)((1L << 20) - 1))
+
 static int
 HandleDevicePresenceMask(ClientPtr client, WindowPtr win,
                          XEventClass * cls, CARD16 *count)