diff --git a/stepmania/src/HighScore.cpp b/stepmania/src/HighScore.cpp
index b2973618e4..4667526c03 100644
--- a/stepmania/src/HighScore.cpp
+++ b/stepmania/src/HighScore.cpp
@@ -2,6 +2,7 @@
 #include "HighScore.h"
 #include "PrefsManager.h"
 #include "GameConstantsAndTypes.h"
+#include "PlayerNumber.h"
 #include "ThemeManager.h"
 #include "XmlFile.h"
 #include "Foreach.h"
diff --git a/stepmania/src/HoldJudgment.h b/stepmania/src/HoldJudgment.h
index 541c6c90c2..fd6b8aea71 100644
--- a/stepmania/src/HoldJudgment.h
+++ b/stepmania/src/HoldJudgment.h
@@ -3,6 +3,7 @@
 
 #include "ActorFrame.h"
 #include "GameConstantsAndTypes.h"
+#include "PlayerNumber.h"
 #include "AutoActor.h"
 
 
diff --git a/stepmania/src/NoteTypes.h b/stepmania/src/NoteTypes.h
index d13b26716a..00666f0174 100644
--- a/stepmania/src/NoteTypes.h
+++ b/stepmania/src/NoteTypes.h
@@ -4,6 +4,8 @@
 #define NOTE_TYPES_H
 
 #include "GameConstantsAndTypes.h"
+#include "PlayerNumber.h"
+
 class XNode;
 
 struct TapNoteResult
diff --git a/stepmania/src/PlayerOptions.h b/stepmania/src/PlayerOptions.h
index 318ceb255f..dbcc8439f3 100644
--- a/stepmania/src/PlayerOptions.h
+++ b/stepmania/src/PlayerOptions.h
@@ -9,6 +9,7 @@ class Steps;
 class Trail;
 
 #include "GameConstantsAndTypes.h"
+#include "PlayerNumber.h"
 
 class PlayerOptions
 {
diff --git a/stepmania/src/PlayerStageStats.h b/stepmania/src/PlayerStageStats.h
index 6bc687d3c2..80f1ec3f45 100644
--- a/stepmania/src/PlayerStageStats.h
+++ b/stepmania/src/PlayerStageStats.h
@@ -6,6 +6,7 @@
 #include "Grade.h"
 #include "RadarValues.h"
 #include "HighScore.h"
+#include "PlayerNumber.h"
 #include <map>
 class Steps;
 struct lua_State;