diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index acb87a4c8..d1ddb68f2 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -79,4 +79,6 @@ int XvdiMatchPort(XvPortPtr pPort, DrawablePtr pDraw);
 int XvdiGrabPort(ClientPtr client, XvPortPtr pPort, Time ctime, int *p_result);
 int XvdiUngrabPort(ClientPtr client, XvPortPtr pPort, Time ctime);
 
+XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
+
 #endif /* _XORG_XVDIX_PRIV_H */
diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h
index 4a0b5bdee..acfbee7d6 100644
--- a/Xext/xvmcext.h
+++ b/Xext/xvmcext.h
@@ -87,8 +87,6 @@ typedef struct {
 extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen,
                                     int num, XvMCAdaptorPtr adapt);
 
-extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
-
 extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, const char *name,
                                             const char *busID, int major, int minor,
                                             int patchLevel);