diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 1efc8236e..f29466ffd 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -501,7 +501,6 @@ typedef struct _winPrivScreenRec {
 
     /* Window Procedures for Rootless mode */
     CreateWindowProcPtr CreateWindow;
-    PositionWindowProcPtr PositionWindow;
     ChangeWindowAttributesProcPtr ChangeWindowAttributes;
     RealizeWindowProcPtr RealizeWindow;
     UnrealizeWindowProcPtr UnrealizeWindow;
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index c0845a7ca..52ef198c0 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -159,12 +159,9 @@ winDestroyWindowMultiWindow(WindowPtr pWin)
 Bool
 winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
 {
-    Bool fResult = TRUE;
     int iX, iY, iWidth, iHeight;
-    ScreenPtr pScreen = pWin->drawable.pScreen;
 
     winWindowPriv(pWin);
-    winScreenPriv(pScreen);
 
     HWND hWnd = pWinPriv->hWnd;
     RECT rcNew;
@@ -181,9 +178,7 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
     winTrace("winPositionWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
-    WIN_UNWRAP(PositionWindow);
-    fResult = (*pScreen->PositionWindow) (pWin, x, y);
-    WIN_WRAP(PositionWindow, winPositionWindowMultiWindow);
+    Bool fResult = fbPositionWindow(pWin, x, y);
 
 #if ENABLE_DEBUG
     ErrorF("winPositionWindowMultiWindow: (x, y) = (%d, %d)\n", x, y);
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 5e12cccb8..23f6dae65 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -380,7 +380,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         WRAP(CreateWindow);
         WRAP(RealizeWindow);
         WRAP(UnrealizeWindow);
-        WRAP(PositionWindow);
         WRAP(ChangeWindowAttributes);
         WRAP(SetShape);
 
@@ -412,7 +411,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         WRAP(CreateWindow);
         WRAP(RealizeWindow);
         WRAP(UnrealizeWindow);
-        WRAP(PositionWindow);
         WRAP(ChangeWindowAttributes);
         WRAP(ReparentWindow);
         WRAP(RestackWindow);
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 905cc9093..ca18a67e0 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -104,18 +104,11 @@ winDestroyWindowRootless(WindowPtr pWin)
 Bool
 winPositionWindowRootless(WindowPtr pWin, int x, int y)
 {
-    Bool fResult = FALSE;
-    ScreenPtr pScreen = pWin->drawable.pScreen;
-
-    winScreenPriv(pScreen);
-
 #if ENABLE_DEBUG
     winTrace("winPositionWindowRootless (%p)\n", pWin);
 #endif
 
-    WIN_UNWRAP(PositionWindow);
-    fResult = (*pScreen->PositionWindow) (pWin, x, y);
-    WIN_WRAP(PositionWindow, winPositionWindowRootless);
+    Bool fResult = fbPositionWindow(pWin, x, y);
 
     winUpdateRgnRootless(pWin);