diff --git a/stepmania/src/CombinedLifeMeterEnemy.cpp b/stepmania/src/CombinedLifeMeterEnemy.cpp
index 60d997591a..eb11a37819 100644
--- a/stepmania/src/CombinedLifeMeterEnemy.cpp
+++ b/stepmania/src/CombinedLifeMeterEnemy.cpp
@@ -188,4 +188,4 @@ void CombinedLifeMeterEnemy::SetFace( Face face )
 void CombinedLifeMeterEnemy::OnTaunt()
 {
 	SetFace( taunt );
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 2898340350..77e44ba9b4 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -634,4 +634,4 @@ bool GameState::ShowMarvelous() const
 			return true;
 
 	return false;
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/OptionIcon.cpp b/stepmania/src/OptionIcon.cpp
index 626beae1dd..7ae26d0145 100644
--- a/stepmania/src/OptionIcon.cpp
+++ b/stepmania/src/OptionIcon.cpp
@@ -42,7 +42,7 @@ void OptionIcon::Load( PlayerNumber pn, CString sText, bool bHeader )
 {
 	static CString sStopWords[] = { "OFF", "VISIBLE", "VIVID", "STANDARD", "X1", "HOLDS", "DEFAULT", "OVERHEAD" };
 	
-	for( int i=0; i<ARRAYSIZE(sStopWords); i++ )
+	for( unsigned i=0; i<ARRAYSIZE(sStopWords); i++ )
 		if( 0==stricmp(sText,sStopWords[i]) )
 			sText = "";
 
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 4d8a98bcdb..cc78ef2f0a 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -478,4 +478,4 @@ CString ScreenPlayerOptions::ConvertParamToThemeDifficulty(
 	if (in == "ONI")	   return CHALLENGE_DESCRIPTION; // Extreme
 
 	return in;  // something else
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index bcbcbb6413..5db9b7794a 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -84,7 +84,7 @@ void ScreenSongOptions::ImportOptions()
 	m_iSelectedOption[0][SO_AUTOSYNC] = so.m_bAutoSync;
 
 	m_iSelectedOption[0][SO_RATE] = 7;	// in case we don't match below
-	for( int i=0; i<g_SongOptionsLines[SO_RATE].choices.size(); i++ )
+	for( unsigned i=0; i<g_SongOptionsLines[SO_RATE].choices.size(); i++ )
 		if( so.m_fMusicRate == atof(g_SongOptionsLines[SO_RATE].choices[i]) ) 
 			m_iSelectedOption[0][SO_RATE] = i;
 }
diff --git a/stepmania/src/ScreenUnlock.cpp b/stepmania/src/ScreenUnlock.cpp
index ee27789e54..3b33f13db4 100644
--- a/stepmania/src/ScreenUnlock.cpp
+++ b/stepmania/src/ScreenUnlock.cpp
@@ -42,7 +42,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
 {
 	LOG->Trace("ScreenUnlock::ScreenUnlock()");
 
-	int NumUnlocks = NUM_UNLOCKS;
+	unsigned NumUnlocks = NUM_UNLOCKS;
 	if (GAMESTATE->m_pUnlockingSys->m_SongEntries.size() < NumUnlocks)
 		NumUnlocks = GAMESTATE->m_pUnlockingSys->m_SongEntries.size();
 
@@ -55,7 +55,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
 	PointsUntilNextUnlock.LoadFromFont( THEME->GetPathToF("Common normal") );
 	PointsUntilNextUnlock.SetHorizAlign( Actor::align_left );
 
-	int i;
+	unsigned i;
 	CString IconCommand = ICON_COMMAND;
 	for(i=1; i <= NumUnlocks; i++)
 	{
@@ -235,7 +235,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
 
 		for(i=1; i <= UNLOCK_TEXT_SCROLL_ROWS; i++)
 		{
-			if (i > (int) LastUnlocks.size())
+			if (i > LastUnlocks.size())
 				continue;
 
 			unsigned NextIcon = LastUnlocks[LastUnlocks.size() - i];
@@ -346,4 +346,4 @@ ScreenUnlock::~ScreenUnlock()
 		SAFE_DELETE(entry);
 		ItemIcons.pop_back();
 	}
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index cb48c06ad2..4e6cfdf951 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -1217,4 +1217,4 @@ void SongManager::UpdateRankingCourses()
 			if (!RankingCourses[j].CompareNoCase(m_pCourses[i]->m_sPath))
 				m_pCourses[i]->SortOrder_Ranking = 1;
 	}
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/UnlockSystem.cpp b/stepmania/src/UnlockSystem.cpp
index 0e8df6d08a..46aa4fd41a 100644
--- a/stepmania/src/UnlockSystem.cpp
+++ b/stepmania/src/UnlockSystem.cpp
@@ -505,4 +505,4 @@ float UnlockSystem::UnlockToasty()
 int UnlockSystem::GetNumUnlocks() const
 {
 	return m_SongEntries.size();
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h b/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h
index f89d2e2a01..f33e5a11a6 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h
@@ -28,4 +28,4 @@ public:
 #undef ARCH_LOADING_WINDOW
 #define ARCH_LOADING_WINDOW LoadingWindow_Cocoa
 
-#endif /* LOADING_WINDOW_COCOA */
\ No newline at end of file
+#endif /* LOADING_WINDOW_COCOA */