diff --git a/objects/dib.c b/objects/dib.c
index a940315424e..5c4e8a3085e 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -522,10 +522,10 @@ INT WINAPI GetDIBits(
         if(bmp->dib && bmp->dib->dsBm.bmBitsPixel >= 15 && info->bmiHeader.biBitCount >= 15)
         {
             /*FIXME: Only RGB dibs supported for now */
-            int srcwidth = bmp->dib->dsBm.bmWidth, srcwidthb = bmp->dib->dsBm.bmWidthBytes;
+            unsigned int srcwidth = bmp->dib->dsBm.bmWidth, srcwidthb = bmp->dib->dsBm.bmWidthBytes;
             int dstwidthb = DIB_GetDIBWidthBytes( info->bmiHeader.biWidth, info->bmiHeader.biBitCount );
             LPBYTE dbits = bits, sbits = (LPBYTE) bmp->dib->dsBm.bmBits + (startscan * srcwidthb);
-            int x, y;
+            unsigned int x, y;
 
             if ((info->bmiHeader.biHeight < 0) ^ (bmp->dib->dsBmih.biHeight < 0))
             {
diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c
index e0db558d3e4..8a9e8790d0b 100644
--- a/objects/enhmetafile.c
+++ b/objects/enhmetafile.c
@@ -1214,7 +1214,7 @@ BOOL WINAPI EnumEnhMetaFile(
     ENHMETAHEADER *emh, *emhTemp;
     ENHMETARECORD *emr;
     DWORD offset;
-    INT i;
+    UINT i;
     HANDLETABLE *ht;
     INT savedMode = 0;
     FLOAT xSrcPixSize, ySrcPixSize, xscale, yscale;
diff --git a/objects/metafile.c b/objects/metafile.c
index 20ef65ce305..ccda9ab1ec2 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -469,7 +469,7 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh)
 
     METARECORD *mr;
     HANDLETABLE16 *ht;
-    int offset = 0;
+    unsigned int offset = 0;
     WORD i;
     HPEN hPen;
     HBRUSH hBrush;
@@ -570,7 +570,7 @@ BOOL16 WINAPI EnumMetaFile16( HDC16 hdc, HMETAFILE16 hmf,
     HANDLETABLE16 *ht;
     HGLOBAL16 hHT;
     SEGPTR spht;
-    int offset = 0;
+    unsigned int offset = 0;
     WORD i, seg;
     HPEN hPen;
     HBRUSH hBrush;
@@ -662,7 +662,8 @@ BOOL WINAPI EnumMetaFile(
     METARECORD *mr;
     HANDLETABLE *ht;
     BOOL result = TRUE;
-    int i, offset = 0;
+    int i;
+    unsigned int offset = 0;
     HPEN hPen;
     HBRUSH hBrush;
     HFONT hFont;
@@ -1216,7 +1217,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc,  HANDLETABLE *handletable,
 {
     HANDLETABLE16 * ht = (void *)GlobalAlloc(GPTR, 
 					     handles*sizeof(HANDLETABLE16));
-    int i = 0;
+    unsigned int i = 0;
     TRACE("(%08x,%p,%p,%d)\n", hdc, handletable, metarecord,
 	  handles); 
     for (i=0; i<handles; i++)  
diff --git a/objects/palette.c b/objects/palette.c
index 764e9aaa647..aabcd7cb06c 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -213,7 +213,7 @@ UINT WINAPI GetPaletteEntries(
     LPPALETTEENTRY entries) /* [out] Address of array receiving entries */
 {
     PALETTEOBJ * palPtr;
-    INT numEntries;
+    UINT numEntries;
 
     TRACE("hpal = %04x, count=%i\n", hpalette, count );
         
@@ -265,7 +265,7 @@ UINT WINAPI SetPaletteEntries(
     LPPALETTEENTRY entries) /* [in] Address of array of structures */
 {
     PALETTEOBJ * palPtr;
-    INT numEntries;
+    UINT numEntries;
 
     TRACE("hpal=%04x,start=%i,count=%i\n",hpalette,start,count );
 
diff --git a/objects/text.c b/objects/text.c
index a419f8cb8fe..1787debea7a 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -64,7 +64,7 @@ BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags,
         UINT wlen = MultiByteToWideChar(codepage,0,str,count,NULL,0);
         if (lpDx)
         {
-            int i = 0, j = 0;
+            unsigned int i = 0, j = 0;
 
             lpDxW = (LPINT)HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(INT));
             while(i < count)