diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 5c2bea0fa9..e8a2e3e7fe 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -59,10 +59,10 @@ LINK32=link.exe
 # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
 # Begin Special Build Tool
 IntDir=.\../Debug6
-TargetDir=\stepmania\stepmania\Program
+TargetDir=\temp\stepmania\Program
 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
 # End Special Build Tool
 
@@ -96,10 +96,10 @@ LINK32=link.exe
 # SUBTRACT LINK32 /verbose /pdb:none /debug
 # Begin Special Build Tool
 IntDir=.\../Release6
-TargetDir=\stepmania\stepmania\Program
+TargetDir=\temp\stepmania\Program
 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
 # End Special Build Tool
 
@@ -167,14 +167,6 @@ SOURCE=.\SDL_SaveJPEG.cpp
 
 SOURCE=.\SDL_SaveJPEG.h
 # End Source File
-# Begin Source File
-
-SOURCE=.\SDL_utils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\SDL_utils.h
-# End Source File
 # End Group
 # Begin Source File
 
@@ -1528,15 +1520,6 @@ SOURCE=.\archutils\Win32\WindowsResources.rc
 # End Group
 # Begin Source File
 
-SOURCE=.\custom_launch_params.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\custom_launch_params.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\global.cpp
 
 !IF  "$(CFG)" == "StepMania - Win32 Debug"
@@ -1559,11 +1542,6 @@ SOURCE=.\ScreenDimensions.h
 # End Source File
 # Begin Source File
 
-SOURCE=".\SDL-1.2.5\src\main\xbox\SDL_main.c"
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
 SOURCE=.\StdString.h
 # End Source File
 # Begin Source File
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index 4faff53245..1c67049e84 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -1123,10 +1123,10 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 						RelativePath="arch\LowLevelWindow\LowLevelWindow.h">
 					</File>
 					<File
-						RelativePath="arch\LowLevelWindow\LowLevelWindow_SDL.cpp">
+						RelativePath="arch\LowLevelWindow\LowLevelWindow_Win32.cpp">
 					</File>
 					<File
-						RelativePath="arch\LowLevelWindow\LowLevelWindow_SDL.h">
+						RelativePath="arch\LowLevelWindow\LowLevelWindow_Win32.h">
 					</File>
 				</Filter>
 				<Filter
@@ -1245,6 +1245,12 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 				<File
 					RelativePath="archutils\Win32\GotoURL.h">
 				</File>
+				<File
+					RelativePath="archutils\Win32\GraphicsWindow.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\GraphicsWindow.h">
+				</File>
 				<File
 					RelativePath="archutils\Win32\RegistryAccess.cpp">
 				</File>
@@ -1272,6 +1278,12 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 				<File
 					RelativePath="archutils\Win32\VideoDriverInfo.h">
 				</File>
+				<File
+					RelativePath="archutils\Win32\WindowIcon.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\WindowIcon.h">
+				</File>
 				<File
 					RelativePath="archutils\Win32\WindowsResources.h">
 				</File>
@@ -2099,12 +2111,6 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 				<File
 					RelativePath="SDL_rotozoom.h">
 				</File>
-				<File
-					RelativePath="SDL_utils.cpp">
-				</File>
-				<File
-					RelativePath="SDL_utils.h">
-				</File>
 				<File
 					RelativePath="ezsockets.cpp">
 				</File>