diff --git a/src/EditMenu.cpp b/src/EditMenu.cpp
index a9a2f6ec6f..25a799a838 100644
--- a/src/EditMenu.cpp
+++ b/src/EditMenu.cpp
@@ -398,7 +398,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
 			StepsType orgSel = StepsType_Invalid;
 			if( !m_StepsTypes.empty() ) // Not first run
 			{
-				ASSERT( m_StepsTypes.size() > m_iSelection[ROW_STEPS_TYPE] );
+				ASSERT( (int) m_StepsTypes.size() > m_iSelection[ROW_STEPS_TYPE] );
 				StepsType orgSel = m_StepsTypes[m_iSelection[ROW_STEPS_TYPE]];
 			}
 			
diff --git a/src/GameManager.cpp b/src/GameManager.cpp
index 9328a5b468..db430656c9 100644
--- a/src/GameManager.cpp
+++ b/src/GameManager.cpp
@@ -2946,7 +2946,7 @@ void GameManager::GetStepsTypesForGame( const Game *pGame, vector<StepsType>& aS
 		// Some Styles use the same StepsType (e.g. single and versus) so check
 		// that we aren't doubling up.
 		bool found = false;
-		for( int j=0; j < aStepsTypeAddTo.size(); j++ )
+		for( unsigned j=0; j < aStepsTypeAddTo.size(); j++ )
 			if( (int) st == (int) aStepsTypeAddTo[j] ) { found = true; break; }
 		if(found) continue;
 			
diff --git a/src/RageSoundMixBuffer.cpp b/src/RageSoundMixBuffer.cpp
index 7b5226bb28..01352cdc04 100644
--- a/src/RageSoundMixBuffer.cpp
+++ b/src/RageSoundMixBuffer.cpp
@@ -92,7 +92,7 @@ void RageSoundMixBuffer::read( float *pBuf )
 
 void RageSoundMixBuffer::read_deinterlace( float **pBufs, int channels )
 {
-	for( int i = 0; i < m_iBufUsed / channels; ++i )
+	for( unsigned i = 0; i < m_iBufUsed / channels; ++i )
 		for( int ch = 0; ch < channels; ++ch )
 			pBufs[ch][i] = m_pMixbuf[channels * i + ch];
 	m_iBufUsed = 0;
diff --git a/src/SongManager.cpp b/src/SongManager.cpp
index 20401e5a9a..6a0eebfe9a 100644
--- a/src/SongManager.cpp
+++ b/src/SongManager.cpp
@@ -1735,7 +1735,7 @@ void SongManager::LoadStepEditsFromProfileDir( const RString &sProfileDir, Profi
 		}
 	}
 	
-	if( vsFiles.size() > MAX_EDIT_STEPS_PER_PROFILE - iNumEditsLoaded )
+	if( (int) vsFiles.size() > MAX_EDIT_STEPS_PER_PROFILE - iNumEditsLoaded )
 	{
 		LOG->Warn("Profile %s has too many edits; some have been skipped.", ProfileSlotToString( slot ).c_str() );
 		return;
@@ -1749,13 +1749,13 @@ void SongManager::LoadStepEditsFromProfileDir( const RString &sProfileDir, Profi
 	GetDirListing( sDir+"*", vsGroups, true, false );
 	
 	// XXX: Same as above, edits may be skipped in error in some cases
-	for( int i=0; i<vsGroups.size(); i++ )
+	for( unsigned i=0; i<vsGroups.size(); i++ )
 	{
 		RString sGroupDir = vsGroups[i]+"/";
 		vector<RString> vsSongs;
 		GetDirListing(sDir+sGroupDir+"*", vsSongs, true, false );
 		
-		for( int j=0; j<vsSongs.size(); j++ )
+		for( unsigned j=0; j<vsSongs.size(); j++ )
 		{
 			vector<RString> vsEdits;
 			RString sSongDir = sGroupDir+vsSongs[j]+"/";
@@ -1777,7 +1777,7 @@ void SongManager::LoadStepEditsFromProfileDir( const RString &sProfileDir, Profi
 					loaderSM.LoadEditFromFile( fn, slot, true, given );
 			}
 			
-			if( vsEdits.size() > MAX_EDIT_STEPS_PER_PROFILE - iNumEditsLoaded )
+			if( (int) vsEdits.size() > MAX_EDIT_STEPS_PER_PROFILE - iNumEditsLoaded )
 			{
 				LOG->Warn("Profile %s has too many edits; some have been skipped.", ProfileSlotToString( slot ).c_str() );
 				return;