diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index d174017c7..4df4629ab 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -862,16 +862,15 @@ DGACopyModeInfo(DGAModePtr mode, XDGAModePtr xmode)
 Bool
 DGAVTSwitch(void)
 {
-    ScreenPtr pScreen;
     int i;
 
     for (i = 0; i < screenInfo.numScreens; i++) {
-        pScreen = screenInfo.screens[i];
+        ScreenPtr walkScreen = screenInfo.screens[i];
 
         /* Alternatively, this could send events to DGA clients */
 
         if (DGAScreenKeyRegistered) {
-            DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+            DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(walkScreen);
 
             if (pScreenPriv && pScreenPriv->current)
                 return FALSE;
diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
index 6e6e794fa..26a476e4d 100644
--- a/hw/xfree86/common/xf86VidMode.c
+++ b/hw/xfree86/common/xf86VidMode.c
@@ -452,7 +452,8 @@ XFree86VidModeExtensionInit(void)
         return;
 
     for (i = 0; i < screenInfo.numScreens; i++) {
-        if (xf86VidModeInit (screenInfo.screens[i]))
+        ScreenPtr walkScreen = screenInfo.screens[i];
+        if (xf86VidModeInit(walkScreen))
             enabled = TRUE;
     }
     /* This means that the DDX doesn't want the vidmode extension enabled */
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 1fa5dc40d..ea6c9b048 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -1713,11 +1713,11 @@ DRIWakeupHandler(void *wakeupData, int result)
     int i;
 
     for (i = 0; i < screenInfo.numScreens; i++) {
-        ScreenPtr pScreen = screenInfo.screens[i];
-        DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+        ScreenPtr walkScreen = screenInfo.screens[i];
+        DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(walkScreen);
 
         if (pDRIPriv && pDRIPriv->pDriverInfo->wrap.WakeupHandler)
-            (*pDRIPriv->pDriverInfo->wrap.WakeupHandler) (pScreen, result);
+            (*pDRIPriv->pDriverInfo->wrap.WakeupHandler) (walkScreen, result);
     }
 }
 
@@ -1727,11 +1727,11 @@ DRIBlockHandler(void *blockData, void *pTimeout)
     int i;
 
     for (i = 0; i < screenInfo.numScreens; i++) {
-        ScreenPtr pScreen = screenInfo.screens[i];
-        DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+        ScreenPtr walkScreen = screenInfo.screens[i];
+        DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(walkScreen);
 
         if (pDRIPriv && pDRIPriv->pDriverInfo->wrap.BlockHandler)
-            (*pDRIPriv->pDriverInfo->wrap.BlockHandler) (pScreen, pTimeout);
+            (*pDRIPriv->pDriverInfo->wrap.BlockHandler) (walkScreen, pTimeout);
     }
 }