diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
index bc0a4c4db..c1b25a40f 100644
--- a/Xi/xichangehierarchy.c
+++ b/Xi/xichangehierarchy.c
@@ -48,7 +48,6 @@
 #include "scrnintstr.h"         /* screen structure  */
 #include "extnsionst.h"
 #include "exglobals.h"
-#include "geext.h"
 #include "misc.h"
 #include "xace.h"
 #include "xiquerydevice.h"      /* for GetDeviceUse */
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 208e5b618..47c18817f 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -24,7 +24,6 @@
 #include "include/gc.h"
 #include "include/input.h"
 #include "include/window.h"
-#include "Xext/geext.h"
 
 /* server setting: maximum size for big requests */
 #define MAX_BIG_REQUEST_SIZE 4194303
diff --git a/dix/events.c b/dix/events.c
index f4cd7bb62..420375668 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -148,7 +148,6 @@ Equipment Corporation.
 #include "extnsionst.h"
 #include "dixevents.h"
 #include "dispatch.h"
-#include "geext.h"
 #include "dixstruct_priv.h"
 #include "eventstr.h"
 #include "enterleave.h"
diff --git a/include/dix.h b/include/dix.h
index 49d50e603..e40a3e64c 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -52,7 +52,6 @@ SOFTWARE.
 #include "window.h"
 #include "input.h"
 #include "cursor.h"
-#include "geext.h"
 #include "events.h"
 #include <X11/extensions/XI.h>
 
diff --git a/include/inputstr.h b/include/inputstr.h
index 034697104..3022944c1 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -54,7 +54,6 @@ SOFTWARE.
 #include "window.h"
 #include "dixstruct.h"
 #include "cursorstr.h"
-#include "geext.h"
 #include "privates.h"
 
 extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev,