diff --git a/fb/fb.h b/fb/fb.h
index 717fea8af..1f75e2aaf 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -842,6 +842,8 @@ fbPolyFillRect(DrawablePtr pDrawable,
 
 #define fbFillPolygon miFillPolygon
 
+#define fbSetShape miSetShape
+
 /*
  * fbfillsp.c
  */
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 509a4b9d5..1ea6f3173 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -509,7 +509,6 @@ typedef struct _winPrivScreenRec {
     ReparentWindowProcPtr ReparentWindow;
     ResizeWindowProcPtr ResizeWindow;
     MoveWindowProcPtr MoveWindow;
-    SetShapeProcPtr SetShape;
     ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
 
     winCursorRec cursor;
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index 268cae74e..7f235b0a7 100644
--- a/hw/xwin/winmultiwindowshape.c
+++ b/hw/xwin/winmultiwindowshape.c
@@ -52,9 +52,7 @@ winSetShapeMultiWindow(WindowPtr pWin, int kind)
     ErrorF("winSetShapeMultiWindow - pWin: %p kind: %i\n", pWin, kind);
 #endif
 
-    WIN_UNWRAP(SetShape);
-    (*pScreen->SetShape) (pWin, kind);
-    WIN_WRAP(SetShape, winSetShapeMultiWindow);
+    fbSetShape(pWin, kind);
 
     /* Update the Windows window's shape */
     winReshapeMultiWindow(pWin);
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 920be7279..ccc06560a 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -380,7 +380,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         /* Save a pointer to each lower-level window procedure */
         WRAP(RealizeWindow);
         WRAP(UnrealizeWindow);
-        WRAP(SetShape);
 
         /* Assign rootless window procedures to be top level procedures */
         pScreen->CreateWindow = winCreateWindowRootless;
@@ -413,7 +412,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         WRAP(RestackWindow);
         WRAP(ResizeWindow);
         WRAP(MoveWindow);
-        WRAP(SetShape);
         WRAP(ModifyPixmapHeader);
 
         /* Assign multi-window window procedures to be top level procedures */
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index a9669f6c0..2aec4d833 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -216,9 +216,7 @@ winSetShapeRootless(WindowPtr pWin, int kind)
     winTrace("winSetShapeRootless (%p, %i)\n", pWin, kind);
 #endif
 
-    WIN_UNWRAP(SetShape);
-    (*pScreen->SetShape) (pWin, kind);
-    WIN_WRAP(SetShape, winSetShapeRootless);
+    fbSetShape(pWin, kind);
 
     winReshapeRootless(pWin);
     winUpdateRgnRootless(pWin);