diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index eb80561b7..64a5a1bf6 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -33,6 +33,7 @@ SOFTWARE.
 #include <X11/extensions/Xvproto.h>
 
 #include "dix/dix_priv.h"
+#include "Xext/xvdix_priv.h"
 
 #include "misc.h"
 #include "scrnintstr.h"
@@ -42,7 +43,6 @@ SOFTWARE.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#include "xvdix.h"
 #ifdef MITSHM
 #include <X11/extensions/shmproto.h>
 #include "shmint.h"
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 3740514a7..52953baa2 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -178,14 +178,6 @@ typedef struct _XvPortRec {
     DevUnion devPriv;
 } XvPortRec, *XvPortPtr;
 
-#define VALIDATE_XV_PORT(portID, pPort, mode)\
-    {\
-	int rc = dixLookupResourceByType((void **)&(pPort), portID,\
-	                                 XvRTPort, client, mode);\
-	if (rc != Success)\
-	    return rc;\
-    }
-
 typedef struct {
     int version, revision;
     int nAdaptors;
@@ -195,10 +187,6 @@ typedef struct {
     CloseScreenProcPtr CloseScreen;
 } XvScreenRec, *XvScreenPtr;
 
-/* Errors */
-
-#define _XvBadPort (XvBadPort+XvErrorBase)
-
 extern _X_EXPORT int ProcXvDispatch(ClientPtr);
 extern _X_EXPORT int SProcXvDispatch(ClientPtr);
 
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
new file mode 100644
index 000000000..763405947
--- /dev/null
+++ b/Xext/xvdix_priv.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XORG_XVDIX_PRIV_H
+
+#include <X11/Xdefs.h>
+
+#include "Xext/xvdix.h"
+
+#define VALIDATE_XV_PORT(portID, pPort, mode)\
+    {\
+        int rc = dixLookupResourceByType((void **)&(pPort), portID,\
+                                         XvRTPort, client, mode);\
+        if (rc != Success)\
+            return rc;\
+    }
+
+/* Errors */
+
+#define _XvBadPort (XvBadPort+XvErrorBase)
+
+#endif /* _XORG_XVDIX_PRIV_H */
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index b80329027..83b3d90db 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -78,9 +78,13 @@ SOFTWARE.
 #endif
 
 #include <string.h>
-
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
+
+#include "Xext/xvdix_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "scrnintstr.h"
@@ -94,10 +98,6 @@ SOFTWARE.
 #include "opaque.h"
 #include "input.h"
 
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
-#include "xvdix.h"
-
 #ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 04023772d..22856af56 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -4,9 +4,11 @@
 #endif
 
 #include <string.h>
-
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "Xext/xvdix_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -16,7 +18,6 @@
 #include "extinit_priv.h"
 #include "servermd.h"
 #include <X11/Xfuncproto.h>
-#include "xvdix.h"
 #include <X11/extensions/XvMC.h>
 #include <X11/extensions/Xvproto.h>
 #include <X11/extensions/XvMCproto.h>