diff --git a/composite/compint.h b/composite/compint.h
index 43a2f4be5..80496da30 100644
--- a/composite/compint.h
+++ b/composite/compint.h
@@ -75,8 +75,6 @@ typedef struct _CompSubwindows {
     CompClientWindowPtr	    clients;
 } CompSubwindowsRec, *CompSubwindowsPtr;
 
-extern int  CompPixmapPrivateIndex;
-
 #define NUM_COMP_ALTERNATE_VISUALS  2
 
 typedef struct _CompScreen {
diff --git a/composite/compwindow.c b/composite/compwindow.c
index 5adc5efc8..29883666e 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -103,7 +103,10 @@ Bool
 compCheckRedirect (WindowPtr pWin)
 {
     CompWindowPtr   cw = GetCompWindow (pWin);
-    Bool	    should = pWin->viewable && (cw != NULL);
+    Bool	    should;
+
+    should = pWin->realized && (pWin->drawable.class != InputOnly) &&
+	     (cw != NULL);
     
     if (should != pWin->redirectDraw)
     {