composite: drop needless include of dix-config.h in headers

The consuming .c files must include it at the very first anyways, and we're not using anything from that header here. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Xi: drop needless include of dix-config.h in headers
2025-07-04 16:24:58 +02:00 · 2025-07-04 16:22:22 +02:00
63 changed files with 35 additions and 322 deletions
--- 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/Xi/allowev.h
+++ b/Xi/allowev.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef ALLOWEV_H
 #define ALLOWEV_H 1

--- a/Xi/chgdctl.h
+++ b/Xi/chgdctl.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGDCTL_H
 #define CHGDCTL_H 1

--- a/Xi/chgfctl.h
+++ b/Xi/chgfctl.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGFCTL_H
 #define CHGFCTL_H 1

--- a/Xi/chgkbd.h
+++ b/Xi/chgkbd.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGKBD_H
 #define CHGKBD_H 1

--- a/Xi/chgkmap.h
+++ b/Xi/chgkmap.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGKMAP_H
 #define CHGKMAP_H 1

--- a/Xi/chgprop.h
+++ b/Xi/chgprop.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGPROP_H
 #define CHGPROP_H 1

--- a/Xi/chgptr.h
+++ b/Xi/chgptr.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGPTR_H
 #define CHGPTR_H 1

--- a/Xi/closedev.h
+++ b/Xi/closedev.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CLOSEDEV_H
 #define CLOSEDEV_H 1

--- a/Xi/devbell.h
+++ b/Xi/devbell.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef DEVBELL_H
 #define DEVBELL_H 1

--- a/Xi/exglobals.h
+++ b/Xi/exglobals.h
@ -28,14 +28,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 * Globals referenced elsewhere in the server.
 *
 */
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-#include "privates.h"
-
 #ifndef EXGLOBALS_H
 #define EXGLOBALS_H 1

+#include "privates.h"
+
 extern int IEventBase;
 extern int BadDevice;
 extern int BadMode;
--- a/Xi/getbmap.h
+++ b/Xi/getbmap.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETBMAP_H
 #define GETBMAP_H 1

--- a/Xi/getdctl.h
+++ b/Xi/getdctl.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETDCTL_H
 #define GETDCTL_H 1

--- a/Xi/getfctl.h
+++ b/Xi/getfctl.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETFCTL_H
 #define GETFCTL_H 1

--- a/Xi/getfocus.h
+++ b/Xi/getfocus.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETFOCUS_H
 #define GETFOCUS_H 1

--- a/Xi/getkmap.h
+++ b/Xi/getkmap.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETKMAP_H
 #define GETKMAP_H 1

--- a/Xi/getmmap.h
+++ b/Xi/getmmap.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETMMAP_H
 #define GETMMAP_H 1

--- a/Xi/getprop.h
+++ b/Xi/getprop.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETPROP_H
 #define GETPROP_H 1

--- a/Xi/getselev.h
+++ b/Xi/getselev.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETSELEV_H
 #define GETSELEV_H 1

--- a/Xi/getvers.h
+++ b/Xi/getvers.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETVERS_H
 #define GETVERS_H 1

--- a/Xi/grabdev.h
+++ b/Xi/grabdev.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GRABDEV_H
 #define GRABDEV_H 1

--- a/Xi/grabdevb.h
+++ b/Xi/grabdevb.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GRABDEVB_H
 #define GRABDEVB_H 1

--- a/Xi/grabdevk.h
+++ b/Xi/grabdevk.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GRABDEVK_H
 #define GRABDEVK_H 1

--- a/Xi/gtmotion.h
+++ b/Xi/gtmotion.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GTMOTION_H
 #define GTMOTION_H 1

--- a/Xi/listdev.h
+++ b/Xi/listdev.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef LISTDEV_H
 #define LISTDEV_H 1

--- a/Xi/opendev.h
+++ b/Xi/opendev.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef OPENDEV_H
 #define OPENDEV_H 1

--- a/Xi/queryst.h
+++ b/Xi/queryst.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef QUERYST_H
 #define QUERYST_H 1

--- a/Xi/selectev.h
+++ b/Xi/selectev.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SELECTEV_H
 #define SELECTEV_H 1

--- a/Xi/sendexev.h
+++ b/Xi/sendexev.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SENDEXEV_H
 #define SENDEXEV_H 1

--- a/Xi/setbmap.h
+++ b/Xi/setbmap.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETBMAP_H
 #define SETBMAP_H 1

--- a/Xi/setdval.h
+++ b/Xi/setdval.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETDVAL_H
 #define SETDVAL_H 1

--- a/Xi/setfocus.h
+++ b/Xi/setfocus.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETFOCUS_H
 #define SETFOCUS_H 1

--- a/Xi/setmmap.h
+++ b/Xi/setmmap.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETMMAP_H
 #define SETMMAP_H 1

--- a/Xi/setmode.h
+++ b/Xi/setmode.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETMODE_H
 #define SETMODE_H 1

--- a/Xi/ungrdev.h
+++ b/Xi/ungrdev.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef UNGRDEV_H
 #define UNGRDEV_H 1

--- a/Xi/ungrdevb.h
+++ b/Xi/ungrdevb.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef UNGRDEVB_H
 #define UNGRDEVB_H 1

--- a/Xi/ungrdevk.h
+++ b/Xi/ungrdevk.h
@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef UNGRDEVK_H
 #define UNGRDEVK_H 1

--- a/Xi/xiallowev.h
+++ b/Xi/xiallowev.h
@ -22,11 +22,6 @@
 *
 * Author: Peter Hutterer
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XIALLOWEV_H
 #define XIALLOWEV_H 1

--- a/Xi/xibarriers.h
+++ b/Xi/xibarriers.h
@ -1,8 +1,3 @@
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _XIBARRIERS_H_
 #define _XIBARRIERS_H_

--- a/Xi/xichangecursor.h
+++ b/Xi/xichangecursor.h
@ -22,11 +22,6 @@
 *
 * Author: Peter Hutterer, University of South Australia, NICTA
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHDEVCUR_H
 #define CHDEVCUR_H 1

--- a/Xi/xichangehierarchy.h
+++ b/Xi/xichangehierarchy.h
@ -28,11 +28,6 @@
 * Request change in the device hierarchy.
 *
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHDEVHIER_H
 #define CHDEVHIER_H 1

--- a/Xi/xigetclientpointer.h
+++ b/Xi/xigetclientpointer.h
@ -22,11 +22,6 @@
 *
 * Author: Peter Hutterer, University of South Australia, NICTA
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETCPTR_H
 #define GETCPTR_H 1

--- a/Xi/xigrabdev.h
+++ b/Xi/xigrabdev.h
@ -22,11 +22,6 @@
 *
 * Author: Peter Hutterer
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XIGRABDEV_H
 #define XIGRABDEV_H 1

--- a/Xi/xipassivegrab.h
+++ b/Xi/xipassivegrab.h
@ -22,11 +22,6 @@
 *
 * Author: Peter Hutterer
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XIPASSIVEGRAB_H
 #define XIPASSIVEGRAB_H 1

--- a/Xi/xiproperty.h
+++ b/Xi/xiproperty.h
@ -22,11 +22,6 @@
 *
 * Author: Peter Hutterer
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XIPROPERTY_H
 #define XIPROPERTY_H 1

--- a/Xi/xiquerydevice.h
+++ b/Xi/xiquerydevice.h
@ -23,11 +23,6 @@
 * Authors: Peter Hutterer
 *
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef QUERYDEV_H
 #define QUERYDEV_H 1

--- a/Xi/xiquerypointer.h
+++ b/Xi/xiquerypointer.h
@ -22,11 +22,6 @@
 *
 * Author: Peter Hutterer, University of South Australia, NICTA
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef QUERYDP_H
 #define QUERYDP_H 1

--- a/Xi/xiqueryversion.h
+++ b/Xi/xiqueryversion.h
@ -23,11 +23,6 @@
 * Authors: Peter Hutterer
 *
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include <X11/extensions/XI2proto.h>

 #ifndef QUERYVERSION_H
--- a/Xi/xiselectev.h
+++ b/Xi/xiselectev.h
@ -22,11 +22,6 @@
 *
 * Author: Peter Hutterer
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XISELECTEVENTS_H
 #define XISELECTEVENTS_H 1

--- a/Xi/xisetclientpointer.h
+++ b/Xi/xisetclientpointer.h
@ -22,11 +22,6 @@
 *
 * Author: Peter Hutterer, University of South Australia, NICTA
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETCPTR_H
 #define SETCPTR_H 1

--- a/Xi/xisetdevfocus.h
+++ b/Xi/xisetdevfocus.h
@ -22,11 +22,6 @@
 *
 * Author: Peter Hutterer
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XISETDEVFOCUS_H
 #define XISETDEVFOCUS_H 1

--- a/Xi/xiwarppointer.h
+++ b/Xi/xiwarppointer.h
@ -22,11 +22,6 @@
 *
 * Author: Peter Hutterer, University of South Australia, NICTA
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef WARPDEVP_H
 #define WARPDEVP_H 1

--- a/composite/compint.h
+++ b/composite/compint.h
@ -40,11 +40,6 @@
 * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 * PERFORMANCE OF THIS SOFTWARE.
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _COMPINT_H_
 #define _COMPINT_H_

--- a/composite/compositeext.h
+++ b/composite/compositeext.h
@ -20,11 +20,6 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _COMPOSITEEXT_H_
 #define _COMPOSITEEXT_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,7 +381,12 @@ OsVendorInit(void)
    if (hostx_want_host_cursor())
        ephyrFuncs.initCursor = &ephyrCursorInit;

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

 KdCardFuncs ephyrFuncs = {
--- 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/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/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/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/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/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.3',
        meson_version: '>= 0.58.0',
 )
-release_date = '2025-07-04'
+release_date = '2025-07-02'

 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')