dix: unexport some lookup functions

These aren't used by any drivers, so no need to export them.

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

9 files changed, 33 insertions, 16 deletions

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 71713f14b..94c81a7c8 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -31,6 +31,10 @@ Equipment Corporation.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xarch.h>
+#include <X11/extensions/panoramiXproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
@@ -43,7 +47,6 @@ Equipment Corporation.
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "panoramiX.h"
-#include <X11/extensions/panoramiXproto.h>
 #include "panoramiXsrv.h"
 #include "globals.h"
 #include "servermd.h"
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 32424fcbd..9c46e3291 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -32,6 +32,9 @@ Equipment Corporation.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "windowstr.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"
diff --git a/Xext/saver.c b/Xext/saver.c
index fd6153c31..d9f0c9a64 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -30,8 +30,13 @@ in this Software without prior written authorization from the X Consortium.
 #include <dix-config.h>
 #endif
 
+#include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/saverproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -41,7 +46,6 @@ in this Software without prior written authorization from the X Consortium.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#include <X11/extensions/saverproto.h>
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"
@@ -56,9 +60,6 @@ in this Software without prior written authorization from the X Consortium.
 #include "dpmsproc.h"
 #endif
 #include "protocol-versions.h"
-
-#include <stdio.h>
-
 #include "extinit.h"
 
 static int ScreenSaverEventBase = 0;
diff --git a/Xext/shape.c b/Xext/shape.c
index 3af0e4b68..9d46cd3d6 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -29,11 +29,11 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #include <stdlib.h>
-
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/shapeproto.h>
 
+#include "dix/dix_priv.h"
 #include "dix/gc_priv.h"
 
 #include "misc.h"
diff --git a/Xext/shm.c b/Xext/shm.c
index 295866480..e8a8dd460 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -96,6 +96,8 @@ in this Software without prior written authorization from The Open Group.
 #include "panoramiXsrv.h"
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "extinit.h"
 
 typedef struct _ShmScrPrivateRec {
diff --git a/Xext/sync.c b/Xext/sync.c
index 8da5bf616..7a814a479 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -54,10 +54,14 @@ PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #include <string.h>
-
+#include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xmd.h>
+#include <X11/extensions/syncproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "scrnintstr.h"
 #include "os.h"
 #include "extnsionst.h"
@@ -65,14 +69,12 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "pixmapstr.h"
 #include "resource.h"
 #include "opaque.h"
-#include <X11/extensions/syncproto.h>
 #include "syncsrv.h"
 #include "syncsdk.h"
 #include "protocol-versions.h"
 #include "inputstr.h"
 #include "misync_priv.h"
 
-#include <stdio.h>
 #if !defined(WIN32)
 #include <sys/time.h>
 #endif
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index 321620c11..c7ce19c49 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -21,6 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "selection.h"
 #include "inputstr.h"
 #include "windowstr.h"
diff --git a/Xext/xtest.c b/Xext/xtest.c
index f03d8c951..a938d813a 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -33,6 +33,12 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
+#include <X11/extensions/xtestproto.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -45,16 +51,12 @@
 #include "mi.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
-#include <X11/extensions/xtestproto.h>
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
 #include "exglobals.h"
 #include "mipointer.h"
 #include "xserver-properties.h"
 #include "exevents.h"
 #include "eventstr.h"
 #include "inpututils.h"
-
 #include "extinit.h"
 
 /* XTest events are sent during request processing and may be interrupted by
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 5232b37d6..eb80561b7 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -29,6 +29,11 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
@@ -37,9 +42,6 @@ SOFTWARE.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
 #include "xvdix.h"
 #ifdef MITSHM
 #include <X11/extensions/shmproto.h>