diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 2d5c85f40..8633dead9 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -173,15 +173,6 @@ typedef struct _XvPortRec {
     DevUnion devPriv;
 } XvPortRec, *XvPortPtr;
 
-typedef struct {
-    int version, revision;
-    int nAdaptors;
-    XvAdaptorPtr pAdaptors;
-    DestroyWindowProcPtr DestroyWindow;
-    DestroyPixmapProcPtr DestroyPixmap;
-    CloseScreenProcPtr CloseScreen;
-} XvScreenRec, *XvScreenPtr;
-
 extern _X_EXPORT int XvScreenInit(ScreenPtr);
 extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
 extern _X_EXPORT unsigned long XvGetRTPort(void);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 7ea9e3795..62fd47843 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -22,6 +22,15 @@
 
 #define _XvBadPort (XvBadPort+XvErrorBase)
 
+typedef struct {
+    int version, revision;
+    int nAdaptors;
+    XvAdaptorPtr pAdaptors;
+    DestroyWindowProcPtr DestroyWindow;
+    DestroyPixmapProcPtr DestroyPixmap;
+    CloseScreenProcPtr CloseScreen;
+} XvScreenRec, *XvScreenPtr;
+
 extern int XvReqCode;
 extern int XvErrorBase;
 
diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
index c67418bf4..747085dbe 100644
--- a/hw/xfree86/common/xf86xvmc.c
+++ b/hw/xfree86/common/xf86xvmc.c
@@ -25,21 +25,21 @@
  * the sale, use or other dealings in this Software without prior written
  * authorization from the copyright holder(s) and author(s).
  */
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
+#include <X11/X.h>
+#include <X11/Xproto.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 "resource.h"
 #include "dixstruct.h"
-
 #include "xf86xvpriv.h"
 #include "xf86xvmc.h"