diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c
index 00fd77a91..80f53155d 100644
--- a/hw/xwin/winfillsp.c
+++ b/hw/xwin/winfillsp.c
@@ -824,36 +824,6 @@ winFillSpansNativeGDI (DrawablePtr	pDrawable,
       SelectClipRgn (pGCPriv->hdc, NULL);
       break;
 
-    case UNDRAWABLE_WINDOW:
-      /* UNDRAWABLE_WINDOW doesn't appear to get called when running xterm */
-      switch (pGC->fillStyle)
-	{
-	case FillSolid:
-	  ErrorF ("winFillSpans - UNDRAWABLE_WINDOW - FillSolid - "
-		  "Unimplemented\n");
-	  break;
-
-	case FillStippled:
-	  ErrorF ("winFillSpans - UNDRAWABLE_WINDOW - FillStippled - "
-		  "Unimplemented\n");
-	  break;
-
-	case FillTiled:
-	  ErrorF ("winFillSpans - UNDRAWABLE_WINDOW - FillTiled - "
-		  "Unimplemented\n");
-	  break;
-
-	case FillOpaqueStippled:
-	  ErrorF ("winFillSpans - UNDRAWABLE_WINDOW - OpaqueStippled - "
-		  "Unimplemented\n");
-	  break;
-
-	default:
-	  ErrorF ("winFillSpans - UNDRAWABLE_WINDOW - Unknown fillStyle\n");
-	  break;
-	}
-      break;
-
     default:
       ErrorF ("winFillSpans - Unknown drawable type\n");
       break;
diff --git a/hw/xwin/wingetsp.c b/hw/xwin/wingetsp.c
index db914c938..82208127b 100644
--- a/hw/xwin/wingetsp.c
+++ b/hw/xwin/wingetsp.c
@@ -177,10 +177,6 @@ winGetSpansNativeGDI (DrawablePtr	pDrawable,
       DeleteDC (hdcMem);
       break;
 
-    case UNDRAWABLE_WINDOW:
-      FatalError ("winGetSpans - UNDRAWABLE_WINDOW\n");
-      break;
-
     default:
       FatalError ("winGetSpans - Unknown drawable type\n");
       break;
diff --git a/hw/xwin/winsetsp.c b/hw/xwin/winsetsp.c
index 6a90781cf..e5d33bee4 100644
--- a/hw/xwin/winsetsp.c
+++ b/hw/xwin/winsetsp.c
@@ -171,10 +171,6 @@ winSetSpansNativeGDI (DrawablePtr	pDrawable,
       SelectClipRgn (pGCPriv->hdc, NULL);
       break;
 
-    case UNDRAWABLE_WINDOW:
-      FatalError ("\nwinSetSpansNativeGDI - UNDRAWABLE_WINDOW\n\n");
-      break;
-
     default:
       FatalError ("\nwinSetSpansNativeGDI - Unknown drawable type\n\n");
       break;