diff --git a/Xi/extinit.c b/Xi/extinit.c
index 1376f4fca..1e7b51e08 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -810,7 +810,7 @@ static void SXIPropertyEvent(xXIPropertyEvent *from, xXIPropertyEvent *to)
 }
 
 /** Event swapping function for XI2 events. */
-static void
+void
 XI2EventSwap(xGenericEvent *from, xGenericEvent *to)
 {
     switch(from->evtype)
diff --git a/include/exevents.h b/include/exevents.h
index f58488d26..8d4b80b5c 100644
--- a/include/exevents.h
+++ b/include/exevents.h
@@ -193,6 +193,10 @@ extern _X_EXPORT void SendEventToAllWindows(
         xEvent *               /* ev */,
         int                    /* count */);
 
+extern _X_HIDDEN void XI2EventSwap(
+        xGenericEvent  *              /* from */,
+        xGenericEvent  *              /* to */);
+
 /* Input device properties */
 extern _X_EXPORT void XIDeleteAllDeviceProperties(
         DeviceIntPtr            /* device */