diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
index a8066de1a..358750a24 100644
--- a/dix/ptrveloc.c
+++ b/dix/ptrveloc.c
@@ -670,7 +670,7 @@ QueryTrackers(DeviceVelocityPtr vel, int cur_t){
  * Perform velocity approximation based on 2D 'mickeys' (mouse motion delta).
  * return true if non-visible state reset is suggested
  */
-short
+BOOL
 ProcessVelocityData2D(
     DeviceVelocityPtr vel,
     int dx,
diff --git a/include/ptrveloc.h b/include/ptrveloc.h
index c14e12d61..6ca309c8c 100644
--- a/include/ptrveloc.h
+++ b/include/ptrveloc.h
@@ -106,7 +106,7 @@ InitVelocityData(DeviceVelocityPtr vel);
 extern _X_EXPORT void
 InitTrackers(DeviceVelocityPtr vel, int ntracker);
 
-extern _X_EXPORT short
+extern _X_EXPORT BOOL
 ProcessVelocityData2D(DeviceVelocityPtr vel, int dx, int dy, int time);
 
 extern _X_EXPORT float