From 6d8dbe3db825483e44fc5e98437ded5eab47efed Mon Sep 17 00:00:00 2001
From: kohnish <kohnish@gmx.com>
Date: Tue, 18 Nov 2025 21:40:39 +0100
Subject: [PATCH] Revert "mi: unexport mieqInit()"

This reverts commit 5ac361cce9b22b2200d39ca4cc8191d90035b8bb.
---
 hw/kdrive/src/kinput.c       | 6 ++++++
 hw/vfb/InitInput.c           | 8 +++-----
 hw/xfree86/common/xf86Init.c | 2 +-
 hw/xnest/Init.c              | 2 +-
 hw/xquartz/darwinEvents.c    | 4 +---
 hw/xwayland/xwayland-input.c | 2 +-
 hw/xwin/InitInput.c          | 3 ---
 mi/mi.h                      | 3 +++
 mi/mi_priv.h                 | 2 --
 mi/mieq.c                    | 2 +-
 test/input.c                 | 2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index ad5d4b047..3ee06203f 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -53,6 +53,12 @@
 #include "inpututils.h"
 #include "optionstr.h"
 
+#include "os/cmdline.h"
+
+#if defined(CONFIG_UDEV) || defined(CONFIG_HAL)
+#include <hotplug.h>
+#endif
+
 #define AtomFromName(x) MakeAtom(x, strlen(x), 1)
 
 struct KdConfigDevice {
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index 447f23931..ca451604d 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -29,16 +29,14 @@ from The Open Group.
 #include <dix-config.h>
 
 #include <X11/X.h>
+#include "mi.h"
 #include <X11/Xproto.h>
-#include <X11/Xos.h>
-#include <X11/keysym.h>
-
-#include "mi/mi_priv.h"
-
 #include "scrnintstr.h"
 #include "inputstr.h"
+#include <X11/Xos.h>
 #include "mipointer.h"
 #include "xkbsrv.h"
+#include <X11/keysym.h>
 #include "xserver-properties.h"
 #include "exevents.h"
 #include "extinit.h"
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 970cc0dc4..95ce29433 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -55,13 +55,13 @@
 #include "config/hotplug_priv.h"
 #include "dix/input_priv.h"
 #include "dix/screenint_priv.h"
-#include "mi/mi_priv.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 
 #include "servermd.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
+#include "mi.h"
 #include "systemd-logind.h"
 
 #include "loaderProcs.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index e9c5fc59b..6e5a11657 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -21,7 +21,6 @@ is" without express or implied warranty.
 #include <X11/fonts/libxfont2.h>
 
 #include "dix/screenint_priv.h"
-#include "mi/mi_priv.h"
 #include "os/ddx_priv.h"
 
 #include "screenint.h"
@@ -30,6 +29,7 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "servermd.h"
+#include "mi.h"
 #include "dixfontstr.h"
 #include "extinit_priv.h"
 #include "Xnest.h"
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 5aa16ffab..b8d85a17e 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -45,16 +45,14 @@
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
-
-#include "mi/mi_priv.h"
 #include "os/client_priv.h"
-
 #include "misc.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "inputstr.h"
 #include "inpututils.h"
 #include "eventstr.h"
+#include "mi.h"
 #include "scrnintstr.h"
 #include "mipointer.h"
 #include "os.h"
diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index cd2046e1d..73a8b4fb7 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -32,13 +32,13 @@
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
-#include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 
 #include <inputstr.h>
 #include <xkbsrv.h>
 #include <xserver-properties.h>
 #include <inpututils.h>
+#include <mi.h>
 #include <mipointer.h>
 #include <mipointrst.h>
 #include <misc.h>
diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index c50464a60..6aced4f9c 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -29,9 +29,6 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
-
-#include "mi/mi_priv.h"
-
 #include "win.h"
 #include "dixstruct_priv.h"
 #include "inputstr.h"
diff --git a/mi/mi.h b/mi/mi.h
index 4f41fbe72..e1d37a285 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,6 +114,9 @@ miDoCopy(DrawablePtr pSrcDrawable,
 typedef struct _DeviceRec *DevicePtr;
 #endif
 
+extern _X_EXPORT Bool mieqInit(void
+    );
+
 extern _X_EXPORT void mieqFini(void);
 
 extern _X_EXPORT void mieqEnqueue(DeviceIntPtr /*pDev */ ,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 90c231ed1..bd92ba171 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -5,7 +5,6 @@
 #ifndef _XSERVER_MI_PRIV_H
 #define _XSERVER_MI_PRIV_H
 
-#include <X11/Xdefs.h>
 #include <X11/Xprotostr.h>
 
 #include "include/gc.h"
@@ -18,6 +17,5 @@ void miScreenClose(ScreenPtr pScreen);
 void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
 void miStepDash(int dist, int * pDashIndex, unsigned char * pDash,
                 int numInDashList, int *pDashOffset);
-Bool mieqInit(void);
 
 #endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/mieq.c b/mi/mieq.c
index 74d10a314..c4018335c 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -41,7 +41,6 @@ in this Software without prior written authorization from The Open Group.
 #include   <X11/extensions/XIproto.h>
 #include   <X11/extensions/geproto.h>
 
-#include   "mi/mi_priv.h"
 #include   "mi/mipointer_priv.h"
 #include   "os/screensaver.h"
 
@@ -50,6 +49,7 @@ in this Software without prior written authorization from The Open Group.
 #include   "pixmapstr.h"
 #include   "inputstr.h"
 #include   "inpututils.h"
+#include   "mi.h"
 #include   "mipointer.h"
 #include   "scrnintstr.h"
 #include   "extinit.h"
diff --git a/test/input.c b/test/input.c
index 39057c828..ef1d14cd9 100644
--- a/test/input.c
+++ b/test/input.c
@@ -37,7 +37,6 @@
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
-#include "mi/mi_priv.h"
 
 #include "misc.h"
 #include "resource.h"
@@ -46,6 +45,7 @@
 #include "exglobals.h"
 #include "eventstr.h"
 #include "inpututils.h"
+#include "mi.h"
 #include "assert.h"
 
 #include "tests-common.h"