diff --git a/present/present_scmd.c b/present/present_scmd.c
index 5628d197c8..01c068f1ed 100644
--- a/present/present_scmd.c
+++ b/present/present_scmd.c
@@ -387,7 +387,6 @@ void
 present_event_notify(uint64_t event_id, uint64_t ust, uint64_t msc)
 {
     present_vblank_ptr  vblank;
-    int                 s;
 
     if (!event_id)
         return;
@@ -409,8 +408,8 @@ present_event_notify(uint64_t event_id, uint64_t ust, uint64_t msc)
         }
     }
 
-    for (s = 0; s < screenInfo.numScreens; s++) {
-        ScreenPtr walkScreen = screenInfo.screens[s];
+    for (unsigned walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) {
+        ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx];
         present_screen_priv_ptr screen_priv = present_screen_priv(walkScreen);
 
         if (event_id == screen_priv->unflip_event_id) {
diff --git a/present/present_screen.c b/present/present_screen.c
index 7a2c14ce2e..cb5c7af5c8 100644
--- a/present/present_screen.c
+++ b/present/present_screen.c
@@ -240,7 +240,6 @@ void
 present_extension_init(void)
 {
     ExtensionEntry *extension;
-    int i;
 
 #ifdef XINERAMA
     if (!noPanoramiXExtension)
@@ -261,8 +260,8 @@ present_extension_init(void)
     if (!present_event_init())
         goto bail;
 
-    for (i = 0; i < screenInfo.numScreens; i++) {
-        ScreenPtr walkScreen = screenInfo.screens[i];
+    for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) {
+        ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx];
         if (!present_screen_init(walkScreen, NULL))
             goto bail;
     }