diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 45febdc7a0..8f840a8fa2 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -134,7 +134,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
 			{
 				vector<bool> &vbSelected = Row.m_vbSelected[p];
 				vbSelected.resize( Row.m_RowDef.choices.size() );
-				for( int j=0; j<vbSelected.size(); j++ )
+				for( unsigned j=0; j<vbSelected.size(); j++ )
 					vbSelected[j] = false;
 
 				// set select the first item if not a multiselect row
diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index 81427061b3..b0d3d6fc88 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -128,7 +128,7 @@ protected:
 		vector<bool> m_vbSelected[NUM_PLAYERS];	// size = m_RowDef.choices.size().
 		int GetOneSelection( PlayerNumber pn )
 		{
-			for( int i=0; i<m_vbSelected[pn].size(); i++ )
+			for( unsigned i=0; i<(unsigned)m_vbSelected[pn].size(); i++ )
 				if( m_vbSelected[pn][i] )
 					return i;
 			ASSERT(0);	// shouldn't call this if not expecting one to be selected
@@ -140,7 +140,7 @@ protected:
 		}
 		void SetOneSelection( PlayerNumber pn, int iChoice )
 		{
-			for( int i=0; i<m_vbSelected[pn].size(); i++ )
+			for( unsigned i=0; i<(unsigned)m_vbSelected[pn].size(); i++ )
 				m_vbSelected[pn][i] = false;
 			m_vbSelected[pn][iChoice] = true;
 		}
diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index 5b24c5f68b..f9dbdc0384 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -69,7 +69,7 @@ void ScreenOptionsMaster::SetList( OptionRowData &row, OptionRowHandler &hand, C
 
 	row.bOneChoiceForAllPlayers = false;
 	const int NumCols = atoi( asParts[0] );
-	for( int i=0; i<asParts.size(); i++ )
+	for( unsigned i=0; i<asParts.size(); i++ )
 	{
 		if( asParts[i].CompareNoCase("together") == 0 )
 			row.bOneChoiceForAllPlayers = true;
@@ -283,7 +283,7 @@ ScreenOptionsMaster::~ScreenOptionsMaster()
 
 void SelectExactlyOne( int iSelection, vector<bool> &vbSelectedOut )
 {
-	for( int i=0; i<vbSelectedOut.size(); i++ )
+	for( int i=0; i<(int)vbSelectedOut.size(); i++ )
 		vbSelectedOut[i] = i==iSelection;
 }
 
@@ -435,7 +435,7 @@ void ScreenOptionsMaster::ImportOptions()
 
 int GetOneSelection( const vector<bool> &vbSelected )
 {
-	for( int i=0; i<vbSelected.size(); i++ )
+	for( unsigned i=0; i<vbSelected.size(); i++ )
 		if( vbSelected[i] )
 			return i;
 	ASSERT(0);	// shouldn't call this if not expecting one to be selected
@@ -451,7 +451,7 @@ int ScreenOptionsMaster::ExportOption( const OptionRowData &row, const OptionRow
 	case ROW_LIST:
 		{
 			hand.Default.Apply( (PlayerNumber)pn );
-			for( int i=0; i<vbSelected.size(); i++ )
+			for( unsigned i=0; i<vbSelected.size(); i++ )
 				if( vbSelected[i] )
 					hand.ListEntries[i].Apply( (PlayerNumber)pn );
 		}
@@ -666,7 +666,7 @@ void ScreenOptionsMaster::RefreshIcons()
 			// find first selection and whether multiple are selected
 			int iFirstSelection = -1;
 			bool bMultipleSelected = false;
-			for( int j=0; j<row.m_vbSelected[p].size(); j++ )
+			for( unsigned j=0; j<row.m_vbSelected[p].size(); j++ )
 			{
 				if( row.m_vbSelected[p][j] )
 				{