diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 57194cebd5..e0860ca7f8 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -88,7 +88,7 @@ void Course::LoadFromCRSFile( CString sPath, CArray<Song*,Song*> &apSongs )
 				continue;	// skip this song
 
 			Notes* pNotes = NULL;
-			for( int i=0; i<pSong->m_arrayNotes.GetSize(); i++ )
+			for( i=0; i<pSong->m_arrayNotes.GetSize(); i++ )
 				if( 0 == stricmp(pSong->m_arrayNotes[i]->m_sDescription, sNotesDescription) )
 					pNotes = pSong->m_arrayNotes[i];
 			
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 192746ab09..957cc2ee1e 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -259,7 +259,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
 						GS[p].fRadarActual[i] += GSstage.fRadarActual[i];
 					}
 				}
-				for( int i=0; i<NUM_RADAR_VALUES; i++ )
+				for( i=0; i<NUM_RADAR_VALUES; i++ )
 				{
 					GS[p].fRadarPossible[i] /= iSongsToShow;
 					GS[p].fRadarActual[i] /= iSongsToShow;
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index fcb1c9c156..afa2530144 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -338,14 +338,6 @@ SOURCE=.\IniFile.cpp
 
 SOURCE=.\IniFile.h
 # End Source File
-# Begin Source File
-
-SOURCE=.\MSDScanner.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MSDScanner.h
-# End Source File
 # End Group
 # Begin Group "System"
 
@@ -528,6 +520,14 @@ SOURCE=.\BPMDisplay.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\Course.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Course.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\CourseContentsFrame.cpp
 # End Source File
 # Begin Source File
@@ -1044,18 +1044,6 @@ SOURCE=.\ScreenStage.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\ScreenSynchronize.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ScreenSynchronize.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ScreenSynchronizeMenu.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\ScreenSynchronizeMenu.h
 # End Source File
 # Begin Source File