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

Public server module API shouldn't be clobbered with private definitions,
thus move them out to dix-intern.h

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1289>

Xi/allowev.c

@@ -58,8 +58,9 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 
-#include "exglobals.h"
+#include "dix/dix_priv.h"
 
+#include "exglobals.h"
 #include "allowev.h"
 #include "dixevents.h"
 

Xi/extinit.c

@@ -55,15 +55,17 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#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>
 #include <X11/extensions/geproto.h>
-#include "geext.h"              /* extension interfaces for ge */
 
+#include "dix/dix_priv.h"
+
+#include "inputstr.h"
+#include "gcstruct.h"           /* pointer for extnsionst.h */
+#include "extnsionst.h"         /* extension entry   */
+#include "geext.h"              /* extension interfaces for ge */
 #include "dixevents.h"
 #include "exevents.h"
 #include "extinit.h"

Xi/grabdev.c

@@ -54,13 +54,15 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
-#include "windowstr.h"          /* window structure  */
 #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 "exglobals.h"
 #include "dixevents.h"          /* GrabDevice */
-
 #include "grabdev.h"
 
 extern XExtEventInfo EventInfo[];

Xi/setfocus.c

@@ -54,15 +54,16 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#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

@@ -36,21 +36,22 @@
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
-#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 "dix/dix_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
+#include "scrnintstr.h"         /* screen structure  */
 #include "extnsionst.h"
 #include "exevents.h"
 #include "exglobals.h"
 #include "geext.h"
 #include "xace.h"
 #include "xiquerydevice.h"      /* for GetDeviceUse */
-
 #include "xkbsrv.h"
-
 #include "xichangehierarchy.h"
 #include "xibarriers.h"
 

Xi/xigrabdev.c

@@ -33,11 +33,13 @@
 #include <dix-config.h>
 #endif
 
-#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 "exevents.h"
 #include "xigrabdev.h"

Xi/xisetdevfocus.c

@@ -32,11 +32,13 @@
 #include <dix-config.h>
 #endif
 
-#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

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

dix/dix_priv.h

@@ -15,10 +15,16 @@
 
 #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"
+#include "Xext/geext.h"
 
 /* server setting: maximum size for big requests */
 #define MAX_BIG_REQUEST_SIZE 4194303
@@ -78,4 +84,148 @@ 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

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

dix/eventconvert.c

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

dix/gestures.c

@@ -27,12 +27,12 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "dixgrabs.h"
-
 #include "eventstr.h"
 #include "exevents.h"
 #include "exglobals.h"

hw/kdrive/ephyr/ephyrinit.c

@@ -27,6 +27,7 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
 #include "os/cmdline.h"
 #include "os/osdep.h"
 

hw/xfree86/common/xf86DGA.c

@@ -41,9 +41,12 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/xf86dgaproto.h>
 
+#include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 
 #include "xf86.h"
@@ -51,7 +54,6 @@
 #include "xf86Priv.h"
 #include "dgaproc.h"
 #include "dgaproc_priv.h"
-#include <X11/extensions/xf86dgaproto.h>
 #include "colormapst.h"
 #include "pixmapstr.h"
 #include "inputstr.h"
@@ -64,9 +66,7 @@
 #include "exevents.h"
 #include "eventstr.h"
 #include "xf86Extensions.h"
-
 #include "mi.h"
-
 #include "misc.h"
 #include "dixstruct.h"
 #include "dixevents.h"
@@ -77,8 +77,6 @@
 #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,12 +50,14 @@
 #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 "xf86.h"
@@ -67,14 +69,12 @@
 #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,6 +28,12 @@
 #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"
@@ -35,9 +41,6 @@
 #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/xwin/InitOutput.c

@@ -32,6 +32,7 @@ from The Open Group.
 #include <xwin-config.h>
 #endif
 
+#include "dix/dix_priv.h"
 #include "os/osdep.h"
 
 #include "win.h"

hw/xwin/winkeybd.c

@@ -35,10 +35,12 @@
 #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/winmultiwindowwndproc.c

@@ -37,6 +37,9 @@
 #endif
 
 #include "win.h"
+
+#include "dix/dix_priv.h"
+
 #include "dixevents.h"
 #include "winmultiwindowclass.h"
 #include "winprefs.h"

include/dix.h

@@ -161,8 +161,6 @@ 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,
@@ -190,12 +188,6 @@ 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);
 
@@ -269,16 +261,8 @@ 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 */ ,
@@ -298,63 +282,23 @@ 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 */ ,
@@ -368,123 +312,19 @@ 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 */ ,
@@ -502,21 +342,12 @@ 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);
@@ -562,37 +393,18 @@ 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;
 
 #endif                          /* DIX_H */

mi/midispcur.c

@@ -35,6 +35,7 @@ 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"
@@ -48,9 +49,7 @@ 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 */

mi/mipointer.c

@@ -53,6 +53,9 @@ in this Software without prior written authorization from The Open Group.
 #include   <X11/X.h>
 #include   <X11/Xmd.h>
 #include   <X11/Xproto.h>
+
+#include   "dix/dix_priv.h"
+
 #include   "misc.h"
 #include   "windowstr.h"
 #include   "pixmapstr.h"

mi/misprite.c

@@ -35,6 +35,9 @@ in this Software without prior written authorization from The Open Group.
 
 #include   <X11/X.h>
 #include   <X11/Xproto.h>
+
+#include   "dix/dix_priv.h"
+
 #include   "misc.h"
 #include   "pixmapstr.h"
 #include   "input.h"

test/input.c

@@ -39,6 +39,7 @@
 #include "inputstr.h"
 #include "exevents.h"
 
+#include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 
 #include "exglobals.h"

xkb/xkbActions.c

@@ -28,21 +28,25 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <ctype.h>
 #include <stdio.h>
 #include <math.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "inputstr.h"
 #include "exevents.h"
 #include "eventstr.h"
 #include <xkbsrv.h>
-#include <ctype.h>
 #include "mi.h"
 #include "mipointer.h"
 #include "inpututils.h"
 #include "dixgrabs.h"
+
 #define EXTENSION_EVENT_BASE 64
 
 DevPrivateKeyRec xkbDevicePrivateKeyRec;