diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index 1ecbe31229..1007368161 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -20,7 +20,7 @@
 #include "Command.h"
 #include "arch/Dialog/Dialog.h"
 #include "Bookkeeper.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "GameSoundManager.h"
 #include "ThemeManager.h"
 #include "PlayerState.h"
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 4fa617759b..25c063c500 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -14,7 +14,7 @@
 #include "GameCommand.h"
 #include "NoteFieldPositioning.h"
 #include "Character.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "AnnouncerManager.h"
 #include "ProfileManager.h"
 #include "arch/arch.h"
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index f1697ae294..e4122cdb8f 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -16,7 +16,7 @@
 #include "RageTextureManager.h"
 #include "Banner.h"
 #include "Steps.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "GameCommand.h"
 #include "ActorUtil.h"
 #include "SongUtil.h"
diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index 98d2d24913..c735fb3666 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -17,7 +17,7 @@
 #include "RageFileManager.h"
 #include "ScoreKeeperMAX2.h"
 #include "crypto/CryptRand.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "XmlFile.h"
 #include "Foreach.h"
 #include "CatalogXml.h"
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 9db421b1fc..dd42073716 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -15,7 +15,7 @@
 #include "GameSoundManager.h"
 #include "ActorUtil.h"
 #include "RageTimer.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "Course.h"
 #include "LightsManager.h"
 #include "ProfileManager.h"
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 21c53b5b04..d40c547bb8 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -32,7 +32,7 @@
 #include "Inventory.h"
 #include "Course.h"
 #include "NoteDataUtil.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "LightsManager.h"
 #include "ProfileManager.h"
 #include "StatsManager.h"
diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp
index a34d4b7f0a..56654c0efa 100644
--- a/stepmania/src/ScreenJukebox.cpp
+++ b/stepmania/src/ScreenJukebox.cpp
@@ -11,7 +11,7 @@
 #include "Steps.h"
 #include "ScreenAttract.h"
 #include "RageUtil.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "Course.h"
 #include "ThemeManager.h"
 #include "Style.h"
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 755e35f956..9f977f7d05 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -11,7 +11,7 @@
 #include "ActorUtil.h"
 #include "ProfileManager.h"
 #include "RageLog.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "ScreenDimensions.h"
 
 static const CString PageTypeNames[NUM_PAGE_TYPES] = {
diff --git a/stepmania/src/ScreenReloadSongs.cpp b/stepmania/src/ScreenReloadSongs.cpp
index 85d294fb1a..0a2e8036f9 100644
--- a/stepmania/src/ScreenReloadSongs.cpp
+++ b/stepmania/src/ScreenReloadSongs.cpp
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "ScreenReloadSongs.h"
 #include "SongManager.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "ScreenManager.h"
 #include "RageTimer.h"
 #include "RageLog.h"
diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index 49240c8cbd..27023d13fd 100644
--- a/stepmania/src/ScreenSelectGroup.cpp
+++ b/stepmania/src/ScreenSelectGroup.cpp
@@ -13,7 +13,7 @@
 #include <map>
 #include "ActorUtil.h"
 #include "GameState.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "MenuTimer.h"
 #include "SongUtil.h"
 
diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp
index 3d4661490c..8fff661d99 100644
--- a/stepmania/src/ScreenTitleMenu.cpp
+++ b/stepmania/src/ScreenTitleMenu.cpp
@@ -16,7 +16,7 @@
 #include "GameSoundManager.h"
 #include "CodeDetector.h"
 #include "RageTextureManager.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "ProductInfo.h"
 #include "LightsManager.h"
 #include "CodeDetector.h"
diff --git a/stepmania/src/ScreenUnlock.cpp b/stepmania/src/ScreenUnlock.cpp
index 15d4230ba7..551a798782 100644
--- a/stepmania/src/ScreenUnlock.cpp
+++ b/stepmania/src/ScreenUnlock.cpp
@@ -4,7 +4,7 @@
 #include "ThemeManager.h"
 #include "GameState.h"
 #include "RageLog.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "SongManager.h"
 #include "ActorUtil.h"
 #include "song.h"
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 4e7bc4924f..e5d20860bf 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -26,7 +26,7 @@
 #include "StepsUtil.h"
 #include "CourseUtil.h"
 #include "RageFileManager.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "CatalogXml.h"
 #include "Foreach.h"
 #include "StatsManager.h"
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index e77c609955..8acbef2ef0 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -55,7 +55,7 @@
 #include "InputQueue.h"
 #include "SongCacheIndex.h"
 #include "BannerCache.h"
-#include "UnlockSystem.h"
+#include "UnlockManager.h"
 #include "RageFileManager.h"
 #include "Bookkeeper.h"
 #include "LightsManager.h"