diff --git a/stepmania/src/SConscript b/stepmania/src/SConscript
index 8ec6c65597..f428cf6061 100644
--- a/stepmania/src/SConscript
+++ b/stepmania/src/SConscript
@@ -297,7 +297,6 @@ Screens = [
 ]
 
 DataStructures = [
-	"ActorCommands.cpp",
 	"AdjustSync.cpp",
 	"Attack.cpp",
 	"AutoKeysounds.cpp",
@@ -330,10 +329,10 @@ DataStructures = [
 	"LuaExpressionTransform.cpp",
 	"LyricsLoader.cpp",
 	"MenuInput.cpp",
+	"ModsGroup.cpp",
 	"NoteData.cpp",
 	"NoteDataUtil.cpp",
 	"NoteDataWithScoring.cpp",
-	"NoteFieldPositioning.cpp",
 	"NoteTypes.cpp",
 	"NotesLoader.cpp",
 	"NotesLoaderBMS.cpp",
@@ -352,6 +351,7 @@ DataStructures = [
 	"Profile.cpp",
 	"RandomSample.cpp",
 	"RadarValues.cpp",
+	"RoomInfoDisplay.cpp",
 	"RoomWheel.cpp",
 	"ScreenDimensions.cpp",
 	"ScoreKeeper.cpp",
@@ -552,7 +552,6 @@ ActorsInMenus = [
 	"ComboGraph.cpp",
 	"CourseContentsList.cpp",
 	"CourseEntryDisplay.cpp",
-	"DifficultyDisplay.cpp",
 	"DifficultyList.cpp",
 	"DifficultyMeter.cpp",
 	"DifficultyRating.cpp",
@@ -676,11 +675,14 @@ Rage = PCRE + RageFile + RageSoundFileReaders + [
 	"RageSurface_Load_XPM.cpp",
 	"RageTexture.cpp",
 	"RageTexturePreloader.cpp",
+	"RageTextureRenderTarget.cpp",
 	"RageSurface_Save_BMP.cpp",
+	"RageSurface_Save_PNG.cpp",
 	"RageTextureID.cpp",
 	"RageTextureManager.cpp",
 	"RageThreads.cpp",
 	"RageTimer.cpp",
+	"RageTypes.cpp",
 	"RageUtil.cpp",
 	"RageUtil_CharConversions.cpp",
 	"RageUtil_BackgroundLoader.cpp",
@@ -691,7 +693,9 @@ Rage = PCRE + RageFile + RageSoundFileReaders + [
 Actors = [
 	"Actor.cpp",
 	"ActorFrame.cpp",
+	"ActorFrameTexture.cpp",
 	"ActorScroller.cpp",
+	"ActorProxy.cpp",
 	"ActorUtil.cpp",
 	"ActorSound.cpp",
 	"AutoActor.cpp",
@@ -710,6 +714,7 @@ GlobalSingletons = [
 	"Bookkeeper.cpp",
 	"CharacterManager.cpp",
 	"CryptManager.cpp",
+	"ExportStrings.cpp",
 	"FontManager.cpp",
 	"GameSoundManager.cpp",
 	"GameManager.cpp",