diff --git a/desmume/src/aggdraw.cpp b/desmume/src/aggdraw.cpp
index 4b9272983..37307275f 100644
--- a/desmume/src/aggdraw.cpp
+++ b/desmume/src/aggdraw.cpp
@@ -114,7 +114,7 @@ static void Agg_init_fonts()
 		{ agg::verdana18_bold, "verdana18_bold" },
 	};
 
-	for(uint i=0;i<ARRAY_SIZE(fonts);i++)
+	for(u32 i=0;i<ARRAY_SIZE(fonts);i++)
 		font_table[fonts[i].name] = fonts[i].font;
 }
 
diff --git a/desmume/src/mc.cpp b/desmume/src/mc.cpp
index 7943dbb64..7f37d7a44 100644
--- a/desmume/src/mc.cpp
+++ b/desmume/src/mc.cpp
@@ -659,7 +659,7 @@ static u32 no_gba_savTrim(void *buf, u32 size)
 
 static u32 no_gba_fillLeft(u32 size)
 {
-	for (uint i = 1; i < ARRAY_SIZE(save_types); i++)
+	for (u32 i = 1; i < ARRAY_SIZE(save_types); i++)
 	{
 		if (size <= (u32)save_types[i][1])
 			return (size + (save_types[i][1] - size));
diff --git a/desmume/src/saves.cpp b/desmume/src/saves.cpp
index 687d75bf1..d4e5dc5dc 100644
--- a/desmume/src/saves.cpp
+++ b/desmume/src/saves.cpp
@@ -1022,9 +1022,9 @@ static void loadstate()
 	//_MMU_write16<ARMCPU_ARM9>(i, _MMU_read16<ARMCPU_ARM9>(i));
 	static const u8 mainRegenAddr[] = {0x00,0x02,0x08,0x0a,0x0c,0x0e,0x40,0x42,0x44,0x46,0x48,0x4a,0x4c,0x50,0x52,0x54,0x60,0x64,0x66,0x6c};
 	static const u8 subRegenAddr[] =  {0x00,0x02,0x08,0x0a,0x0c,0x0e,0x40,0x42,0x44,0x46,0x48,0x4a,0x4c,0x50,0x52,0x54,0x6c};
-	for(uint i=0;i<ARRAY_SIZE(mainRegenAddr);i++)
+	for(u32 i=0;i<ARRAY_SIZE(mainRegenAddr);i++)
 		_MMU_write16<ARMCPU_ARM9>(REG_BASE_DISPA+mainRegenAddr[i], _MMU_read16<ARMCPU_ARM9>(REG_BASE_DISPA+mainRegenAddr[i]));
-	for(uint i=0;i<ARRAY_SIZE(subRegenAddr);i++)
+	for(u32 i=0;i<ARRAY_SIZE(subRegenAddr);i++)
 		_MMU_write16<ARMCPU_ARM9>(REG_BASE_DISPB+subRegenAddr[i], _MMU_read16<ARMCPU_ARM9>(REG_BASE_DISPB+subRegenAddr[i]));