diff --git a/Xi/exevents.c b/Xi/exevents.c
index a828044fa..a83d5edb3 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -952,7 +952,6 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
     KeyClassPtr k;
     ValuatorClassPtr v;
     deviceValuator *xV  = (deviceValuator *) xE;
-    int coretype = 0;
     int ret = 0;
 
     ret = UpdateDeviceState(device, xE, count);
diff --git a/Xi/warpdevp.c b/Xi/warpdevp.c
index 26081eb59..21fe22c12 100644
--- a/Xi/warpdevp.c
+++ b/Xi/warpdevp.c
@@ -48,6 +48,7 @@ from the author.
 #include "extnsionst.h"
 #include "exevents.h"
 #include "exglobals.h"
+#include "mipointer.h" /* for miPointerUpdateSprite */
 
 
 #include "warpdevp.h"