diff --git a/stepmania/src/StepManiaXbox.vcproj b/stepmania/src/StepManiaXbox.vcproj
index 1831dfbea3..082b58c242 100644
--- a/stepmania/src/StepManiaXbox.vcproj
+++ b/stepmania/src/StepManiaXbox.vcproj
@@ -226,6 +226,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="3"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.0/include&quot;"
 				PreprocessorDefinitions="WIN32,_XBOX,XBOX,NDEBUG"
@@ -267,8 +268,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="XboxDeploymentTool"
+				ExcludedFromBuild="TRUE"
 				Progress="TRUE"
-				ForceCopy="TRUE"/>
+				ForceCopy="FALSE"/>
 			<Tool
 				Name="XboxImageTool"
 				FileName="../default.xbe"
@@ -1221,6 +1223,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 					<File
 						RelativePath=".\arch\LoadingWindow\LoadingWindow_Xbox.h">
 					</File>
+					<File
+						RelativePath="arch\LoadingWindow\Selector_LoadingWindow.h">
+					</File>
 				</Filter>
 				<Filter
 					Name="Sound"
@@ -1258,6 +1263,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 					<File
 						RelativePath="arch\Sound\RageSoundDriver_Null.h">
 					</File>
+					<File
+						RelativePath="arch\Sound\Selector_RageSoundDriver.h">
+					</File>
 				</Filter>
 				<Filter
 					Name="ArchHooks"
@@ -1309,12 +1317,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 					<File
 						RelativePath="arch\MovieTexture\MovieTexture.h">
 					</File>
-					<File
-						RelativePath=".\arch\MovieTexture\MovieTexture_FFMpeg.cpp">
-					</File>
-					<File
-						RelativePath=".\arch\MovieTexture\MovieTexture_FFMpeg.h">
-					</File>
 					<File
 						RelativePath="arch\MovieTexture\MovieTexture_Null.cpp">
 					</File>
@@ -1405,9 +1407,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				<File
 					RelativePath="archutils\Win32\arch_setup.cpp">
 				</File>
-				<File
-					RelativePath="archutils\Win32\arch_setup.h">
-				</File>
 				<File
 					RelativePath=".\archutils\Xbox\arch_setup.h">
 				</File>