diff --git a/stepmania/src/StepManiaXbox.vcproj b/stepmania/src/StepManiaXbox.vcproj
index c709e34634..3366ae5003 100644
--- a/stepmania/src/StepManiaXbox.vcproj
+++ b/stepmania/src/StepManiaXbox.vcproj
@@ -323,30 +323,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenBranch.h">
 			</File>
-			<File
-				RelativePath="ScreenCaution.cpp">
-			</File>
-			<File
-				RelativePath="ScreenCaution.h">
-			</File>
 			<File
 				RelativePath="ScreenCenterImage.cpp">
 			</File>
 			<File
 				RelativePath="ScreenCenterImage.h">
 			</File>
-			<File
-				RelativePath="ScreenClearBookkeepingData.cpp">
-			</File>
-			<File
-				RelativePath="ScreenClearBookkeepingData.h">
-			</File>
-			<File
-				RelativePath="ScreenClearMachineStats.cpp">
-			</File>
-			<File
-				RelativePath="ScreenClearMachineStats.h">
-			</File>
 			<File
 				RelativePath="ScreenCredits.cpp">
 			</File>
@@ -365,12 +347,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenDimensions.h">
 			</File>
-			<File
-				RelativePath="ScreenDownloadMachineStats.cpp">
-			</File>
-			<File
-				RelativePath="ScreenDownloadMachineStats.h">
-			</File>
 			<File
 				RelativePath="ScreenEdit.cpp">
 			</File>
@@ -425,12 +401,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenEz2SelectPlayer.h">
 			</File>
-			<File
-				RelativePath="ScreenGameOver.cpp">
-			</File>
-			<File
-				RelativePath="ScreenGameOver.h">
-			</File>
 			<File
 				RelativePath="ScreenGameplay.cpp">
 			</File>
@@ -443,12 +413,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenHowToPlay.h">
 			</File>
-			<File
-				RelativePath="ScreenInsertCredit.cpp">
-			</File>
-			<File
-				RelativePath="ScreenInsertCredit.h">
-			</File>
 			<File
 				RelativePath="ScreenInstructions.cpp">
 			</File>
@@ -590,12 +554,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenReloadSongs.h">
 			</File>
-			<File
-				RelativePath="ScreenResetToDefaults.cpp">
-			</File>
-			<File
-				RelativePath="ScreenResetToDefaults.h">
-			</File>
 			<File
 				RelativePath="ScreenSandbox.cpp">
 			</File>
@@ -774,6 +732,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="CodeDetector.h">
 			</File>
+			<File
+				RelativePath=".\Command.cpp">
+			</File>
+			<File
+				RelativePath=".\Command.h">
+			</File>
 			<File
 				RelativePath="Course.cpp">
 			</File>
@@ -828,6 +792,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="Game.h">
 			</File>
+			<File
+				RelativePath=".\GameCommand.cpp">
+			</File>
+			<File
+				RelativePath=".\GameCommand.h">
+			</File>
 			<File
 				RelativePath="GameConstantsAndTypes.cpp">
 			</File>
@@ -876,12 +846,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="MenuInput.h">
 			</File>
-			<File
-				RelativePath="ModeChoice.cpp">
-			</File>
-			<File
-				RelativePath="ModeChoice.h">
-			</File>
 			<File
 				RelativePath="NoteData.cpp">
 			</File>
@@ -972,6 +936,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="PlayerOptions.h">
 			</File>
+			<File
+				RelativePath=".\Preference.cpp">
+			</File>
+			<File
+				RelativePath=".\Preference.h">
+			</File>
 			<File
 				RelativePath="Profile.cpp">
 			</File>
@@ -1865,12 +1835,24 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="RageFile.h">
 			</File>
+			<File
+				RelativePath=".\RageFileBasic.cpp">
+			</File>
+			<File
+				RelativePath=".\RageFileBasic.h">
+			</File>
 			<File
 				RelativePath="RageFileDriver.cpp">
 			</File>
 			<File
 				RelativePath="RageFileDriver.h">
 			</File>
+			<File
+				RelativePath=".\RageFileDriverDeflate.cpp">
+			</File>
+			<File
+				RelativePath=".\RageFileDriverDeflate.h">
+			</File>
 			<File
 				RelativePath="RageFileDriverDirect.cpp">
 			</File>
@@ -1883,6 +1865,18 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="RageFileDriverDirectHelpers.h">
 			</File>
+			<File
+				RelativePath=".\RageFileDriverMemory.cpp">
+			</File>
+			<File
+				RelativePath=".\RageFileDriverMemory.h">
+			</File>
+			<File
+				RelativePath=".\RageFileDriverSlice.cpp">
+			</File>
+			<File
+				RelativePath=".\RageFileDriverSlice.h">
+			</File>
 			<File
 				RelativePath="RageFileDriverZip.cpp">
 			</File>
@@ -2204,12 +2198,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ActorCollision.h">
 			</File>
-			<File
-				RelativePath="ActorCommands.cpp">
-			</File>
-			<File
-				RelativePath="ActorCommands.h">
-			</File>
 			<File
 				RelativePath=".\ActorFrame.cpp">
 			</File>