diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 6e6595963b..23eb7d38b6 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -60,7 +60,7 @@ IntDir=.\../Release6
 TargetDir=\temp\stepmania
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                              	cl                                               /Zl                                               /nologo                                               /c                                               verstub.cpp                                               /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                               	cl                                                /Zl                                                /nologo                                                /c                                                verstub.cpp                                                /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -78,7 +78,7 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "DEBUG" /Fr /YX"stdafx.h" /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "DEBUG" /Fr /YX"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -95,7 +95,7 @@ IntDir=.\../Debug6
 TargetDir=\temp\stepmania
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                              	cl                                               /Zl                                               /nologo                                               /c                                               verstub.cpp                                               /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                               	cl                                                /Zl                                                /nologo                                                /c                                                verstub.cpp                                                /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -511,6 +511,14 @@ SOURCE=.\SongOptions.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\StageStats.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\StageStats.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\StyleDef.cpp
 # End Source File
 # Begin Source File
@@ -656,6 +664,38 @@ SOURCE=.\arch\arch_Win32.h
 # Begin Group "system"
 
 # PROP Default_Filter ""
+# Begin Group "Disasm"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\archutils\Win32\Crash.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\archutils\Win32\Crash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\archutils\Win32\CrashList.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\archutils\Win32\Disasm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\archutils\Win32\Disasm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\archutils\Win32\Tls.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\archutils\Win32\Tls.h
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=.\archutils\Win32\AppInstance.cpp
@@ -1716,38 +1756,6 @@ SOURCE=.\ThemeManager.cpp
 SOURCE=.\ThemeManager.h
 # End Source File
 # End Group
-# Begin Group "Disasm"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\Crash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Crash.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CrashList.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Disasm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Disasm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Tls.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Tls.h
-# End Source File
-# End Group
 # Begin Group "Utils"
 
 # PROP Default_Filter ""
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index a439e1cec6..a218b1b764 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -24,7 +24,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHa"
 				Optimization="0"
-				AdditionalIncludeDirectories="SDL-1.2.5/include,SDL_image-1.2"
+				AdditionalIncludeDirectories=".;SDL-1.2.5/include,SDL_image-1.2"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,DEBUG"
 				ExceptionHandling="FALSE"
 				BasicRuntimeChecks="3"
@@ -741,6 +741,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 						RelativePath="arch\Sound\RageSoundDriver_WaveOut.h">
 					</File>
 				</Filter>
+				<Filter
+					Name="DebugInfo"
+					Filter="">
+				</Filter>
 			</Filter>
 			<Filter
 				Name="system"
@@ -769,6 +773,31 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				<File
 					RelativePath=".\resource.h">
 				</File>
+				<Filter
+					Name="Disasm"
+					Filter="">
+					<File
+						RelativePath="archutils\Win32\Crash.cpp">
+					</File>
+					<File
+						RelativePath="archutils\Win32\Crash.h">
+					</File>
+					<File
+						RelativePath="archutils\Win32\CrashList.h">
+					</File>
+					<File
+						RelativePath="archutils\Win32\Disasm.cpp">
+					</File>
+					<File
+						RelativePath="archutils\Win32\Disasm.h">
+					</File>
+					<File
+						RelativePath="archutils\Win32\Tls.cpp">
+					</File>
+					<File
+						RelativePath="archutils\Win32\Tls.h">
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
@@ -1396,31 +1425,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				RelativePath=".\ThemeManager.h">
 			</File>
 		</Filter>
-		<Filter
-			Name="Disasm"
-			Filter="">
-			<File
-				RelativePath="Crash.cpp">
-			</File>
-			<File
-				RelativePath="Crash.h">
-			</File>
-			<File
-				RelativePath="CrashList.h">
-			</File>
-			<File
-				RelativePath="Disasm.cpp">
-			</File>
-			<File
-				RelativePath="Disasm.h">
-			</File>
-			<File
-				RelativePath="Tls.cpp">
-			</File>
-			<File
-				RelativePath="Tls.h">
-			</File>
-		</Filter>
 		<File
 			RelativePath="StepMania.xpm">
 		</File>