diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index f29466ffd..d884e790f 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -500,7 +500,6 @@ typedef struct _winPrivScreenRec {
     winCreateScreenResourcesProc pwinCreateScreenResources;
 
     /* Window Procedures for Rootless mode */
-    CreateWindowProcPtr CreateWindow;
     ChangeWindowAttributesProcPtr ChangeWindowAttributes;
     RealizeWindowProcPtr RealizeWindow;
     UnrealizeWindowProcPtr UnrealizeWindow;
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 909d6302c..80dbaea03 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -111,9 +111,7 @@ winCreateWindowMultiWindow(WindowPtr pWin)
     winTrace("winCreateWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
-    WIN_UNWRAP(CreateWindow);
-    fResult = (*pScreen->CreateWindow) (pWin);
-    WIN_WRAP(CreateWindow, winCreateWindowMultiWindow);
+    fbCreateWindow(pWin);
 
     /* Initialize some privates values */
     pWinPriv->hRgn = NULL;
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 23f6dae65..a4e62a6f4 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -377,7 +377,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
     }
 
         /* Save a pointer to each lower-level window procedure */
-        WRAP(CreateWindow);
         WRAP(RealizeWindow);
         WRAP(UnrealizeWindow);
         WRAP(ChangeWindowAttributes);
@@ -408,7 +407,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
     }
 
         /* Save a pointer to each lower-level window procedure */
-        WRAP(CreateWindow);
         WRAP(RealizeWindow);
         WRAP(UnrealizeWindow);
         WRAP(ChangeWindowAttributes);
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index d75616b7e..72e6080cc 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -68,9 +68,7 @@ winCreateWindowRootless(WindowPtr pWin)
     winTrace("winCreateWindowRootless (%p)\n", pWin);
 #endif
 
-    WIN_UNWRAP(CreateWindow);
-    fResult = (*pScreen->CreateWindow) (pWin);
-    WIN_WRAP(CreateWindow, winCreateWindowRootless);
+    fResult = fbCreateWindow(pWin);
 
     pWinPriv->hRgn = NULL;