diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index df0a431ac..c64ebb7f6 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -277,4 +277,15 @@ Bool MaybeDeliverEventToClient(WindowPtr pWindow,
                                ClientPtr skipClient)
     _X_ATTRIBUTE_NONNULL_ARG(1,2);
 
+/*
+ * @brief select window events to listen on
+ *
+ * @param pWindow   window to listen on
+ * @param pClient   the client that's listening on the events
+ * @param mask      mask of events to listen on
+ * @return X error code
+ */
+XRetCode EventSelectForWindow(WindowPtr pWindow, ClientPtr pClient, Mask mask)
+    _X_ATTRIBUTE_NONNULL_ARG(1,2);
+
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/events.c b/dix/events.c
index 5cb2f2a37..dc01d7911 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4536,8 +4536,7 @@ OtherClientGone(void *value, XID id)
     FatalError("client not on event list");
 }
 
-int
-EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)
+XRetCode EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)
 {
     Mask check;
     OtherClients *others;
diff --git a/include/dixevents.h b/include/dixevents.h
index 884ed6661..11b81fff2 100644
--- a/include/dixevents.h
+++ b/include/dixevents.h
@@ -26,10 +26,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef DIXEVENTS_H
 #define DIXEVENTS_H
 
-extern _X_EXPORT int EventSelectForWindow(WindowPtr /* pWin */ ,
-                                          ClientPtr /* client */ ,
-                                          Mask /* mask */ );
-
 extern _X_EXPORT int EventSuppressForWindow(WindowPtr /* pWin */ ,
                                             ClientPtr /* client */ ,
                                             Mask /* mask */ ,