diff --git a/Xext/dri2/dri2.c b/Xext/dri2/dri2.c
index ada6e53754..6bf1f9f727 100644
--- a/Xext/dri2/dri2.c
+++ b/Xext/dri2/dri2.c
@@ -921,17 +921,15 @@ Bool
 DRI2CanFlip(DrawablePtr pDraw)
 {
     ScreenPtr pScreen = pDraw->pScreen;
-    WindowPtr pWin, pRoot;
-    PixmapPtr pWinPixmap, pRootPixmap;
 
     if (pDraw->type == DRAWABLE_PIXMAP)
         return TRUE;
 
-    pRoot = pScreen->root;
-    pRootPixmap = pScreen->GetWindowPixmap(pRoot);
+    WindowPtr pRoot = pScreen->root;
+    PixmapPtr pRootPixmap = pScreen->GetWindowPixmap(pRoot);
 
-    pWin = (WindowPtr) pDraw;
-    pWinPixmap = pScreen->GetWindowPixmap(pWin);
+    WindowPtr pWin = (WindowPtr) pDraw;
+    PixmapPtr pWinPixmap = pScreen->GetWindowPixmap(pWin);
     if (pRootPixmap != pWinPixmap)
         return FALSE;
     if (!RegionEqual(&pWin->clipList, &pRoot->winSize))