115 changed files with 197 additions and 855 deletions
--- a/.github/ISSUE_TEMPLATE/01-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/01-bug-report.yml
@ -1,65 +0,0 @@
-name: 🐞 Bug report
-description: Create a report to help us improve
-
-labels: [bug, needs-triage]
-#type: bug
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please fill out the sections below to help everyone identify and fix the bug. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
-  - type: dropdown
-    id: affected-version
-    attributes:
-      label: Select the version
-      options:
-        - 25.0.0.X
-        - Git master branch
-        - other or don't know
-      default: 1
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe your issue
-      placeholder: When I did X then Y happened.
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to reproduce
-      placeholder: |
-        1. Start ...
-        2. Do this
-        3. Do that
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: What did you expect?
-      placeholder: I expected this to happen.
-  - type: textarea
-    id: environment
-    attributes:
-      label: Additional Information
-      description: Additional information you want to provide such as logs, system info, environment, screenshots, etc.
-      placeholder: |
-        Add any other context about the bug here.
-  - type: checkboxes
-    id: checks
-    attributes:
-      label: Extra fields
-      options:
-        - label: I have checked the existing [issues](https://github.com/X11Libre/xserver/issues)
-          required: true
-        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
-          required: true
-        - label: I'd like to work on this issue
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for reporting this issue! We will get back to you as soon as possible.
--- a/.github/ISSUE_TEMPLATE/02-feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/02-feature-request.yml
@ -1,49 +0,0 @@
-name: ✨ Feature request
-description: Suggest a feature for this software
-labels: [enhancement, needs-triage]
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please fill out the sections below to properly describe the new software feature you are suggesting. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
-  - type: textarea
-    id: description
-    attributes:
-      label: "Describe the feature"
-      placeholder: A thing in X that allows to do Y.
-    validations:
-      required: true
-  - type: textarea
-    id: rationale
-    attributes:
-      label: "It should be implemented because"
-      placeholder: Doing Y is needed for Z.
-    validations:
-      required: true
-  - type: textarea
-    id: alternative
-    attributes:
-      label: "What are the alternatives?"
-      placeholder: We could do A or B instead.
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Additional information you want to provide such as references to related issues or protocols, the implications on existing use cases, etc.
-      placeholder: |
-        Add any other context about the feature request here.
-  - type: checkboxes
-    id: checks
-    attributes:
-      label: Extra fields
-      options:
-        - label: I have checked the existing [issues](https://github.com/X11Libre/xserver/issues)
-          required: true
-        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
-          required: true
-        - label: I'd like to work on this issue
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for your suggestion! Let's see together if it can be implemented.
--- a/.github/ISSUE_TEMPLATE/03-code-cleanup.yml
+++ b/.github/ISSUE_TEMPLATE/03-code-cleanup.yml
@ -1,50 +0,0 @@
-name: 🔧 Code cleanup
-description: Level up the source code
-labels: [code-cleanup, needs-triage]
-#type: codecleanup
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please fill out the sections below to properly describe the code cleanup you are suggesting. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
-  - type: textarea
-    id: description
-    attributes:
-      label: "Describe the cleanup"
-      placeholder: C in X needs to be changed into D.
-    validations:
-      required: true
-  - type: textarea
-    id: rationale
-    attributes:
-      label: "It should be done because"
-      placeholder: Having D is needed for E.
-    validations:
-      required: true
-  - type: textarea
-    id: alternative
-    attributes:
-      label: "What are the alternatives?"
-      placeholder: We could do A or B instead.
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Additional information you want to provide such as implications on existing code, how to ensure API/ABI stability, which tests are needed or to be run, related issues, etc.
-      placeholder: |
-        Add any other context about the cleanup here.
-  - type: checkboxes
-    id: checks
-    attributes:
-      label: Extra fields
-      options:
-        - label: I have checked the existing [issues](https://github.com/X11Libre/xserver/issues)
-          required: true
-        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
-          required: true
-        - label: I'd like to work on this issue
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for looking at the source code! Let's see together how it can be improved.
--- a/.github/ISSUE_TEMPLATE/04-doc-update.yml
+++ b/.github/ISSUE_TEMPLATE/04-doc-update.yml
@ -1,39 +0,0 @@
-name: 🔖 Documentation update
-description: Make your mark for better documentation
-
-labels: [documentation, needs-triage]
-#type: docchange
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please fill out the sections below to help others understand our software. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe the update
-      placeholder: These things need to be better documented.
-    validations:
-      required: true
-  - type: textarea
-    id: environment
-    attributes:
-      label: Additional Information
-      description: Additional information you want to provide such as tickets related to changes in the software, affected files, screenshots, etc.
-      placeholder: |
-        Add any other context about the update here.
-  - type: checkboxes
-    id: checks
-    attributes:
-      label: Extra fields
-      options:
-        - label: I have checked the existing [issues](https://github.com/X11Libre/xserver/issues)
-          required: true
-        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
-          required: true
-        - label: I'd like to work on this issue
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for requesting this update! We will get back to you as soon as possible.
--- a/.github/ISSUE_TEMPLATE/05-org-task.yml
+++ b/.github/ISSUE_TEMPLATE/05-org-task.yml
@ -1,44 +0,0 @@
-name: ✅ Organizational task
-description: Create a task for project organization
-
-labels: [needs-triage, organization]
-#type: task
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please fill out the sections below to get organizational things done. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe the task
-      placeholder: These things need to be done.
-    validations:
-      required: true
-  - type: textarea
-    id: rationale
-    attributes:
-      label: "It should be done because"
-      placeholder: Doing Y is needed for Z.
-  - type: textarea
-    id: environment
-    attributes:
-      label: Additional Information
-      description: Additional information you want to provide such as the context for bigger tasks, the implicatons on existing workflows, related issues, etc.
-      placeholder: |
-        Add any other context about the task here.
-  - type: checkboxes
-    id: checks
-    attributes:
-      label: Extra fields
-      options:
-        - label: I have checked the existing [issues](https://github.com/X11Libre/xserver/issues)
-          required: true
-        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
-          required: true
-        - label: I'd like to work on this issue
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for adding this task! We will get back to you as soon as possible.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: XLibre Community Support
-    url: https://github.com/orgs/X11Libre/discussions
-    about: Please ask and answer questions here.
-  - name: Mailing List
-    url: https://www.freelists.org/list/xlibre
-    about: You can join the discussions on our mailing list.
--- a/.github/scripts/compile-drivers.sh
+++ b/.github/scripts/compile-drivers.sh
@ -14,7 +14,6 @@ cd $DRV_BUILD_DIR
 build_drv_ac xf86-input-elographics $X11L_DRV_GIT/xf86-input-elographics master
 build_drv_ac xf86-input-evdev       $X11L_DRV_GIT/xf86-input-evdev       master
 build_drv_ac xf86-input-libinput    $X11L_DRV_GIT/xf86-input-libinput    master
-build_drv_ac xf86-input-mouse       $X11L_DRV_GIT/xf86-input-mouse       master
 build_drv_ac xf86-input-synaptics   $X11L_DRV_GIT/xf86-input-synaptics   master

 build_drv_ac xf86-video-amdgpu      $X11L_DRV_GIT/xf86-video-amdgpu      xf86-video-amdgpu-23.0.0
--- a/.github/scripts/conf.sh
+++ b/.github/scripts/conf.sh
@ -1,13 +1,6 @@
-export X11_OS=`uname -s`
-
-export X11_PREFIX="${X11_PREFIX:-$HOME/x11}"
-export X11_BUILD_DIR="${X11_BUILD_DIR:-$HOME/build-deps}"
-export DRV_BUILD_DIR="${DRV_BUILD_DIR:-$HOME/build-drivers}"
-
-case "$X11_OS" in
-Darwin) export FDO_CI_CONCURRENT=`sysctl -n hw.logicalcpu` ;;
-Linux) export FDO_CI_CONCURRENT=`nproc` ;;
-esac
-
+export X11_PREFIX=/home/runner/x11
 export PATH="$X11_PREFIX/bin:$PATH"
 export PKG_CONFIG_PATH="$X11_PREFIX/lib/x86_64-linux-gnu/pkgconfig:$X11_PREFIX/lib/pkgconfig:$X11_PREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
+export FDO_CI_CONCURRENT=`nproc`
+export X11_BUILD_DIR=/home/runner/build-deps
+export DRV_BUILD_DIR=/home/runner/build-drivers
--- a/.github/scripts/install-prereq.sh
+++ b/.github/scripts/install-prereq.sh
@ -8,13 +8,10 @@ mkdir -p $X11_BUILD_DIR
 cd $X11_BUILD_DIR

 build_meson   rendercheck       https://gitlab.freedesktop.org/xorg/test/rendercheck     rendercheck-1.6
-if [ "$X11_OS" = "Linux" ]; then
 build_meson   drm               https://gitlab.freedesktop.org/mesa/drm                  libdrm-2.4.121 \
    -Domap=enabled
-fi
 build_meson   libxcvt           https://gitlab.freedesktop.org/xorg/lib/libxcvt          libxcvt-0.1.0
 build_ac      xorgproto         https://gitlab.freedesktop.org/xorg/proto/xorgproto      xorgproto-2024.1
-if [ "$X11_OS" = "Linux" ]; then
 build_meson   wayland           https://gitlab.freedesktop.org/wayland/wayland           1.21.0 \
    -Dtests=false -Ddocumentation=false -Ddtd_validation=false
 build_meson   wayland-protocols https://gitlab.freedesktop.org/wayland/wayland-protocols 1.38
@ -22,10 +19,6 @@ build_meson   libdecor          https://gitlab.freedesktop.org/libdecor/libdecor
    -D{demo,install_demo}=false
 build_meson   libei             https://gitlab.freedesktop.org/libinput/libei            1.0.0 \
    -Dtests=disabled -Ddocumentation=[] -Dliboeffis=enabled
-fi
-if [ "$X11_OS" = "Darwin" ]; then
-build_ac      xset              https://gitlab.freedesktop.org/xorg/app/xset             xset-1.2.5
-fi
 build_ac_xts  xts               https://gitlab.freedesktop.org/xorg/test/xts             master # dbbfa96c036e596346147081cbceda136e7c86c1

 clone_source piglit             https://gitlab.freedesktop.org/mesa/piglit               main # 265896c86f90cb72e8f218ba6a3617fca8b9a1e3
--- a/.github/scripts/macos/install-pkg.sh
+++ b/.github/scripts/macos/install-pkg.sh
@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -e
-
-brew update
-
-brew install \
-	autoconf \
-	automake \
-	bdftopcf \
-	libapplewm \
-	libtool \
-	libx11 \
-	libxau \
-	libxaw \
-	libxcb \
-	libxdmcp \
-	libxext \
-	libxfixes \
-	libxfont2 \
-	libxkbfile \
-	libxi \
-	libxmu \
-	libxrender \
-	libxt \
-	libxtst \
-	meson \
-	mkfontscale \
-	pkgconf \
-	pixman \
-	util-macros \
-	xdpyinfo \
-	xkbcomp \
-	xkeyboard-config \
-	xtrans
-
-pip3 install --break-system-packages \
-	mako
--- a/.github/scripts/util.sh
+++ b/.github/scripts/util.sh
@ -82,28 +82,8 @@ build_ac_xts() {
        clone_source "$pkgname" "$url" "$ref"
        (
            cd $pkgname
-            CFLAGS='-fcommon'
-            if [ "$X11_OS" = "Darwin" ]; then
-                # xts5/include/XtTest.h includes <X11/Intrinsic.h> => needs xt
-                # xts5/src/libXtaw/*.c include <X11/Xaw/*.h> and <X11/Xmu/*.h> => need xmu and xaw7
-                sed -E -i~ 's|(\[XTS\], \[)|\1xt xmu xaw7 |' configure.ac
-                # xts5/Xlib14/X{mb,wc}TextListToTextProperty.m define a function accepting `XTextProperty` but call it passing
-                #`XTextProperty*`; since the parameter is seemingly meant for output, accept it as pointer
-                sed -E -i~ -e 's|(XTextProperty)[[:space:]]+(text_prop_good)|\1 *\2|' -e 's|(style_good),[[:space:]]*&(text_prop_good)|\1,\2|' -e 's|text_prop_good\.|text_prop_good->|' xts5/Xlib14/X{mb,wc}TextListToTextProperty.m
-                # xts5/Xlib*/*.m forward-declare `strcpy()` which is incompatible with _FORTIFY_SOURCE > 0 where `strcpy` is
-                # a macro; set _FORTIFY_SOURCE to 0 as we don't care much about security in this test code
-                CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"
-                # declarations for `XtAppSetError{,Msg}Handler()` in <X11/Intrinsic.h> (libXt) make it hard to write warning-
-                # free code: they want a noreturn-annotated handler as input but return old handler without noreturn annotation,
-                # so e.g. `XtAppSetErrorHandler(XtAppSetErrorHandler(NULL))` (similar to xts5/Xt13/XtAppSetError*Handler.m)
-                # doesn't compile complaining about incompatible function pointers, at least with Apple Clang 16 (not sure why
-                # it treats this warning as error by default though)
-                if cc -Werror=unknown-warning-option -Wincompatible-function-pointer-types -c -xc -o /dev/null /dev/null 2>/dev/null; then
-                    CFLAGS="$CFLAGS -Wno-error=incompatible-function-pointer-types"
-                fi
-            fi
-            ./autogen.sh --prefix=$X11_PREFIX CFLAGS="$CFLAGS"
-            make -j${FDO_CI_CONCURRENT:-4} install
+            CFLAGS=-fcommon ./autogen.sh --prefix=$X11_PREFIX
+            xvfb-run make -j${FDO_CI_CONCURRENT:-4} install
        )
        touch $X11_PREFIX/$pkgname.DONE
    fi
--- a/.github/workflows/build-xserver.yml
+++ b/.github/workflows/build-xserver.yml
@ -1,8 +1,5 @@
 name: Build X servers

-permissions:
-    contents: read
-
 env:
    MESON_BUILDDIR:  "build"
    X11_PREFIX:      /home/runner/x11
@ -23,8 +20,7 @@ jobs:

            - name: prepare build environment
              run: |
-                MACHINE=`gcc -dumpmachine`
-                echo "MACHINE=$MACHINE" >> "$GITHUB_ENV"
+                export MACHINE=`gcc -dumpmachine`
                echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
                sudo chown root /bin/tar && sudo chmod u+s /bin/tar

@ -45,11 +41,11 @@ jobs:
                    ${{ env.X11_PREFIX }}
                    ${{ env.X11_BUILD_DIR }}/xts
                    ${{ env.X11_BUILD_DIR }}/piglit
-                key: ${{ runner.name }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
-                restore-keys: ${{ runner.name }}-x11-deps-
+                key: ${{ runner.os }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
+                restore-keys: ${{ runner.os }}-x11-deps-

            - name: generic prereq
-              run:  .github/scripts/install-prereq.sh
+              run:  sudo .github/scripts/install-prereq.sh

            - name: build
              run:  .gitlab-ci/meson-build.sh
@ -82,8 +78,7 @@ jobs:

            - name: prepare build environment
              run: |
-                MACHINE=`gcc -dumpmachine`
-                echo "MACHINE=$MACHINE" >> "$GITHUB_ENV"
+                export MACHINE=`gcc -dumpmachine`
                echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
                sudo chown root /bin/tar && sudo chmod u+s /bin/tar

@ -104,11 +99,11 @@ jobs:
                    ${{ env.X11_PREFIX }}
                    ${{ env.X11_BUILD_DIR }}/xts
                    ${{ env.X11_BUILD_DIR }}/piglit
-                key: ${{ runner.name }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
-                restore-keys: ${{ runner.name }}-x11-deps-
+                key: ${{ runner.os }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
+                restore-keys: ${{ runner.os }}-x11-deps-

            - name: generic prereq
-              run:  .github/scripts/install-prereq.sh
+              run:  sudo .github/scripts/install-prereq.sh

            - name: build xserver sdk
              run:  |
@ -122,61 +117,3 @@ jobs:

            - name: compile drivers
              run: .github/scripts/compile-drivers.sh
-
-    xserver-build-macos:
-        env:
-            MESON_ARGS: -Dprefix=/tmp -Dglx=false -Dxnest=false
-            X11_PREFIX: /Users/runner/x11
-            X11_BUILD_DIR: /Users/runner/build-deps
-        runs-on: macos-latest
-        steps:
-            - name: Check out repository code
-              uses: actions/checkout@v4
-
-            - name: prepare build environment
-              run: |
-                echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
-
-            - name: homebrew cache
-              uses: actions/cache@v4
-              with:
-                path: /Users/runner/Library/Caches/Homebrew
-                key: ${{ runner.os }}-homebrew-cache-${{ hashFiles('.github/scripts/macos/install-pkg.sh') }}
-                restore-keys: ${{ runner.os }}-homebrew-cache-
-
-            - name: pkg install
-              run:  .github/scripts/macos/install-pkg.sh
-
-            - name: X11 prereq cache
-              uses: actions/cache@v4
-              with:
-                path: |
-                    ${{ env.X11_PREFIX }}
-                    ${{ env.X11_BUILD_DIR }}/xts
-                    ${{ env.X11_BUILD_DIR }}/piglit
-                key: ${{ runner.os }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
-                restore-keys: ${{ runner.os }}-x11-deps-
-
-            - name: generic prereq
-              run:  .github/scripts/install-prereq.sh
-
-            - name: build
-              run:  .gitlab-ci/meson-build.sh
-
-            - name: tests (may fail)
-              continue-on-error: true
-              run:  meson test -C "${{ env.MESON_BUILDDIR }}" --print-errorlogs -j1 || true
-              env:
-                  XTEST_DIR:  ${{ env.X11_BUILD_DIR }}/xts
-                  PIGLIT_DIR: ${{ env.X11_BUILD_DIR }}/piglit
-
-            - name: archive build logs
-              uses: actions/upload-artifact@v4
-              with:
-                  name: build-logs-macos
-                  path: |
-                      build/meson-logs/*
-            - name: ddx build check
-              run:  .gitlab-ci/check-ddx-build.sh
-            - name: manpage check
-              run:  .gitlab-ci/manpages-check
--- a/.gitlab-ci/check-ddx-build.sh
+++ b/.gitlab-ci/check-ddx-build.sh
@ -19,7 +19,6 @@ fi
 [[ "$BUILD_XEPHYR" == true ]]   && check_executable "hw/kdrive/ephyr/Xephyr"
 [[ "$BUILD_XNEST" == true ]]    && check_executable "hw/xnest/Xnest"
 [[ "$BUILD_XORG" == true ]]     && check_executable "hw/xfree86/Xorg"
-[[ "$BUILD_XQUARTZ" == true ]]  && check_executable "hw/xquartz/mach-startup/Xquartz"
 [[ "$BUILD_XVFB" == true ]]     && check_executable "hw/vfb/Xvfb"

 exit 0
--- a/.gitlab-ci/manpages-check
+++ b/.gitlab-ci/manpages-check
@ -1,6 +1,6 @@
 #!/bin/sh

-find build/ -type f -regex ".*\.[1-9]$" -exec grep -E \
+find build/ -regex ".*\.[1-9]$" -exec grep -E \
@vendorversion@\|\
@xorgversion@\|\
@xservername@\|\
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -10,9 +10,9 @@
   Keep in mind that history is also a piece of documentation.

 3. Once release is out, bugfixes should be submitted separately, against
-   the affected release branch(es) as well as master (so multiple pull requests)
+   the affected release branch(es) as well as master (so multiple MRs)

 4. If new functions or types are introduced, these should be documented
   in-code, so we can generate docs directly from the code :)

-5. Use pull request tags if you can - if we need some more, just ask.
+5. Use MR tags if you can - if we need some more, just ask.
--- a/Xext/geext_priv.h
+++ b/Xext/geext_priv.h
@ -2,9 +2,7 @@
 *
 * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
 */
-
 #ifndef _XORG_GEEXT_PRIV_H
-#define _XORG_GEEXT_PRIV_H

 #include <X11/Xproto.h>

--- a/Xext/meson.build
+++ b/Xext/meson.build
@ -58,13 +58,13 @@ if build_xv
    hdrs_xext += ['xvdix.h', 'xvmcext.h']
 endif

-libxserver_xext = static_library('xserver_xext',
+libxserver_xext = static_library('libxserver_xext',
    srcs_xext,
    include_directories: inc,
    dependencies: common_dep,
 )

-libxserver_xext_vidmode = static_library('xserver_xext_vidmode',
+libxserver_xext_vidmode = static_library('libxserver_xext_vidmode',
    'vidmode.c',
    include_directories: inc,
    dependencies: common_dep,
--- a/Xext/namespace/hook-windowproperty.c
+++ b/Xext/namespace/hook-windowproperty.c
@ -11,6 +11,14 @@
 #include "namespace.h"
 #include "hooks.h"

+static inline Bool winIsRoot(WindowPtr pWin) {
+    if (!pWin)
+        return FALSE;
+    if (pWin->drawable.pScreen->root == pWin)
+        return TRUE;
+    return FALSE;
+}
+
 void hookWindowProperty(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
    XNS_HOOK_HEAD(PropertyFilterParam);
--- a/Xext/namespace/meson.build
+++ b/Xext/namespace/meson.build
@ -1,5 +1,5 @@
 libxserver_namespace = static_library(
-	'xserver_namespace',
+	'libxserver_namespace',
 	[
 		'config.c',
 		'hook-client.c',
--- a/Xext/panoramiXh.h
+++ b/Xext/panoramiXh.h
@ -1,10 +1,8 @@
+
 /*
 *	Server dispatcher function replacements
 */

-#ifndef XSERVER_PANORAMIXH_H
-#define XSERVER_PANORAMIXH_H
-
 extern int PanoramiXCreateWindow(ClientPtr client);
 extern int PanoramiXChangeWindowAttributes(ClientPtr client);
 extern int PanoramiXDestroyWindow(ClientPtr client);
@ -73,5 +71,3 @@ extern int connBlockScreenStart;
 extern xConnSetupPrefix connSetupPrefix;

 extern int (*SavedProcVector[256]) (ClientPtr client);
-
-#endif /* XSERVER_PANORAMIXH_H */
--- a/Xext/vidmode.c
+++ b/Xext/vidmode.c
@ -1280,7 +1280,7 @@ ProcVidModeGetMonitor(ClientPtr client)
                  + nHsync + nVrefresh + nVendorItems + nModelItems
    };

-    const int buflen = nHsync + nVrefresh + nVendorItems + nModelItems;
+    const int buflen = nHsync * nVrefresh + nVendorItems + nModelItems;

    CARD32 *sendbuf = calloc(buflen, sizeof(CARD32));
    if (!sendbuf)
@ -1302,22 +1302,22 @@ ProcVidModeGetMonitor(ClientPtr client)
        bufwalk++;
    }

-    memcpy(bufwalk,
+    memcpy(sendbuf,
           pVidMode->GetMonitorValue(pScreen, VIDMODE_MON_VENDOR, 0).ptr,
           vendorLength);
-    bufwalk += nVendorItems;
+    sendbuf += nVendorItems;

-    memcpy(bufwalk,
+    memcpy(sendbuf,
           pVidMode->GetMonitorValue(pScreen, VIDMODE_MON_MODEL, 0).ptr,
           modelLength);
-    bufwalk += nModelItems;
+    sendbuf += nModelItems;

    if (client->swapped) {
        swaps(&rep.sequenceNumber);
        swapl(&rep.length);
    }

-    WriteToClient(client, sizeof(xXF86VidModeGetMonitorReply), &rep);
+    WriteToClient(client, SIZEOF(xXF86VidModeGetMonitorReply), &rep);
    WriteToClient(client, buflen * sizeof(CARD32), sendbuf);

    free(sendbuf);
--- a/Xext/xace.h
+++ b/Xext/xace.h
@ -78,7 +78,7 @@ int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, PropertyPtr *ppProp,
                           Mask access_mode);
 int XaceHookSelectionAccess(ClientPtr ptr, Selection ** ppSel, Mask access_mode);

-/* needs to be exported for in-tree modesetting, but not part of public API */
+/* needs to be exported for in-tree modsetting, but not part of public API */
 _X_EXPORT int XaceHookResourceAccess(ClientPtr client, XID id, RESTYPE rtype, void *res,
                           RESTYPE ptype, void *parent, Mask access_mode);

--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@ -647,6 +647,7 @@ ProcXF86BigfontDispatch(ClientPtr client)
 static int _X_COLD
 SProcXF86BigfontQueryVersion(ClientPtr client)
 {
+    REQUEST(xXF86BigfontQueryVersionReq);
    return ProcXF86BigfontQueryVersion(client);
 }

--- a/Xext/xvdisp.h
+++ b/Xext/xvdisp.h
@ -1,7 +1,2 @@
-#ifndef XSERVER_XVDISP_H
-#define XSERVER_XVDISP_H
-
 extern void XineramifyXv(void);
 extern int xvUseXinerama;
-
-#endif /* XSERVER_XVDISP_H */
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@ -2,9 +2,7 @@
 *
 * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
 */
-
 #ifndef _XORG_XVDIX_PRIV_H
-#define _XORG_XVDIX_PRIV_H

 #include <X11/Xdefs.h>

--- a/Xi/meson.build
+++ b/Xi/meson.build
@ -53,14 +53,14 @@ srcs_xi = [
    'xiwarppointer.c',
 ]

-libxserver_xi = static_library('xserver_xi',
+libxserver_xi = static_library('libxserver_xi',
    srcs_xi,
    include_directories: inc,
    dependencies: common_dep,
 )

 srcs_xi_stubs = ['stubs.c']
-libxserver_xi_stubs = static_library('xserver_xi_stubs',
+libxserver_xi_stubs = static_library('libxserver_xi_stubs',
    srcs_xi_stubs,
    include_directories: inc,
    dependencies: common_dep,
--- a/composite/meson.build
+++ b/composite/meson.build
@ -10,7 +10,7 @@ hdrs_composite = [
 	'compositeext.h',
 ]

-libxserver_composite = static_library('xserver_composite',
+libxserver_composite = static_library('libxserver_composite',
 	srcs_composite,
 	include_directories: inc,
 	dependencies: common_dep,
--- a/config/config-backends.h
+++ b/config/config-backends.h
@ -23,9 +23,6 @@
 * Author: Daniel Stone <daniel@fooishbar.org>
 */

-#ifndef XSERVER_CONFIG_BACKENDS_H
-#define XSERVER_CONFIG_BACKENDS_H
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
@ -47,5 +44,3 @@ void config_hal_fini(void);
 int config_wscons_init(void);
 void config_wscons_fini(void);
 #endif
-
-#endif /* XSERVER_CONFIG_BACKENDS_H */
--- a/config/meson.build
+++ b/config/meson.build
@ -28,7 +28,7 @@ if build_xorg
                 install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'))
 endif

-libxserver_config = static_library('xserver_config',
+libxserver_config = static_library('libxserver_config',
    srcs_config,
    include_directories: inc,
    dependencies: config_dep,
--- a/damageext/meson.build
+++ b/damageext/meson.build
@ -2,7 +2,7 @@ srcs_damageext = [
 	'damageext.c',
 ]

-libxserver_damageext = static_library('xserver_damageext',
+libxserver_damageext = static_library('libxserver_damageext',
 	srcs_damageext,
 	include_directories: inc,
 	dependencies: common_dep,
--- a/dbe/meson.build
+++ b/dbe/meson.build
@ -3,7 +3,7 @@ srcs_dbe = [
 	'midbe.c',
 ]

-libxserver_dbe = static_library('xserver_dbe',
+libxserver_dbe = static_library('libxserver_dbe',
 	srcs_dbe,
 	include_directories: inc,
 	dependencies: common_dep,
--- a/dix/generate-atoms
+++ b/dix/generate-atoms
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # SPDX-License-Identifier: MIT OR X11
 #
 # Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
@ -7,10 +7,10 @@ INPUT="$1"
 OUTPUT="$2"

 do_line() {
-    name="$1"
+    local name="$1"
    [ "$2" != "@" ] && return 0
    echo "    if (MakeAtom(\"$name\", ${#name}, 1) != XA_$name)"
-    echo "        FatalError(\"Adding builtin atom\");"
+    echo "        FatalError(\"adding builtin atom\");"
 }

 cat > "$OUTPUT" << __END__
@ -35,6 +35,6 @@ MakePredeclaredAtoms(void)
 {
 __END__

-( grep '@' < "$INPUT" ) | ( while IFS= read -r l ; do do_line $l ; done ) >> "$OUTPUT"
+( grep '@' < "$INPUT" ) | ( while read l ; do do_line $l ; done ) >> "$OUTPUT"

 echo "}" >> "$OUTPUT"
--- a/dix/meson.build
+++ b/dix/meson.build
@ -57,13 +57,13 @@ endif

 dtrace_dep = declare_dependency(sources: [dtrace_src, dtrace_hdr])

-libxserver_dix = static_library('xserver_dix',
+libxserver_dix = static_library('libxserver_dix',
    [ srcs_dix, builtinatoms_src ],
    include_directories: inc,
    dependencies: [ dtrace_dep, common_dep, ]
 )

-libxserver_main = static_library('xserver_main',
+libxserver_main = static_library('libxserver_main',
    'stubmain.c',
    include_directories: inc,
    dependencies: common_dep,
--- a/dix/screen.c
+++ b/dix/screen.c
@ -23,7 +23,6 @@ void dixFreeScreen(ScreenPtr pScreen)
    DeleteCallbackList(&pScreen->hookWindowDestroy);
    DeleteCallbackList(&pScreen->hookWindowPosition);
    DeleteCallbackList(&pScreen->hookClose);
-    DeleteCallbackList(&pScreen->hookPostClose);
    DeleteCallbackList(&pScreen->hookPixmapDestroy);
    free(pScreen);
 }
--- a/dix/screen_hooks.c
+++ b/dix/screen_hooks.c
@ -28,7 +28,6 @@
 DECLARE_HOOK_PROC(WindowDestroy, hookWindowDestroy, XorgScreenWindowDestroyProcPtr);
 DECLARE_HOOK_PROC(WindowPosition, hookWindowPosition, XorgScreenWindowPositionProcPtr);
 DECLARE_HOOK_PROC(Close, hookClose, XorgScreenCloseProcPtr);
-DECLARE_HOOK_PROC(PostClose, hookPostClose, XorgScreenCloseProcPtr);
 DECLARE_HOOK_PROC(PixmapDestroy, hookPixmapDestroy, XorgScreenPixmapDestroyProcPtr);
 DECLARE_HOOK_PROC(PostCreateResources, hookPostCreateResources,
                  XorgScreenPostCreateResourcesProcPtr);
@ -72,8 +71,6 @@ void dixScreenRaiseClose(ScreenPtr pScreen) {

    if (pScreen->CloseScreen)
        pScreen->CloseScreen(pScreen);
-
-    CallCallbacks(&pScreen->hookPostClose, NULL);
 }

 void dixScreenRaisePixmapDestroy(PixmapPtr pPixmap)
--- a/dix/screen_hooks_priv.h
+++ b/dix/screen_hooks_priv.h
@ -147,37 +147,6 @@ _X_EXPORT
 void dixScreenUnhookClose(ScreenPtr pScreen,
                          XorgScreenCloseProcPtr func);

-/**
- * @brief register a screen post close notify hook on the given screen
- *
- * @param pScreen pointer to the screen to register the notify hook into
- * @param func pointer to the hook function
- *
- * In contrast to Close hook, it's called *after* the driver's CloseScreen()
- * proc had been called.
- *
- * When registration fails, the server aborts.
- **/
-void dixScreenHookPostClose(ScreenPtr pScreen,
-                            XorgScreenCloseProcPtr func);
-
-/**
- * @brief unregister a screen close notify hook on the given screen
- *
- * @param pScreen pointer to the screen to unregister the hook from
- * @param func pointer to the hook function
- * @param arg opaque pointer passed to the destructor
- *
- * @see dixScreenHookPostClose
- *
- * Unregister a screen close notify hook registered via @ref dixScreenHookPostClose
- *
- * In contrast to Close hook, it's called *after* the driver's CloseScreen()
- * proc had been called.
- **/
-void dixScreenUnhookPostClose(ScreenPtr pScreen,
-                              XorgScreenCloseProcPtr func);
-
 /* prototype of pixmap destroy notification handler */
 typedef void (*XorgScreenPixmapDestroyProcPtr)(CallbackListPtr *pcbl,
                                               ScreenPtr pScreen,
--- a/dri3/meson.build
+++ b/dri3/meson.build
@ -10,7 +10,7 @@ hdrs_dri3 = [

 libxserver_dri3 = []
 if build_dri3
-    libxserver_dri3 = static_library('xserver_dri3',
+    libxserver_dri3 = static_library('libxserver_dri3',
        srcs_dri3,
        include_directories: inc,
        dependencies: [ common_dep, libdrm_dep ],
--- a/exa/meson.build
+++ b/exa/meson.build
@ -12,7 +12,7 @@ srcs_exa = [
    'exa_unaccel.c',
 ]

-libxserver_exa = static_library('xserver_exa',
+libxserver_exa = static_library('libxserver_exa',
    srcs_exa,
    include_directories: inc,
    dependencies: common_dep,
--- a/fb/meson.build
+++ b/fb/meson.build
@ -37,7 +37,7 @@ hdrs_fb = [
 	'wfbrename.h'
 ]

-libxserver_fb = static_library('xserver_fb',
+libxserver_fb = static_library('libxserver_fb',
 	srcs_fb,
 	include_directories: inc,
 	dependencies: common_dep,
@ -46,7 +46,7 @@ libxserver_fb = static_library('xserver_fb',

 wfb_args = '-DFB_ACCESS_WRAPPER'

-libxserver_wfb = static_library('xserver_wfb',
+libxserver_wfb = static_library('libxserver_wfb',
 	srcs_fb,
 	c_args: wfb_args,
 	include_directories: inc,
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@ -1,6 +1,3 @@
-#ifndef XSERVER_WFBRENAME_H
-#define XSERVER_WFBRENAME_H
-
 #define fbAddTraps wfbAddTraps
 #define fbAddTriangles wfbAddTriangles
 #define fbAllocatePrivates wfbAllocatePrivates
@ -121,5 +118,3 @@
 #define fbWinPrivateKeyRec wfbWinPrivateKeyRec
 #define free_pixman_pict wfb_free_pixman_pict
 #define image_from_pict wfb_image_from_pict
-
-#endif /* XSERVER_WFBRENAME_H */
--- a/glamor/glamor_composite_glyphs.c
+++ b/glamor/glamor_composite_glyphs.c
@ -185,24 +185,6 @@ glamor_glyph_add(struct glamor_glyph_atlas *atlas, DrawablePtr glyph_draw)
    return TRUE;
 }

-static const glamor_facet glamor_facet_composite_glyphs_es300 = {
-    .name = "composite_glyphs",
-    .version = 130,
-    .fs_extensions = ("#extension GL_EXT_blend_func_extended : enable\n"),
-    .vs_vars = ("in vec4 primitive;\n"
-                "in vec2 source;\n"
-                "out vec2 glyph_pos;\n"),
-    .vs_exec = ("       vec2 pos = primitive.zw * vec2(gl_VertexID&1, (gl_VertexID&2)>>1);\n"
-                GLAMOR_POS(gl_Position, (primitive.xy + pos))
-                "       glyph_pos = (source + pos) * ATLAS_DIM_INV;\n"),
-    .fs_vars = ("in vec2 glyph_pos;\n"
-                "out vec4 color0;\n"
-                "out vec4 color1;\n"),
-    .fs_exec = ("       vec4 mask = texture(atlas, glyph_pos);\n"),
-    .source_name = "source",
-    .locations = glamor_program_location_atlas,
-};
-
 static const glamor_facet glamor_facet_composite_glyphs_130 = {
    .name = "composite_glyphs",
    .version = 130,
@ -482,8 +464,6 @@ glamor_composite_glyphs(CARD8 op,
                        if (glamor_glsl_has_ints(glamor_priv))
                            prog = glamor_setup_program_render(op, src, glyph_pict, dst,
                                                               glyphs_program,
-                                                               glamor_priv->is_gles ?
-                                                                   &glamor_facet_composite_glyphs_es300 :
                                                               &glamor_facet_composite_glyphs_130,
                                                               glamor_priv->glyph_defines);
                        else
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@ -1192,8 +1192,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
                                                  "dmabuf_capable");
        else if (strstr((const char *)renderer, "Intel"))
            glamor_egl->dmabuf_capable = TRUE;
-        else if (strstr((const char *)renderer, "zink"))
-            glamor_egl->dmabuf_capable = TRUE;
        else
            glamor_egl->dmabuf_capable = FALSE;
    }
--- a/glx/indirect_util.c
+++ b/glx/indirect_util.c
@ -128,10 +128,13 @@ __glXSendReply(ClientPtr client, const void *data, size_t elements,
        .retval = retval,
    };

-    /* Single element goes in reply padding; don't leak uninitialized data. */
-    if (elements == 1) {
-        (void) memcpy(&reply.pad3, data, element_size);
-    }
+    /* It is faster on almost always every architecture to just copy the 8
+     * bytes, even when not necessary, than check to see of the value of
+     * elements requires it.  Copying the data when not needed will do no
+     * harm.
+     */
+
+    (void) memcpy(&reply.pad3, data, 8);
    WriteToClient(client, sizeof(xGLXSingleReply), &reply);

    if (reply_ints != 0) {
@ -173,10 +176,13 @@ __glXSendReplySwap(ClientPtr client, const void *data, size_t elements,
        .retval = bswap_32(retval),
    };

-    /* Single element goes in reply padding; don't leak uninitialized data. */
-    if (elements == 1) {
-        (void) memcpy(&reply.pad3, data, element_size);
-    }
+    /* It is faster on almost always every architecture to just copy the 8
+     * bytes, even when not necessary, than check to see of the value of
+     * elements requires it.  Copying the data when not needed will do no
+     * harm.
+     */
+
+    (void) memcpy(&reply.pad3, data, 8);
    WriteToClient(client, sizeof(xGLXSingleReply), &reply);

    if (reply_ints != 0) {
--- a/glx/meson.build
+++ b/glx/meson.build
@ -32,7 +32,7 @@ srcs_glx = [

 libxserver_glx = []
 if build_glx
-    libxserver_glx = static_library('xserver_glx',
+    libxserver_glx = static_library('libxserver_glx',
        srcs_glx,
        include_directories: inc,
        dependencies: [
@ -68,7 +68,7 @@ hdrs_vnd = [

 libglxvnd = []
 if build_glx
-    libglxvnd = static_library('glxvnd',
+    libglxvnd = static_library('libglxvnd',
    srcs_vnd,
    include_directories: inc,
        dependencies: [
--- a/glx/rensize.c
+++ b/glx/rensize.c
@ -347,7 +347,7 @@ __glXTypeSize(GLenum enm)
    case GL_INT:
        return sizeof(GLint);
    case GL_UNSIGNED_INT:
-        return sizeof(GLuint);
+        return sizeof(GLint);
    case GL_FLOAT:
        return sizeof(GLfloat);
    case GL_DOUBLE:
--- a/glx/singlesize.c
+++ b/glx/singlesize.c
@ -105,7 +105,7 @@ __glGetMap_size(GLenum target, GLenum query)
        }
        break;
    }
-    return 0;
+    return -1;
 }

 GLint
@ -164,7 +164,7 @@ __glGetPixelMap_size(GLenum map)
        query = GL_PIXEL_MAP_A_TO_A_SIZE;
        break;
    default:
-        return 0;
+        return -1;
    }
    glGetIntegerv(query, &size);
    return size;
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@ -1435,11 +1435,12 @@ MouseFini(KdPointerInfo * pi)
 }

 KdPointerDriver EphyrMouseDriver = {
-    .name    = "ephyr",
-    .Init    = MouseInit,
-    .Enable  = MouseEnable,
-    .Disable = MouseDisable,
-    .Fini    = MouseFini,
+    "ephyr",
+    MouseInit,
+    MouseEnable,
+    MouseDisable,
+    MouseFini,
+    NULL,
 };

 /* Keyboard */
@ -1508,11 +1509,12 @@ EphyrKeyboardBell(KdKeyboardInfo * ki, int volume, int frequency, int duration)
 }

 KdKeyboardDriver EphyrKeyboardDriver = {
-    .name    = "ephyr",
-    .Init    = EphyrKeyboardInit,
-    .Enable  = EphyrKeyboardEnable,
-    .Leds    = EphyrKeyboardLeds,
-    .Bell    = EphyrKeyboardBell,
-    .Disable = EphyrKeyboardDisable,
-    .Fini    = EphyrKeyboardFini,
+    "ephyr",
+    EphyrKeyboardInit,
+    EphyrKeyboardEnable,
+    EphyrKeyboardLeds,
+    EphyrKeyboardBell,
+    EphyrKeyboardDisable,
+    EphyrKeyboardFini,
+    NULL,
 };
--- a/hw/kdrive/ephyr/ephyr_glamor.h
+++ b/hw/kdrive/ephyr/ephyr_glamor.h
@ -21,9 +21,6 @@
 * IN THE SOFTWARE.
 */

-#ifndef XSERVER_KDRIVE_EPHYR_GLAMOR_H
-#define XSERVER_KDRIVE_EPHYR_GLAMOR_H
-
 #include <xcb/xcb.h>
 #include "dix-config.h"

@ -66,5 +63,3 @@ ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
 }

 #endif /* !GLAMOR */
-
-#endif /* XSERVER_KDRIVE_EPHYR_GLAMOR_H */
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@ -370,23 +370,6 @@ ddxProcessArgument(int argc, char **argv, int i)
    return KdProcessArgument(argc, argv, i);
 }

-static int
-EphyrInit(void)
-{
-    /*
-     * make sure at least one screen
-     * has been added to the system.
-     */
-    if (!KdCardInfoLast()) {
-        processScreenArg("640x480", NULL);
-    }
-    return hostx_init();
-}
-
-KdOsFuncs EphyrOsFuncs = {
-    .Init = EphyrInit,
-};
-
 void
 OsVendorInit(void)
 {
@ -398,23 +381,32 @@ OsVendorInit(void)
    if (hostx_want_host_cursor())
        ephyrFuncs.initCursor = &ephyrCursorInit;

-    KdOsInit(&EphyrOsFuncs);
+    if (serverGeneration == 1) {
+        if (!KdCardInfoLast()) {
+            processScreenArg("640x480", NULL);
+        }
+        hostx_init();
+    }
 }

 KdCardFuncs ephyrFuncs = {
-    .cardinit         = ephyrCardInit,
-    .scrinit          = ephyrScreenInitialize,
-    .initScreen       = ephyrInitScreen,
-    .finishInitScreen = ephyrFinishInitScreen,
-    .createRes        = ephyrCreateResources,
+    ephyrCardInit,              /* cardinit */
+    ephyrScreenInitialize,      /* scrinit */
+    ephyrInitScreen,            /* initScreen */
+    ephyrFinishInitScreen,      /* finishInitScreen */
+    ephyrCreateResources,       /* createRes */
+    ephyrScreenFini,            /* scrfini */
+    ephyrCardFini,              /* cardfini */

-    .scrfini          = ephyrScreenFini,
-    .cardfini         = ephyrCardFini,
+    0,                          /* initCursor */

-    /* no cursor or accel funcs here */
+    0,                          /* initAccel */
+    0,                          /* enableAccel */
+    0,                          /* disableAccel */
+    0,                          /* finiAccel */

-    .getColors        = ephyrGetColors,
-    .putColors        = ephyrPutColors,
+    ephyrGetColors,             /* getColors */
+    ephyrPutColors,             /* putColors */

-    .closeScreen      = ephyrCloseScreen,
+    ephyrCloseScreen,           /* closeScreen */
 };
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@ -91,14 +91,6 @@ const char *kdGlobalXkbLayout = NULL;
 const char *kdGlobalXkbVariant = NULL;
 const char *kdGlobalXkbOptions = NULL;

-
-/*
- * Carry arguments from InitOutput through driver initialization
- * to KdScreenInit
- */
-
-KdOsFuncs *kdOsFuncs = NULL;
-
 void
 KdDisableScreen(ScreenPtr pScreen)
 {
@ -525,19 +517,6 @@ KdProcessArgument(int argc, char **argv, int i)
    return 0;
 }

-void
-KdOsInit(KdOsFuncs * pOsFuncs)
-{
-    kdOsFuncs = pOsFuncs;
-    if (pOsFuncs) {
-        if (serverGeneration == 1) {
-            KdDoSwitchCmd("start");
-            if (pOsFuncs->Init)
-                (*pOsFuncs->Init) ();
-        }
-    }
-}
-
 static Bool
 KdAllocatePrivates(ScreenPtr pScreen)
 {
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@ -278,16 +278,6 @@ int KdAddConfigKeyboard(char *pointer);
 int KdAddKeyboard(KdKeyboardInfo * ki);
 void KdRemoveKeyboard(KdKeyboardInfo * ki);

-typedef struct _KdOsFuncs {
-    int (*Init) (void); /* Only called when the X server is started, when serverGeneration == 1 */
-    void (*Enable) (void);
-    Bool (*SpecialKey) (KeySym);
-    void (*Disable) (void);
-    void (*Fini) (void);
-    void (*pollEvents) (void);
-    void (*Bell) (int, int, int);
-} KdOsFuncs;
-
 typedef struct _KdPointerMatrix {
    int matrix[2][3];
 } KdPointerMatrix;
@ -299,8 +289,6 @@ extern DevPrivateKeyRec kdScreenPrivateKeyRec;
 extern Bool kdEmulateMiddleButton;
 extern Bool kdDisableZaphod;

-extern KdOsFuncs *kdOsFuncs;
-
 #define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \
    dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))
 #define KdSetScreenPriv(pScreen,v) \
@ -357,9 +345,6 @@ void
 int
 KdProcessArgument(int argc, char **argv, int i);

-void
- KdOsInit(KdOsFuncs * pOsFuncs);
-
 void
 KdOsAddInputDrivers(void);

--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@ -259,6 +259,13 @@ ddxGiveUp(enum ExitCode error)
    }
 }

+#ifdef __APPLE__
+void
+DarwinHandleGUI(int argc, char *argv[])
+{
+}
+#endif
+
 void
 OsVendorInit(void)
 {
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@ -342,32 +342,20 @@ xf86UpdateHasVTProperty(Bool hasVT)

 static void xf86DisableInputHandler(void *handler);
 static void xf86EnableInputHandler(void *handler);
+static void xf86DisableGeneralHandler(void *handler);

 static void _xf86EnableGeneralHandler(void *handler);
-static void _xf86DisableGeneralHandler(void *handler);

 _X_EXPORT /* needs to be exported for Nvidia legacy (470.256.02) */
 void xf86EnableGeneralHandler(void *handler);

-_X_EXPORT /* needs to be exported for Nvidia legacy (470.256.02) */
-void xf86DisableGeneralHandler(void *handler);
-
 void xf86EnableGeneralHandler(void *handler) {
    LogMessageVerb(X_WARNING, 0, "Outdated driver still using xf86EnableGeneralHandler() !\n");
    LogMessageVerb(X_WARNING, 0, "File a bug report to driver vendor or use a FOSS driver.\n");
-    LogMessageVerb(X_WARNING, 0, "https://forums.developer.nvidia.com/c/gpu-graphics/linux/148\n");
    LogMessageVerb(X_WARNING, 0, "Proprietary drivers are inherently unstable, they just can't be done right.\n");
    _xf86EnableGeneralHandler(handler);
 }

-void xf86DisableGeneralHandler(void *handler) {
-    LogMessageVerb(X_WARNING, 0, "Outdated driver still using xf86DisableGeneralHandler() !\n");
-    LogMessageVerb(X_WARNING, 0, "File a bug report to driver vendor or use a FOSS driver.\n");
-    LogMessageVerb(X_WARNING, 0, "https://forums.developer.nvidia.com/c/gpu-graphics/linux/148\n");
-    LogMessageVerb(X_WARNING, 0, "Proprietary drivers are inherently unstable, they just can't be done right.\n");
-    _xf86DisableGeneralHandler(handler);
-}
-
 static void
 xf86VTLeave(void)
 {
@ -395,7 +383,7 @@ xf86VTLeave(void)
        if (ih->is_input)
            xf86DisableInputHandler(ih);
        else
-            _xf86DisableGeneralHandler(ih);
+            xf86DisableGeneralHandler(ih);
    }
    for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next)
        xf86DisableInputDeviceForVTSwitch(pInfo);
@ -661,7 +649,7 @@ static void xf86DisableInputHandler(void *handler)
        RemoveNotifyFd(ih->fd);
 }

-static void _xf86DisableGeneralHandler(void *handler)
+static void xf86DisableGeneralHandler(void *handler)
 {
    IHPtr ih;

--- a/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/hw/xfree86/common/xf86VGAarbiterPriv.h
@ -24,9 +24,6 @@
 *
 */

-#ifndef XSERVER_XFREE86_XF86VGAARBITERPRIV_H
-#define XSERVER_XFREE86_XF86VGAARBITERPRIV_H
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@ -276,5 +273,3 @@ static void VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
 static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst,
                                     xRenderColor * color, int nRect,
                                     xRectangle *rects);
-
-#endif /* XSERVER_XFREE86_XF86VGAARBITERPRIV_H */
--- a/hw/xfree86/compat/README
+++ b/hw/xfree86/compat/README
@ -1,5 +1 @@
 special compat code for legacy drivers, namely Nvidia proprietary
-
-NVidia is lacking behind for at least a year and don't actually clean up
-their spaghetti code. That's why we need to keep several special compat
-functions to emulate prehistoric behaviour.
--- a/hw/xfree86/compat/clientexception.c
+++ b/hw/xfree86/compat/clientexception.c
@ -4,8 +4,6 @@

 #include "dix/dix_priv.h"

-#include "xf86_compat.h"
-
 /*
 * this is specifically for NVidia proprietary driver: they're again lagging
 * behind a year, doing at least some minimal cleanup of their code base.
@ -15,7 +13,12 @@ _X_EXPORT void MarkClientException(ClientPtr pClient);

 void MarkClientException(ClientPtr pClient)
 {
-    xf86NVidiaBugInternalFunc("MarkClientException()");
+    LogMessageVerb(X_WARNING, 0, "Bogus driver calling DIX-internal function MarkClientException() !\n");
+    LogMessageVerb(X_WARNING, 0, "External drivers really should never ever call this function.\n");
+    LogMessageVerb(X_WARNING, 0, "Nor should they ever DIX-internal fields like ClientRec->noClientException\n");
+    LogMessageVerb(X_WARNING, 0, "File a bug report to driver vendor or use a FOSS driver.\n");
+    LogMessageVerb(X_WARNING, 0, "Proprietary drivers are inherently unstable, they just can't be done right.\n");
+    LogMessageVerb(X_WARNING, 0, "And just don't buy Nvidia hardware, ever.\n");

    dixMarkClientException(pClient);
 }
--- a/hw/xfree86/compat/log.c
+++ b/hw/xfree86/compat/log.c
@ -4,8 +4,6 @@

 #include "include/os.h"

-#include "xf86_compat.h"
-
 #undef xf86Msg
 #undef xf86MsgVerb

@ -19,7 +17,9 @@ _X_EXPORT void xf86Msg(MessageType type, const char *format, ...)

 void xf86Msg(MessageType type, const char *format, ...)
 {
-    xf86NVidiaBugInternalFunc("xf86Msg()");
+    LogMessageVerb(X_WARNING, 0, "Outdated driver still using xf86Msg() !\n");
+    LogMessageVerb(X_WARNING, 0, "File a bug report to driver vendor or use a FOSS driver.\n");
+    LogMessageVerb(X_WARNING, 0, "Proprietary drivers are inherently unstable, they just can't be done right.\n");

    va_list ap;

@ -39,12 +39,9 @@ _X_EXPORT void xf86MsgVerb(MessageType type, int verb, const char *format, ...)
 void
 xf86MsgVerb(MessageType type, int verb, const char *format, ...)
 {
-    static char reportxf86MsgVerb = 1;
-
-    if (reportxf86MsgVerb) {
-        xf86NVidiaBugInternalFunc("xf86MsgVerb()");
-        reportxf86MsgVerb = 0;
-    }
+    LogMessageVerb(X_WARNING, 0, "Outdated driver still using xf86MsgVerb() !\n");
+    LogMessageVerb(X_WARNING, 0, "File a bug report to driver vendor or use a FOSS driver.\n");
+    LogMessageVerb(X_WARNING, 0, "Proprietary drivers are inherently unstable, they just can't be done right.\n");

    va_list ap;
    va_start(ap, format);
--- a/hw/xfree86/compat/meson.build
+++ b/hw/xfree86/compat/meson.build
@ -1,7 +1,6 @@
 srcs_xorg_compat = [
    'clientexception.c',
    'log.c',
-    'nvidiabug.c',
    'ones.c',
    'xf86Helper.c',
 ]
--- a/hw/xfree86/compat/nvidiabug.c
+++ b/hw/xfree86/compat/nvidiabug.c
@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: MIT OR X11
- *
- * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
- */
-#include <dix-config.h>
-
-#include "include/os.h"
-
-#include "xf86_compat.h"
-
-void xf86NVidiaBug(void)
-{
-    LogMessageVerb(X_WARNING, 0, "[DRIVER BUG] file a bug report to driver vendor or use a free Xlibre driver.\n");
-    LogMessageVerb(X_WARNING, 0, "[DRIVER BUG] Proprietary drivers are inherently unstable, they just can't be done right.\n");
-    LogMessageVerb(X_WARNING, 0, "[DRIVER BUG] For NVidia report here: https://forums.developer.nvidia.com/c/gpu-graphics/linux/148\n");
-    LogMessageVerb(X_WARNING, 0, "[DRIVER BUG] And better don't buy NVidia HW until they've fixed their mess.\n");
-}
-
-void xf86NVidiaBugInternalFunc(const char* name)
-{
-    LogMessageVerb(X_WARNING, 0, "[DRIVER BUG] calling internal function: %s\n", name);
-    LogMessageVerb(X_WARNING, 0, "[DRIVER BUG] this function is not supposed to be by drivers ever\n");
-    xf86NVidiaBug();
-}
-
-void xf86NVidiaBugObsoleteFunc(const char* name)
-{
-    LogMessageVerb(X_WARNING, 0, "[DRIVER BUG] calling obsolete function: %s\n", name);
-    LogMessageVerb(X_WARNING, 0, "[DRIVER BUG] this function is not supposed to be by drivers ever\n");
-    xf86NVidiaBug();
-}
--- a/hw/xfree86/compat/ones.c
+++ b/hw/xfree86/compat/ones.c
@ -27,6 +27,7 @@ Ones(unsigned long mask)

    y = (mask >> 1) & 033333333333;
    y = mask - y - ((y >> 1) & 033333333333);
-    return (((y + (y >> 3)) & 030707070707) % 077);
+    /* x & 077 == x % 077 */
+    return (((y + (y >> 3)) & 030707070707) & 077);
 #endif
 }
--- a/hw/xfree86/compat/xf86_compat.h
+++ b/hw/xfree86/compat/xf86_compat.h
@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: MIT OR X11
- *
- * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
- */
-#ifndef __XFREE86_COMPAT_XF86_COMPAT_H
-#define __XFREE86_COMPAT_XF86_COMPAT_H
-
-void xf86NVidiaBug(void);
-void xf86NVidiaBugInternalFunc(const char* name);
-void xf86NVidiaBugObsoleteFunc(const char* name);
-
-#endif /* __XFREE86_COMPAT_XF86_COMPAT_H */
--- a/hw/xfree86/dri2/dri2int.h
+++ b/hw/xfree86/dri2/dri2int.h
@ -23,9 +23,4 @@
 * Author: Daniel Stone <daniel@fooishbar.org>
 */

-#ifndef XSERVER_XFREE86_DRI2INT_H
-#define XSERVER_XFREE86_DRI2INT_H
-
 extern Bool DRI2ModuleSetup(void);
-
-#endif /* XSERVER_XFREE86_DRI2INT_H */
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@ -1306,7 +1306,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
    ms->atomic_modeset_capable = (ret == 0);

    if (xf86ReturnOptValBool(ms->drmmode.Options, OPTION_ATOMIC, FALSE)) {
-        ret = drmSetClientCap(ms->fd, DRM_CLIENT_CAP_ATOMIC, 2);
+        ret = drmSetClientCap(ms->fd, DRM_CLIENT_CAP_ATOMIC, 1);
        ms->atomic_modeset = (ret == 0);
        if (!ms->atomic_modeset)
            xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Atomic modesetting not supported\n");
@ -1631,7 +1631,7 @@ msStopFlippingPixmapTracking(DrawablePtr src,
 }

 static Bool
-modesetCreateScreenResources(ScreenPtr pScreen)
+modsetCreateScreenResources(ScreenPtr pScreen)
 {
    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
    modesettingPtr ms = modesettingPTR(pScrn);
@ -1941,7 +1941,7 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
        return FALSE;
    }

-    pScreen->CreateScreenResources = modesetCreateScreenResources;
+    pScreen->CreateScreenResources = modsetCreateScreenResources;

    xf86SetBlackWhitePixels(pScreen);

--- a/hw/xfree86/drivers/modesetting/driver.h
+++ b/hw/xfree86/drivers/modesetting/driver.h
@ -29,9 +29,6 @@
 *   Aaron Plattner <aplattner@nvidia.com>
 */

-#ifndef XSERVER_XFREE86_DRIVER_H
-#define XSERVER_XFREE86_DRIVER_H
-
 #include <errno.h>
 #include <drm.h>
 #include <xf86drm.h>
@ -264,5 +261,3 @@ void ms_drain_drm_events(ScreenPtr screen);
 Bool ms_window_has_variable_refresh(modesettingPtr ms, WindowPtr win);
 void ms_present_set_screen_vrr(ScrnInfoPtr scrn, Bool vrr_enabled);
 Bool ms_tearfree_is_active_on_crtc(xf86CrtcPtr crtc);
-
-#endif /* XSERVER_XFREE86_DRIVER_H */
--- a/hw/xfree86/int10/vbeModes.h
+++ b/hw/xfree86/int10/vbeModes.h
@ -29,7 +29,6 @@
 */

 #ifndef _VBE_MODES_H
-#define _VBE_MODES_H

 /*
 * This is intended to be stored in the DisplayModeRec's private area.
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@ -417,6 +417,7 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
 {
    int vercode[4];
    long ver = data->xf86version;
+    MessageType errtype;

    LogMessage(X_INFO, "Module %s: vendor=\"%s\"\n",
               data->modname ? data->modname : "UNKNOWN!",
@ -457,7 +458,6 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
            vermaj = GET_ABI_MAJOR(ver);
            vermin = GET_ABI_MINOR(ver);
            if (abimaj != vermaj) {
-                MessageType errtype;
                if (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL)
                    errtype = X_WARNING;
                else
@ -469,7 +469,6 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
                    return FALSE;
            }
            else if (abimin > vermin) {
-                MessageType errtype;
                if (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL)
                    errtype = X_WARNING;
                else
--- a/hw/xfree86/man/Xorg.man
+++ b/hw/xfree86/man/Xorg.man
@ -656,7 +656,11 @@ Orest Zborowski    \fIorestz@eskimo.com\fP
 .fi
 .RE
 .PP
-Xlibre source is available via git \fI<https://github.com/X11Libre/xserver.git/>\fP.
+Xorg source is available from the FTP server
+\fI<ftp://ftp.x.org/>\fP, and from the X.Org
+server \fI<https://gitlab.freedesktop.org/xorg/>\fP.  Documentation and other
+information can be found from the X.Org web site
+\fI<https://www.x.org/>\fP.

 .SH LEGAL
 .B Xorg
--- a/hw/xfree86/parser/configProcs.h
+++ b/hw/xfree86/parser/configProcs.h
@ -29,9 +29,6 @@

 /* exported functions are/were used by the X Server */

-#ifndef XSERVER_XFREE86_CONFIGPROCS_H
-#define XSERVER_XFREE86_CONFIGPROCS_H
-
 #include <X11/Xfuncproto.h>

 /* Device.c */
@ -149,5 +146,3 @@ xf86freeExtensions(XF86ConfExtensionsPtr ptr);
 void
 ErrorF(const char *f, ...);
 #endif
-
-#endif /* XSERVER_XFREE86_CONFIGPROCS_H */
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@ -154,6 +154,13 @@ ddxGiveUp(enum ExitCode error)
    xnestCloseDisplay();
 }

+#ifdef __APPLE__
+void
+DarwinHandleGUI(int argc, char *argv[])
+{
+}
+#endif
+
 void
 OsVendorInit(void)
 {
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@ -164,7 +164,7 @@ Bool
 xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
 {
    unsigned long valuemask;
-    VisualID defaultVisual = 0;
+    VisualID defaultVisual;
    int rootDepth;
    miPointerScreenPtr PointPriv;

--- a/hw/xquartz/NSUserDefaults+XQuartzDefaults.h
+++ b/hw/xquartz/NSUserDefaults+XQuartzDefaults.h
@ -6,9 +6,6 @@
 //  Copyright (c) 2021 Apple Inc. All rights reserved.
 //

-#ifndef XSERVER_XQUARTZ_NSUSERDEFAULTS_XQUARTZDEFAULTS_H
-#define XSERVER_XQUARTZ_NSUSERDEFAULTS_XQUARTZDEFAULTS_H
-
 #import <Foundation/Foundation.h>

 extern NSString * const XQuartzPrefKeyAppsMenu;
@ -50,5 +47,3 @@ extern NSString * const XQuartzPrefKeySyncPrimaryOnSelect;
 + (NSUserDefaults *)xquartzDefaults;

@end
-
-#endif /* XSERVER_XQUARTZ_NSUSERDEFAULTS_XQUARTZDEFAULTS_H */
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@ -690,6 +690,7 @@ SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to)
 static int
 SProcAppleWMQueryVersion(register ClientPtr client)
 {
+    REQUEST(xAppleWMQueryVersionReq);
    return ProcAppleWMQueryVersion(client);
 }

--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@ -38,7 +38,6 @@
 #include "os/ddx_priv.h"
 #include "os/log_priv.h"
 #include "os/osdep.h"
-#include "xkb/xkbsrv_priv.h"

 #include "os.h"
 #include "servermd.h"
--- a/hw/xquartz/mach-startup/bundle_trampoline.c
+++ b/hw/xquartz/mach-startup/bundle_trampoline.c
@ -50,7 +50,7 @@
 * needs and simply execs the startup script which then execs the main binary.
 */

-static char *executable_path(void) {
+static char *executable_path() {
    uint32_t bufsize = PATH_MAX;
    char *buf = calloc(1, bufsize);

--- a/hw/xquartz/mach-startup/meson.build
+++ b/hw/xquartz/mach-startup/meson.build
@ -62,7 +62,7 @@ x11_bin = executable('X11.bin',
      mach_startup[3], # mach_startupUser.c
     ],
     link_with: x11_bin_libs,
-     dependencies: [xproto_dep, x11_dep, x11_bin_deps, mach_startup_dep],
+     dependencies: [xproto_dep, x11_bin_deps, mach_startup_dep],
     include_directories: [inc, '..', top_dir_inc],
     c_args: xquartz_defs,
     link_args: ['-Objc'],
--- a/hw/xquartz/meson.build
+++ b/hw/xquartz/meson.build
@ -76,7 +76,7 @@ libXquartz = static_library('Xquartz',
    c_args: libxquartz_defs,
    objc_args: libxquartz_defs,
    include_directories: [inc, '../../pseudoramiX', '../../miext/rootless', top_dir_inc],
-    dependencies: [xproto_dep, xdmcp_dep, pixman_dep],
+    dependencies: [xproto_dep, pixman_dep],
    link_with: [libxserver_pseudoramix, libxserver_miext_rootless],
 )

--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@ -33,8 +33,6 @@

 #include <dix-config.h>

-#include "dix/dix_priv.h"
-
 #include "quartzRandR.h"
 #include "inputstr.h"
 #include "quartz.h"
--- a/hw/xquartz/xpr/appledri.c
+++ b/hw/xquartz/xpr/appledri.c
@ -394,6 +394,7 @@ SNotifyEvent(xAppleDRINotifyEvent *from,
 static int
 SProcAppleDRIQueryVersion(register ClientPtr client)
 {
+    REQUEST(xAppleDRIQueryVersionReq);
    return ProcAppleDRIQueryVersion(client);
 }

--- a/hw/xquartz/xpr/driWrap.h
+++ b/hw/xquartz/xpr/driWrap.h
@ -28,8 +28,6 @@
 */

 #ifndef DRIWRAP_H
-#define DRIWRAP_H
-
 #include "scrnintstr.h"

 Bool
--- a/hw/xwin/glx/winpriv.h
+++ b/hw/xwin/glx/winpriv.h
@ -4,14 +4,9 @@
 * Authors: Alexander Gottwald
 */

-#ifndef XSERVER_XWIN_WINPRIV_H
-#define XSERVER_XWIN_WINPRIV_H
-
 #include <X11/Xwindows.h>
 #include <windowstr.h>

 HWND winGetWindowInfo(WindowPtr pWin);
 Bool winCheckScreenAiglxIsSupported(ScreenPtr pScreen);
 void winSetScreenAiglxIsActive(ScreenPtr pScreen);
-
-#endif /* XSERVER_XWIN_WINPRIV_H */
--- a/hw/xwin/winauth.h
+++ b/hw/xwin/winauth.h
@ -19,13 +19,8 @@
 * IN THE SOFTWARE.
 */

-#ifndef XSERVER_XWIN_WINAUTH_H
-#define XSERVER_XWIN_WINAUTH_H
-
 #include <xcb/xcb.h>
 #include <X11/Xmd.h> // for BOOL

 BOOL winGenerateAuthorization(void);
 xcb_auth_info_t * winGetXcbAuthInfo(void);
-
-#endif /* XSERVER_XWIN_WINAUTH_H */
--- a/hw/xwin/winlayouts.h
+++ b/hw/xwin/winlayouts.h
@ -27,9 +27,6 @@
 * XKB settings.
 */

-#ifndef XSERVER_XWIN_WINLAYOUTS_H
-#define XSERVER_XWIN_WINLAYOUTS_H
-
 typedef struct {
    unsigned int winlayout;
    int winkbtype;
@ -101,5 +98,3 @@ WinKBLayoutRec winKBLayouts[] = {
  See http://technet.microsoft.com/en-us/library/cc766503%28WS.10%29.aspx
  for a listing of input locale (keyboard layout) codes
 */
-
-#endif /* XSERVER_XWIN_WINLAYOUTS_H */
--- a/hw/xwin/winmonitors.h
+++ b/hw/xwin/winmonitors.h
@ -27,9 +27,6 @@ from The Open Group.

 */

-#ifndef XSERVER_XWIN_WINMONITORS_H
-#define XSERVER_XWIN_WINMONITORS_H
-
 /* data returned for monitor information */
 struct GetMonitorInfoData {
    int requestedMonitor;
@ -44,5 +41,3 @@ struct GetMonitorInfoData {
 };

 Bool QueryMonitor(int i, struct GetMonitorInfoData *data);
-
-#endif /* XSERVER_XWIN_WINMONITORS_H */
--- a/include/dix-config-apple-verbatim.h
+++ b/include/dix-config-apple-verbatim.h
@ -1,13 +1,8 @@
 /* Do not include this file directly.  It is included at the end of <dix-config.h> */

-#ifndef XSERVER_CONFIG_APPLE_VERBATIM_H
-#define XSERVER_CONFIG_APPLE_VERBATIM_H
-
 /* Correctly set _XSERVER64 for OSX fat binaries */
 #if defined(__LP64__) && !defined(_XSERVER64)
 #define _XSERVER64 1
 #elif !defined(__LP64__) && defined(_XSERVER64)
 #undef _XSERVER64
 #endif
-
-#endif /* XSERVER_CONFIG_APPLE_VERBATIM_H */
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@ -696,10 +696,6 @@ typedef struct _Screen {
    CallbackListPtr hookPostCreateResources;

    SetWindowVRRModeProcPtr SetWindowVRRMode;
-
-    /* additional screen post-close notify hooks (replaces wrapping CloseScreen)
-       should NOT be touched outside of DIX core */
-    CallbackListPtr hookPostClose;
 } ScreenRec;

 static inline RegionPtr
--- a/include/xwin-config.h.meson.in
+++ b/include/xwin-config.h.meson.in
@ -4,10 +4,6 @@
 * This file has all defines used in the xwin ddx
 *
 */
-
-#ifndef XSERVER_XWIN_CONFIG_H
-#define XSERVER_XWIN_CONFIG_H
-
 #include <dix-config.h>

 /* Winsock networking */
@ -21,5 +17,3 @@

 /* Whether we should re-locate the root to where the executable lives */
 #mesondefine RELOCATE_PROJECTROOT
-
-#endif /* XSERVER_XWIN_CONFIG_H */
--- a/meson.build
+++ b/meson.build
@ -3,10 +3,10 @@ project('xserver', 'c',
            'buildtype=debugoptimized',
            'c_std=gnu99',
        ],
-        version: '25.0.0.4',
+        version: '25.0.0.0',
        meson_version: '>= 0.58.0',
 )
-release_date = '2025-07-04'
+release_date = '2021-07-05'

 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')
@ -777,8 +777,7 @@ endif

 subdir('hw')

-build_tests = get_option('tests') and host_machine.system() != 'windows'
-if build_tests
+if host_machine.system() != 'windows'
    subdir('test')
 endif

--- a/meson_options.txt
+++ b/meson_options.txt
@ -14,7 +14,7 @@ option('xquartz', type: 'combo', choices: ['true', 'false', 'auto'], value: 'aut
       description: 'Enable Xquartz X server')


-option('builder_addr', type: 'string', description: 'Builder address', value: 'xlibre@freelists.org')
+option('builder_addr', type: 'string', description: 'Builder address', value: 'xorg@lists.freedesktop.org')
 option('builder_string', type: 'string', description: 'Additional builder string')

 option('log_dir', type: 'string')
@ -110,8 +110,6 @@ option('sha1', type: 'combo', choices: ['libc', 'CommonCrypto', 'CryptoAPI', 'li
       description: 'SHA1 implementation')
 option('xf86-input-inputtest', type: 'boolean', value: true,
       description: 'Test input driver support on Xorg')
-option('tests', type: 'boolean', value: true,
-       description: 'Build tests for the X server on platforms that support it')

 option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
 option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')
--- a/mi/meson.build
+++ b/mi/meson.build
@ -40,7 +40,7 @@ hdrs_mi = [
  'mizerarc.h',
 ]

-libxserver_mi = static_library('xserver_mi',
+libxserver_mi = static_library('libxserver_mi',
    srcs_mi,
    include_directories: inc,
    dependencies: [
--- a/mi/miline.h
+++ b/mi/miline.h
@ -1,3 +1,4 @@
+
 /*

 Copyright 1994, 1998  The Open Group
@ -25,7 +26,6 @@ in this Software without prior written authorization from The Open Group.
 */

 #ifndef MILINE_H
-#define MILINE_H

 #include "screenint.h"
 #include "privates.h"
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@ -141,7 +141,7 @@ miPointerInitialize(ScreenPtr pScreen,
    pScreenPriv->screenFuncs = screenFuncs;
    pScreenPriv->waitForUpdate = waitForUpdate;
    pScreenPriv->showTransparent = FALSE;
-    dixScreenHookPostClose(pScreen, miPointerCloseScreen);
+    dixScreenHookClose(pScreen, miPointerCloseScreen);
    dixSetPrivate(&pScreen->devPrivates, miPointerScreenKey, pScreenPriv);
    /*
     * set up screen cursor method table
@ -169,7 +169,7 @@ static void miPointerCloseScreen(CallbackListPtr *pcbl, ScreenPtr pScreen, void
 {
    SetupScreen(pScreen);

-    dixScreenUnhookPostClose(pScreen, miPointerCloseScreen);
+    dixScreenUnhookClose(pScreen, miPointerCloseScreen);
    free((void *) pScreenPriv);
    dixSetPrivate(&pScreen->devPrivates, miPointerScreenKey, NULL);
    FreeEventList(mipointermove_events, GetMaximumEventsNum());
--- a/mi/mipoly.h
+++ b/mi/mipoly.h
@ -78,9 +78,6 @@ from The Open Group.
 *     drawn (as with the even-odd rule).
 */

-#ifndef XSERVER_MIPOLY_H
-#define XSERVER_MIPOLY_H
-
 /*
 * for the winding number rule
 */
@ -175,5 +172,3 @@ typedef struct _ScanLineListBlock {
      pAET = pAET->next; \
   } \
 }
-
-#endif /* XSERVER_MIPOLY_H */
--- a/mi/misprite.h
+++ b/mi/misprite.h
@ -1,3 +1,11 @@
+/*
+ * misprite.h
+ *
+ * software-sprite/sprite drawing interface spec
+ *
+ * mi versions of these routines exist.
+ */
+
 /*

 Copyright 1989, 1998  The Open Group
@ -23,17 +31,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 */

-/*
- * misprite.h
- *
- * software-sprite/sprite drawing interface spec
- *
- * mi versions of these routines exist.
- */
-
-#ifndef XSERVER_MISPRITE_H
-#define XSERVER_MISPRITE_H
-
 Bool miSpriteInitialize(ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs);

 Bool miDCRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
@ -47,5 +44,3 @@ Bool miDCRestoreUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
                            int x, int y, int w, int h);
 Bool miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);
 void miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);
-
-#endif /* XSERVER_MISPRITE_H */
--- a/mi/miwideline.h
+++ b/mi/miwideline.h
@ -28,9 +28,6 @@ from The Open Group.

 /* Author:  Keith Packard, MIT X Consortium */

-#ifndef XSERVER_MIWIDELINE_H
-#define XSERVER_MIWIDELINE_H
-
 #include "mifpoly.h"            /* for ICEIL */

 /*
@ -94,5 +91,3 @@ typedef struct _LineFace {
 	ValidateGC (pDrawable, pGC); \
    } \
 }
-
-#endif /* XSERVER_MIWIDELINE_H */
--- a/mi/mizerarc.h
+++ b/mi/mizerarc.h
@ -24,9 +24,6 @@ in this Software without prior written authorization from The Open Group.

 ********************************************************/

-#ifndef XSERVER_MIZERARC_H
-#define XSERVER_MIZERARC_H
-
 typedef struct {
    int x;
    int y;
@ -125,5 +122,3 @@ extern _X_EXPORT Bool miZeroArcSetup(xArc * /*arc */ ,
                                     miZeroArcRec * /*info */ ,
                                     Bool       /*ok360 */
    );
-
-#endif /* XSERVER_MIZERARC_H */
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@ -1569,7 +1569,7 @@ damageWindowDestroy(CallbackListPtr *pcbl, ScreenPtr pScreen, WindowPtr pWindow)

 static void damageCloseScreen(CallbackListPtr *pcbl, ScreenPtr pScreen, void *unused)
 {
-    dixScreenUnhookPostClose(pScreen, damageCloseScreen);
+    dixScreenUnhookClose(pScreen, damageCloseScreen);
    dixScreenUnhookWindowDestroy(pScreen, damageWindowDestroy);
    dixScreenUnhookPixmapDestroy(pScreen, damagePixmapDestroy);

@ -1667,7 +1667,7 @@ DamageSetup(ScreenPtr pScreen)
    pScrPriv->internalLevel = 0;
    pScrPriv->pScreenDamage = 0;

-    dixScreenHookPostClose(pScreen, damageCloseScreen);
+    dixScreenHookClose(pScreen, damageCloseScreen);
    dixScreenHookWindowDestroy(pScreen, damageWindowDestroy);
    dixScreenHookPixmapDestroy(pScreen, damagePixmapDestroy);

--- a/miext/damage/meson.build
+++ b/miext/damage/meson.build
@ -7,7 +7,7 @@ hdrs_miext_damage = [
 	'damagestr.h',
 ]

-libxserver_miext_damage = static_library('xserver_miext_damage',
+libxserver_miext_damage = static_library('libxserver_miext_damage',
 	srcs_miext_damage,
 	include_directories: inc,
 	dependencies: common_dep,
--- a/miext/rootless/meson.build
+++ b/miext/rootless/meson.build
@ -6,7 +6,7 @@ srcs_miext_rootless = [
        'rootlessWindow.c',
 ]

-libxserver_miext_rootless = static_library('xserver_miext_rootless',
+libxserver_miext_rootless = static_library('libxserver_miext_rootless',
        srcs_miext_rootless,
        include_directories: inc,
        dependencies: common_dep,
--- a/miext/rootless/rootlessWindow.h
+++ b/miext/rootless/rootlessWindow.h
@ -34,8 +34,6 @@
 #ifndef _ROOTLESSWINDOW_H
 #define _ROOTLESSWINDOW_H

-#include "dix/screen_hooks_priv.h"
-
 #include "rootlessCommon.h"

 Bool RootlessCreateWindow(WindowPtr pWin);
--- a/miext/shadow/c2p_core.h
+++ b/miext/shadow/c2p_core.h
@ -27,9 +27,6 @@
 *  DEALINGS IN THE SOFTWARE.
 */

-#ifndef XSERVER_C2P_CORE_H
-#define XSERVER_C2P_CORE_H
-
 #include "os/bug_priv.h"

    /*
@ -189,5 +186,3 @@ static inline void transp2x(CARD32 d[], unsigned int n)
    _transp(d, 1, 0, n, mask);
    return;
 }
-
-#endif /* XSERVER_C2P_CORE_H */
--- a/Show More
+++ b/Show More