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>

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"