diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c
index d905ad81c..3febeb1d1 100755
--- a/hw/xwin/windialogs.c
+++ b/hw/xwin/windialogs.c
@@ -207,8 +207,9 @@ winDisplayDepthChangeDialog (winPrivScreenPtr pScreenPriv)
   ShowWindow (g_hDlgDepthChange, SW_SHOW);
   
   ErrorF ("winDisplayDepthChangeDialog - DialogBox returned: %d\n",
-	  g_hDlgDepthChange);
-  ErrorF ("winDisplayDepthChangeDialog - GetLastError: %d\n", GetLastError ());
+	  (int) g_hDlgDepthChange);
+  ErrorF ("winDisplayDepthChangeDialog - GetLastError: %d\n",
+	  (int) GetLastError ());
 	      
   /* Minimize the display window */
   ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index 5c623d14e..a21bbe9f3 100755
--- a/hw/xwin/winmultiwindowshape.c
+++ b/hw/xwin/winmultiwindowshape.c
@@ -117,9 +117,9 @@ winReshapeMultiWindow (WindowPtr pWin)
   if (!wBoundingShape (pWin))
     return;
 
-  REGION_NULL(pScreen, &rrNewShape);
-  REGION_COPY(pScreen, &rrNewShape, wBoundingShape(pWin));
-  REGION_TRANSLATE(pScreen,
+  REGION_NULL(pWin->drawable.pScreen, &rrNewShape);
+  REGION_COPY(pWin->drawable.pScreen, &rrNewShape, wBoundingShape(pWin));
+  REGION_TRANSLATE(pWin->drawable.pScreen,
 		   &rrNewShape,
 		   pWin->borderWidth,
                    pWin->borderWidth);
@@ -138,7 +138,7 @@ winReshapeMultiWindow (WindowPtr pWin)
       if (!GetClientRect (pWinPriv->hWnd, &rcClient))
 	{
 	  ErrorF ("winReshape - GetClientRect failed, bailing: %d\n",
-		  GetLastError ());
+		  (int) GetLastError ());
 	  return;
 	}
 
@@ -150,7 +150,7 @@ winReshapeMultiWindow (WindowPtr pWin)
       if (!GetWindowRect (pWinPriv->hWnd, &rcWindow))
 	{
 	  ErrorF ("winReshape - GetWindowRect failed, bailing: %d\n",
-		  GetLastError ());
+		  (int) GetLastError ());
 	  return;
 	}
 
@@ -165,7 +165,7 @@ winReshapeMultiWindow (WindowPtr pWin)
 	{
 	  ErrorF ("winReshape - Initial CreateRectRgn (%d, %d, %d, %d) "
 		  "failed: %d\n",
-		  0, 0, rcWindow.right, iOffsetY, GetLastError ());
+		  0, 0, (int) rcWindow.right, iOffsetY, (int) GetLastError ());
 	}
 
       /* Loop through all rectangles in the X region */
@@ -185,7 +185,7 @@ winReshapeMultiWindow (WindowPtr pWin)
 		      pRects->y1 + iOffsetY - 1,
 		      pRects->x2 + iOffsetX - 1,
 		      pRects->y2 + iOffsetY - 1,
-		      GetLastError (),
+		      (int) GetLastError (),
 		      pRects->x1, pRects->x2, iOffsetX,
 		      pRects->y1, pRects->y2, iOffsetY);
 	    }
@@ -194,7 +194,7 @@ winReshapeMultiWindow (WindowPtr pWin)
 	  if (CombineRgn (hRgn, hRgn, hRgnRect, RGN_OR) == ERROR)
 	    {
 	      ErrorF ("winReshape - CombineRgn () failed: %d\n",
-		      GetLastError ());
+		      (int) GetLastError ());
 	    }
 
 	  /* Delete the temporary Windows region */
@@ -205,7 +205,7 @@ winReshapeMultiWindow (WindowPtr pWin)
       pWinPriv->hRgn = hRgn;
     }
 
-  REGION_UNINIT(pScreen, &rrNewShape);
+  REGION_UNINIT(pWin->drawable.pScreen, &rrNewShape);
   
   return;
 }
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 15e508659..7bb9d0ea9 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -548,7 +548,7 @@ winCreateWindowsWindow (WindowPtr pWin)
   if (hWnd == NULL)
     {
       ErrorF ("winCreateWindowsWindow - CreateWindowExA () failed: %d\n",
-	      GetLastError ());
+	      (int) GetLastError ());
     }
   
   pWinPriv->hWnd = hWnd;
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 6515c8596..378465bc4 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -98,7 +98,7 @@ winCopyWindowNativeGDI (WindowPtr pWin,
   int			dx, dy;
   int			i, nbox;
   WindowPtr		pwinRoot;
-  BoxPtr		pBoxDst, pBoxSrc;
+  BoxPtr		pBoxDst;
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
@@ -465,9 +465,7 @@ void
 winReshapePRootless (WindowPtr pWin)
 {
   int		nRects;
-#if 0
   ScreenPtr	pScreen = pWin->drawable.pScreen;
-#endif
   RegionRec	rrNewShape;
   BoxPtr	pShape, pRects, pEnd;
   HRGN		hRgn, hRgnRect;