Initial revision

36 files changed, 2071 insertions, 0 deletions

diff --git a/Xi/allowev.h b/Xi/allowev.h
new file mode 100644
index 000000000..950824927
--- /dev/null
+++ b/Xi/allowev.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.1 1996/04/15 11:18:23 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef ALLOWEV_H
+#define ALLOWEV_H 1
+
+int
+SProcXAllowDeviceEvents(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXAllowDeviceEvents(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* ALLOWEV_H */
diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h
new file mode 100644
index 000000000..4d245388d
--- /dev/null
+++ b/Xi/chgdctl.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.1 1996/04/15 11:18:25 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef CHGDCTL_H
+#define CHGDCTL_H 1
+
+int
+SProcXChangeDeviceControl(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXChangeDeviceControl(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXChangeDeviceControl (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xChangeDeviceControlReply * /* rep */
+#endif
+	);
+
+#endif /* CHGDCTL_H */
diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h
new file mode 100644
index 000000000..ebf41976c
--- /dev/null
+++ b/Xi/chgfctl.h
@@ -0,0 +1,110 @@
+/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.1 1996/04/15 11:18:26 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef CHGFCTL_H
+#define CHGFCTL_H 1
+
+int
+SProcXChangeFeedbackControl(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXChangeFeedbackControl(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ChangeKbdFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	DeviceIntPtr           /* dev */,
+	unsigned long          /* mask */,
+	KbdFeedbackPtr         /* k */,
+	xKbdFeedbackCtl *      /* f */
+#endif
+	);
+
+int
+ChangePtrFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	DeviceIntPtr           /* dev */,
+	unsigned long          /* mask */,
+	PtrFeedbackPtr         /* p */,
+	xPtrFeedbackCtl *      /* f */
+#endif
+	);
+
+int
+ChangeIntegerFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	DeviceIntPtr           /* dev */,
+	unsigned long          /* mask */,
+	IntegerFeedbackPtr     /* i */,
+	xIntegerFeedbackCtl *  /* f */
+#endif
+	);
+
+int
+ChangeStringFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	DeviceIntPtr           /* dev */,
+	unsigned long          /* mask */,
+	StringFeedbackPtr      /* s */,
+	xStringFeedbackCtl *   /* f */
+#endif
+	);
+
+int
+ChangeBellFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	DeviceIntPtr           /* dev */,
+	unsigned long          /* mask */,
+	BellFeedbackPtr        /* b */,
+	xBellFeedbackCtl *     /* f */
+#endif
+	);
+
+int
+ChangeLedFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	DeviceIntPtr           /* dev */,
+	unsigned long          /* mask */,
+	LedFeedbackPtr         /* l */,
+	xLedFeedbackCtl *      /* f */
+#endif
+	);
+
+#endif /* CHGFCTL_H */
diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h
new file mode 100644
index 000000000..98b95a6b0
--- /dev/null
+++ b/Xi/chgkbd.h
@@ -0,0 +1,54 @@
+/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.1 1996/04/15 11:18:27 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef CHGKBD_H
+#define CHGKBD_H 1
+
+int
+SProcXChangeKeyboardDevice(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXChangeKeyboardDevice (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXChangeKeyboardDevice (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xChangeKeyboardDeviceReply * /* rep */
+#endif
+	);
+
+
+#endif /* CHGKBD_H */
diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h
new file mode 100644
index 000000000..fa7035988
--- /dev/null
+++ b/Xi/chgkmap.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.1 1996/04/15 11:18:28 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef CHGKMAP_H
+#define CHGKMAP_H 1
+
+int
+SProcXChangeDeviceKeyMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXChangeDeviceKeyMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* CHGKMAP_H */
diff --git a/Xi/chgprop.h b/Xi/chgprop.h
new file mode 100644
index 000000000..a72c6f036
--- /dev/null
+++ b/Xi/chgprop.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.1 1996/04/15 11:18:29 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef CHGPROP_H
+#define CHGPROP_H 1
+
+int
+SProcXChangeDeviceDontPropagateList (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXChangeDeviceDontPropagateList (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* CHGPROP_H */
diff --git a/Xi/chgptr.h b/Xi/chgptr.h
new file mode 100644
index 000000000..93f5822fc
--- /dev/null
+++ b/Xi/chgptr.h
@@ -0,0 +1,81 @@
+/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.1 1996/04/15 11:18:31 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef CHGPTR_H
+#define CHGPTR_H 1
+
+int
+SProcXChangePointerDevice(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXChangePointerDevice (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+DeleteFocusClassDeviceStruct(
+#if NeedFunctionPrototypes
+	DeviceIntPtr           /* dev */
+#endif
+	);
+
+void
+SendEventToAllWindows (
+#if NeedFunctionPrototypes
+	DeviceIntPtr           /* dev */,
+	Mask                   /* mask */,
+	xEvent *               /* ev */,
+	int                    /* count */
+#endif
+	);
+
+void
+FindInterestedChildren ( /* FIXME: could be static? */
+#if NeedFunctionPrototypes
+	DeviceIntPtr           /* dev */,
+	WindowPtr              /* p1 */,
+	Mask                   /* mask */,
+	xEvent *               /* ev */,
+	int                    /* count */
+#endif
+	);
+
+void
+SRepXChangePointerDevice (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xChangePointerDeviceReply * /* rep */
+#endif
+	);
+
+#endif /* CHGPTR_H */
diff --git a/Xi/closedev.h b/Xi/closedev.h
new file mode 100644
index 000000000..f71336e96
--- /dev/null
+++ b/Xi/closedev.h
@@ -0,0 +1,62 @@
+/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef CLOSEDEV_H
+#define CLOSEDEV_H 1
+
+int
+SProcXCloseDevice(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXCloseDevice(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+DeleteEventsFromChildren(
+#if NeedFunctionPrototypes
+	DeviceIntPtr           /* dev */,
+	WindowPtr              /* p1 */,
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+DeleteDeviceEvents (
+#if NeedFunctionPrototypes
+	DeviceIntPtr           /* dev */,
+	WindowPtr              /* pWin */,
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* CLOSEDEV_H */
diff --git a/Xi/devbell.h b/Xi/devbell.h
new file mode 100644
index 000000000..cccb31de9
--- /dev/null
+++ b/Xi/devbell.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef DEVBELL_H
+#define DEVBELL_H 1
+
+int
+SProcXDeviceBell (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXDeviceBell (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* DEVBELL_H */
diff --git a/Xi/exglobals.h b/Xi/exglobals.h
new file mode 100644
index 000000000..f07618b84
--- /dev/null
+++ b/Xi/exglobals.h
@@ -0,0 +1,76 @@
+/* $XFree86: xc/programs/Xserver/Xi/exglobals.h,v 3.3 1998/12/05 14:39:57 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+/*****************************************************************
+ *
+ * Globals referenced elsewhere in the server.
+ *
+ */
+#ifndef EXGLOBALS_H
+#define EXGLOBALS_H 1
+
+extern	int 	IReqCode;
+extern	int	BadDevice;
+extern	int	BadEvent;
+extern	int	BadMode;
+extern	int	DeviceBusy;
+extern	int	BadClass;
+
+extern	Mask	DevicePointerMotionMask;
+extern	Mask	DevicePointerMotionHintMask;
+extern	Mask	DeviceFocusChangeMask;
+extern	Mask	DeviceStateNotifyMask;
+extern	Mask	ChangeDeviceNotifyMask;
+extern	Mask	DeviceMappingNotifyMask;
+extern	Mask	DeviceOwnerGrabButtonMask;
+extern	Mask	DeviceButtonGrabMask;
+extern	Mask	DeviceButtonMotionMask;
+extern	Mask	PropagateMask[];
+
+extern	int	DeviceValuator;
+extern	int	DeviceKeyPress;
+extern	int	DeviceKeyRelease;
+extern	int	DeviceButtonPress;
+extern	int	DeviceButtonRelease;
+extern	int	DeviceMotionNotify;
+extern	int	DeviceFocusIn;
+extern	int	DeviceFocusOut;
+extern	int	ProximityIn;
+extern	int	ProximityOut;
+extern	int	DeviceStateNotify;
+extern	int	DeviceKeyStateNotify;
+extern	int	DeviceButtonStateNotify;
+extern	int	DeviceMappingNotify;
+extern	int	ChangeDeviceNotify;
+
+extern	int	RT_INPUTCLIENT;
+
+#if 0
+/* FIXME: in dix */
+extern	InputInfo inputInfo;
+#endif
+
+#endif /* EXGLOBALS_H */
diff --git a/Xi/getbmap.h b/Xi/getbmap.h
new file mode 100644
index 000000000..30de6f5c6
--- /dev/null
+++ b/Xi/getbmap.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.1 1996/04/15 11:18:37 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GETBMAP_H
+#define GETBMAP_H 1
+
+int
+SProcXGetDeviceButtonMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGetDeviceButtonMapping (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXGetDeviceButtonMapping (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xGetDeviceButtonMappingReply * /* rep */
+#endif
+	);
+
+#endif /* GETBMAP_H */
diff --git a/Xi/getdctl.h b/Xi/getdctl.h
new file mode 100644
index 000000000..d22675f4f
--- /dev/null
+++ b/Xi/getdctl.h
@@ -0,0 +1,63 @@
+/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.1 1996/04/15 11:18:38 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GETDCTL_H
+#define GETDCTL_H 1
+
+int
+SProcXGetDeviceControl (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGetDeviceControl (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+CopySwapDeviceResolution (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	ValuatorClassPtr       /* v */,
+	char *                 /* buf */,
+	int                    /* length */
+#endif
+	);
+
+void
+SRepXGetDeviceControl (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xGetDeviceControlReply * /* rep */
+#endif
+	);
+
+#endif /* GETDCTL_H */
diff --git a/Xi/getfctl.h b/Xi/getfctl.h
new file mode 100644
index 000000000..e51830d49
--- /dev/null
+++ b/Xi/getfctl.h
@@ -0,0 +1,107 @@
+/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.1 1996/04/15 11:18:39 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GETFCTL_H
+#define GETFCTL_H 1
+
+int
+SProcXGetFeedbackControl(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGetFeedbackControl(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+CopySwapKbdFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	KbdFeedbackPtr         /* k */,
+	char **                /* buf */
+#endif
+	);
+
+void
+CopySwapPtrFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	PtrFeedbackPtr         /* p */,
+	char **                /* buf */
+#endif
+	);
+
+void
+CopySwapIntegerFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	IntegerFeedbackPtr     /* i */,
+	char **                /* buf */
+#endif
+	);
+
+void
+CopySwapStringFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	StringFeedbackPtr      /* s */,
+	char **                /* buf */
+#endif
+	);
+
+void
+CopySwapLedFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	LedFeedbackPtr         /* l */,
+	char **                /* buf */
+#endif
+	);
+
+void
+CopySwapBellFeedback (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	BellFeedbackPtr        /* b */,
+	char **                /* buf */
+#endif
+	);
+
+void
+SRepXGetFeedbackControl (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xGetFeedbackControlReply * /* rep */
+#endif
+	);
+
+#endif /* GETFCTL_H */
diff --git a/Xi/getfocus.h b/Xi/getfocus.h
new file mode 100644
index 000000000..8a21c860c
--- /dev/null
+++ b/Xi/getfocus.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.1 1996/04/15 11:18:40 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GETFOCUS_H
+#define GETFOCUS_H 1
+
+int
+SProcXGetDeviceFocus(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGetDeviceFocus(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXGetDeviceFocus (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xGetDeviceFocusReply * /* rep */
+#endif
+	);
+
+#endif /* GETFOCUS_H */
diff --git a/Xi/getkmap.h b/Xi/getkmap.h
new file mode 100644
index 000000000..780a2e016
--- /dev/null
+++ b/Xi/getkmap.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.1 1996/04/15 11:18:41 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GETKMAP_H
+#define GETKMAP_H 1
+
+int
+SProcXGetDeviceKeyMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGetDeviceKeyMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXGetDeviceKeyMapping (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xGetDeviceKeyMappingReply * /* rep */
+#endif
+	);
+
+#endif /* GETKMAP_H */
diff --git a/Xi/getmmap.h b/Xi/getmmap.h
new file mode 100644
index 000000000..cf9ca000d
--- /dev/null
+++ b/Xi/getmmap.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.1 1996/04/15 11:18:42 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GETMMAP_H
+#define GETMMAP_H 1
+
+int
+SProcXGetDeviceModifierMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGetDeviceModifierMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXGetDeviceModifierMapping (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xGetDeviceModifierMappingReply * /* rep */
+#endif
+	);
+
+#endif /* GETMMAP_H */
diff --git a/Xi/getprop.h b/Xi/getprop.h
new file mode 100644
index 000000000..4f467e041
--- /dev/null
+++ b/Xi/getprop.h
@@ -0,0 +1,64 @@
+/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.1 1996/04/15 11:18:44 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GETPROP_H
+#define GETPROP_H 1
+
+int
+SProcXGetDeviceDontPropagateList(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGetDeviceDontPropagateList (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+XEventClass *
+ClassFromMask (
+#if NeedFunctionPrototypes
+	XEventClass *          /* buf */,
+	Mask                   /* mask */,
+	int                    /* maskndx */,
+	CARD16 *               /* count */,
+	int                    /* mode */
+#endif
+	);
+
+void
+SRepXGetDeviceDontPropagateList (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xGetDeviceDontPropagateListReply * /* rep */
+#endif
+	);
+
+#endif /* GETPROP_H */
diff --git a/Xi/getselev.h b/Xi/getselev.h
new file mode 100644
index 000000000..0d4e6a467
--- /dev/null
+++ b/Xi/getselev.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.1 1996/04/15 11:18:49 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GETSELEV_H
+#define GETSELEV_H 1
+
+int
+SProcXGetSelectedExtensionEvents(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGetSelectedExtensionEvents(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXGetSelectedExtensionEvents (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xGetSelectedExtensionEventsReply * /* rep */
+#endif
+	);
+
+#endif /* GETSELEV_H */
diff --git a/Xi/getvers.h b/Xi/getvers.h
new file mode 100644
index 000000000..1646633e9
--- /dev/null
+++ b/Xi/getvers.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.1 1996/04/15 11:18:50 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GETVERS_H
+#define GETVERS_H 1
+
+int
+SProcXGetExtensionVersion(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGetExtensionVersion (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXGetExtensionVersion (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xGetExtensionVersionReply * /* rep */
+#endif
+	);
+
+#endif /* GETVERS_H */
diff --git a/Xi/grabdev.h b/Xi/grabdev.h
new file mode 100644
index 000000000..382e06b99
--- /dev/null
+++ b/Xi/grabdev.h
@@ -0,0 +1,65 @@
+/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.1 1996/04/15 11:18:51 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GRABDEV_H
+#define GRABDEV_H 1
+
+int
+SProcXGrabDevice(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGrabDevice(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+CreateMaskFromList (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	XEventClass *          /* list */,
+	int                    /* count */,
+	struct tmask           /* mask */[],
+	DeviceIntPtr           /* dev */,
+	int                    /* req */
+#endif
+	);
+
+void
+SRepXGrabDevice (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xGrabDeviceReply *     /* rep */
+#endif
+	);
+
+#endif /* GRABDEV_H */
diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h
new file mode 100644
index 000000000..39b96bcf1
--- /dev/null
+++ b/Xi/grabdevb.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.1 1996/04/15 11:18:52 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GRABDEVB_H
+#define GRABDEVB_H 1
+
+int
+SProcXGrabDeviceButton(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGrabDeviceButton(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* GRABDEVB_H */
diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h
new file mode 100644
index 000000000..7e533fe16
--- /dev/null
+++ b/Xi/grabdevk.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.1 1996/04/15 11:18:53 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GRABDEVK_H
+#define GRABDEVK_H 1
+
+int
+SProcXGrabDeviceKey(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGrabDeviceKey(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* GRABDEVK_H */
diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h
new file mode 100644
index 000000000..1139a1a76
--- /dev/null
+++ b/Xi/gtmotion.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.1 1996/04/15 11:18:56 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef GTMOTION_H
+#define GTMOTION_H 1
+
+int
+SProcXGetDeviceMotionEvents(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXGetDeviceMotionEvents(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXGetDeviceMotionEvents (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xGetDeviceMotionEventsReply * /* rep */
+#endif
+	);
+
+#endif /* GTMOTION_H */
diff --git a/Xi/listdev.h b/Xi/listdev.h
new file mode 100644
index 000000000..d1ecde2ab
--- /dev/null
+++ b/Xi/listdev.h
@@ -0,0 +1,119 @@
+/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.1 1996/04/15 11:18:57 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef LISTDEV_H
+#define LISTDEV_H 1
+
+int
+SProcXListInputDevices(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXListInputDevices (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SizeDeviceInfo (
+#if NeedFunctionPrototypes
+	DeviceIntPtr           /* d */,
+	int *                  /* namesize */,
+	int *                  /* size */
+#endif
+	);
+
+void
+ListDeviceInfo (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	DeviceIntPtr           /* d */,
+	xDeviceInfoPtr         /* dev */,
+	char **                /* devbuf */,
+	char **                /* classbuf */,
+	char **                /* namebuf */
+#endif
+	);
+
+void
+CopyDeviceName (
+#if NeedFunctionPrototypes
+	char **                /* namebuf */,
+	char *                 /* name */
+#endif
+	);
+
+void
+CopySwapDevice (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	DeviceIntPtr           /* d */,
+	int                    /* num_classes */,
+	char **                /* buf */
+#endif
+	);
+
+void
+CopySwapKeyClass (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	KeyClassPtr            /* k */,
+	char **                /* buf */
+#endif
+	);
+
+void
+CopySwapButtonClass (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	ButtonClassPtr         /* b */,
+	char **                /* buf */
+#endif
+	);
+
+int
+CopySwapValuatorClass (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	ValuatorClassPtr       /* v */,
+	char **                /* buf */
+#endif
+	);
+
+void
+SRepXListInputDevices (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xListInputDevicesReply * /* rep */
+#endif
+	);
+
+#endif /* LISTDEV_H */
diff --git a/Xi/opendev.h b/Xi/opendev.h
new file mode 100644
index 000000000..0813e59ad
--- /dev/null
+++ b/Xi/opendev.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.1 1996/04/15 11:18:58 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef OPENDEV_H
+#define OPENDEV_H 1
+
+int
+SProcXOpenDevice(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXOpenDevice(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXOpenDevice (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xOpenDeviceReply *     /* rep */
+#endif
+	);
+
+#endif /* OPENDEV_H */
diff --git a/Xi/queryst.h b/Xi/queryst.h
new file mode 100644
index 000000000..6d6b4b65b
--- /dev/null
+++ b/Xi/queryst.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.1 1996/04/15 11:19:00 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef QUERYST_H
+#define QUERYST_H 1
+
+int
+SProcXQueryDeviceState(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXQueryDeviceState(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXQueryDeviceState (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xQueryDeviceStateReply * /* rep */
+#endif
+	);
+
+#endif /* QUERYST_H */
diff --git a/Xi/selectev.h b/Xi/selectev.h
new file mode 100644
index 000000000..79332e199
--- /dev/null
+++ b/Xi/selectev.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.1 1996/04/15 11:19:01 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef SELECTEV_H
+#define SELECTEV_H 1
+
+int
+SProcXSelectExtensionEvent (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXSelectExtensionEvent (
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* SELECTEV_H */
diff --git a/Xi/sendexev.h b/Xi/sendexev.h
new file mode 100644
index 000000000..876bbe647
--- /dev/null
+++ b/Xi/sendexev.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.1 1996/04/15 11:19:02 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef SENDEXEV_H
+#define SENDEXEV_H 1
+
+int
+SProcXSendExtensionEvent(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXSendExtensionEvent(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* SENDEXEV_H */
diff --git a/Xi/setbmap.h b/Xi/setbmap.h
new file mode 100644
index 000000000..3e85c0a58
--- /dev/null
+++ b/Xi/setbmap.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.1 1996/04/15 11:19:03 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef SETBMAP_H
+#define SETBMAP_H 1
+
+int
+SProcXSetDeviceButtonMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXSetDeviceButtonMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXSetDeviceButtonMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xSetDeviceButtonMappingReply * /* rep */
+#endif
+	);
+
+#endif /* SETBMAP_H */
diff --git a/Xi/setdval.h b/Xi/setdval.h
new file mode 100644
index 000000000..5a8b42192
--- /dev/null
+++ b/Xi/setdval.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.1 1996/04/15 11:19:04 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef SETDVAL_H
+#define SETDVAL_H 1
+
+int
+SProcXSetDeviceValuators(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXSetDeviceValuators(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXSetDeviceValuators(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xSetDeviceValuatorsReply * /* rep */
+#endif
+	);
+
+#endif /* SETDVAL_H */
diff --git a/Xi/setfocus.h b/Xi/setfocus.h
new file mode 100644
index 000000000..44a98193a
--- /dev/null
+++ b/Xi/setfocus.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.1 1996/04/15 11:19:05 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef SETFOCUS_H
+#define SETFOCUS_H 1
+
+int
+SProcXSetDeviceFocus(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXSetDeviceFocus(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* SETFOCUS_H */
diff --git a/Xi/setmmap.h b/Xi/setmmap.h
new file mode 100644
index 000000000..925373e9e
--- /dev/null
+++ b/Xi/setmmap.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.1 1996/04/15 11:19:06 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef SETMMAP_H
+#define SETMMAP_H 1
+
+int
+SProcXSetDeviceModifierMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXSetDeviceModifierMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXSetDeviceModifierMapping(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xSetDeviceModifierMappingReply * /* rep */
+#endif
+	);
+
+#endif /* SETMMAP_H */
diff --git a/Xi/setmode.h b/Xi/setmode.h
new file mode 100644
index 000000000..cd27ba146
--- /dev/null
+++ b/Xi/setmode.h
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.1 1996/04/15 11:19:07 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef SETMODE_H
+#define SETMODE_H 1
+
+int
+SProcXSetDeviceMode(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXSetDeviceMode(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+void
+SRepXSetDeviceMode(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */,
+	int                    /* size */,
+	xSetDeviceModeReply *  /* rep */
+#endif
+	);
+
+#endif /* SETMODE_H */
diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h
new file mode 100644
index 000000000..6b00a3ef6
--- /dev/null
+++ b/Xi/ungrdev.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.1 1996/04/15 11:19:08 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef UNGRDEV_H
+#define UNGRDEV_H 1
+
+int
+SProcXUngrabDevice(
+#if NeedFunctionPrototypes
+	ClientPtr /* client */
+#endif
+	);
+
+int
+ProcXUngrabDevice(
+#if NeedFunctionPrototypes
+	ClientPtr /* client */
+#endif
+	);
+
+#endif /* UNGRDEV_H */
diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h
new file mode 100644
index 000000000..d416c73c6
--- /dev/null
+++ b/Xi/ungrdevb.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.1 1996/04/15 11:19:10 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef UNGRDEVB_H
+#define UNGRDEVB_H 1
+
+int
+SProcXUngrabDeviceButton(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXUngrabDeviceButton(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* UNGRDEVB_H */
diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h
new file mode 100644
index 000000000..26dc14ae0
--- /dev/null
+++ b/Xi/ungrdevk.h
@@ -0,0 +1,44 @@
+/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.1 1996/04/15 11:19:12 dawes Exp $ */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef UNGRDEVK_H
+#define UNGRDEVK_H 1
+
+int
+SProcXUngrabDeviceKey(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+int
+ProcXUngrabDeviceKey(
+#if NeedFunctionPrototypes
+	ClientPtr              /* client */
+#endif
+	);
+
+#endif /* UNGRDEVK_H */