diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 579713934..c4d151e00 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -185,7 +185,6 @@ typedef struct {
 extern _X_EXPORT int XvScreenInit(ScreenPtr);
 extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
 extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern _X_EXPORT void XvFreeAdaptor(XvAdaptorPtr pAdaptor);
 extern void _X_EXPORT XvFillColorKey(DrawablePtr pDraw, CARD32 key,
                                      RegionPtr region);
 extern _X_EXPORT int XvdiSendPortNotify(XvPortPtr, Atom, INT32);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index d66c8716d..532a02623 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -29,4 +29,6 @@ extern RESTYPE XvRTPort;
 int ProcXvDispatch(ClientPtr);
 int SProcXvDispatch(ClientPtr);
 
+void XvFreeAdaptor(XvAdaptorPtr pAdaptor);
+
 #endif /* _XORG_XVDIX_PRIV_H */
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index cb04f48cc..9e284203e 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -38,8 +38,13 @@ of the copyright holder.
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
-#include "kdrive.h"
 
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
+
+#include "Xext/xvdix_priv.h"
+
+#include "kdrive.h"
 #include "scrnintstr.h"
 #include "regionstr.h"
 #include "windowstr.h"
@@ -49,10 +54,6 @@ of the copyright holder.
 #include "resource.h"
 #include "gcstruct.h"
 #include "dixstruct.h"
-
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
-
 #include "kxv.h"
 #include "fourcc.h"
 
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index 8a8c5939d..35eab722c 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -32,12 +32,16 @@
 #include <xorg-config.h>
 #endif
 
+#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 "xf86.h"
 #include "xf86_OSproc.h"
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "regionstr.h"
 #include "windowstr.h"
@@ -47,11 +51,7 @@
 #include "resource.h"
 #include "gcstruct.h"
 #include "dixstruct.h"
-
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
 #include "xvdix.h"
-
 #include "xf86xvpriv.h"
 
 /* XvAdaptorRec fields */
diff --git a/hw/xwayland/xwayland-glamor-xv.c b/hw/xwayland/xwayland-glamor-xv.c
index 68bae5737..d0aaa02c7 100644
--- a/hw/xwayland/xwayland-glamor-xv.c
+++ b/hw/xwayland/xwayland-glamor-xv.c
@@ -32,10 +32,11 @@
 
 #include <xwayland-config.h>
 
-#include "glamor_priv.h"
-
 #include <X11/extensions/Xv.h>
 
+#include "Xext/xvdix_priv.h"
+
+#include "glamor_priv.h"
 #include "xwayland-glamor.h"
 
 #define NUM_FORMATS    3