diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index 856eed6081..fc0c36f378 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -363,4 +363,4 @@ void BitmapText::DrawPrimitives()
 		DISPLAY->DrawQuads( v, iNumV );
 	}
 
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/FootMeter.cpp b/stepmania/src/FootMeter.cpp
index 9ebe0477c7..5f94c218d0 100644
--- a/stepmania/src/FootMeter.cpp
+++ b/stepmania/src/FootMeter.cpp
@@ -53,11 +53,12 @@ void FootMeter::SetFromNotes( Notes* pNotes )
 void FootMeter::SetNumFeet( int iNumFeet )
 {
 	CString sNewText;
-	for( int f=0; f<NUM_FEET_IN_METER; f++ )
+	int f;
+	for( f=0; f<NUM_FEET_IN_METER; f++ )
 		sNewText += (f<iNumFeet) ? "1" : "0";
 	for( f=NUM_FEET_IN_METER; f<=13; f++ )
 		if( f<iNumFeet )
 			sNewText += "1";
 
 	SetText( sNewText );
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/GameDef.cpp b/stepmania/src/GameDef.cpp
index c5443670d2..ca2eaa9bfe 100644
--- a/stepmania/src/GameDef.cpp
+++ b/stepmania/src/GameDef.cpp
@@ -41,8 +41,9 @@ MenuInput GameDef::GameInputToMenuInput( GameInput GameI ) const
 	default:
 		ASSERT(0);	return MenuInput(); // invalid m_StyleType
 	};
-
-	for( int i=0; i<NUM_MENU_BUTTONS; i++ )
+	
+	int i;
+	for( i=0; i<NUM_MENU_BUTTONS; i++ )
 		if( m_DedicatedMenuButton[i] == GameI.button )
 			return MenuInput( pn, (MenuButton)i );
 
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index b3274752a5..3252d8825f 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -349,4 +349,4 @@ Grade GameState::GetCurrentGrade( PlayerNumber pn )
 	else if( fPercentDancePoints >= 0.65 )	return GRADE_B;
 	else if( fPercentDancePoints >= 0.45 )	return GRADE_C;
 	else									return GRADE_D;
-}
\ No newline at end of file
+}