diff --git a/Xext/geext.c b/Xext/geext.c
index a861a779b..05b5073dd 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -36,6 +36,12 @@ Bool noGEExtension = FALSE;
 
 DevPrivateKeyRec GEClientPrivateKeyRec;
 
+/** Struct to keep information about registered extensions */
+typedef struct _GEExtension {
+    /** Event swapping routine */
+    void (*evswap) (xGenericEvent *from, xGenericEvent *to);
+} GEExtension, *GEExtensionPtr;
+
 static GEExtension GEExtensions[MAXEXTENSIONS];
 
 /* Forward declarations */
diff --git a/Xext/geext.h b/Xext/geext.h
index d48df8ca9..71fd3f061 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -34,12 +34,6 @@ from the author.
 #define _GEEXT_H_
 #include <X11/extensions/geproto.h>
 
-/** Struct to keep information about registered extensions */
-typedef struct _GEExtension {
-    /** Event swapping routine */
-    void (*evswap) (xGenericEvent *from, xGenericEvent *to);
-} GEExtension, *GEExtensionPtr;
-
 /* Interface for other extensions */
 extern _X_EXPORT void GERegisterExtension(int extension,
                                           void (*ev_dispatch) (xGenericEvent