Revert "dix: unexport NewCurrentScreen()"

This reverts commit bd3c252710.

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

Xi/xiwarppointer.c

@@ -36,7 +36,6 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2proto.h>
 
-#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "mi/mipointer_priv.h"
 

dix/cursor_priv.h

@@ -10,10 +10,8 @@
 #include <X11/Xdefs.h>
 #include <X11/Xmd.h>
 
-#include "dix/screenint_priv.h"
 #include "include/cursor.h"
 #include "include/dix.h"
-#include "include/input.h"
 #include "include/window.h"
 
 extern CursorPtr rootCursor;
@@ -64,9 +62,4 @@ Bool CursorMetricsFromGlyph(FontPtr pfont,
 
 void CheckCursorConfinement(WindowPtr pWin);
 
-void NewCurrentScreen(DeviceIntPtr pDev,
-                      ScreenPtr newScreen,
-                      int x,
-                      int y);
-
 #endif /* _XSERVER_DIX_CURSOR_PRIV_H */

hw/xnest/Events.c

@@ -17,7 +17,6 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
-#include "dix/cursor_priv.h"
 #include "mi/mi_priv.h"
 
 #include "screenint.h"

include/cursor.h

@@ -70,6 +70,11 @@ typedef struct _CursorMetric *CursorMetricPtr;
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
+extern _X_EXPORT void NewCurrentScreen(struct _DeviceIntRec * /*pDev */ ,
+                                       ScreenPtr /*newScreen */ ,
+                                       int /*x */ ,
+                                       int /*y */ );
+
 extern _X_EXPORT Bool PointerConfinedToScreen(struct _DeviceIntRec * /* pDev */
                                               );
 

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   "dix/cursor_priv.h"
 #include   "mi/mi_priv.h"
 #include   "mi/mipointer_priv.h"
 #include   "os/screensaver.h"

mi/mipointer.c

@@ -52,7 +52,6 @@ in this Software without prior written authorization from The Open Group.
 #include   <X11/Xmd.h>
 #include   <X11/Xproto.h>
 
-#include   "dix/cursor_priv.h"
 #include   "dix/dix_priv.h"
 #include   "dix/input_priv.h"
 #include   "mi/mi_priv.h"