diff --git a/fb/fb.h b/fb/fb.h
index ecd98d89bb..bc7b8c0441 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1000,8 +1000,7 @@ fbCopyWindowProc(DrawablePtr pSrcDrawable,
                  int dy,
                  Bool reverse, Bool upsidedown, Pixel bitplane, void *closure);
 
-extern _X_EXPORT void
- fbCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
+_X_EXPORT void fbCopyWindow(WindowPtr pWin, xPoint ptOldOrg, RegionPtr prgnSrc);
 
 extern _X_EXPORT Bool
  fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask);
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index dd8e46bdc6..c0ccbb50b6 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -187,7 +187,7 @@ fbOverlayUpdateLayerRegion(ScreenPtr pScreen, int layer, RegionPtr prgn)
  * Copy only areas in each layer containing real bits
  */
 static void
-fbOverlayCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+fbOverlayCopyWindow(WindowPtr pWin, xPoint ptOldOrg, RegionPtr prgnSrc)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
     FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 5cd200dfb9..330979224f 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -98,7 +98,7 @@ fbCopyWindowProc(DrawablePtr pSrcDrawable,
 }
 
 void
-fbCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+fbCopyWindow(WindowPtr pWin, xPoint ptOldOrg, RegionPtr prgnSrc)
 {
     RegionRec rgnDst;
     int dx, dy;