diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index bfd1c1aa3..ee09b3dde 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -212,12 +212,6 @@ typedef struct {
     CloseScreenProcPtr CloseScreen;
 } XvScreenRec, *XvScreenPtr;
 
-#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \
-    dixLookupPrivate(&(pScreen)->devPrivates, XvScreenKey))->field)
-
-#define SCREEN_EPILOGUE(pScreen, field, wrapper)\
-    ((pScreen)->field = wrapper)
-
 /* Errors */
 
 #define _XvBadPort (XvBadPort+XvErrorBase)
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 6c254fdd0..22baec49f 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -104,6 +104,12 @@ SOFTWARE.
 #endif
 #include "xvdisp.h"
 
+#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, XvScreenKey))->field)
+
+#define SCREEN_EPILOGUE(pScreen, field, wrapper)\
+    ((pScreen)->field = wrapper)
+
 static DevPrivateKeyRec XvScreenKeyRec;
 
 Bool noXvExtension = FALSE;