diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 2eb034ce4..f3153de06 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -186,23 +186,12 @@ extern _X_EXPORT int XvScreenInit(ScreenPtr);
 extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
 extern _X_EXPORT unsigned long XvGetRTPort(void);
 
-extern _X_EXPORT int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
-                                  INT16, INT16, CARD16, CARD16,
-                                  INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
-                                  INT16, INT16, CARD16, CARD16,
-                                  INT16, INT16, CARD16, CARD16);
 extern _X_EXPORT int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
                                   INT16, INT16, CARD16, CARD16,
                                   INT16, INT16, CARD16, CARD16);
 extern _X_EXPORT int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
                                   INT16, INT16, CARD16, CARD16,
                                   INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
-                                  INT16, INT16, CARD16, CARD16,
-                                  INT16, INT16, CARD16, CARD16,
-                                  XvImagePtr, unsigned char *, Bool,
-                                  CARD16, CARD16);
 extern _X_EXPORT int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
 extern _X_EXPORT int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32 *);
 extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 3ee5c59f7..0709f59e8 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -38,4 +38,18 @@ void XvFillColorKey(DrawablePtr pDraw, CARD32 key, RegionPtr region);
 int XvdiSelectVideoNotify(ClientPtr client, DrawablePtr pDraw, BOOL onoff);
 int XvdiSelectPortNotify(ClientPtr client, XvPortPtr pPort, BOOL onoff);
 
+int XvdiPutVideo(ClientPtr client, DrawablePtr pDraw, XvPortPtr pPort,
+                 GCPtr pGC, INT16 vid_x, INT16 vid_y, CARD16 vid_w,
+                 CARD16 wid_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w,
+                 CARD16 drw_h);
+int XvdiPutStill(ClientPtr client, DrawablePtr pDraw, XvPortPtr pPort,
+                 GCPtr pGC, INT16 vid_x, INT16 vid_y, CARD16 vid_w,
+                 CARD16 vid_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w,
+                 CARD16 drw_h);
+int XvdiPutImage(ClientPtr client, DrawablePtr pDraw, XvPortPtr pPort,
+                 GCPtr pGC, INT16 src_x, INT16 src_y, CARD16 src_w,
+                 CARD16 src_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w,
+                 CARD16 drw_h, XvImagePtr image, unsigned char *data,
+                 Bool sync, CARD16 width, CARD16 height);
+
 #endif /* _XORG_XVDIX_PRIV_H */