Revert "include: split out non-exported prototypes to dix_priv.h"

This reverts commit f17bc7e24d.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2102>

Xi/allowev.c

@@ -60,6 +60,7 @@ SOFTWARE.
 #include "dix/input_priv.h"
 
 #include "exglobals.h"
+
 #include "allowev.h"
 #include "dixevents.h"
 

Xi/extinit.c

@@ -53,6 +53,9 @@ SOFTWARE.
 
 #include <dix-config.h>
 
+#include "inputstr.h"
+#include "gcstruct.h"           /* pointer for extnsionst.h */
+#include "extnsionst.h"         /* extension entry   */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
@@ -65,6 +68,7 @@ SOFTWARE.
 #include "gcstruct.h"           /* pointer for extnsionst.h */
 #include "extnsionst.h"         /* extension entry   */
 #include "geext.h"              /* extension interfaces for ge */
+
 #include "dixevents.h"
 #include "extinit_priv.h"
 #include "exglobals.h"

Xi/grabdev.c

@@ -52,15 +52,13 @@ SOFTWARE.
 
 #include <dix-config.h>
 
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
-
-#include "dix/dix_priv.h"
-
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #include "exglobals.h"
 #include "dixevents.h"          /* GrabDevice */
+
 #include "grabdev.h"
 
 extern XExtEventInfo EventInfo[];

Xi/setfocus.c

@@ -52,16 +52,15 @@ SOFTWARE.
 
 #include <dix-config.h>
 
+#include "windowstr.h"          /* focus struct      */
+#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 
-#include "windowstr.h"          /* focus struct      */
-#include "inputstr.h"           /* DeviceIntPtr      */
-
-#include "dix/dix_priv.h"
-
 #include "dixevents.h"
+
 #include "exglobals.h"
+
 #include "setfocus.h"
 
 /***********************************************************************

Xi/xichangehierarchy.c

@@ -45,12 +45,17 @@
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "scrnintstr.h"         /* screen structure  */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+#include <X11/extensions/geproto.h>
 #include "extnsionst.h"
 #include "exglobals.h"
 #include "misc.h"
 #include "xace.h"
 #include "xiquerydevice.h"      /* for GetDeviceUse */
+
 #include "xkbsrv.h"
+
 #include "xichangehierarchy.h"
 #include "xibarriers.h"
 

Xi/xigrabdev.c

@@ -31,6 +31,8 @@
 
 #include <dix-config.h>
 
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XI2proto.h>
 

Xi/xisetdevfocus.c

@@ -30,13 +30,11 @@
 
 #include <dix-config.h>
 
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XI2proto.h>
 
-#include "dix/dix_priv.h"
-
-#include "inputstr.h"           /* DeviceIntPtr      */
-#include "windowstr.h"          /* window structure  */
 #include "exglobals.h"          /* BadDevice */
 #include "xisetdevfocus.h"
 

dix/cursor.c

@@ -48,9 +48,6 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
-
-#include "dix/dix_priv.h"
-
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "dixstruct.h"

dix/display.c

@@ -7,6 +7,7 @@
 #include "dix/dix_priv.h"
 #include "include/dix.h"
 #include "include/screenint.h"
+#include "opaque.h"
 
 const char *display = "0";
 int displayfd = -1;

dix/dix_priv.h

@@ -15,14 +15,9 @@
 
 #include <X11/Xdefs.h>
 #include <X11/Xfuncproto.h>
-#include <X11/extensions/XI.h>
 
-#include "include/callback.h"
-#include "include/cursor.h"
 #include "include/dix.h"
-#include "include/events.h"
 #include "include/gc.h"
-#include "include/input.h"
 #include "include/window.h"
 
 /* server setting: maximum size for big requests */
@@ -74,148 +69,4 @@ int dixLookupClient(ClientPtr *result,
                     ClientPtr client,
                     Mask access_mode);
 
-Bool CreateConnectionBlock(void);
-
-void EnableLimitedSchedulingLatency(void);
-
-void DisableLimitedSchedulingLatency(void);
-
-int dix_main(int argc, char *argv[], char *envp[]);
-
-void SetMaskForEvent(int deviceid, Mask mask, int event);
-
-void EnqueueEvent(InternalEvent *ev, DeviceIntPtr device);
-
-void PlayReleasedEvents(void);
-
-void ActivatePointerGrab(DeviceIntPtr mouse,
-                         GrabPtr grab,
-                         TimeStamp time,
-                         Bool autoGrab);
-
-void DeactivatePointerGrab(DeviceIntPtr mouse);
-
-void ActivateKeyboardGrab(DeviceIntPtr keybd,
-                          GrabPtr grab,
-                          TimeStamp time,
-                          Bool passive);
-
-void DeactivateKeyboardGrab(DeviceIntPtr keybd);
-
-BOOL ActivateFocusInGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win);
-
-void AllowSome(ClientPtr client,
-               TimeStamp time,
-               DeviceIntPtr thisDev,
-               int newState);
-
-void ReleaseActiveGrabs(ClientPtr client);
-
-GrabPtr CheckPassiveGrabsOnWindow(WindowPtr pWin,
-                                  DeviceIntPtr device,
-                                  InternalEvent *event,
-                                  BOOL checkCore,
-                                  BOOL activate);
-
-int DeliverDeviceEvents(WindowPtr pWin,
-                        InternalEvent *event,
-                        GrabPtr grab,
-                        WindowPtr stopAt,
-                        DeviceIntPtr dev);
-
-int DeliverOneGrabbedEvent(InternalEvent *event,
-                           DeviceIntPtr dev,
-                           enum InputLevel level);
-
-void DeliverTouchEvents(DeviceIntPtr dev,
-                        TouchPointInfoPtr ti,
-                        InternalEvent *ev,
-                        XID resource);
-
-Bool DeliverGestureEventToOwner(DeviceIntPtr dev,
-                                GestureInfoPtr gi,
-                                InternalEvent *ev);
-
-void InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin);
-void FreeSprite(DeviceIntPtr pDev);
-void UpdateSpriteForScreen(DeviceIntPtr pDev, ScreenPtr pScreen);
-
-Bool CheckDeviceGrabs(DeviceIntPtr device,
-                      InternalEvent *event,
-                      WindowPtr ancestor);
-
-void DeliverFocusedEvent(DeviceIntPtr keybd,
-                         InternalEvent *event,
-                         WindowPtr window);
-
-int DeliverGrabbedEvent(InternalEvent *event,
-                        DeviceIntPtr thisDev,
-                        Bool deactivateGrab);
-
-void FreezeThisEventIfNeededForSyncGrab(DeviceIntPtr thisDev,
-                                        InternalEvent *event);
-
-void FixKeyState(DeviceEvent *event, DeviceIntPtr keybd);
-
-void RecalculateDeliverableEvents(WindowPtr pWin);
-
-void DoFocusEvents(DeviceIntPtr dev,
-                   WindowPtr fromWin,
-                   WindowPtr toWin,
-                   int mode);
-
-int SetInputFocus(ClientPtr client,
-                  DeviceIntPtr dev,
-                  Window focusID,
-                  CARD8 revertTo,
-                  Time ctime,
-                  Bool followOK);
-
-int GrabDevice(ClientPtr client,
-               DeviceIntPtr dev,
-               unsigned this_mode,
-               unsigned other_mode,
-               Window grabWindow,
-               unsigned ownerEvents,
-               Time ctime,
-               GrabMask *mask,
-               int grabtype,
-               Cursor curs,
-               Window confineToWin,
-               CARD8 *status);
-
-void InitEvents(void);
-
-void CloseDownEvents(void);
-
-void DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources);
-
-Mask EventMaskForClient(WindowPtr pWin, ClientPtr client);
-
-Bool CheckMotion(DeviceEvent *ev, DeviceIntPtr pDev);
-
-int SetClientPointer(ClientPtr client, DeviceIntPtr device);
-
-Bool IsInterferingGrab(ClientPtr client, DeviceIntPtr dev, xEvent *events);
-
-int XItoCoreType(int xi_type);
-
-Bool DevHasCursor(DeviceIntPtr pDev);
-
-Bool IsPointerEvent(InternalEvent *event);
-
-Bool IsTouchEvent(InternalEvent *event);
-
-Bool IsGestureEvent(InternalEvent *event);
-
-Bool IsGestureBeginEvent(InternalEvent *event);
-
-Bool IsGestureEndEvent(InternalEvent *event);
-
-void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
-
-int CorePointerProc(DeviceIntPtr dev, int what);
-
-int CoreKeyboardProc(DeviceIntPtr dev, int what);
-
 #endif /* _XSERVER_DIX_PRIV_H */

dix/enterleave.c

@@ -31,7 +31,6 @@
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
 
-#include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/input_priv.h"
 

dix/eventconvert.c

@@ -37,7 +37,6 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2.h>
 
-#include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 

dix/gestures.c

@@ -32,6 +32,7 @@
 
 #include "inputstr.h"
 #include "scrnintstr.h"
+
 #include "eventstr.h"
 #include "exevents.h"
 #include "exglobals.h"

hw/kdrive/ephyr/ephyrinit.c

@@ -25,9 +25,6 @@
 
 #include <dix-config.h>
 
-#include "dix/dix_priv.h"
-#include "os/cmdline.h"
-#include "os/ddx_priv.h"
 #include "os/osdep.h"
 
 #include "ephyr.h"

hw/kdrive/src/kdrive.c

@@ -23,7 +23,6 @@
 #include <dix-config.h>
 
 #include "config/hotplug_priv.h"
-#include "dix/screenint_priv.h"
 
 #include "kdrive.h"
 #include <mivalidate.h>

hw/kdrive/src/kinput.c

@@ -41,7 +41,6 @@
 #include "dix/input_priv.h"
 #include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
-#include "os/cmdline.h"
 
 #include "xkbsrv.h"
 #include "XIstubs.h"            /* even though we don't use stubs.  cute, no? */

hw/xfree86/common/xf86DGA.c

@@ -41,10 +41,8 @@
 #include <xorg-config.h>
 #endif
 
-#include <string.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/extensions/xf86dgaproto.h>
 
 #include "dix/colormap_priv.h"
 #include "dix/dix_priv.h"
@@ -56,6 +54,7 @@
 #include "xf86Priv.h"
 #include "dgaproc.h"
 #include "dgaproc_priv.h"
+#include <X11/extensions/xf86dgaproto.h>
 #include "colormapst.h"
 #include "pixmapstr.h"
 #include "inputstr.h"
@@ -67,7 +66,9 @@
 #include "exglobals.h"
 #include "eventstr.h"
 #include "xf86Extensions.h"
+
 #include "mi.h"
+
 #include "misc.h"
 #include "dixstruct.h"
 #include "dixevents.h"
@@ -78,6 +79,8 @@
 #include "dgaproc.h"
 #include "protocol-versions.h"
 
+#include <string.h>
+
 #define DGA_PROTOCOL_OLD_SUPPORT 1
 
 static DevPrivateKeyRec DGAScreenKeyRec;

hw/xfree86/common/xf86Xinput.c

@@ -50,14 +50,12 @@
 #include <xorg-config.h>
 #endif
 
-#include <string.h>             /* InputClassMatches */
 #include <X11/Xfuncproto.h>
 #include <X11/Xmd.h>
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include <X11/Xatom.h>
 
-#include "dix/dix_priv.h"
 #include "dix/ptrveloc_priv.h"
 #include "dix/input_priv.h"
 
@@ -71,12 +69,14 @@
 #include "extinit.h"
 #include "loaderProcs.h"
 #include "systemd-logind.h"
+
 #include "exevents.h"           /* AddInputDevice */
 #include "exglobals.h"
 #include "eventstr.h"
 #include "inpututils.h"
 #include "optionstr.h"
 
+#include <string.h>             /* InputClassMatches */
 #ifdef HAVE_FNMATCH_H
 #include <fnmatch.h>
 #endif

hw/xfree86/modes/xf86Rotate.c

@@ -28,12 +28,6 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
-#include <X11/Xatom.h>
-#include <X11/extensions/render.h>
-#include <X11/extensions/dpmsconst.h>
-
-#include "dix/dix_priv.h"
-
 #include "mi.h"
 #include "xf86.h"
 #include "xf86DDC.h"
@@ -41,6 +35,9 @@
 #include "xf86Crtc.h"
 #include "xf86Modes.h"
 #include "xf86RandR12.h"
+#include "X11/extensions/render.h"
+#include "X11/extensions/dpmsconst.h"
+#include "X11/Xatom.h"
 
 void
 xf86RotateCrtcRedisplay(xf86CrtcPtr crtc, PixmapPtr dst_pixmap,

hw/xquartz/darwin.c

@@ -34,7 +34,6 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 
-#include "os/ddx_priv.h"
 #include "os/osdep.h"
 
 #include "os.h"

hw/xwayland/xwayland-window.c

@@ -24,7 +24,7 @@
  */
 
 #include <dix-config.h>
-
+#include "dix/dix_priv.h"
 #include <float.h>
 #include <math.h>
 #include <sys/mman.h>

hw/xwayland/xwayland.c

@@ -35,10 +35,7 @@
 #include <X11/Xatom.h>
 #include <X11/Xfuncproto.h>
 
-#include "dix/screenint_priv.h"
-#include "os/cmdline.h"
 #include "os/client_priv.h"
-#include "os/ddx_priv.h"
 #include "os/fmt.h"
 #include "os/osdep.h"
 #include "os/xserver_poll.h"

hw/xwin/InitOutput.c

@@ -32,7 +32,6 @@ from The Open Group.
 #include <xwin-config.h>
 #endif
 
-#include "dix/dix_priv.h"
 #include "os/osdep.h"
 
 #include "win.h"
@@ -60,7 +59,6 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
                                               DWORD dwFlags, LPTSTR pszPath);
 #endif
 
-#include "dix/screenint_priv.h"
 #include "os/osdep.h"
 
 #include "winmonitors.h"

hw/xwin/winkeybd.c

@@ -35,12 +35,10 @@
 #include <xwin-config.h>
 #endif
 #include "win.h"
-
-#include "dix/dix_priv.h"
-
 #include "winkeybd.h"
 #include "winconfig.h"
 #include "winmsg.h"
+
 #include "xkbsrv.h"
 
 /* C does not have a logical XOR operator, so we use a macro instead */

hw/xwin/winprocarg.c

@@ -35,7 +35,6 @@ from The Open Group.
 #include <sys/utsname.h>
 #endif
 
-#include "os/cmdline.h"
 #include "os/osdep.h"
 
 #include <../xfree86/common/xorgVersion.h>

include/dix.h

@@ -171,6 +171,8 @@ extern _X_EXPORT void SendErrorToClient(ClientPtr /*client */ ,
 
 extern _X_EXPORT void MarkClientException(ClientPtr /*client */ );
 
+extern _X_HIDDEN Bool CreateConnectionBlock(void);
+
 /* dixutils.c */
 
 extern _X_EXPORT int dixLookupWindow(WindowPtr *result,
@@ -198,6 +200,12 @@ extern _X_EXPORT void BlockHandler(void *timeout);
 
 extern _X_EXPORT void WakeupHandler(int result);
 
+void
+EnableLimitedSchedulingLatency(void);
+
+void
+DisableLimitedSchedulingLatency(void);
+
 typedef void (*ServerBlockHandlerProcPtr) (void *blockData,
                                            void *timeout);
 
@@ -271,8 +279,16 @@ InitAtoms(void);
 extern _X_EXPORT void
 SetVendorRelease(int release);
 
+int
+dix_main(int argc, char *argv[], char *envp[]);
+
 /* events.c */
 
+extern void
+SetMaskForEvent(int /* deviceid */ ,
+                Mask /* mask */ ,
+                int /* event */ );
+
 extern _X_EXPORT void
 ConfineToShape(DeviceIntPtr /* pDev */ ,
                RegionPtr /* shape */ ,
@@ -292,23 +308,63 @@ GetSpriteWindow(DeviceIntPtr pDev);
 extern _X_EXPORT void
 NoticeTime(const DeviceIntPtr dev,
            TimeStamp time);
-
 extern _X_EXPORT void
 NoticeEventTime(InternalEvent *ev,
                 DeviceIntPtr dev);
-
 extern _X_EXPORT TimeStamp
 LastEventTime(int deviceid);
-
 extern _X_EXPORT Bool
 LastEventTimeWasReset(int deviceid);
-
 extern _X_EXPORT void
 LastEventTimeToggleResetFlag(int deviceid, Bool state);
-
 extern _X_EXPORT void
 LastEventTimeToggleResetAll(Bool state);
 
+extern void
+EnqueueEvent(InternalEvent * /* ev */ ,
+             DeviceIntPtr /* device */ );
+extern void
+PlayReleasedEvents(void);
+
+extern void
+ActivatePointerGrab(DeviceIntPtr /* mouse */ ,
+                    GrabPtr /* grab */ ,
+                    TimeStamp /* time */ ,
+                    Bool /* autoGrab */ );
+
+extern void
+DeactivatePointerGrab(DeviceIntPtr /* mouse */ );
+
+extern void
+ActivateKeyboardGrab(DeviceIntPtr /* keybd */ ,
+                     GrabPtr /* grab */ ,
+                     TimeStamp /* time */ ,
+                     Bool /* passive */ );
+
+extern void
+DeactivateKeyboardGrab(DeviceIntPtr /* keybd */ );
+
+extern BOOL
+ActivateFocusInGrab(DeviceIntPtr /* dev */ ,
+                    WindowPtr /* old */ ,
+                    WindowPtr /* win */ );
+
+extern void
+AllowSome(ClientPtr /* client */ ,
+          TimeStamp /* time */ ,
+          DeviceIntPtr /* thisDev */ ,
+          int /* newState */ );
+
+extern void
+ReleaseActiveGrabs(ClientPtr client);
+
+extern GrabPtr
+CheckPassiveGrabsOnWindow(WindowPtr /* pWin */ ,
+                          DeviceIntPtr /* device */ ,
+                          InternalEvent * /* event */ ,
+                          BOOL /* checkCore */ ,
+                          BOOL /* activate */ );
+
 extern _X_EXPORT int
 DeliverEventsToWindow(DeviceIntPtr /* pWin */ ,
                       WindowPtr /* pWin */ ,
@@ -322,19 +378,123 @@ DeliverRawEvent(RawDeviceEvent * /* ev */ ,
                 DeviceIntPtr    /* dev */
     );
 
+extern int
+DeliverDeviceEvents(WindowPtr /* pWin */ ,
+                    InternalEvent * /* event */ ,
+                    GrabPtr /* grab */ ,
+                    WindowPtr /* stopAt */ ,
+                    DeviceIntPtr /* dev */ );
+
+extern int
+DeliverOneGrabbedEvent(InternalEvent * /* event */ ,
+                       DeviceIntPtr /* dev */ ,
+                       enum InputLevel /* level */ );
+
+extern void
+DeliverTouchEvents(DeviceIntPtr /* dev */ ,
+                   TouchPointInfoPtr /* ti */ ,
+                   InternalEvent * /* ev */ ,
+                   XID /* resource */ );
+
+extern Bool
+DeliverGestureEventToOwner(DeviceIntPtr dev, GestureInfoPtr gi,
+                           InternalEvent *ev);
+
+extern void
+InitializeSprite(DeviceIntPtr /* pDev */ ,
+                 WindowPtr /* pWin */ );
+extern void
+FreeSprite(DeviceIntPtr pDev);
+
+extern void
+UpdateSpriteForScreen(DeviceIntPtr /* pDev */ ,
+                      ScreenPtr /* pScreen */ );
+
 extern _X_EXPORT void
 WindowHasNewCursor(WindowPtr /* pWin */ );
 
+extern Bool
+CheckDeviceGrabs(DeviceIntPtr /* device */ ,
+                 InternalEvent * /* event */ ,
+                 WindowPtr /* ancestor */ );
+
+extern void
+DeliverFocusedEvent(DeviceIntPtr /* keybd */ ,
+                    InternalEvent * /* event */ ,
+                    WindowPtr /* window */ );
+
+extern int
+DeliverGrabbedEvent(InternalEvent * /* event */ ,
+                    DeviceIntPtr /* thisDev */ ,
+                    Bool /* deactivateGrab */ );
+
+extern void
+FreezeThisEventIfNeededForSyncGrab(DeviceIntPtr thisDev,
+                                   InternalEvent *event);
+
+extern void
+FixKeyState(DeviceEvent * /* event */ ,
+            DeviceIntPtr /* keybd */ );
+
+extern void
+RecalculateDeliverableEvents(WindowPtr /* pWin */ );
+
 extern _X_EXPORT int
 OtherClientGone(void *value,
                 XID id);
 
+extern void
+DoFocusEvents(DeviceIntPtr /* dev */ ,
+              WindowPtr /* fromWin */ ,
+              WindowPtr /* toWin */ ,
+              int /* mode */ );
+
+extern int
+SetInputFocus(ClientPtr /* client */ ,
+              DeviceIntPtr /* dev */ ,
+              Window /* focusID */ ,
+              CARD8 /* revertTo */ ,
+              Time /* ctime */ ,
+              Bool /* followOK */ );
+
+extern int
+GrabDevice(ClientPtr /* client */ ,
+           DeviceIntPtr /* dev */ ,
+           unsigned /* this_mode */ ,
+           unsigned /* other_mode */ ,
+           Window /* grabWindow */ ,
+           unsigned /* ownerEvents */ ,
+           Time /* ctime */ ,
+           GrabMask * /* mask */ ,
+           int /* grabtype */ ,
+           Cursor /* curs */ ,
+           Window /* confineToWin */ ,
+           CARD8 * /* status */ );
+
+extern void
+InitEvents(void);
+
+extern void
+CloseDownEvents(void);
+
+extern void
+DeleteWindowFromAnyEvents(WindowPtr /* pWin */ ,
+                          Bool /* freeResources */ );
+
+extern Mask
+EventMaskForClient(WindowPtr /* pWin */ ,
+                   ClientPtr /* client */ );
+
 extern _X_EXPORT int
 DeliverEvents(WindowPtr /*pWin */ ,
               xEventPtr /*xE */ ,
               int /*count */ ,
               WindowPtr /*otherParent */ );
 
+extern Bool
+CheckMotion(DeviceEvent * /* ev */ ,
+            DeviceIntPtr /* pDev */ );
+
 extern _X_EXPORT void
 WriteEventsToClient(ClientPtr /*pClient */ ,
                     int /*count */ ,
@@ -352,12 +512,21 @@ TryClientEvents(ClientPtr /*client */ ,
 extern _X_EXPORT void
 WindowsRestructured(void);
 
+extern int
+SetClientPointer(ClientPtr /* client */ ,
+                 DeviceIntPtr /* device */ );
+
 extern _X_EXPORT DeviceIntPtr
 PickPointer(ClientPtr /* client */ );
 
 extern _X_EXPORT DeviceIntPtr
 PickKeyboard(ClientPtr /* client */ );
 
+extern Bool
+IsInterferingGrab(ClientPtr /* client */ ,
+                  DeviceIntPtr /* dev */ ,
+                  xEvent * /* events */ );
+
 #ifdef RANDR
 extern _X_EXPORT void
 ScreenRestructured(ScreenPtr pScreen);
@@ -403,18 +572,37 @@ typedef struct {
 
 extern _X_EXPORT CallbackListPtr RootWindowFinalizeCallback;
 
+extern int
+XItoCoreType(int xi_type);
+extern Bool
+DevHasCursor(DeviceIntPtr pDev);
 extern _X_EXPORT Bool
 IsPointerDevice(DeviceIntPtr dev);
-
 extern _X_EXPORT Bool
 IsKeyboardDevice(DeviceIntPtr dev);
+extern Bool
+IsPointerEvent(InternalEvent *event);
+extern Bool
+IsTouchEvent(InternalEvent *event);
+Bool
+IsGestureEvent(InternalEvent *event);
+Bool
+IsGestureBeginEvent(InternalEvent *event);
+Bool
+IsGestureEndEvent(InternalEvent *event);
 
 extern _X_EXPORT Bool
 IsMaster(DeviceIntPtr dev);
-
 extern _X_EXPORT Bool
 IsFloating(DeviceIntPtr dev);
 
+extern _X_HIDDEN void
+CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
+extern _X_HIDDEN int
+CorePointerProc(DeviceIntPtr dev, int what);
+extern _X_HIDDEN int
+CoreKeyboardProc(DeviceIntPtr dev, int what);
+
 extern _X_EXPORT void *lastGLContext;
 
 /**

mi/midispcur.c

@@ -33,7 +33,6 @@ in this Software without prior written authorization from The Open Group.
 
 #include   <X11/X.h>
 
-#include   "dix/dix_priv.h"
 #include   "dix/gc_priv.h"
 
 #include   "misc.h"
@@ -47,7 +46,9 @@ in this Software without prior written authorization from The Open Group.
 #include   "mipointer.h"
 #include   "misprite.h"
 #include   "gcstruct.h"
+
 #include   "picturestr.h"
+
 #include "inputstr.h"
 
 /* per-screen private data */

test/bigreq/request-length.c

@@ -62,7 +62,8 @@ int main(int argc, char **argv)
     free(xcb_big_requests_enable_reply(c, xcb_big_requests_enable(c), NULL));
 
     /* Manually write out the bad request.  XCB can't help us here.*/
-    write(fd, &xise_req, sizeof(xise_req));
+    int written = write(fd, &xise_req, sizeof(xise_req));
+    (void)written;
 
     /* Block until the server has processed our mess and throws an
      * error. If we get disconnected, then the server has noticed what we're

test/simple-xinit.c

@@ -66,7 +66,8 @@ static const char *server_dead = "server_dead";
 static void
 handle_sigchld(int sig)
 {
-    write(server_displayfd, server_dead, strlen(server_dead));
+    int written = write(server_displayfd, server_dead, strlen(server_dead));
+    (void)written;
 }
 
 /* Starts the X server, returning its pid. */

xkb/xkbActions.c

@@ -26,7 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <dix-config.h>
 
-#include <ctype.h>
 #include <stdio.h>
 #include <math.h>
 #include <ctype.h>
@@ -48,6 +47,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "mipointer.h"
 #include "inpututils.h"
 
+#include <xkbsrv.h>
+#include <ctype.h>
+#include "mi.h"
+#include "mipointer.h"
+#include "inpututils.h"
 #define EXTENSION_EVENT_BASE 64
 
 DevPrivateKeyRec xkbDevicePrivateKeyRec;