merge XFree86 4.3.0.1 to -CURRENT

38 files changed, 316 insertions, 239 deletions

diff --git a/src/XAllowDv.c b/src/XAllowDv.c
index 200bb4b..d88001b 100644
--- a/src/XAllowDv.c
+++ b/src/XAllowDv.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XAllowDv.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XAllowDeviceEvents (dpy, dev, event_mode, time)
@@ -66,7 +68,7 @@ XAllowDeviceEvents (dpy, dev, event_mode, time)
     Time		time;
     {       
     xAllowDeviceEventsReq 	*req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XChgDCtl.c b/src/XChgDCtl.c
index 038136a..ec08db0 100644
--- a/src/XChgDCtl.c
+++ b/src/XChgDCtl.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XChgDCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -53,11 +54,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XChangeDeviceControl (dpy, dev, control, d)
@@ -69,7 +71,7 @@ XChangeDeviceControl (dpy, dev, control, d)
     int length;
     xChangeDeviceControlReq	*req;
     xChangeDeviceControlReply	rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Add_XChangeDeviceControl) == -1)
diff --git a/src/XChgFCtl.c b/src/XChgFCtl.c
index 75fe93c..36f5893 100644
--- a/src/XChgFCtl.c
+++ b/src/XChgFCtl.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XChgFCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -53,11 +54,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XChangeFeedbackControl (dpy, dev, mask, f)
@@ -68,7 +70,7 @@ XChangeFeedbackControl (dpy, dev, mask, f)
     {
     int length;
     xChangeFeedbackControlReq	*req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XChgKMap.c b/src/XChgKMap.c
index 74c1481..c698cc9 100644
--- a/src/XChgKMap.c
+++ b/src/XChgKMap.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XChgKMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XChangeDeviceKeyMapping (dpy, dev, first, syms_per_code, keysyms, count)
@@ -69,7 +71,7 @@ XChangeDeviceKeyMapping (dpy, dev, first, syms_per_code, keysyms, count)
     {
     register long nbytes;
     xChangeDeviceKeyMappingReq *req;
-    XExtDisplayInfo 	*info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XChgKbd.c b/src/XChgKbd.c
index 089f124..c4d31ba 100644
--- a/src/XChgKbd.c
+++ b/src/XChgKbd.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XChgKbd.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XChangeKeyboardDevice (dpy, dev)
@@ -65,7 +67,7 @@ XChangeKeyboardDevice (dpy, dev)
     {       
     xChangeKeyboardDeviceReq 	*req;
     xChangeKeyboardDeviceReply 	rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XChgPnt.c b/src/XChgPnt.c
index e1dbb1e..78e54c2 100644
--- a/src/XChgPnt.c
+++ b/src/XChgPnt.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XChgPnt.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XChangePointerDevice (dpy, dev, xaxis, yaxis)
@@ -67,7 +69,7 @@ XChangePointerDevice (dpy, dev, xaxis, yaxis)
     {       
     xChangePointerDeviceReq 	*req;
     xChangePointerDeviceReply 	rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XChgProp.c b/src/XChgProp.c
index 2426759..dc09621 100644
--- a/src/XChgProp.c
+++ b/src/XChgProp.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XChgProp.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -53,11 +54,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XChangeDeviceDontPropagateList (dpy, window, count, events, mode)
@@ -68,7 +70,7 @@ XChangeDeviceDontPropagateList (dpy, window, count, events, mode)
     int 		mode;
     {       
     xChangeDeviceDontPropagateListReq 	*req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XCloseDev.c b/src/XCloseDev.c
index f4da25e..ab6c25f 100644
--- a/src/XCloseDev.c
+++ b/src/XCloseDev.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XCloseDev.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XI.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XCloseDevice(dpy, dev)
@@ -64,7 +66,7 @@ XCloseDevice(dpy, dev)
     register XDevice	*dev;
     {	
     xCloseDeviceReq 	*req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XDevBell.c b/src/XDevBell.c
index b352a06..2184530 100644
--- a/src/XDevBell.c
+++ b/src/XDevBell.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XDevBell.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XDeviceBell (dpy, dev, feedbackclass, feedbackid, percent)
@@ -66,7 +68,7 @@ XDeviceBell (dpy, dev, feedbackclass, feedbackid, percent)
     int			percent;
     {       
     xDeviceBellReq 	*req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Add_XDeviceBell) == -1)
diff --git a/src/XExtInt.c b/src/XExtInt.c
index b8da8a0..ebd0614 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XExtInt.c,v 3.7 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -55,11 +56,12 @@ SOFTWARE.
 #define NEED_EVENTS
 #define NEED_REPLIES
 #include <stdio.h>
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 #define ENQUEUE_EVENT	True
 #define DONT_ENQUEUE	False
@@ -132,7 +134,7 @@ void _xibaddevice (dpy, error)
     Display *dpy;
     int *error;
     {
-    XExtDisplayInfo 	*info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
     *error = info->codes->first_error + XI_BadDevice;
     }
 
@@ -140,7 +142,7 @@ void _xibadclass (dpy, error)
     Display *dpy;
     int *error;
     {
-    XExtDisplayInfo 	*info = (XExtDisplayInfo *) XInput_find_display (dpy); 
+    XExtDisplayInfo *info = XInput_find_display (dpy); 
     *error = info->codes->first_error + XI_BadClass;
     }
 
@@ -148,7 +150,7 @@ void _xibadevent (dpy, error)
     Display *dpy;
     int *error;
     {
-    XExtDisplayInfo 	*info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
     *error = info->codes->first_error + XI_BadEvent;
     }
 
@@ -156,7 +158,7 @@ void _xibadmode (dpy, error)
     Display *dpy;
     int *error;
     {
-    XExtDisplayInfo 	*info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
     *error = info->codes->first_error + XI_BadMode;
     }
 
@@ -164,7 +166,7 @@ void _xidevicebusy (dpy, error)
     Display *dpy;
     int *error;
     {
-    XExtDisplayInfo 	*info = (XExtDisplayInfo *) XInput_find_display (dpy); 
+    XExtDisplayInfo *info = XInput_find_display (dpy); 
     *error = info->codes->first_error + XI_DeviceBusy;
     }
 
@@ -175,6 +177,7 @@ void _xidevicebusy (dpy, error)
  *
  */
 
+int
 _XiCheckExtInit(dpy, version_index)
     register	Display *dpy;
     register	int	version_index;
diff --git a/src/XExtToWire.c b/src/XExtToWire.c
index abdaf14..aefcfbb 100644
--- a/src/XExtToWire.c
+++ b/src/XExtToWire.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XExtToWire.c,v 3.6 2002/10/16 12:56:28 tsi Exp $ */
 
 /****************************************************************
  *
@@ -54,10 +55,11 @@ SOFTWARE.
 #define NEED_EVENTS
 #define NEED_REPLIES
 
-#include "Xlibint.h"
-#include "XInput.h"
-#include "XIproto.h"
-#include "extutil.h"
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 Status
 _XiEventToWire(dpy, re, event, count)
@@ -66,7 +68,7 @@ _XiEventToWire(dpy, re, event, count)
     register xEvent **event;	/* wire protocol event */
     register int *count;
     {
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
     int i;
 
     switch ((re->type & 0x7f) - info->codes->first_event) 
@@ -81,7 +83,7 @@ _XiEventToWire(dpy, re, event, count)
 	    *count = 2;
 	    kev = (deviceKeyButtonPointer *) Xmalloc (*count * sizeof (xEvent));
 	    if (!kev)
-	        return(_XUnknownNativeEvent(dpy, re, event));
+	        return(_XUnknownNativeEvent(dpy, re, *event));
 	    *event = (xEvent *) kev;
 
 	    kev->type		= ev->type;
@@ -128,7 +130,7 @@ _XiEventToWire(dpy, re, event, count)
 	    *count = 2;
 	    pev = (deviceKeyButtonPointer *) Xmalloc (*count * sizeof (xEvent));
 	    if (!pev)
-	        return(_XUnknownNativeEvent(dpy, re, event));
+	        return(_XUnknownNativeEvent(dpy, re, *event));
 	    *event = (xEvent *) pev;
 
 	    pev->type		= ev->type;
@@ -175,7 +177,7 @@ _XiEventToWire(dpy, re, event, count)
 	    *count = 2;
 	    bev = (deviceKeyButtonPointer *) Xmalloc (*count * sizeof (xEvent));
 	    if (!bev)
-	        return(_XUnknownNativeEvent(dpy, re, event));
+	        return(_XUnknownNativeEvent(dpy, re, *event));
 	    *event = (xEvent *) bev;
 
 	    bev->type		= ev->type;
@@ -222,7 +224,7 @@ _XiEventToWire(dpy, re, event, count)
 	    *count = 2;
 	    mev = (deviceKeyButtonPointer *) Xmalloc (*count * sizeof (xEvent));
 	    if (!mev)
-	        return(_XUnknownNativeEvent(dpy, re, event));
+	        return(_XUnknownNativeEvent(dpy, re, *event));
 	    *event = (xEvent *) mev;
 
 	    mev->type		= ev->type;
@@ -269,7 +271,7 @@ _XiEventToWire(dpy, re, event, count)
 	    *count = 1;
 	    fev = (deviceFocus *) Xmalloc (*count * sizeof (xEvent));
 	    if (!fev)
-	        return(_XUnknownNativeEvent(dpy, re, event));
+	        return(_XUnknownNativeEvent(dpy, re, *event));
 	    *event = (xEvent *) fev;
 
 	    fev->type		= ev->type;
@@ -288,7 +290,7 @@ _XiEventToWire(dpy, re, event, count)
 	    *count = 1;
 	    mev = (deviceMappingNotify *) Xmalloc (*count * sizeof (xEvent));
 	    if (!mev)
-	        return(_XUnknownNativeEvent(dpy, re, event));
+	        return(_XUnknownNativeEvent(dpy, re, *event));
 	    *event = (xEvent *) mev;
 
 	    mev->type		= ev->type;
@@ -334,7 +336,7 @@ _XiEventToWire(dpy, re, event, count)
 
 	    sev = (deviceStateNotify *) Xmalloc (*count * sizeof (xEvent));
 	    if (!sev)
-	        return(_XUnknownNativeEvent(dpy, re, event));
+	        return(_XUnknownNativeEvent(dpy, re, *event));
 	    *event = (xEvent *) sev;
 	    tev = (xEvent *) (sev+1);
 
@@ -434,7 +436,7 @@ _XiEventToWire(dpy, re, event, count)
 	    *count = 1;
 	    cev = (changeDeviceNotify *) Xmalloc (*count * sizeof (xEvent));
 	    if (!cev)
-	        return(_XUnknownNativeEvent(dpy, re, event));
+	        return(_XUnknownNativeEvent(dpy, re, *event));
 	    *event = (xEvent *) cev;
 
 	    cev->type		= ev->type;
@@ -444,7 +446,7 @@ _XiEventToWire(dpy, re, event, count)
 	    break;
 	    }
 	default:
-	    return(_XUnknownNativeEvent(dpy, re, event));
+	    return(_XUnknownNativeEvent(dpy, re, *event));
 	}
     return(1);
     }
diff --git a/src/XFreeLst.c b/src/XFreeLst.c
index 63a5946..067a819 100644
--- a/src/XFreeLst.c
+++ b/src/XFreeLst.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XFreeLst.c,v 1.3 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -53,7 +54,7 @@ SOFTWARE.
  */
 
 #include <stdio.h>
-#include "Xlib.h"
+#include <X11/Xlib.h>
 
 /***********************************************************************
  *
diff --git a/src/XGMotion.c b/src/XGMotion.c
index 14d2cba..e065b33 100644
--- a/src/XGMotion.c
+++ b/src/XGMotion.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGMotion.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 XDeviceTimeCoord
 *XGetDeviceMotionEvents (dpy, dev, start, stop, nEvents, mode, axis_count)
@@ -74,7 +76,7 @@ XDeviceTimeCoord
     int *data, *bufp, *readp, *savp;
     long size, size2;
     int	 i, j;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XGetBMap.c b/src/XGetBMap.c
index 7c814fe..fa5eab6 100644
--- a/src/XGetBMap.c
+++ b/src/XGetBMap.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGetBMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,13 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
+
 #ifdef MIN			/* some systems define this in <sys/param.h> */
 #undef MIN
 #endif
@@ -72,7 +75,7 @@ XGetDeviceButtonMapping (dpy, device, map, nmap)
     int	status = 0;
     unsigned char mapping[256];				/* known fixed size */
     long nbytes;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     register xGetDeviceButtonMappingReq *req;
     xGetDeviceButtonMappingReply rep;
diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c
index 65c270c..2f060b0 100644
--- a/src/XGetDCtl.c
+++ b/src/XGetDCtl.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGetDCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,12 +53,13 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "Xlib.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 XDeviceControl
 *XGetDeviceControl (dpy, dev, control)
@@ -73,7 +75,7 @@ XDeviceControl
     xDeviceState *sav = NULL;
     xGetDeviceControlReq *req;
     xGetDeviceControlReply rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Add_XChangeDeviceControl) == -1)
diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c
index b941bfb..d8c3407 100644
--- a/src/XGetFCtl.c
+++ b/src/XGetFCtl.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGetFCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,12 +53,13 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "Xlib.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 XFeedbackState
 *XGetFeedbackControl (dpy, dev, num_feedbacks)
@@ -73,7 +75,7 @@ XFeedbackState
     xFeedbackState *sav = NULL;
     xGetFeedbackControlReq *req;
     xGetFeedbackControlReply rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XGetKMap.c b/src/XGetKMap.c
index 8813b8f..3ea7819 100644
--- a/src/XGetKMap.c
+++ b/src/XGetKMap.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 KeySym 
 #if NeedFunctionPrototypes
@@ -83,7 +85,7 @@ KeySym
     register KeySym *mapping = NULL;
     xGetDeviceKeyMappingReq *req;
     xGetDeviceKeyMappingReply rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XGetMMap.c b/src/XGetMMap.c
index 04615b8..4207676 100644
--- a/src/XGetMMap.c
+++ b/src/XGetMMap.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGetMMap.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 XModifierKeymap 
 *XGetDeviceModifierMapping (dpy, dev)
@@ -67,7 +69,7 @@ XModifierKeymap
     XModifierKeymap *res;
     xGetDeviceModifierMappingReq *req;
     xGetDeviceModifierMappingReply rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XGetProp.c b/src/XGetProp.c
index fdfaf8c..8eeb1b0 100644
--- a/src/XGetProp.c
+++ b/src/XGetProp.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGetProp.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -53,11 +54,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 XEventClass
 *XGetDeviceDontPropagateList (dpy, window, count)
@@ -69,7 +71,7 @@ XEventClass
     int			rlen;
     xGetDeviceDontPropagateListReq 	*req;
     xGetDeviceDontPropagateListReply 	rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XGetVers.c b/src/XGetVers.c
index dba03d8..0672e75 100644
--- a/src/XGetVers.c
+++ b/src/XGetVers.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XI.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 XExtensionVersion
 #if NeedFunctionPrototypes
@@ -72,7 +74,7 @@ XExtensionVersion
     xGetExtensionVersionReq 	*req;
     xGetExtensionVersionReply 	rep;
     XExtensionVersion		*ext;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, Dont_Check) == -1)
diff --git a/src/XGrDvBut.c b/src/XGrDvBut.c
index fc6b400..34a3fa1 100644
--- a/src/XGrDvBut.c
+++ b/src/XGrDvBut.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGrDvBut.c,v 3.5 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XGrabDeviceButton (dpy, dev, button, modifiers, modifier_device, 
@@ -75,7 +77,7 @@ XGrabDeviceButton (dpy, dev, button, modifiers, modifier_device,
     int 			other_devices_mode;
     {
     register xGrabDeviceButtonReq *req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XGrDvKey.c b/src/XGrDvKey.c
index e17d55f..437684c 100644
--- a/src/XGrDvKey.c
+++ b/src/XGrDvKey.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGrDvKey.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XGrabDeviceKey (dpy, dev, key, modifiers, modifier_device, 
@@ -75,7 +77,7 @@ XGrabDeviceKey (dpy, dev, key, modifiers, modifier_device,
     int 			other_devices_mode;
     {
     register xGrabDeviceKeyReq *req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XGrabDev.c b/src/XGrabDev.c
index 6f5ee02..8b953bf 100644
--- a/src/XGrabDev.c
+++ b/src/XGrabDev.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGrabDev.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int 
 XGrabDevice (dpy, dev, grab_window, ownerEvents, event_count, event_list,
@@ -73,7 +75,7 @@ XGrabDevice (dpy, dev, grab_window, ownerEvents, event_count, event_list,
     {
     xGrabDeviceReply rep;
     register xGrabDeviceReq *req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XGtFocus.c b/src/XGtFocus.c
index b4a00eb..0b8ef56 100644
--- a/src/XGtFocus.c
+++ b/src/XGtFocus.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGtFocus.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XGetDeviceFocus (dpy, dev, focus, revert_to, time)
@@ -68,7 +70,7 @@ XGetDeviceFocus (dpy, dev, focus, revert_to, time)
     {       
     xGetDeviceFocusReq 	*req;
     xGetDeviceFocusReply 	rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XGtSelect.c b/src/XGtSelect.c
index 2d76a4f..f1c72d0 100644
--- a/src/XGtSelect.c
+++ b/src/XGtSelect.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XGtSelect.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XGetSelectedExtensionEvents (dpy, w, this_client_count, this_client_list, 
@@ -71,7 +73,7 @@ XGetSelectedExtensionEvents (dpy, w, this_client_count, this_client_list,
     int		tlen, alen;
     register 	xGetSelectedExtensionEventsReq *req;
     xGetSelectedExtensionEventsReply rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XListDev.c b/src/XListDev.c
index 714e0c4..71e63ce 100644
--- a/src/XListDev.c
+++ b/src/XListDev.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XListDev.c,v 3.5 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -55,11 +56,12 @@ SOFTWARE.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "Xlibint.h"
-#include "XIproto.h"
-#include "XI.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 XDeviceInfo 
 *XListInputDevices(dpy, ndevices)
@@ -69,15 +71,15 @@ XDeviceInfo
     int				size;
     xListInputDevicesReq 	*req;
     xListInputDevicesReply	rep;
-    xDeviceInfo 		*list, *slist;
-    XDeviceInfo 		*sclist;
+    xDeviceInfo 		*list, *slist = NULL;
+    XDeviceInfo 		*sclist = NULL;
     XDeviceInfo 		*clist = NULL;
     xAnyClassPtr 		any, sav_any;
     XAnyClassPtr 		Any;
     char			*nptr, *Nptr;
     register int 		i,j,k;
     register long 		rlen;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XOpenDev.c b/src/XOpenDev.c
index ed1ffe1..3439882 100644
--- a/src/XOpenDev.c
+++ b/src/XOpenDev.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XOpenDev.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 XDevice
 *XOpenDevice(dpy, id)
@@ -67,7 +69,7 @@ XDevice
     xOpenDeviceReq 	*req;
     xOpenDeviceReply 	rep;
     XDevice 		*dev;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XQueryDv.c b/src/XQueryDv.c
index e9b3be7..186310c 100644
--- a/src/XQueryDv.c
+++ b/src/XQueryDv.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XQueryDv.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 XDeviceState
 *XQueryDeviceState (dpy, dev)
@@ -71,7 +73,7 @@ XDeviceState
     XDeviceState		*state = NULL;
     XInputClass			*any, *Any;
     char			*data;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XSelect.c b/src/XSelect.c
index 09ea2b4..6bef46a 100644
--- a/src/XSelect.c
+++ b/src/XSelect.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XSelect.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XSelectExtensionEvent (dpy, w, event_list, count)
@@ -66,7 +68,7 @@ XSelectExtensionEvent (dpy, w, event_list, count)
     int		count;
     {
     register 		xSelectExtensionEventReq *req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy,XInput_Initial_Release) == -1)
diff --git a/src/XSetBMap.c b/src/XSetBMap.c
index 29fc22e..34139f2 100644
--- a/src/XSetBMap.c
+++ b/src/XSetBMap.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XSetBMap.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 #define NEED_REPLIES
 
 /* returns either  DeviceMappingSuccess or DeviceMappingBusy  */
@@ -70,7 +72,7 @@ XSetDeviceButtonMapping (dpy, device, map, nmap)
     {
     register xSetDeviceButtonMappingReq *req;
     xSetDeviceButtonMappingReply rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay(dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XSetDVal.c b/src/XSetDVal.c
index 55e9bff..64da6c4 100644
--- a/src/XSetDVal.c
+++ b/src/XSetDVal.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XSetDVal.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -53,11 +54,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XSetDeviceValuators (dpy, dev, valuators, first_valuator, num_valuators)
@@ -69,7 +71,7 @@ XSetDeviceValuators (dpy, dev, valuators, first_valuator, num_valuators)
     {       
     xSetDeviceValuatorsReq 		*req;
     xSetDeviceValuatorsReply 	rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Add_XSetDeviceValuators) == -1)
diff --git a/src/XSetMMap.c b/src/XSetMMap.c
index a6a97d7..b377cd2 100644
--- a/src/XSetMMap.c
+++ b/src/XSetMMap.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XSetMMap.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int 
 XSetDeviceModifierMapping (dpy, dev, modmap)
@@ -67,7 +69,7 @@ XSetDeviceModifierMapping (dpy, dev, modmap)
     int         mapSize = modmap->max_keypermod << 3;	/* 8 modifiers */
     xSetDeviceModifierMappingReq 	*req;
     xSetDeviceModifierMappingReply 	rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XSetMode.c b/src/XSetMode.c
index 8ec69cb..85eb815 100644
--- a/src/XSetMode.c
+++ b/src/XSetMode.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XSetMode.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XSetDeviceMode (dpy, dev, mode)
@@ -66,7 +68,7 @@ XSetDeviceMode (dpy, dev, mode)
     {       
     xSetDeviceModeReq 		*req;
     xSetDeviceModeReply 	rep;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XSndExEv.c b/src/XSndExEv.c
index 78642a5..55626d0 100644
--- a/src/XSndExEv.c
+++ b/src/XSndExEv.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XSndExEv.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 extern Status _XiEventToWire();
 
@@ -76,7 +78,7 @@ XSendExtensionEvent (dpy, dev, dest, prop, count, list, event)
     xEvent 			*ev;
     register Status 		(**fp)();
     Status 			status;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XStFocus.c b/src/XStFocus.c
index e59f3b5..5b232e7 100644
--- a/src/XStFocus.c
+++ b/src/XStFocus.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XStFocus.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XSetDeviceFocus(dpy, dev, focus, revert_to, time)
@@ -67,7 +69,7 @@ XSetDeviceFocus(dpy, dev, focus, revert_to, time)
     Time	time;
     {       
     xSetDeviceFocusReq 	*req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
 
diff --git a/src/XUngrDev.c b/src/XUngrDev.c
index a241fba..ef77c64 100644
--- a/src/XUngrDev.c
+++ b/src/XUngrDev.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XUngrDev.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XUngrabDevice (dpy, dev, time)
@@ -65,7 +67,7 @@ XUngrabDevice (dpy, dev, time)
     Time time;
     {
     register xUngrabDeviceReq 	*req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XUngrDvB.c b/src/XUngrDvB.c
index 03b7eb1..1f2134d 100644
--- a/src/XUngrDvB.c
+++ b/src/XUngrDvB.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XUngrDvB.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XUngrabDeviceButton(dpy, dev, button, modifiers, modifier_dev, grab_window)
@@ -68,7 +70,7 @@ XUngrabDeviceButton(dpy, dev, button, modifiers, modifier_dev, grab_window)
     Window 			grab_window;
     {
     register xUngrabDeviceButtonReq 	*req;
-    XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+    XExtDisplayInfo *info = XInput_find_display (dpy);
 
     LockDisplay(dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
diff --git a/src/XUngrDvK.c b/src/XUngrDvK.c
index 9c9cfb3..90c4063 100644
--- a/src/XUngrDvK.c
+++ b/src/XUngrDvK.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/lib/Xi/XUngrDvK.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -52,11 +53,12 @@ SOFTWARE.
  *
  */
 
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
 
 int
 XUngrabDeviceKey (dpy, dev, key, modifiers, modifier_dev, grab_window)
@@ -68,7 +70,7 @@ XUngrabDeviceKey (dpy, dev, key, modifiers, modifier_dev, grab_window)
     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)