diff --git a/Xext/namespace/hook-receive.c b/Xext/namespace/hook-receive.c
index fb5d367298..be173e2b23 100644
--- a/Xext/namespace/hook-receive.c
+++ b/Xext/namespace/hook-receive.c
@@ -8,7 +8,6 @@
 #include "dix/registry_priv.h"
 #include "dix/resource_priv.h"
 #include "Xext/xacestr.h"
-#include "Xi/exglobals.h"
 
 #include "namespace.h"
 #include "hooks.h"
diff --git a/Xi/allowev.c b/Xi/allowev.c
index 7fecef7356..60258747d4 100644
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
 
-#include "exglobals.h"
 #include "allowev.h"
 
 /***********************************************************************
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index e1295b5fa9..4454bab2d3 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -56,8 +56,6 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>     /* control constants */
 
-#include "exglobals.h"
-
 #include "chgfctl.h"
 
 #define DO_ALL    (-1)
diff --git a/Xi/closedev.c b/Xi/closedev.c
index 5edff83e89..a005d1edfe 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -61,7 +61,6 @@ SOFTWARE.
 #include "windowstr.h"          /* window structure  */
 #include "scrnintstr.h"         /* screen structure  */
 #include "XIstubs.h"
-#include "exglobals.h"
 
 #include "closedev.h"
 
diff --git a/Xi/devbell.c b/Xi/devbell.c
index 76085c738e..bcd2a92070 100644
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@@ -55,7 +55,6 @@ SOFTWARE.
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "exglobals.h"
 
 #include "devbell.h"
 
diff --git a/Xi/getbmap.c b/Xi/getbmap.c
index dd64a92eaf..3d692c93c0 100644
--- a/Xi/getbmap.c
+++ b/Xi/getbmap.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "dix/rpcbuf_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
-#include "exglobals.h"
 
 #include "getbmap.h"
 
diff --git a/Xi/getdctl.c b/Xi/getdctl.c
index a73d741058..5f5378ad38 100644
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@@ -53,7 +53,6 @@ SOFTWARE.
 #include "dix/rpcbuf_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
-#include "exglobals.h"
 #include "getdctl.h"
 
 static void
diff --git a/Xi/getfctl.c b/Xi/getfctl.c
index b19783a213..d93845af4e 100644
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "dix/rpcbuf_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
-#include "exglobals.h"
 
 #include "getfctl.h"
 
diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index a98cbd94e0..347bbeff66 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "dix/rpcbuf_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
-#include "exglobals.h"
 #include "swaprep.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
diff --git a/Xi/getmmap.c b/Xi/getmmap.c
index e0e9685d54..9823bcb99d 100644
--- a/Xi/getmmap.c
+++ b/Xi/getmmap.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "dix/rpcbuf_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
-#include "exglobals.h"
 
 #include "getmmap.h"
 
diff --git a/Xi/getprop.c b/Xi/getprop.c
index 356e9b8565..6bf5f2bad1 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -60,7 +60,6 @@ SOFTWARE.
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structs    */
-#include "exglobals.h"
 #include "swaprep.h"
 #include "getprop.h"
 
diff --git a/Xi/getselev.c b/Xi/getselev.c
index 7f1309a39a..243e91173d 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -61,7 +61,6 @@ SOFTWARE.
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window struct     */
-#include "exglobals.h"
 #include "swaprep.h"
 #include "getprop.h"
 #include "getselev.h"
diff --git a/Xi/getvers.c b/Xi/getvers.c
index e80ec30dc6..f8e1e84bc3 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -58,7 +58,6 @@ SOFTWARE.
 #include "dix/dix_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
-#include "exevents.h"
 #include "exglobals.h"
 
 #include "getvers.h"
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index e0e8878f75..93a29656a2 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -60,7 +60,6 @@ SOFTWARE.
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
-#include "exglobals.h"
 #include "xace.h"
 #include "grabdev.h"
 #include "grabdevb.h"
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index 2fb1a95dd1..4b6f2d8b87 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -60,7 +60,6 @@ SOFTWARE.
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
-#include "exglobals.h"
 #include "xace.h"
 #include "grabdev.h"
 #include "grabdevk.h"
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index b7b10ba01c..7d81ad5893 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "dix/rpcbuf_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
-#include "exglobals.h"
 #include "gtmotion.h"
 
 /***********************************************************************
diff --git a/Xi/queryst.c b/Xi/queryst.c
index 69767dc94e..c67ece7a32 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -44,7 +44,6 @@ from The Open Group.
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
-#include "exglobals.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
 #include "queryst.h"
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index 79a93b6b70..ec03335017 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* Window            */
 #include "extnsionst.h"         /* EventSwapPtr      */
-#include "exglobals.h"
 #include "grabdev.h"
 #include "sendexev.h"
 
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index bcee494baa..7707ec8ff7 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -60,7 +60,6 @@ SOFTWARE.
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "exevents.h"
-#include "exglobals.h"
 #include "setbmap.h"
 
 /***********************************************************************
diff --git a/Xi/setdval.c b/Xi/setdval.c
index 7077d92230..81e93bc8c5 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -61,7 +61,6 @@ SOFTWARE.
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "XIstubs.h"
-#include "exglobals.h"
 #include "setdval.h"
 
 /***********************************************************************
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index 8fb158c8a8..9ca2b072ea 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -61,7 +61,6 @@ SOFTWARE.
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "exevents.h"
-#include "exglobals.h"
 #include "setmmap.h"
 
 /***********************************************************************
diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c
index 511f39202b..a1533c4d5c 100644
--- a/Xi/ungrdev.c
+++ b/Xi/ungrdev.c
@@ -58,7 +58,6 @@ SOFTWARE.
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
-#include "exglobals.h"
 #include "ungrdev.h"
 
 /***********************************************************************
diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
index 0c5fcd8304..a107e50d06 100644
--- a/Xi/xiselectev.c
+++ b/Xi/xiselectev.c
@@ -34,7 +34,6 @@
 
 #include "dixstruct.h"
 #include "windowstr.h"
-#include "exglobals.h"
 #include "xiselectev.h"
 
 /**
diff --git a/dix/getevents.c b/dix/getevents.c
index 41414f8152..553b794f80 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -61,7 +61,6 @@
 #include "windowstr.h"
 #include "xkbsrv.h"
 #include "exglobals.h"
-#include "exevents.h"
 #include "extnsionst.h"
 #include "listdev.h"            /* for sizing up DeviceClassesChangedEvent */
 
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 6adc50357e..4b4681ddfb 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -65,7 +65,6 @@
 #include "micmap.h"
 #include "xkbsrv.h"
 #include "xf86Xinput.h"
-#include "exglobals.h"
 #include "eventstr.h"
 #include "xf86Extensions.h"
 #include "misc.h"
diff --git a/mi/mieq.c b/mi/mieq.c
index 356c7c939a..92a7d41698 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -56,7 +56,6 @@ in this Software without prior written authorization from The Open Group.
 #include   "inputstr.h"
 #include   "mipointer.h"
 #include   "scrnintstr.h"
-#include   "exglobals.h"
 #include   "eventstr.h"
 
 #ifdef DPMSExtension
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 556ee84da2..3689fa0524 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -41,7 +41,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "os/log_priv.h"
 #include "xkb/xkbsrv_priv.h"
 
-#include "exglobals.h"
 #include "inputstr.h"
 #include "eventstr.h"