diff --git a/dix/devices.c b/dix/devices.c
index df7ed7d83b..3f4e826472 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -101,7 +101,6 @@ DeviceSetTransform(DeviceIntPtr dev, float *transform_data)
     struct pixman_f_transform scale;
     struct pixman_f_transform transform;
     double sx, sy;
-    int x, y;
 
     /**
      * calculate combined transformation matrix:
@@ -124,8 +123,8 @@ DeviceSetTransform(DeviceIntPtr dev, float *transform_data)
     scale.m[1][2] = dev->valuator->axes[1].min_value;
 
     /* transform */
-    for (y = 0; y < 3; y++)
-        for (x = 0; x < 3; x++)
+    for (int y = 0; y < 3; y++)
+        for (int x = 0; x < 3; x++)
             transform.m[y][x] = *transform_data++;
 
     pixman_f_transform_multiply(&dev->scale_and_transform, &scale, &transform);
@@ -170,13 +169,12 @@ DeviceSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
     }
     else if (property == XIGetKnownProperty(XI_PROP_TRANSFORM)) {
         float *f = (float *) prop->data;
-        int i;
 
         if (prop->format != 32 || prop->size != 9 ||
             prop->type != XIGetKnownProperty(XATOM_FLOAT))
             return BadValue;
 
-        for (i = 0; i < 9; i++)
+        for (int i = 0; i < 9; i++)
             if (!isfinite(f[i]))
                 return BadValue;
 
@@ -224,9 +222,7 @@ PairDevices(DeviceIntPtr ptr, DeviceIntPtr kbd)
 static DeviceIntPtr
 NextFreePointerDevice(void)
 {
-    DeviceIntPtr dev;
-
-    for (dev = inputInfo.devices; dev; dev = dev->next)
+    for (DeviceIntPtr dev = inputInfo.devices; dev; dev = dev->next)
         if (InputDevIsMaster(dev) &&
             dev->spriteInfo->spriteOwner && !dev->spriteInfo->paired)
             return dev;
@@ -244,7 +240,6 @@ DeviceIntPtr
 AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
 {
     DeviceIntPtr dev, *prev;    /* not a typo */
-    DeviceIntPtr devtmp;
     int devid;
     char devind[MAXDEVICES];
     BOOL enabled;
@@ -252,9 +247,9 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
 
     /* Find next available id, 0 and 1 are reserved */
     memset(devind, 0, sizeof(char) * MAXDEVICES);
-    for (devtmp = inputInfo.devices; devtmp; devtmp = devtmp->next)
+    for (DeviceIntPtr devtmp = inputInfo.devices; devtmp; devtmp = devtmp->next)
         devind[devtmp->id]++;
-    for (devtmp = inputInfo.off_devices; devtmp; devtmp = devtmp->next)
+    for (DeviceIntPtr devtmp = inputInfo.off_devices; devtmp; devtmp = devtmp->next)
         devind[devtmp->id]++;
     for (devid = 2; devid < MAXDEVICES && devind[devid]; devid++);
 
@@ -458,7 +453,7 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
 Bool
 DisableDevice(DeviceIntPtr dev, BOOL sendevent)
 {
-    DeviceIntPtr *prev, other;
+    DeviceIntPtr *prev;
     BOOL enabled;
     BOOL dev_in_devices_list = FALSE;
     int flags[MAXDEVICES] = { 0 };
@@ -466,7 +461,7 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
     if (!dev->enabled)
         return TRUE;
 
-    for (other = inputInfo.devices; other; other = other->next) {
+    for (DeviceIntPtr other = inputInfo.devices; other; other = other->next) {
         if (other == dev) {
             dev_in_devices_list = TRUE;
             break;
@@ -484,14 +479,14 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
 
     /* float attached devices */
     if (InputDevIsMaster(dev)) {
-        for (other = inputInfo.devices; other; other = other->next) {
+        for (DeviceIntPtr other = inputInfo.devices; other; other = other->next) {
             if (!InputDevIsMaster(other) && GetMaster(other, MASTER_ATTACHED) == dev) {
                 AttachDevice(NULL, other, NULL);
                 flags[other->id] |= XISlaveDetached;
             }
         }
 
-        for (other = inputInfo.off_devices; other; other = other->next) {
+        for (DeviceIntPtr other = inputInfo.off_devices; other; other = other->next) {
             if (!InputDevIsMaster(other) && GetMaster(other, MASTER_ATTACHED) == dev) {
                 AttachDevice(NULL, other, NULL);
                 flags[other->id] |= XISlaveDetached;
@@ -499,14 +494,14 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
         }
     }
     else {
-        for (other = inputInfo.devices; other; other = other->next) {
+        for (DeviceIntPtr other = inputInfo.devices; other; other = other->next) {
             if (InputDevIsMaster(other) && other->lastSlave == dev)
                 other->lastSlave = NULL;
         }
     }
 
     if (InputDevIsMaster(dev) && dev->spriteInfo->sprite) {
-        for (other = inputInfo.devices; other; other = other->next)
+        for (DeviceIntPtr other = inputInfo.devices; other; other = other->next)
             if (other->spriteInfo->paired == dev && !other->spriteInfo->spriteOwner)
                 DisableDevice(other, sendevent);
     }
@@ -520,7 +515,7 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
 
     /* now that the device is disabled, we can reset the event reader's
      * last.slave */
-    for (other = inputInfo.devices; other; other = other->next) {
+    for (DeviceIntPtr other = inputInfo.devices; other; other = other->next) {
         if (other->last.slave == dev)
             other->last.slave = NULL;
     }
@@ -675,14 +670,13 @@ CorePointerProc(DeviceIntPtr pDev, int what)
 #define NBUTTONS 10
 #define NAXES 2
     BYTE map[NBUTTONS + 1];
-    int i = 0;
     Atom btn_labels[NBUTTONS] = { 0 };
     Atom axes_labels[NAXES] = { 0 };
     ScreenPtr scr = screenInfo.screens[0];
 
     switch (what) {
     case DEVICE_INIT:
-        for (i = 1; i <= NBUTTONS; i++)
+        for (int i = 1; i <= NBUTTONS; i++)
             map[i] = i;
 
         btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
@@ -781,16 +775,14 @@ InitCoreDevices(void)
 int
 InitAndStartDevices(void)
 {
-    DeviceIntPtr dev, next;
-
-    for (dev = inputInfo.off_devices; dev; dev = dev->next) {
+    for (DeviceIntPtr dev = inputInfo.off_devices; dev; dev = dev->next) {
         DebugF("(dix) initialising device %d\n", dev->id);
         if (!dev->inited)
             ActivateDevice(dev, TRUE);
     }
 
     /* enable real devices */
-    for (dev = inputInfo.off_devices; dev; dev = next) {
+    for (DeviceIntPtr dev = inputInfo.off_devices, next; dev; dev = next) {
         DebugF("(dix) enabling device %d\n", dev->id);
         next = dev->next;
         if (dev->inited && dev->startup)
@@ -840,9 +832,8 @@ FreeDeviceClass(int type, void **class)
     case XITouchClass:
     {
         TouchClassPtr *t = (TouchClassPtr *) class;
-        int i;
 
-        for (i = 0; i < (*t)->num_touches; i++) {
+        for (int i = 0; i < (*t)->num_touches; i++) {
             free((*t)->touches[i].sprite.spriteTrace);
             free((*t)->touches[i].listeners);
             free((*t)->touches[i].valuators);
@@ -888,10 +879,7 @@ FreeFeedbackClass(int type, void **class)
     switch (type) {
     case KbdFeedbackClass:
     {
-        KbdFeedbackPtr *kbdfeed = (KbdFeedbackPtr *) class;
-        KbdFeedbackPtr k, knext;
-
-        for (k = (*kbdfeed); k; k = knext) {
+        for (KbdFeedbackPtr k = *(KbdFeedbackPtr *)class, knext; k; k = knext) {
             knext = k->next;
             if (k->xkb_sli)
                 XkbFreeSrvLedInfo(k->xkb_sli);
@@ -901,10 +889,7 @@ FreeFeedbackClass(int type, void **class)
     }
     case PtrFeedbackClass:
     {
-        PtrFeedbackPtr *ptrfeed = (PtrFeedbackPtr *) class;
-        PtrFeedbackPtr p, pnext;
-
-        for (p = (*ptrfeed); p; p = pnext) {
+        for (PtrFeedbackPtr p = *(PtrFeedbackPtr *)class, pnext; p; p = pnext) {
             pnext = p->next;
             free(p);
         }
@@ -912,10 +897,7 @@ FreeFeedbackClass(int type, void **class)
     }
     case IntegerFeedbackClass:
     {
-        IntegerFeedbackPtr *intfeed = (IntegerFeedbackPtr *) class;
-        IntegerFeedbackPtr i, inext;
-
-        for (i = (*intfeed); i; i = inext) {
+        for (IntegerFeedbackPtr i = *(IntegerFeedbackPtr *)class, inext; i; i = inext) {
             inext = i->next;
             free(i);
         }
@@ -923,10 +905,7 @@ FreeFeedbackClass(int type, void **class)
     }
     case StringFeedbackClass:
     {
-        StringFeedbackPtr *stringfeed = (StringFeedbackPtr *) class;
-        StringFeedbackPtr s, snext;
-
-        for (s = (*stringfeed); s; s = snext) {
+        for (StringFeedbackPtr s = *(StringFeedbackPtr *)class, snext; s; s = snext) {
             snext = s->next;
             free(s->ctrl.symbols_supported);
             free(s->ctrl.symbols_displayed);
@@ -936,10 +915,7 @@ FreeFeedbackClass(int type, void **class)
     }
     case BellFeedbackClass:
     {
-        BellFeedbackPtr *bell = (BellFeedbackPtr *) class;
-        BellFeedbackPtr b, bnext;
-
-        for (b = (*bell); b; b = bnext) {
+        for (BellFeedbackPtr b = *(BellFeedbackPtr *)class, bnext; b; b = bnext) {
             bnext = b->next;
             free(b);
         }
@@ -947,10 +923,7 @@ FreeFeedbackClass(int type, void **class)
     }
     case LedFeedbackClass:
     {
-        LedFeedbackPtr *leds = (LedFeedbackPtr *) class;
-        LedFeedbackPtr l, lnext;
-
-        for (l = (*leds); l; l = lnext) {
+        for (LedFeedbackPtr l = *(LedFeedbackPtr *)class, lnext; l; l = lnext) {
             lnext = l->next;
             if (l->xkb_sli)
                 XkbFreeSrvLedInfo(l->xkb_sli);
@@ -1016,7 +989,6 @@ CloseDevice(DeviceIntPtr dev)
 {
     ScreenPtr screen = screenInfo.screens[0];
     ClassesPtr classes;
-    int j;
 
     if (!dev)
         return;
@@ -1050,7 +1022,7 @@ CloseDevice(DeviceIntPtr dev)
     }
 
     /* a client may have the device set as client pointer */
-    for (j = 0; j < currentMaxClients; j++) {
+    for (int j = 0; j < currentMaxClients; j++) {
         if (clients[j] && clients[j]->clientPtr == dev) {
             clients[j]->clientPtr = NULL;
             clients[j]->clientPtr = PickPointer(clients[j]);
@@ -1061,7 +1033,7 @@ CloseDevice(DeviceIntPtr dev)
     free(dev->deviceGrab.sync.event);
     free(dev->config_info);     /* Allocated in xf86ActivateDevice. */
     free(dev->last.scroll);
-    for (j = 0; j < dev->last.num_touches; j++)
+    for (int j = 0; j < dev->last.num_touches; j++)
         valuator_mask_free(&dev->last.touches[j].valuators);
     free(dev->last.touches);
     dev->config_info = NULL;
@@ -1079,12 +1051,11 @@ CloseDeviceList(DeviceIntPtr *listHead)
     /* Used to mark devices that we tried to free */
     Bool freedIds[MAXDEVICES];
     DeviceIntPtr dev;
-    int i;
 
     if (listHead == NULL)
         return;
 
-    for (i = 0; i < MAXDEVICES; i++)
+    for (int i = 0; i < MAXDEVICES; i++)
         freedIds[i] = FALSE;
 
     dev = *listHead;
@@ -1105,8 +1076,6 @@ CloseDeviceList(DeviceIntPtr *listHead)
 void
 CloseDownDevices(void)
 {
-    DeviceIntPtr dev;
-
     input_lock();
 
     /* Float all SDs before closing them. Note that at this point resources
@@ -1114,12 +1083,12 @@ CloseDownDevices(void)
      * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master
      * to NULL and pretend nothing happened.
      */
-    for (dev = inputInfo.devices; dev; dev = dev->next) {
+    for (DeviceIntPtr dev = inputInfo.devices; dev; dev = dev->next) {
         if (!InputDevIsMaster(dev) && !InputDevIsFloating(dev))
             dev->master = NULL;
     }
 
-    for (dev = inputInfo.off_devices; dev; dev = dev->next) {
+    for (DeviceIntPtr dev = inputInfo.off_devices; dev; dev = dev->next) {
         if (!InputDevIsMaster(dev) && !InputDevIsFloating(dev))
             dev->master = NULL;
     }
@@ -1173,19 +1142,17 @@ AbortDevices(void)
 void
 UndisplayDevices(void)
 {
-    DeviceIntPtr dev;
     ScreenPtr screen = screenInfo.screens[0];
 
-    for (dev = inputInfo.devices; dev; dev = dev->next)
+    for (DeviceIntPtr dev = inputInfo.devices; dev; dev = dev->next)
         screen->DisplayCursor(dev, screen, NullCursor);
 }
 
 static int
 CloseOneDevice(const DeviceIntPtr dev, DeviceIntPtr *listHead)
 {
-    DeviceIntPtr tmp, next, prev = NULL;
-
-    for (tmp = *listHead; tmp; (prev = tmp), (tmp = next)) {
+    for (DeviceIntPtr tmp = *listHead, next, prev = NULL;
+        tmp; (prev = tmp), (tmp = next)) {
         next = tmp->next;
         if (tmp == dev) {
             if (prev == NULL)
@@ -1306,7 +1273,6 @@ InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons, Atom *labels,
                             CARD8 *map)
 {
     ButtonClassPtr butc;
-    int i;
 
     BUG_RETURN_VAL(dev == NULL, FALSE);
     BUG_RETURN_VAL(dev->button != NULL, FALSE);
@@ -1317,9 +1283,9 @@ InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons, Atom *labels,
         return FALSE;
     butc->numButtons = numButtons;
     butc->sourceid = dev->id;
-    for (i = 1; i <= numButtons; i++)
+    for (int i = 1; i <= numButtons; i++)
         butc->map[i] = map[i];
-    for (i = numButtons + 1; i < MAP_LENGTH; i++)
+    for (int i = numButtons + 1; i < MAP_LENGTH; i++)
         butc->map[i] = i;
     memcpy(butc->labels, labels, numButtons * sizeof(Atom));
     dev->button = butc;
@@ -1369,7 +1335,6 @@ Bool
 InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
                               int numMotionEvents, int mode)
 {
-    int i;
     ValuatorClassPtr valc;
 
     BUG_RETURN_VAL(dev == NULL, FALSE);
@@ -1409,7 +1374,7 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
 
     AllocateMotionHistory(dev);
 
-    for (i = 0; i < numAxes; i++) {
+    for (int i = 0; i < numAxes; i++) {
         InitValuatorAxisStruct(dev, i, labels[i], NO_AXIS_LIMITS,
                                NO_AXIS_LIMITS, 0, 0, 0, mode);
         valc->axisVal[i] = 0;
@@ -1441,7 +1406,7 @@ ValuatorAccelerationRec pointerAccelerationScheme[] = {
 Bool
 InitPointerAccelerationScheme(DeviceIntPtr dev, int scheme)
 {
-    int x, i = -1;
+    int i = -1;
     ValuatorClassPtr val;
 
     val = dev->valuator;
@@ -1452,7 +1417,7 @@ InitPointerAccelerationScheme(DeviceIntPtr dev, int scheme)
     if (InputDevIsMaster(dev) && scheme != PtrAccelNoOp)
         return FALSE;
 
-    for (x = 0; pointerAccelerationScheme[x].number >= 0; x++) {
+    for (int x = 0; pointerAccelerationScheme[x].number >= 0; x++) {
         if (pointerAccelerationScheme[x].number == scheme) {
             i = x;
             break;
@@ -1541,8 +1506,6 @@ InitStringFeedbackClassDeviceStruct(DeviceIntPtr dev,
                                     int max_symbols, int num_symbols_supported,
                                     KeySym * symbols)
 {
-    int i;
-
     BUG_RETURN_VAL(dev == NULL, FALSE);
 
     StringFeedbackPtr feedc = calloc(1, sizeof(StringFeedbackClassRec));
@@ -1561,9 +1524,9 @@ InitStringFeedbackClassDeviceStruct(DeviceIntPtr dev,
         free(feedc);
         return FALSE;
     }
-    for (i = 0; i < num_symbols_supported; i++)
+    for (int i = 0; i < num_symbols_supported; i++)
         *(feedc->ctrl.symbols_supported + i) = *symbols++;
-    for (i = 0; i < max_symbols; i++)
+    for (int i = 0; i < max_symbols; i++)
         *(feedc->ctrl.symbols_displayed + i) = (KeySym) 0;
     feedc->ctrl.id = 0;
     if ((feedc->next = dev->stringfeed))
@@ -1661,7 +1624,6 @@ InitTouchClassDeviceStruct(DeviceIntPtr device, unsigned int max_touches,
                            unsigned int mode, unsigned int num_axes)
 {
     TouchClassPtr touch;
-    int i;
 
     BUG_RETURN_VAL(device == NULL, FALSE);
     BUG_RETURN_VAL(device->touch != NULL, FALSE);
@@ -1689,7 +1651,7 @@ InitTouchClassDeviceStruct(DeviceIntPtr device, unsigned int max_touches,
     if (!touch->touches)
         goto err;
     touch->num_touches = max_touches;
-    for (i = 0; i < max_touches; i++)
+    for (int i = 0; i < max_touches; i++)
         TouchInitTouchPoint(touch, device->valuator, i);
 
     touch->mode = mode;
@@ -1699,13 +1661,13 @@ InitTouchClassDeviceStruct(DeviceIntPtr device, unsigned int max_touches,
     if (!(device->last.touches = calloc(max_touches, sizeof(*device->last.touches))))
         goto err;
     device->last.num_touches = touch->num_touches;
-    for (i = 0; i < touch->num_touches; i++)
+    for (int i = 0; i < touch->num_touches; i++)
         TouchInitDDXTouchPoint(device, &device->last.touches[i]);
 
     return TRUE;
 
  err:
-    for (i = 0; i < touch->num_touches; i++)
+    for (int i = 0; i < touch->num_touches; i++)
         TouchFreeTouchPoint(device, i);
 
     free(touch->touches);
@@ -1749,9 +1711,7 @@ InitGestureClassDeviceStruct(DeviceIntPtr device, unsigned int max_touches)
 Bool
 BadDeviceMap(BYTE * buff, int length, unsigned low, unsigned high, XID *errval)
 {
-    int i;
-
-    for (i = 0; i < length; i++)
+    for (int i = 0; i < length; i++)
         if (buff[i]) {          /* only check non-zero elements */
             if ((low > buff[i]) || (high < buff[i])) {
                 *errval = buff[i];
@@ -1833,7 +1793,7 @@ ProcChangeKeyboardMapping(ClientPtr client)
     REQUEST(xChangeKeyboardMappingReq);
     unsigned len;
     KeySymsRec keysyms;
-    DeviceIntPtr pDev, tmp;
+    DeviceIntPtr pDev;
     int rc;
 
     REQUEST_AT_LEAST_SIZE(xChangeKeyboardMappingReq);
@@ -1869,7 +1829,7 @@ ProcChangeKeyboardMapping(ClientPtr client)
     XkbApplyMappingChange(pDev, &keysyms, stuff->firstKeyCode,
                           stuff->keyCodes, NULL, client);
 
-    for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {
+    for (DeviceIntPtr tmp = inputInfo.devices; tmp; tmp = tmp->next) {
         if (InputDevIsMaster(tmp) || GetMaster(tmp, MASTER_KEYBOARD) != pDev)
             continue;
         if (!tmp->key)
@@ -1891,7 +1851,6 @@ ProcSetPointerMapping(ClientPtr client)
 {
     BYTE *map;
     int ret;
-    int i, j;
     DeviceIntPtr ptr = PickPointer(client);
 
     REQUEST(xSetPointerMappingReq);
@@ -1916,8 +1875,8 @@ ProcSetPointerMapping(ClientPtr client)
 
     /* Core protocol specs don't allow for duplicate mappings; this check
      * almost certainly wants disabling through XFixes too. */
-    for (i = 0; i < stuff->nElts; i++) {
-        for (j = i + 1; j < stuff->nElts; j++) {
+    for (int i = 0; i < stuff->nElts; i++) {
+        for (int j = i + 1; j < stuff->nElts; j++) {
             if (map[i] && map[i] == map[j]) {
                 client->errorValue = map[i];
                 return BadValue;
@@ -2227,7 +2186,7 @@ ProcChangeKeyboardControl(ClientPtr client)
     XID *vlist;
     BITS32 vmask;
     int ret = Success, error = Success;
-    DeviceIntPtr pDev = NULL, keyboard;
+    DeviceIntPtr keyboard;
 
     REQUEST(xChangeKeyboardControlReq);
 
@@ -2242,7 +2201,7 @@ ProcChangeKeyboardControl(ClientPtr client)
 
     keyboard = PickKeyboard(client);
 
-    for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
+    for (DeviceIntPtr pDev = inputInfo.devices; pDev; pDev = pDev->next) {
         if ((pDev == keyboard ||
              (!InputDevIsMaster(pDev) && GetMaster(pDev, MASTER_KEYBOARD) == keyboard))
             && pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {
@@ -2252,7 +2211,7 @@ ProcChangeKeyboardControl(ClientPtr client)
         }
     }
 
-    for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
+    for (DeviceIntPtr pDev = inputInfo.devices; pDev; pDev = pDev->next) {
         if ((pDev == keyboard ||
              (!InputDevIsMaster(pDev) && GetMaster(pDev, MASTER_KEYBOARD) == keyboard))
             && pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {
@@ -2305,7 +2264,7 @@ ProcGetKeyboardControl(ClientPtr client)
 int
 ProcBell(ClientPtr client)
 {
-    DeviceIntPtr dev, keybd = PickKeyboard(client);
+    DeviceIntPtr keybd = PickKeyboard(client);
     int base = keybd->kbdfeed->ctrl.bell;
     int newpercent;
     int rc;
@@ -2324,7 +2283,7 @@ ProcBell(ClientPtr client)
     else
         newpercent = base - newpercent + stuff->percent;
 
-    for (dev = inputInfo.devices; dev; dev = dev->next) {
+    for (DeviceIntPtr dev = inputInfo.devices; dev; dev = dev->next) {
         if ((dev == keybd ||
              (!InputDevIsMaster(dev) && GetMaster(dev, MASTER_KEYBOARD) == keybd)) &&
             ((dev->kbdfeed && dev->kbdfeed->BellProc) || dev->xkb_interest)) {
@@ -2343,7 +2302,7 @@ ProcBell(ClientPtr client)
 int
 ProcChangePointerControl(ClientPtr client)
 {
-    DeviceIntPtr dev, mouse = PickPointer(client);
+    DeviceIntPtr mouse = PickPointer(client);
     PtrCtrl ctrl;               /* might get BadValue part way through */
     int rc;
 
@@ -2398,7 +2357,7 @@ ProcChangePointerControl(ClientPtr client)
         }
     }
 
-    for (dev = inputInfo.devices; dev; dev = dev->next) {
+    for (DeviceIntPtr dev = inputInfo.devices; dev; dev = dev->next) {
         if ((dev == mouse ||
              (!InputDevIsMaster(dev) && GetMaster(dev, MASTER_POINTER) == mouse)) &&
             dev->ptrfeed) {
@@ -2408,7 +2367,7 @@ ProcChangePointerControl(ClientPtr client)
         }
     }
 
-    for (dev = inputInfo.devices; dev; dev = dev->next) {
+    for (DeviceIntPtr dev = inputInfo.devices; dev; dev = dev->next) {
         if ((dev == mouse ||
              (!InputDevIsMaster(dev) && GetMaster(dev, MASTER_POINTER) == mouse)) &&
             dev->ptrfeed) {
@@ -2550,7 +2509,7 @@ ProcGetMotionEvents(ClientPtr client)
 int
 ProcQueryKeymap(ClientPtr client)
 {
-    int rc, i;
+    int rc;
     DeviceIntPtr keybd = PickKeyboard(client);
     CARD8 *down = keybd->key->down;
 
@@ -2567,7 +2526,7 @@ ProcQueryKeymap(ClientPtr client)
      * If it's BadAccess, we leave it empty & lie to the client.
      */
     if (rc == Success) {
-        for (i = 0; i < 32; i++)
+        for (int i = 0; i < 32; i++)
             rep.map[i] = down[i];
     }
     else if (rc != BadAccess)
@@ -2590,7 +2549,7 @@ ProcQueryKeymap(ClientPtr client)
 static void
 RecalculateMasterButtons(DeviceIntPtr slave)
 {
-    DeviceIntPtr dev, master;
+    DeviceIntPtr master;
     int maxbuttons = 0;
 
     if (!slave->button || InputDevIsMaster(slave))
@@ -2600,7 +2559,7 @@ RecalculateMasterButtons(DeviceIntPtr slave)
     if (!master)
         return;
 
-    for (dev = inputInfo.devices; dev; dev = dev->next) {
+    for (DeviceIntPtr dev = inputInfo.devices; dev; dev = dev->next) {
         if (InputDevIsMaster(dev) ||
             GetMaster(dev, MASTER_ATTACHED) != master || !dev->button)
             continue;
@@ -2609,7 +2568,6 @@ RecalculateMasterButtons(DeviceIntPtr slave)
     }
 
     if (master->button && master->button->numButtons != maxbuttons) {
-        int i;
         int last_num_buttons = master->button->numButtons;
 
         DeviceChangedEvent event = {
@@ -2636,7 +2594,7 @@ RecalculateMasterButtons(DeviceIntPtr slave)
 
         if (master->valuator) {
             event.num_valuators = master->valuator->numAxes;
-            for (i = 0; i < event.num_valuators; i++) {
+            for (int i = 0; i < event.num_valuators; i++) {
                 event.valuators[i].min = master->valuator->axes[i].min_value;
                 event.valuators[i].max = master->valuator->axes[i].max_value;
                 event.valuators[i].resolution =
@@ -2665,26 +2623,26 @@ ReleaseButtonsAndKeys(DeviceIntPtr dev)
     InternalEvent *eventlist = InitEventList(GetMaximumEventsNum());
     ButtonClassPtr b = dev->button;
     KeyClassPtr k = dev->key;
-    int i, j, nevents;
+    int nevents;
 
     if (!eventlist)             /* no release events for you */
         return;
 
     /* Release all buttons */
-    for (i = 0; b && i < b->numButtons; i++) {
+    for (int i = 0; b && i < b->numButtons; i++) {
         if (BitIsOn(b->down, i)) {
             nevents =
                 GetPointerEvents(eventlist, dev, ButtonRelease, i, 0, NULL);
-            for (j = 0; j < nevents; j++)
+            for (int j = 0; j < nevents; j++)
                 mieqProcessDeviceEvent(dev, &eventlist[j], NULL);
         }
     }
 
     /* Release all keys */
-    for (i = 0; k && i < MAP_LENGTH; i++) {
+    for (int i = 0; k && i < MAP_LENGTH; i++) {
         if (BitIsOn(k->down, i)) {
             nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i);
-            for (j = 0; j < nevents; j++)
+            for (int j = 0; j < nevents; j++)
                 mieqProcessDeviceEvent(dev, &eventlist[j], NULL);
         }
     }
@@ -2946,9 +2904,7 @@ valuator_set_mode(DeviceIntPtr dev, int axis, int mode)
     if (axis != VALUATOR_MODE_ALL_AXES)
         dev->valuator->axes[axis].mode = mode;
     else {
-        int i;
-
-        for (i = 0; i < dev->valuator->numAxes; i++)
+        for (int i = 0; i < dev->valuator->numAxes; i++)
             dev->valuator->axes[i].mode = mode;
     }
 }