include: move private definitions out of input.h

It's not good having the public server api headers clobbered with private
definitions, so cleaning them up.

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

14 files changed, 29 insertions, 10 deletions

diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index a6325a1c6..4dd4799ad 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -58,6 +58,7 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>     /* control constants */
 
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "XIstubs.h"
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 71384254d..30b1a72dd 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -93,6 +93,7 @@ SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"
 #include "windowstr.h"
diff --git a/Xi/listdev.c b/Xi/listdev.c
index c8076a62d..acd73af28 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -56,16 +56,18 @@ SOFTWARE.
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
-#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/input_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
 #include "XIstubs.h"
 #include "extnsionst.h"
 #include "exevents.h"
 #include "xace.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
-
 #include "listdev.h"
 
 /***********************************************************************
diff --git a/Xi/queryst.c b/Xi/queryst.c
index 34bfa9031..d0aad33de 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -40,6 +40,7 @@ from The Open Group.
 #include <X11/extensions/XIproto.h>
 
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index f94db861d..cad881b7a 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -54,12 +54,14 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/input_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
 #include "exevents.h"
 #include "exglobals.h"
-
 #include "setbmap.h"
 
 /***********************************************************************
diff --git a/Xi/setdval.c b/Xi/setdval.c
index e57cb259d..26dedfbf6 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -54,12 +54,14 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/input_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
 #include "XIstubs.h"
 #include "exglobals.h"
-
 #include "setdval.h"
 
 /***********************************************************************
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index d60096a5a..5adc7e9d5 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -54,13 +54,15 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/input_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
 #include "exevents.h"
 #include "exglobals.h"
-
 #include "setmmap.h"
 
 /***********************************************************************
diff --git a/Xi/setmode.c b/Xi/setmode.c
index e7e12d4e0..f67e89e1a 100644
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@@ -54,12 +54,14 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/input_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
 #include "XIstubs.h"
 #include "exglobals.h"
-
 #include "setmode.h"
 
 /***********************************************************************
diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c
index 03ced79bb..23ad4c7ce 100644
--- a/Xi/xiallowev.c
+++ b/Xi/xiallowev.c
@@ -38,6 +38,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index da6964453..5cccebdf2 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -46,6 +46,7 @@
 #endif
 
 #include "dix/dix_priv.h"
+#include "dix/input_priv.h"
 
 #include "xibarriers.h"
 #include "scrnintstr.h"
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
index eea917ff6..99cc25045 100644
--- a/Xi/xichangehierarchy.c
+++ b/Xi/xichangehierarchy.c
@@ -42,6 +42,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index aaafc629b..5ac5d1c1d 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -35,6 +35,7 @@
 #include <X11/extensions/XI2proto.h>
 
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "dix.h"
 #include "inputstr.h"
diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c
index cd9bb39d5..e286064c2 100644
--- a/Xi/xiquerydevice.c
+++ b/Xi/xiquerydevice.c
@@ -37,6 +37,7 @@
 #include <X11/extensions/XI2proto.h>
 
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"
 #include "xkbstr.h"
diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
index 2ac3e73a0..594804662 100644
--- a/Xi/xiquerypointer.c
+++ b/Xi/xiquerypointer.c
@@ -41,6 +41,7 @@
 #include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */