diff --git a/Xext/geext.c b/Xext/geext.c
index 05b5073dd..d2a32f999 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -27,7 +27,6 @@
 #include "windowstr.h"
 #include <X11/extensions/ge.h>
 
-#include "geint.h"
 #include "geext.h"
 #include "protocol-versions.h"
 #include "extinit_priv.h"
@@ -36,6 +35,8 @@ Bool noGEExtension = FALSE;
 
 DevPrivateKeyRec GEClientPrivateKeyRec;
 
+#define GEClientPrivateKey (&GEClientPrivateKeyRec)
+
 /** Struct to keep information about registered extensions */
 typedef struct _GEExtension {
     /** Event swapping routine */
@@ -44,6 +45,13 @@ typedef struct _GEExtension {
 
 static GEExtension GEExtensions[MAXEXTENSIONS];
 
+typedef struct _GEClientInfo {
+    CARD32 major_version;
+    CARD32 minor_version;
+} GEClientInfoRec, *GEClientInfoPtr;
+
+#define GEGetClient(pClient)    ((GEClientInfoPtr)(dixLookupPrivate(&((pClient)->devPrivates), GEClientPrivateKey)))
+
 /* Forward declarations */
 static void SGEGenericEvent(xEvent *from, xEvent *to);
 
diff --git a/Xext/geint.h b/Xext/geint.h
deleted file mode 100644
index 0ee28e471..000000000
--- a/Xext/geint.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2007-2008 Peter Hutterer
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Author: Peter Hutterer, University of South Australia, NICTA
- */
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _GEINT_H_
-#define _GEINT_H_
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include <X11/extensions/geproto.h>
-
-extern DevPrivateKeyRec GEClientPrivateKeyRec;
-
-#define GEClientPrivateKey (&GEClientPrivateKeyRec)
-
-typedef struct _GEClientInfo {
-    CARD32 major_version;
-    CARD32 minor_version;
-} GEClientInfoRec, *GEClientInfoPtr;
-
-#define GEGetClient(pClient)    ((GEClientInfoPtr)(dixLookupPrivate(&((pClient)->devPrivates), GEClientPrivateKey)))
-
-#endif                          /* _GEINT_H_ */
diff --git a/Xext/meson.build b/Xext/meson.build
index bfe40b7f3..457c7ef2c 100644
--- a/Xext/meson.build
+++ b/Xext/meson.build
@@ -10,7 +10,6 @@ srcs_xext = [
 
 hdrs_xext = [
     'geext.h',
-    'geint.h',
     'syncsdk.h',
 ]
 
diff --git a/dix/events.c b/dix/events.c
index e732fdc30..f4cd7bb62 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -149,7 +149,6 @@ Equipment Corporation.
 #include "dixevents.h"
 #include "dispatch.h"
 #include "geext.h"
-#include "geint.h"
 #include "dixstruct_priv.h"
 #include "eventstr.h"
 #include "enterleave.h"