diff --git a/src/mouse.c b/src/mouse.c
index 70ea7fb3ca490ad0fa79f5268543ccad9e345a8b..719b1fa278a1013433d7cd0554390cfa7b76dff8 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -327,7 +327,7 @@ MouseCommonOptions(InputInfoPtr pInfo)
         int lock;             /* lock button */
         int target;           /* target button */
         int lockM,targetM;    /* bitmasks for drag lock, target */
-        int i, j;             /* indexes */
+        int j;                /* indexes */
         char *s1;             /* parse input string */
         DragLockPtr pLock;
 
@@ -3599,14 +3599,14 @@ autoProbeMouse(InputInfoPtr pInfo, Bool inSync, Bool lostSync)
         }
         case AUTOPROBE_SWITCH_PROTOCOL:
         {
-            MouseProtocolID proto;
+            MouseProtocolID prot;
             MouseProtocolPtr pProto;
             void *defaults;
             AP_DBG(("State SWITCH_PROTOCOL\n"));
-            proto = mPriv->protoList[mPriv->protocolID++];
-            if (proto == PROT_UNKNOWN)
+            prot = mPriv->protoList[mPriv->protocolID++];
+            if (prot == PROT_UNKNOWN)
                 mPriv->autoState = AUTOPROBE_SWITCHSERIAL;
-            else if (!((pProto = GetProtocol(proto)) &&
+            else if (!((pProto = GetProtocol(prot)) &&
                        ((defaults = pProto->defaults)))
                        || (mPriv->serialDefaultsNum == -1
                            && (defaults == msDefaults))
@@ -3614,8 +3614,8 @@ autoProbeMouse(InputInfoPtr pInfo, Bool inSync, Bool lostSync)
                            && serialDefaultsList[mPriv->serialDefaultsNum]
                            == defaults)) {
                 AP_DBG(("Changing Protocol to %s\n",
-                        ProtocolIDToName(proto)));
-                SetMouseProto(pMse,proto);
+                        ProtocolIDToName(prot)));
+                SetMouseProto(pMse,prot);
                 FlushButtons(pMse);
                 RESET_VALIDATION;
                 mPriv->autoState = AUTOPROBE_VALIDATE2;
diff --git a/src/pnp.c b/src/pnp.c
index 6eba24d1dec0e6cee3499d3e4b9e6cbf74750ee0..e5c4bc785737a3849510aa659d5241bb3525a44d 100644
--- a/src/pnp.c
+++ b/src/pnp.c
@@ -708,8 +708,8 @@ probePs2ProtocolPnP(InputInfoPtr pInfo)
             u = ps2GetDeviceID(pInfo);
             if (u == 0x03) {
                 /* found IntelliMouse now try IntelliExplorer */
-                unsigned char seq[] = { 243, 200, 243, 200, 243, 80 };
-                if (ps2SendPacket(pInfo,seq,sizeof(seq))) {
+                unsigned char im_seq[] = { 243, 200, 243, 200, 243, 80 };
+                if (ps2SendPacket(pInfo,im_seq,sizeof(im_seq))) {
                     u = ps2GetDeviceID(pInfo);
                     if (u == 0x04)
                         ret =  PROT_EXPPS2;