wip

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

.gitlab-ci.yml

@@ -16,17 +16,22 @@
 # gcc/clang or other packages, which might break the build with older commits
 # using the same tag.
 variables:
-    FDO_UPSTREAM_REPO: xorg/xserver
+    FDO_UPSTREAM_REPO:    xorg/xserver
-    FDO_DISTRIBUTION_VERSION: bullseye-slim
+    MESON_BUILDDIR:       "build"
-    FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
+    REPO_URL_XORGPROTO:   'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git'
-    FDO_DISTRIBUTION_TAG: "2024-03-26-explicit-sync-2"
+    XORG_DEBIAN_VERSION:  'bullseye-slim'
-    MESON_BUILDDIR: "build"
+    XORG_DEBIAN_EXEC:     'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
+    XORG_DEBIAN_TAG:      '2024-03-26-explicit-sync-2'
+    XORG_FREEBSD_VERSION: '14.0'
+    XORG_FREEBSD_EXEC:    ''
+    XORG_FREEBSD_TAG:     '2024-06-10.0'
 
 include:
   - project: 'freedesktop/ci-templates'
     ref: *template_sha
     file:
       - '/templates/debian.yml'
+      - '/templates/freebsd.yml'
       - '/templates/ci-fairy.yml'
   - template: Security/SAST.gitlab-ci.yml
 
@@ -93,17 +98,52 @@ stages:
 .all_ddx_paths:
   - hw/**/*
 
+.debian:
+    variables:
+        FDO_DISTRIBUTION_VERSION:   "$XORG_DEBIAN_VERSION"
+        FDO_DISTRIBUTION_EXEC:      "$XORG_DEBIAN_EXEC"
+        FDO_DISTRIBUTION_TAG:       "$XORG_DEBIAN_TAG"
+
+.freebsd:
+    variables:
+        FDO_DISTRIBUTION_TAG:       "$XORG_FREEBSD_TAG"
+        FDO_DISTRIBUTION_VERSION:   "$XORG_FREEBSD_VERSION"
+        FDO_DISTRIBUTION_EXEC:      ''
+        FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool xorg-macros xorgproto bash meson ninja pixman xtrans libXau libXdmcp libXfont2 libxkbfile libxcvt libpciaccess font-util libepoll-shim'
+
 debian-bullseye:
   extends:
     - .fdo.container-build@debian
     - .ci-run-policy
+    - .debian
   stage: docker-image
   variables:
     GIT_STRATEGY: none
 
-.common-build-and-test:
+freebsd-image:
+    extends:
+        - .fdo.qemu-build@freebsd@x86_64
+        - .freebsd
+    stage: docker-image
+    variables:
+        GIT_STRATEGY:               none
+
+.xorg-image@debian:
     extends:
         - .fdo.distribution-image@debian
+        - .debian
+
+.xorg-image@freebsd:
+    extends:
+        - .fdo.distribution-image@freebsd
+        - .freebsd
+    variables:
+        GIT_DEPTH:                1
+        PKG_CONFIG_PATH:          /usr/share/pkgconfig:/usr/lib/pkgconfig:/usr/pkg/share/pkgconfig:/usr/pkg/lib/pkgconfig:/usr/local/libdata/pkgconfig
+
+.common-build-and-test:
+    extends:
+        - .xorg-image@debian
         - .ci-run-policy
     stage: build-and-test
     artifacts:
@@ -153,6 +193,29 @@ mingw-cross-build:
     variables:
       MESON_ARGS: --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dlisten_tcp=true
 
+freebsd:
+    stage: build-and-test
+    extends:
+        - .xorg-image@freebsd
+    variables:
+        MESON_ARGS: -Dglx=false -Dglamor=false -Dudev=false -Dudev_kms=false
+    script:
+# running of of disk space without this
+# needed until https://gitlab.freedesktop.org/freedesktop/ci-templates/-/issues/67 is fixed
+      - git gc
+      - git clone --depth=1 $REPO_URL_XORGPROTO dep.xorgproto
+      - /app/vmctl start
+      - set +e
+      - scp -r $PWD "vm:"
+# need to install newer xorgproto
+      - /app/vmctl exec "cd $CI_PROJECT_NAME/dep.xorgproto && ./autogen.sh --prefix=/usr && make && make install"
+      - /app/vmctl exec "cd $CI_PROJECT_NAME && PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\" MESON_ARGS=\"$MESON_ARGS\" MESON_BUILDDIR=\"$MESON_BUILDDIR\" .gitlab-ci/meson-build.sh --skip-test" && touch .success
+# test not working yet, so skipped
+#     - scp -r vm:$CI_PROJECT_NAME/test-results.xml .
+      - /app/vmctl stop
+      - set -e
+      - test -e .success || exit 1
+
 meson-dist:
     extends: .common-build-and-test
     artifacts:
@@ -171,7 +234,7 @@ meson-dist:
 
 xf86-driver-build-test:
     extends:
-        - .fdo.distribution-image@debian
+        - .xorg-image@debian
         - .ci-run-policy
     stage: drivers
     parallel:

Xext/bigreq.c

@@ -26,22 +26,20 @@ from The Open Group.
 
 */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/bigreqsproto.h>
 
 #include "dix/dix_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "opaque.h"
-#include "extinit_priv.h"
 
 static int
 ProcBigReqDispatch(ClientPtr client)

Xext/dpms.c

@@ -26,24 +26,27 @@ Equipment Corporation.
 
 ******************************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/dpmsproto.h>
+
+#include "miext/extinit_priv.h"
+#include "os/screensaver.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "opaque.h"
-#include <X11/extensions/dpmsproto.h>
 #include "dpmsproc.h"
-#include "extinit_priv.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "protocol-versions.h"
 
+Bool noDPMSExtension = FALSE;
+
 CARD16 DPMSPowerLevel = 0;
 Bool DPMSDisabledSwitch = FALSE;
 CARD32 DPMSStandbyTime = -1;

Xext/geext.c

@@ -23,16 +23,19 @@
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
+
-#include "windowstr.h"
 #include <X11/extensions/ge.h>
 
+#include "windowstr.h"
+
+#include "miext/extinit_priv.h"
+
 #include "geint.h"
 #include "geext.h"
 #include "protocol-versions.h"
-#include "extinit_priv.h"
+
+Bool noGEExtension = FALSE;
 
 DevPrivateKeyRec GEClientPrivateKeyRec;
 

Xext/hashtable.c

@@ -1,6 +1,4 @@
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdlib.h>
 #include "misc.h"

Xext/panoramiX.c

@@ -23,9 +23,7 @@ dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdio.h>
 #include <X11/X.h>
@@ -34,6 +32,7 @@ Equipment Corporation.
 #include <X11/extensions/panoramiXproto.h>
 
 #include "dix/dix_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "misc.h"
 #include "cursor.h"
@@ -57,7 +56,6 @@ Equipment Corporation.
 #ifdef COMPOSITE
 #include "compint.h"
 #endif
-#include "extinit_priv.h"
 #include "protocol-versions.h"
 
 #ifdef GLXPROXY
@@ -65,6 +63,9 @@ extern VisualPtr glxMatchVisual(ScreenPtr pScreen,
                                 VisualPtr pVisual, ScreenPtr pMatchScreen);
 #endif
 
+/* Xinerama is disabled by default unless enabled via +xinerama */
+Bool noPanoramiXExtension = TRUE;
+
 /*
  *	PanoramiX data declarations
  */

Xext/panoramiXSwap.c

@@ -23,9 +23,7 @@ dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdio.h>
 #include <X11/X.h>

Xext/panoramiXprocs.c

@@ -25,9 +25,7 @@ Equipment Corporation.
 
 /* Massively rewritten by Mark Vojkovich <markv@valinux.com> */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdio.h>
 #include <X11/X.h>

Xext/saver.c

@@ -26,16 +26,18 @@ in this Software without prior written authorization from the X Consortium.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/saverproto.h>
 
+#include "dix/colormap_priv.h"
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
+#include "miext/extinit_priv.h"
+#include "os/screensaver.h"
 
 #include "misc.h"
 #include "os.h"
@@ -50,43 +52,27 @@ in this Software without prior written authorization from the X Consortium.
 #include "colormapst.h"
 #include "xace.h"
 #include "inputstr.h"
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */
 #ifdef DPMSExtension
 #include <X11/extensions/dpmsconst.h>
 #include "dpmsproc.h"
 #endif
 #include "protocol-versions.h"
-#include "extinit_priv.h"
+
+Bool noScreenSaverExtension = FALSE;
 
 static int ScreenSaverEventBase = 0;
 
-static Bool ScreenSaverHandle(ScreenPtr /* pScreen */ ,
+static Bool ScreenSaverHandle(ScreenPtr pScreen, int xstate, Bool force);
-                              int /* xstate */ ,
+static Bool CreateSaverWindow(ScreenPtr pScreen);
-                              Bool      /* force */
+static Bool DestroySaverWindow(ScreenPtr pScreen);
-    );
+static void UninstallSaverColormap(ScreenPtr pScreen);
-
+static void CheckScreenPrivate(ScreenPtr pScreen);
-static Bool
+static void SScreenSaverNotifyEvent(xScreenSaverNotifyEvent *from,
- CreateSaverWindow(ScreenPtr    /* pScreen */
+                                    xScreenSaverNotifyEvent *to);
-    );
-
-static Bool
- DestroySaverWindow(ScreenPtr   /* pScreen */
-    );
-
-static void
- UninstallSaverColormap(ScreenPtr       /* pScreen */
-    );
-
-static void
- CheckScreenPrivate(ScreenPtr   /* pScreen */
-    );
-
-static void SScreenSaverNotifyEvent(xScreenSaverNotifyEvent * /* from */ ,
-                                    xScreenSaverNotifyEvent *   /* to */
-    );
 
 static RESTYPE SuspendType;     /* resource type for suspension records */
 
@@ -193,8 +179,6 @@ static DevPrivateKeyRec ScreenPrivateKeyRec;
     dixSetPrivate(&(s)->devPrivates, ScreenPrivateKey, v);
 #define SetupScreen(s)	ScreenSaverScreenPrivatePtr pPriv = (s ? GetScreenPrivate(s) : NULL)
 
-#define New(t)	(malloc(sizeof (t)))
-
 static void
 CheckScreenPrivate(ScreenPtr pScreen)
 {
@@ -217,7 +201,7 @@ MakeScreenPrivate(ScreenPtr pScreen)
 
     if (pPriv)
         return pPriv;
-    pPriv = New(ScreenSaverScreenPrivateRec);
+    pPriv = calloc(1, sizeof(ScreenSaverScreenPrivateRec));
     if (!pPriv)
         return 0;
     pPriv->events = 0;
@@ -267,7 +251,7 @@ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
     }
     else {
         if (!pEv) {
-            pEv = New(ScreenSaverEventRec);
+            pEv = calloc(1, sizeof(ScreenSaverEventRec));
             if (!pEv) {
                 CheckScreenPrivate(pScreen);
                 return FALSE;
@@ -601,9 +585,9 @@ ScreenSaverHandle(ScreenPtr pScreen, int xstate, Bool force)
             ret = TRUE;
 
     }
-#ifdef PANORAMIX
+#ifdef XINERAMA
     if (noPanoramiXExtension || !pScreen->myNum)
-#endif
+#endif /* XINERAMA */
         SendScreenSaverNotify(pScreen, state, force);
     return ret;
 }
@@ -846,7 +830,7 @@ ScreenSaverSetAttributes(ClientPtr client)
         if (!pPriv)
             return FALSE;
     }
-    pAttr = New(ScreenSaverAttrRec);
+    pAttr = calloc(1, sizeof(ScreenSaverAttrRec));
     if (!pAttr) {
         ret = BadAlloc;
         goto bail;
@@ -1091,7 +1075,7 @@ ScreenSaverUnsetAttributes(ClientPtr client)
 static int
 ProcScreenSaverSetAttributes(ClientPtr client)
 {
-#ifdef PANORAMIX
+#ifdef XINERAMA
     if (!noPanoramiXExtension) {
         REQUEST(xScreenSaverSetAttributesReq);
         PanoramiXRes *draw;
@@ -1170,7 +1154,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
 
         return status;
     }
-#endif
+#endif /* XINERAMA */
 
     return ScreenSaverSetAttributes(client);
 }
@@ -1178,7 +1162,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
 static int
 ProcScreenSaverUnsetAttributes(ClientPtr client)
 {
-#ifdef PANORAMIX
+#ifdef XINERAMA
     if (!noPanoramiXExtension) {
         REQUEST(xScreenSaverUnsetAttributesReq);
         PanoramiXRes *draw;
@@ -1198,7 +1182,7 @@ ProcScreenSaverUnsetAttributes(ClientPtr client)
 
         stuff->drawable = draw->info[0].id;
     }
-#endif
+#endif /* XINERAMA */
 
     return ScreenSaverUnsetAttributes(client);
 }

Xext/security.c

@@ -24,12 +24,14 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
+
+#include <X11/extensions/securproto.h>
+#include <X11/Xfuncproto.h>
 
 #include "dix/dix_priv.h"
 #include "dix/registry_priv.h"
+#include "miext/extinit_priv.h"
 #include "os/audit.h"
 #include "os/auth.h"
 
@@ -41,10 +43,10 @@ in this Software without prior written authorization from The Open Group.
 #include "privates.h"
 #include "xacestr.h"
 #include "securitysrv.h"
-#include <X11/extensions/securproto.h>
-#include "extinit.h"
 #include "protocol-versions.h"
 
+Bool noSecurityExtension = FALSE;
+
 /* Extension stuff */
 static int SecurityErrorBase;   /* first Security error number */
 static int SecurityEventBase;   /* first Security event number */

Xext/shape.c

@@ -24,9 +24,7 @@ in this Software without prior written authorization from The Open Group.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdlib.h>
 #include <X11/X.h>
@@ -35,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include "dix/dix_priv.h"
 #include "dix/gc_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "misc.h"
 #include "os.h"
@@ -47,7 +46,6 @@ in this Software without prior written authorization from The Open Group.
 #include "opaque.h"
 #include "regionstr.h"
 #include "gcstruct.h"
-#include "extinit_priv.h"
 #include "protocol-versions.h"
 
 typedef RegionPtr (*CreateDftPtr) (WindowPtr    /* pWin */
@@ -67,10 +65,12 @@ static void SShapeNotifyEvent(xShapeNotifyEvent * /* from */ ,
  * externally by the Xfixes extension and are now defined in window.h
  */
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */
+
+Bool noShapeExtension = FALSE;
 
 static int ShapeEventBase = 0;
 static RESTYPE ClientType, ShapeEventType;      /* resource types for event masks */
@@ -299,7 +299,7 @@ ProcShapeRectangles(ClientPtr client)
                          stuff->xOff, stuff->yOff, createDefault);
 }
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 static int
 ProcPanoramiXShapeRectangles(ClientPtr client)
 {
@@ -322,7 +322,7 @@ ProcPanoramiXShapeRectangles(ClientPtr client)
     }
     return result;
 }
-#endif
+#endif /* XINERAMA */
 
 /**************
  * ProcShapeMask
@@ -397,7 +397,7 @@ ProcShapeMask(ClientPtr client)
                          stuff->xOff, stuff->yOff, createDefault);
 }
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 static int
 ProcPanoramiXShapeMask(ClientPtr client)
 {
@@ -431,7 +431,7 @@ ProcPanoramiXShapeMask(ClientPtr client)
     }
     return result;
 }
-#endif
+#endif /* XINERAMA */
 
 /************
  * ProcShapeCombine
@@ -525,7 +525,7 @@ ProcShapeCombine(ClientPtr client)
                          stuff->xOff, stuff->yOff, createDefault);
 }
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 static int
 ProcPanoramiXShapeCombine(ClientPtr client)
 {
@@ -554,7 +554,7 @@ ProcPanoramiXShapeCombine(ClientPtr client)
     }
     return result;
 }
-#endif
+#endif /* XINERAMA */
 
 /*************
  * ProcShapeOffset
@@ -596,7 +596,7 @@ ProcShapeOffset(ClientPtr client)
     return Success;
 }
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 static int
 ProcPanoramiXShapeOffset(ClientPtr client)
 {
@@ -619,7 +619,7 @@ ProcPanoramiXShapeOffset(ClientPtr client)
     }
     return result;
 }
-#endif
+#endif /* XINERAMA */
 
 static int
 ProcShapeQueryExtents(ClientPtr client)
@@ -1037,32 +1037,32 @@ ProcShapeDispatch(ClientPtr client)
     case X_ShapeQueryVersion:
         return ProcShapeQueryVersion(client);
     case X_ShapeRectangles:
-#ifdef PANORAMIX
+#ifdef XINERAMA
         if (!noPanoramiXExtension)
             return ProcPanoramiXShapeRectangles(client);
         else
-#endif
+#endif /* XINERAMA */
             return ProcShapeRectangles(client);
     case X_ShapeMask:
-#ifdef PANORAMIX
+#ifdef XINERAMA
         if (!noPanoramiXExtension)
             return ProcPanoramiXShapeMask(client);
         else
-#endif
+#endif /* XINERAMA */
             return ProcShapeMask(client);
     case X_ShapeCombine:
-#ifdef PANORAMIX
+#ifdef XINERAMA
         if (!noPanoramiXExtension)
             return ProcPanoramiXShapeCombine(client);
         else
-#endif
+#endif /* XINERAMA */
             return ProcShapeCombine(client);
     case X_ShapeOffset:
-#ifdef PANORAMIX
+#ifdef XINERAMA
         if (!noPanoramiXExtension)
             return ProcPanoramiXShapeOffset(client);
         else
-#endif
+#endif /* XINERAMA */
             return ProcShapeOffset(client);
     case X_ShapeQueryExtents:
         return ProcShapeQueryExtents(client);

Xext/shm.c

@@ -28,9 +28,7 @@ in this Software without prior written authorization from The Open Group.
 
 #define SHM
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -45,6 +43,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xfuncproto.h>
 
 #include "dix/dix_priv.h"
+#include "miext/extinit_priv.h"
 #include "os/auth.h"
 #include "os/busfault.h"
 #include "os/osdep.h"
@@ -61,7 +60,6 @@ in this Software without prior written authorization from The Open Group.
 #include "servermd.h"
 #include "shmint.h"
 #include "xace.h"
-#include "extinit_priv.h"
 #include "protocol-versions.h"
 
 /* Needed for Solaris cross-zone shared memory extension */
@@ -91,10 +89,10 @@ in this Software without prior written authorization from The Open Group.
 #define SHMPERM_MODE(p)		p->mode
 #endif
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */
 
 typedef struct _ShmScrPrivateRec {
     CloseScreenProcPtr CloseScreen;
@@ -110,6 +108,8 @@ static void SShmCompletionEvent(xShmCompletionEvent *from,
 
 static Bool ShmDestroyPixmap(PixmapPtr pPixmap);
 
+Bool noMITShmExtension = FALSE;
+
 static unsigned char ShmReqCode;
 int ShmCompletionCode;
 int BadShmSegCode;
@@ -156,7 +156,7 @@ static ShmFuncs fbFuncs = { fbShmCreatePixmap, NULL };
     } \
 }
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 
 static Bool badSysCall = FALSE;
 
@@ -732,7 +732,7 @@ ProcShmGetImage(ClientPtr client)
     return Success;
 }
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 static int
 ProcPanoramiXShmPutImage(ClientPtr client)
 {
@@ -1028,7 +1028,7 @@ ProcPanoramiXShmCreatePixmap(ClientPtr client)
 
     return result;
 }
-#endif
+#endif /* XINERAMA */
 
 static PixmapPtr
 fbShmCreatePixmap(ScreenPtr pScreen,
@@ -1348,22 +1348,22 @@ ProcShmDispatch(ClientPtr client)
     case X_ShmDetach:
         return ProcShmDetach(client);
     case X_ShmPutImage:
-#ifdef PANORAMIX
+#ifdef XINERAMA
         if (!noPanoramiXExtension)
             return ProcPanoramiXShmPutImage(client);
-#endif
+#endif /* XINERAMA */
         return ProcShmPutImage(client);
     case X_ShmGetImage:
-#ifdef PANORAMIX
+#ifdef XINERAMA
         if (!noPanoramiXExtension)
             return ProcPanoramiXShmGetImage(client);
-#endif
+#endif /* XINERAMA */
         return ProcShmGetImage(client);
     case X_ShmCreatePixmap:
-#ifdef PANORAMIX
+#ifdef XINERAMA
         if (!noPanoramiXExtension)
             return ProcPanoramiXShmCreatePixmap(client);
-#endif
+#endif /* XINERAMA */
         return ProcShmCreatePixmap(client);
 #ifdef SHM_FD_PASSING
     case X_ShmAttachFd:

Xext/sleepuntil.c

@@ -27,9 +27,7 @@ in this Software without prior written authorization from The Open Group.
 
 /* dixsleep.c - implement millisecond timeouts for X clients */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "sleepuntil.h"
 #include <X11/X.h>

Xext/sync.c

@@ -49,9 +49,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <string.h>
 #include <stdio.h>
@@ -61,6 +59,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/syncproto.h>
 
 #include "dix/dix_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "scrnintstr.h"
 #include "os.h"
@@ -78,8 +77,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <sys/time.h>
 #endif
 
-#include "extinit_priv.h"
-
 /*
  * Local Global Variables
  */

Xext/vidmode.c

@@ -29,9 +29,7 @@ from Kaleb S. KEITHLEY
 */
 /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #ifdef XF86VIDMODE
 

Xext/xace.c

@@ -17,9 +17,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdarg.h>
 #include "scrnintstr.h"

Xext/xace.h

@@ -25,12 +25,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_MAJOR_VERSION		2
 #define XACE_MINOR_VERSION		0
 
+#include "dix/selection_priv.h"
+
 #include "extnsionst.h"
 #include "pixmap.h"
 #include "region.h"
 #include "window.h"
 #include "property.h"
-#include "selection.h"
 
 /* Default window background */
 #define XaceBackgroundNoneState(w) ((w)->forcedBG ? BackgroundPixel : None)

Xext/xacestr.h

@@ -20,13 +20,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _XACESTR_H
 #define _XACESTR_H
 
+#include "dix/selection_priv.h"
+
 #include "dix.h"
 #include "resource.h"
 #include "extnsionst.h"
 #include "window.h"
 #include "input.h"
 #include "property.h"
-#include "selection.h"
 #include "xace.h"
 
 /* XACE_CORE_DISPATCH */

Xext/xcmisc.c

@@ -26,21 +26,20 @@ from The Open Group.
 
 */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
+#include <stdint.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/xcmiscproto.h>
+
+#include "miext/extinit_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
-#include <X11/extensions/xcmiscproto.h>
-#include "extinit_priv.h"
-
-#include <stdint.h>
 
 static int
 ProcXCMiscGetVersion(ClientPtr client)

Xext/xf86bigfont.c

@@ -34,19 +34,13 @@
  * XLoadQueryFont).
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <sys/types.h>
 #ifdef MITSHM
 #ifdef SVR4
 #include <sys/sysmacros.h>
 #endif
-#if defined(__CYGWIN__)
-#include <sys/param.h>
-#include <sys/sysmacros.h>
-#endif
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/stat.h>
@@ -58,18 +52,21 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/xf86bigfproto.h>
+
+#include "miext/extinit_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "gcstruct.h"
 #include "dixfontstr.h"
 #include "extnsionst.h"
-#include "extinit.h"
 #include "protocol-versions.h"
-
-#include <X11/extensions/xf86bigfproto.h>
 #include "xf86bigfontsrv.h"
 
+Bool noXFree86BigfontExtension = FALSE;
+
 static void XF86BigfontResetProc(ExtensionEntry *       /* extEntry */
     );
 
@@ -87,7 +84,7 @@ static unsigned int pagesize;
 
 static Bool badSysCall = FALSE;
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 
 static void
 SigSysHandler(int signo)
@@ -716,7 +713,7 @@ XFree86BigfontExtensionInit(void)
 
         FontShmdescIndex = xfont2_allocate_font_private_index();
 
-#if !defined(CSRG_BASED) && !defined(__CYGWIN__)
+#if !defined(CSRG_BASED)
         pagesize = SHMLBA;
 #else
 #ifdef _SC_PAGESIZE

Xext/xres.c

@@ -2,30 +2,29 @@
    Copyright (c) 2002  XFree86 Inc
 */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/XResproto.h>
 #include <assert.h>
 
 #include "dix/registry_priv.h"
+#include "miext/extinit_priv.h"
+#include "os/client_priv.h"
 
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
-#include <X11/extensions/XResproto.h>
 #include "pixmapstr.h"
 #include "windowstr.h"
 #include "gcstruct.h"
-#include "extinit_priv.h"
 #include "protocol-versions.h"
-#include "client.h"
 #include "list.h"
 #include "misc.h"
 #include <string.h>
@@ -36,6 +35,8 @@
 #include "compint.h"
 #endif
 
+Bool noResExtension = FALSE;
+
 /** @brief Holds fragments of responses for ConstructClientIds.
  *
  *  note: there is no consideration for data alignment */

Xext/xselinux_ext.c

@@ -17,18 +17,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "dix/dix_priv.h"
+#include "dix/property_priv.h"
+#include "dix/selection_priv.h"
+#include "miext/extinit_priv.h"
 
-#include "selection.h"
 #include "inputstr.h"
 #include "windowstr.h"
 #include "propertyst.h"
 #include "extnsionst.h"
-#include "extinit_priv.h"
 #include "xselinuxint.h"
 
 #define CTX_DEV offsetof(SELinuxSubjectRec, dev_create_sid)

Xext/xselinux_hooks.c

@@ -22,9 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * All rights reserved.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <errno.h>
 #include <sys/socket.h>
@@ -32,17 +30,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdarg.h>
 #include <libaudit.h>
 #include <X11/Xatom.h>
+#include <X11/Xfuncproto.h>
 
 #include "dix/registry_priv.h"
+#include "dix/selection_priv.h"
+#include "os/client_priv.h"
 
-#include "selection.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "propertyst.h"
 #include "extnsionst.h"
 #include "xacestr.h"
-#include "client.h"
 #define _XSELINUX_NEED_FLASK_MAP
 #include "xselinuxint.h"
 

Xext/xselinux_label.c

@@ -17,9 +17,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <selinux/label.h>
 

Xext/xtest.c

@@ -26,9 +26,7 @@
 
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
@@ -37,8 +35,10 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 
+#include "dix/input_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "miext/extinit_priv.h"
 #include "os/osdep.h"
 
 #include "misc.h"
@@ -58,7 +58,8 @@
 #include "xserver-properties.h"
 #include "eventstr.h"
 #include "inpututils.h"
-#include "extinit_priv.h"
+
+Bool noTestExtensions = FALSE;
 
 /* XTest events are sent during request processing and may be interrupted by
  * a SIGIO. We need a separate event list to avoid events overwriting each
@@ -78,10 +79,10 @@ static InternalEvent *xtest_evlist;
  */
 DeviceIntPtr xtestpointer, xtestkeyboard;
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */
 
 static int XTestSwapFakeInput(ClientPtr /* client */ ,
                               xReq *    /* req */

Xext/xvdisp.c

@@ -21,9 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 ******************************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <string.h>
 
@@ -50,12 +48,12 @@ SOFTWARE.
 
 #include "xvdisp.h"
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 
 unsigned long XvXRTPort;
-#endif
+#endif /* XINERAMA */
 
 static int
 SWriteQueryExtensionReply(ClientPtr client, xvQueryExtensionReply * rep)
@@ -1435,7 +1433,7 @@ SProcXvDispatch(ClientPtr client)
     return SXvProcVector[stuff->data] (client);
 }
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 static int
 XineramaXvStopVideo(ClientPtr client)
 {
@@ -1543,7 +1541,7 @@ XineramaXvShmPutImage(ClientPtr client)
 }
 #else
 #define XineramaXvShmPutImage ProcXvShmPutImage
-#endif
+#endif /* MITSHM */
 
 static int
 XineramaXvPutImage(ClientPtr client)
@@ -1798,17 +1796,17 @@ XineramifyXv(void)
     XvProcVector[xv_PutImage] = XineramaXvPutImage;
     XvProcVector[xv_ShmPutImage] = XineramaXvShmPutImage;
 }
-#endif                          /* PANORAMIX */
+#endif /* XINERAMA */
 
 void
 XvResetProcVector(void)
 {
-#ifdef PANORAMIX
+#ifdef XINERAMA
     XvProcVector[xv_PutVideo] = ProcXvPutVideo;
     XvProcVector[xv_PutStill] = ProcXvPutStill;
     XvProcVector[xv_StopVideo] = ProcXvStopVideo;
     XvProcVector[xv_SetPortAttribute] = ProcXvSetPortAttribute;
     XvProcVector[xv_PutImage] = ProcXvPutImage;
     XvProcVector[xv_ShmPutImage] = ProcXvShmPutImage;
-#endif
+#endif /* XINERAMA */
 }

Xext/xvmain.c

@@ -73,14 +73,15 @@ SOFTWARE.
 **
 */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <string.h>
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "miext/extinit_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "scrnintstr.h"
@@ -88,7 +89,6 @@ SOFTWARE.
 #include "pixmapstr.h"
 #include "gcstruct.h"
 #include "extnsionst.h"
-#include "extinit_priv.h"
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
@@ -100,12 +100,14 @@ SOFTWARE.
 #include <X11/extensions/Xvproto.h>
 #include "xvdix.h"
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */
 #include "xvdisp.h"
 
+Bool noXvExtension = FALSE;
+
 static DevPrivateKeyRec XvScreenKeyRec;
 
 #define XvScreenKey (&XvScreenKeyRec)
@@ -163,9 +165,9 @@ XvExtensionInit(void)
             ErrorF("XvExtensionInit: Unable to allocate resource types\n");
             return;
         }
-#ifdef PANORAMIX
+#ifdef XINERAMA
         XineramaRegisterConnectionBlockCallback(XineramifyXv);
-#endif
+#endif /* XINERAMA */
         XvScreenGeneration = serverGeneration;
     }
 
@@ -256,9 +258,9 @@ XvScreenInit(ScreenPtr pScreen)
             ErrorF("XvScreenInit: Unable to allocate resource types\n");
             return BadAlloc;
         }
-#ifdef PANORAMIX
+#ifdef XINERAMA
         XineramaRegisterConnectionBlockCallback(XineramifyXv);
-#endif
+#endif /* XINERAMA */
         XvScreenGeneration = serverGeneration;
     }
 

Xext/xvmc.c

@@ -1,25 +1,25 @@
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <string.h>
 
 #include <X11/X.h>
+#include <X11/Xfuncproto.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/XvMC.h>
+#include <X11/extensions/Xvproto.h>
+#include <X11/extensions/XvMCproto.h>
+
+#include "miext/extinit_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "resource.h"
 #include "scrnintstr.h"
 #include "extnsionst.h"
-#include "extinit_priv.h"
 #include "servermd.h"
-#include <X11/Xfuncproto.h>
 #include "xvdix.h"
-#include <X11/extensions/XvMC.h>
-#include <X11/extensions/Xvproto.h>
-#include <X11/extensions/XvMCproto.h>
 #include "xvmcext.h"
 #include "protocol-versions.h"
 

Xi/XIstubs.h

@@ -26,21 +26,18 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef XI_STUBS_H
 #define XI_STUBS_H 1
 
-extern _X_EXPORT int
+int SetDeviceMode(ClientPtr client,
- SetDeviceMode(ClientPtr /* client */ ,
+                  DeviceIntPtr dev,
-               DeviceIntPtr /* dev */ ,
+                  int mode);
-               int /* mode */ );
 
-extern _X_EXPORT int
+int SetDeviceValuators(ClientPtr client,
- SetDeviceValuators(ClientPtr /* client */ ,
+                       DeviceIntPtr dev,
-                    DeviceIntPtr /* dev */ ,
+                       int *valuators,
-                    int * /* valuators */ ,
+                       int first_valuator,
-                    int /* first_valuator */ ,
+                       int num_valuators);
-                    int /* num_valuators */ );
 
-extern _X_EXPORT int
+int ChangeDeviceControl(ClientPtr client,
- ChangeDeviceControl(ClientPtr /* client */ ,
+                        DeviceIntPtr dev,
-                     DeviceIntPtr /* dev */ ,
+                        xDeviceCtl *control);
-                     xDeviceCtl * /* control */ );
 
 #endif                          /* XI_STUBS_H */

Xi/allowev.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/chgdctl.c

@@ -50,14 +50,13 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>     /* control constants */
 
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "XIstubs.h"

Xi/chgfctl.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/chgkbd.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/chgkmap.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

Xi/chgprop.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

Xi/chgptr.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/closedev.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */

Xi/devbell.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/exevents.c

@@ -78,9 +78,9 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
+
+#include "dix/cursor_priv.h"
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
@@ -91,8 +91,10 @@ SOFTWARE.
 #include <X11/extensions/XKBproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/dixgrabs_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"
 #include "windowstr.h"
@@ -102,7 +104,6 @@ SOFTWARE.
 #include "exglobals.h"
 #include "eventstr.h"
 #include "dixevents.h"          /* DeliverFocusedEvent */
-#include "dixgrabs.h"           /* CreateGrab() */
 #include "scrnintstr.h"
 #include "listdev.h"            /* for CopySwapXXXClass */
 #include "xace.h"
@@ -615,7 +616,7 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
 
         if (from->button->xkb_acts) {
             size_t maxbuttons = max(to->button->numButtons, from->button->numButtons);
-            to->button->xkb_acts = xnfreallocarray(to->button->xkb_acts,
+            to->button->xkb_acts = XNFreallocarray(to->button->xkb_acts,
                                                    maxbuttons,
                                                    sizeof(XkbAction));
             memset(to->button->xkb_acts, 0, maxbuttons * sizeof(XkbAction));

Xi/extinit.c

@@ -51,9 +51,7 @@ SOFTWARE.
  */
 #define	 NUMTYPES 15
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
@@ -62,13 +60,13 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "inputstr.h"
 #include "gcstruct.h"           /* pointer for extnsionst.h */
 #include "extnsionst.h"         /* extension entry   */
 #include "geext.h"              /* extension interfaces for ge */
 #include "dixevents.h"
-#include "extinit_priv.h"
 #include "exglobals.h"
 #include "swaprep.h"
 #include "privates.h"

Xi/getbmap.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/getdctl.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/getfctl.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/getfocus.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "windowstr.h"          /* focus struct      */
 #include "inputstr.h"           /* DeviceIntPtr      */

Xi/getkmap.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/getmmap.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/getprop.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

Xi/getselev.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

Xi/getvers.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/grabdev.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

Xi/grabdevb.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

Xi/grabdevk.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

Xi/gtmotion.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

Xi/listdev.c

@@ -50,22 +50,22 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #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"
 
 /***********************************************************************

Xi/opendev.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>

Xi/queryst.c

@@ -32,14 +32,13 @@ from The Open Group.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */

Xi/selectev.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2.h>

Xi/sendexev.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

Xi/setbmap.c

@@ -50,16 +50,16 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #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"
 
 /***********************************************************************

Xi/setdval.c

@@ -50,16 +50,16 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #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"
 
 /***********************************************************************

Xi/setfocus.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

Xi/setmmap.c

@@ -50,17 +50,17 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #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"
 
 /***********************************************************************

Xi/setmode.c

@@ -50,16 +50,16 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #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"
 
 /***********************************************************************

Xi/stubs.c

@@ -54,9 +54,7 @@ SOFTWARE.
  * Xnest could do the same thing.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>
 #include <X11/Xproto.h>

Xi/ungrdev.c

@@ -50,9 +50,7 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */

Xi/ungrdevb.c

@@ -50,19 +50,17 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/dixgrabs_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "exglobals.h"
-#include "dixgrabs.h"
 #include "ungrdevb.h"
 
 #define AllModifiersMask ( \

Xi/ungrdevk.c

@@ -50,19 +50,17 @@ SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/dixgrabs_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "exglobals.h"
-#include "dixgrabs.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
 #include "ungrdevk.h"

Xi/xiallowev.c

@@ -29,15 +29,14 @@
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XI2proto.h>
 
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */

Xi/xibarriers.c

@@ -41,11 +41,11 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
+#include "dix/input_priv.h"
 
 #include "xibarriers.h"
 #include "scrnintstr.h"

Xi/xichangecursor.c

@@ -29,15 +29,14 @@
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2proto.h>
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */

Xi/xichangehierarchy.c

@@ -30,9 +30,7 @@
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
@@ -42,6 +40,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  */

Xi/xigetclientpointer.c

@@ -23,9 +23,7 @@
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
@@ -38,7 +36,6 @@
 #include "windowstr.h"          /* window structure  */
 #include "scrnintstr.h"         /* screen structure  */
 #include "extnsionst.h"
-#include "extinit.h"            /* LookupDeviceIntRec */
 #include "exevents.h"
 #include "exglobals.h"
 #include "xigetclientpointer.h"

Xi/xigrabdev.c

@@ -29,9 +29,7 @@
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XI2proto.h>

Xi/xipassivegrab.c

@@ -29,14 +29,13 @@
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XI2proto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/dixgrabs_priv.h"
 #include "dix/exevents_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
@@ -44,7 +43,6 @@
 #include "swaprep.h"
 #include "exglobals.h"          /* BadDevice */
 #include "xipassivegrab.h"
-#include "dixgrabs.h"
 #include "misc.h"
 #include "inpututils.h"
 

Xi/xiproperty.c

@@ -25,9 +25,7 @@
 
 /* This code is a modified version of randr/rrproperty.c */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/Xatom.h>
 #include <X11/extensions/XI.h>
@@ -35,6 +33,7 @@
 #include <X11/extensions/XI2proto.h>
 
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "dix.h"
 #include "inputstr.h"

Xi/xiquerydevice.c

@@ -28,15 +28,14 @@
  * @file Protocol handling for the XIQueryDevice request/reply.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/XI2proto.h>
 
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"
 #include "xkbstr.h"

Xi/xiquerypointer.c

@@ -29,9 +29,7 @@
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
@@ -41,6 +39,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  */
@@ -49,9 +48,9 @@
 #include "scrnintstr.h"
 #include "xkbsrv.h"
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */
 
 #include "inpututils.h"
 #include "xiquerypointer.h"
@@ -185,7 +184,7 @@ ProcXIQueryPointer(ClientPtr client)
         rep.win_y = 0;
     }
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
     if (!noPanoramiXExtension) {
         rep.root_x += double_to_fp1616(screenInfo.screens[0]->x);
         rep.root_y += double_to_fp1616(screenInfo.screens[0]->y);
@@ -194,7 +193,7 @@ ProcXIQueryPointer(ClientPtr client)
             rep.win_y += double_to_fp1616(screenInfo.screens[0]->y);
         }
     }
-#endif
+#endif /* XINERAMA */
 
     WriteReplyToClient(client, sizeof(xXIQueryPointerReply), &rep);
     if (buttons)

Xi/xiqueryversion.c

@@ -29,9 +29,7 @@
  * Protocol handling for the XIQueryVersion request/reply.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "inputstr.h"
 

Xi/xiselectev.c

@@ -23,9 +23,7 @@
  * Author: Peter Hutterer
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI2proto.h>
 

Xi/xisetclientpointer.c

@@ -30,9 +30,7 @@
  * default value.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */

Xi/xisetdevfocus.c

@@ -28,9 +28,7 @@
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XI2proto.h>

Xi/xiwarppointer.c

@@ -29,15 +29,14 @@
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2proto.h>
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */

composite/compalloc.c

@@ -41,9 +41,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "compint.h"
 

composite/compext.c

@@ -41,14 +41,15 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
+
+#include "miext/extinit_priv.h"
 
 #include "compint.h"
 #include "xace.h"
 #include "protocol-versions.h"
-#include "extinit_priv.h"
+
+Bool noCompositeExtension = FALSE;
 
 static CARD8 CompositeReqCode;
 static DevPrivateKeyRec CompositeClientPrivateKeyRec;
@@ -589,7 +590,7 @@ CompositeExtensionInit(void)
     noCompositeExtension = FALSE;
 }
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiXsrv.h"
 
 int (*PanoramiXSaveCompositeVector[CompositeNumberRequests]) (ClientPtr);
@@ -942,4 +943,4 @@ PanoramiXCompositeReset(void)
         ProcCompositeVector[i] = PanoramiXSaveCompositeVector[i];
 }
 
-#endif
+#endif /* XINERAMA */

composite/compinit.c

@@ -41,9 +41,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "dix/dix_priv.h"
 

composite/compoverlay.c

@@ -41,16 +41,14 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "compint.h"
 #include "xace.h"
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */
 
 /*
  * Delete the given overlay client list element from its screen list.
@@ -135,14 +133,14 @@ compCreateOverlayWindow(ScreenPtr pScreen)
     int h = pScreen->height;
     int x = 0, y = 0;
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
     if (!noPanoramiXExtension) {
         x = -pScreen->x;
         y = -pScreen->y;
         w = PanoramiXPixWidth;
         h = PanoramiXPixHeight;
     }
-#endif
+#endif /* XINERAMA */
 
     pWin = cs->pOverlayWin =
         CreateWindow(cs->overlayWid, pRoot, x, y, w, h, 0,

composite/compwindow.c

@@ -41,9 +41,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "dix/dix_priv.h"
 #include "os/osdep.h"
@@ -51,9 +49,9 @@
 #include "compint.h"
 #include "compositeext_priv.h"
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */
 
 #ifdef COMPOSITE_DEBUG
 static int
@@ -203,12 +201,12 @@ updateOverlayWindow(ScreenPtr pScreen)
     int w = pScreen->width;
     int h = pScreen->height;
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
     if (!noPanoramiXExtension) {
         w = PanoramiXPixWidth;
         h = PanoramiXPixHeight;
     }
-#endif
+#endif /* XINERAMA */
 
     cs = GetCompScreen(pScreen);
     if ((pWin = cs->pOverlayWin) != NULL) {

config/config.c

@@ -23,16 +23,17 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <unistd.h>
+
+#include "config/hotplug_priv.h"
+
 #include "os.h"
 #include "inputstr.h"
-#include "hotplug.h"
 #include "config-backends.h"
-#include "systemd-logind.h"
+
+#include "../hw/xfree86/os-support/linux/systemd-logind.h"
 
 void
 config_pre_init(void)
@@ -133,7 +134,7 @@ struct OdevAttributes *
 config_odev_allocate_attributes(void)
 {
     struct OdevAttributes *attribs =
-        xnfcalloc(1, sizeof (struct OdevAttributes));
+        XNFcallocarray(1, sizeof (struct OdevAttributes));
     attribs->fd = -1;
     return attribs;
 }

config/dbus-core.c

@@ -23,9 +23,7 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <dbus/dbus.h>
 #include <sys/select.h>

config/hotplug_priv.h

@@ -0,0 +1,64 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ * Copyright © 2006-2007 Daniel Stone
+ */
+#ifndef _XSERVER_HOTPLUG_PRIV_H
+#define _XSERVER_HOTPLUG_PRIV_H
+
+#include <X11/Xfuncproto.h>
+
+#include "hotplug.h"
+#include "list.h"
+
+/* Bump this each time you add something to the struct
+ * so that drivers can easily tell what is available
+ */
+#define ODEV_ATTRIBUTES_VERSION         1
+
+struct OdevAttributes {
+    /* path to kernel device node - Linux e.g. /dev/dri/card0 */
+    char        *path;
+
+    /* system device path - Linux e.g. /sys/devices/pci0000:00/0000:00:01.0/0000:01:00.0/drm/card1 */
+    char        *syspath;
+
+    /* DRI-style bus id */
+    char        *busid;
+
+    /* Server managed FD */
+    int         fd;
+
+    /* Major number of the device node pointed to by ODEV_ATTRIB_PATH */
+    int         major;
+
+    /* Minor number of the device node pointed to by ODEV_ATTRIB_PATH */
+    int         minor;
+
+    /* kernel driver name */
+    char        *driver;
+};
+
+/* Note starting with xserver 1.16 this function never fails */
+struct OdevAttributes *
+config_odev_allocate_attributes(void);
+
+void
+config_odev_free_attributes(struct OdevAttributes *attribs);
+
+typedef void (*config_odev_probe_proc_ptr)(struct OdevAttributes *attribs);
+void config_odev_probe(config_odev_probe_proc_ptr probe_callback);
+
+#ifdef CONFIG_UDEV_KMS
+void NewGPUDeviceRequest(struct OdevAttributes *attribs);
+void DeleteGPUDeviceRequest(struct OdevAttributes *attribs);
+#endif
+
+#define ServerIsNotSeat0() (SeatId && strcmp(SeatId, "seat0"))
+
+struct xf86_platform_device *
+xf86_find_platform_device_by_devnum(int major, int minor);
+
+void config_pre_init(void);
+
+#endif /* _XSERVER_HOTPLUG_PRIV_H */

config/udev.c

@@ -23,21 +23,21 @@
  * Author: Julien Cristau <jcristau@debian.org>
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <libudev.h>
 #include <ctype.h>
 #include <unistd.h>
 
+#include "config/hotplug_priv.h"
+
 #include "input.h"
 #include "inputstr.h"
-#include "hotplug.h"
 #include "config-backends.h"
 #include "os.h"
 #include "globals.h"
-#include "systemd-logind.h"
+
+#include "../hw/xfree86/os-support/linux/systemd-logind.h"
 
 #ifdef HAVE_SYS_SYSMACROS_H
 #include <sys/sysmacros.h>

config/wscons.c

@@ -21,9 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <sys/time.h>
 #include <dev/wscons/wsconsio.h>

damageext/damageext.c

@@ -21,19 +21,17 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "dix/dix_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "damageextint.h"
 #include "damagestr.h"
 #include "protocol-versions.h"
-#include "extinit_priv.h"
 #include "dixstruct_priv.h"
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 
@@ -45,7 +43,7 @@ typedef struct {
 static RESTYPE XRT_DAMAGE;
 static int (*PanoramiXSaveDamageCreate) (ClientPtr);
 
-#endif
+#endif /* XINERAMA */
 
 static unsigned char DamageReqCode;
 static int DamageEventBase;
@@ -55,6 +53,8 @@ static DevPrivateKeyRec DamageClientPrivateKeyRec;
 
 #define DamageClientPrivateKey (&DamageClientPrivateKeyRec)
 
+Bool noDamageExtension = FALSE;
+
 static void
 DamageNoteCritical(ClientPtr pClient)
 {
@@ -70,7 +70,7 @@ DamageNoteCritical(ClientPtr pClient)
 static void
 damageGetGeometry(DrawablePtr draw, int *x, int *y, int *w, int *h)
 {
-#ifdef PANORAMIX
+#ifdef XINERAMA
     if (!noPanoramiXExtension && draw->type == DRAWABLE_WINDOW) {
         WindowPtr win = (WindowPtr)draw;
 
@@ -82,7 +82,7 @@ damageGetGeometry(DrawablePtr draw, int *x, int *y, int *w, int *h)
             return;
         }
     }
-#endif
+#endif /* XINERAMA */
 
     *x = draw->x;
     *y = draw->y;
@@ -321,7 +321,7 @@ ProcDamageDestroy(ClientPtr client)
     return Success;
 }
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 static RegionPtr
 DamageExtSubtractWindowClip(DamageExtPtr pDamageExt)
 {
@@ -369,7 +369,7 @@ DamageExtFreeWindowClip(RegionPtr reg)
     if (reg != &PanoramiXScreenRegion)
         RegionDestroy(reg);
 }
-#endif
+#endif /* XINERAMA */
 
 /*
  * DamageSubtract intersects with borderClip, so we must reconstruct the
@@ -380,7 +380,7 @@ DamageExtSubtract(DamageExtPtr pDamageExt, const RegionPtr pRegion)
 {
     DamagePtr pDamage = pDamageExt->pDamage;
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
     if (!noPanoramiXExtension) {
         RegionPtr damage = DamageRegion(pDamage);
         RegionSubtract(damage, damage, pRegion);
@@ -398,7 +398,7 @@ DamageExtSubtract(DamageExtPtr pDamageExt, const RegionPtr pRegion)
 
         return RegionNotEmpty(damage);
     }
-#endif
+#endif /* XINERAMA */
 
     return DamageSubtract(pDamage, pRegion);
 }
@@ -606,7 +606,7 @@ SDamageNotifyEvent(xDamageNotifyEvent * from, xDamageNotifyEvent * to)
     cpswaps(from->geometry.height, to->geometry.height);
 }
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 
 static void
 PanoramiXDamageReport(DamagePtr pDamage, RegionPtr pRegion, void *closure)
@@ -725,7 +725,7 @@ PanoramiXDamageReset(void)
     ProcDamageVector[X_DamageCreate] = PanoramiXSaveDamageCreate;
 }
 
-#endif /* PANORAMIX */
+#endif /* XINERAMA */
 
 void
 DamageExtensionInit(void)
@@ -754,10 +754,10 @@ DamageExtensionInit(void)
             (EventSwapPtr) SDamageNotifyEvent;
         SetResourceTypeErrorValue(DamageExtType,
                                   extEntry->errorBase + BadDamage);
-#ifdef PANORAMIX
+#ifdef XINERAMA
         if (XRT_DAMAGE)
             SetResourceTypeErrorValue(XRT_DAMAGE,
                                       extEntry->errorBase + BadDamage);
-#endif
+#endif /* XINERAMA */
     }
 }

damageext/damageextint.h

@@ -29,13 +29,15 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/damageproto.h>
+
+#include "dix/selection_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include <X11/extensions/damageproto.h>
 #include "windowstr.h"
-#include "selection.h"
 #include "scrnintstr.h"
 #include "damage.h"
 #include "xfixes.h"

dbe/dbe.c

@@ -32,9 +32,7 @@
 
 /* INCLUDES */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <string.h>
 #include <stdint.h>
@@ -42,10 +40,10 @@
 #include <X11/Xproto.h>
 
 #include "dix/dix_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "scrnintstr.h"
 #include "extnsionst.h"
-#include "extinit_priv.h"
 #include "gcstruct.h"
 #include "dixstruct.h"
 #include "dbestruct.h"
@@ -53,6 +51,7 @@
 #include "xace.h"
 
 /* GLOBALS */
+Bool noDbeExtension = FALSE;
 
 /* These are globals for use by DDX */
 DevPrivateKeyRec dbeScreenPrivKeyRec;
@@ -1369,10 +1368,10 @@ DbeExtensionInit(void)
     int nStubbedScreens = 0;
     Bool ddxInitSuccess;
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
     if (!noPanoramiXExtension)
         return;
-#endif
+#endif /* XINERAMA */
 
     /* Create the resource types. */
     dbeDrawableResType =

dbe/midbe.c

@@ -32,9 +32,7 @@
 
 /* INCLUDES */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>
 #include <X11/Xproto.h>

dix/atom.c

@@ -44,9 +44,7 @@ SOFTWARE.
 
 ******************************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/X.h>
 #include <X11/Xatom.h>

dix/callback_priv.h

@@ -7,8 +7,6 @@
 
 #include "callback.h"
 
-typedef struct _CallbackList *CallbackListPtr;
-
 void InitCallbackManager(void);
 void DeleteCallbackManager(void);
 

dix/closestr.h

@@ -99,7 +99,7 @@ typedef struct _LFclosure {
 typedef struct _PTclosure {
     ClientPtr client;
     DrawablePtr pDraw;
-    GC *pGC;
+    GCPtr pGC;
     unsigned char *pElt;
     unsigned char *endReq;
     unsigned char *data;
@@ -115,7 +115,7 @@ typedef struct _PTclosure {
 typedef struct _ITclosure {
     ClientPtr client;
     DrawablePtr pDraw;
-    GC *pGC;
+    GCPtr pGC;
     BYTE nChars;
     unsigned char *data;
     int xorg;

dix/color.c

@@ -44,9 +44,7 @@ SOFTWARE.
 
 ******************************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <X11/keysym.h>