diff --git a/fb/fb.h b/fb/fb.h
index a63d52be4d..e81dd3e894 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -844,6 +844,8 @@ fbPolyFillRect(DrawablePtr pDrawable,
 
 #define fbSetShape miSetShape
 
+#define fbMoveWindow miMoveWindow
+
 /*
  * fbfillsp.c
  */
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 0f7f69be7c..7d40a3076d 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -504,7 +504,6 @@ typedef struct _winPrivScreenRec {
     ClearToBackgroundProcPtr ClearToBackground;
     ClipNotifyProcPtr ClipNotify;
     ResizeWindowProcPtr ResizeWindow;
-    MoveWindowProcPtr MoveWindow;
     ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
 
     winCursorRec cursor;
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 4932c681fb..7033ed6ece 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -792,9 +792,7 @@ winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
     ErrorF("MoveWindowMultiWindow to (%d, %d)\n", x, y);
 #endif
 
-    WIN_UNWRAP(MoveWindow);
-    (*pScreen->MoveWindow) (pWin, x, y, pSib, kind);
-    WIN_WRAP(MoveWindow, winMoveWindowMultiWindow);
+    fbMoveWindow(pWin, x, y, pSib, kind);
 }
 
 /*
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 6699c8978b..e5137a4588 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -403,7 +403,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
 
         /* Save a pointer to each lower-level window procedure */
         WRAP(ResizeWindow);
-        WRAP(MoveWindow);
         WRAP(ModifyPixmapHeader);
 
         /* Assign multi-window window procedures to be top level procedures */