diff --git a/dix/exevents_priv.h b/dix/exevents_priv.h
index b9e397987..681099e57 100644
--- a/dix/exevents_priv.h
+++ b/dix/exevents_priv.h
@@ -155,4 +155,8 @@ void XTestDeviceSendEvents(DeviceIntPtr dev,
                            int flags,
                            const ValuatorMask *mask);
 
+int XIPropToInt(XIPropertyValuePtr val, int *nelem_return, int **buf_return);
+
+int XIPropToFloat(XIPropertyValuePtr val, int *nelem_return, float **buf_return);
+
 #endif /* _XSERVER_EXEVENTS_PRIV_H */
diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
index cae377333..b9f611f05 100644
--- a/dix/ptrveloc.c
+++ b/dix/ptrveloc.c
@@ -26,11 +26,11 @@
 
 #include <math.h>
 
+#include "dix/exevents_priv.h"
 #include "dix/ptrveloc_priv.h"
 #include "os/bug_priv.h"
 
 #include <ptrveloc.h>
-#include <exevents.h>
 #include <X11/Xatom.h>
 #include <os.h>
 
diff --git a/include/exevents.h b/include/exevents.h
index 50a777a33..8bd405834 100644
--- a/include/exevents.h
+++ b/include/exevents.h
@@ -124,12 +124,6 @@ extern _X_EXPORT Atom XIGetKnownProperty(const char *name);
 
 extern _X_EXPORT DeviceIntPtr XIGetDevice(xEvent *ev);
 
-extern _X_EXPORT int XIPropToInt(XIPropertyValuePtr val,
-                                 int *nelem_return, int **buf_return);
-
-extern _X_EXPORT int XIPropToFloat(XIPropertyValuePtr val,
-                                   int *nelem_return, float **buf_return);
-
 /****************************************************************************
  *                      End of driver interface                             *
  ****************************************************************************/