--- OLD/xc/lib/Xi/XUngrDvK.c	Thu Jan  1 00:00:00 1970
+++ NEW/xc/lib/Xi/XUngrDvK.c	Thu Jan  1 00:00:00 1970
@@ -53,6 +53,7 @@
 #include "Xlibint.h"
 #include "XInput.h"
 #include "extutil.h"
+#include "XIint.h"
 
 int
 XUngrabDeviceKey (dpy, dev, key, modifiers, modifier_dev, grab_window)
@@ -64,7 +65,7 @@
     Window 			grab_window;
     {
     register xUngrabDeviceKeyReq 	*req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay(dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)