diff --git a/Xi/exevents.c b/Xi/exevents.c
index 4aa5fbf66..3be5c46ef 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -919,7 +919,7 @@ ProcessRawEvent(RawDeviceEvent *ev, DeviceIntPtr device)
     GrabPtr grab = device->deviceGrab.grab;
 
     if (grab)
-        DeliverGrabbedEvent(ev, device, FALSE);
+        DeliverGrabbedEvent((InternalEvent*)ev, device, FALSE);
     else { /* deliver to all root windows */
         xEvent *xi;
         int i;
@@ -1077,12 +1077,13 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
 
 
     if (grab)
-        DeliverGrabbedEvent(event, device, deactivateDeviceGrab);
+        DeliverGrabbedEvent((InternalEvent*)event, device, deactivateDeviceGrab);
     else if (device->focus && !IsPointerEvent((InternalEvent*)ev))
-	DeliverFocusedEvent(device, event, GetSpriteWindow(device));
+        DeliverFocusedEvent(device, (InternalEvent*)event,
+                            GetSpriteWindow(device));
     else
-	DeliverDeviceEvents(GetSpriteWindow(device), event, NullGrab,
-                            NullWindow, device);
+        DeliverDeviceEvents(GetSpriteWindow(device), (InternalEvent*)event,
+                            NullGrab, NullWindow, device);
 
     if (deactivateDeviceGrab == TRUE)
 	(*device->deviceGrab.DeactivateGrab) (device);