diff --git a/dix/dixutils.c b/dix/dixutils.c
index d9f7c0a9e6..d252467682 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -248,7 +248,7 @@ XRetCode
 AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
                       Bool toRoot, Bool map)
 {
-    int numnow;
+    unsigned numnow;
     SaveSetElt *pTmp = NULL;
     int j;
 
diff --git a/dix/window.c b/dix/window.c
index f47771f732..6c0a05df4d 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2918,7 +2918,7 @@ HandleSaveSet(ClientPtr client)
 {
     WindowPtr pParent, pWin;
 
-    for (int j = 0; j < client->numSaved; j++) {
+    for (unsigned j = 0; j < client->numSaved; j++) {
         pWin = SaveSetWindow(client->saveSet[j]);
         if (SaveSetToRoot(client->saveSet[j]))
             pParent = pWin->drawable.pScreen->root;
diff --git a/include/dixstruct.h b/include/dixstruct.h
index fa975ca804..06a5c1b2c7 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -96,7 +96,7 @@ typedef struct _Client {
     XID errorValue;
     int sequence;
     int ignoreCount;            /* count for Attend/IgnoreClient */
-    int numSaved;
+    unsigned numSaved;          /* amount of windows in saveSet */
     SaveSetElt *saveSet;
     int (**requestVector) (ClientPtr /* pClient */ );
     CARD32 req_len;             /* length of current request */