diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 340e9c0170..7c5b7d0a1a 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -26,6 +26,7 @@
 #include "ArrowEffects.h"
 #include "Game.h"
 #include "NetworkSyncManager.h"	//used for sending timing offset
+#include "DancingCharacters.h"
 
 CachedThemeMetricF GRAY_ARROWS_Y_STANDARD		("Player","ReceptorArrowsYStandard");
 CachedThemeMetricF GRAY_ARROWS_Y_REVERSE		("Player","ReceptorArrowsYReverse");
diff --git a/stepmania/src/Player.h b/stepmania/src/Player.h
index cadf312a91..f5dbbb7253 100644
--- a/stepmania/src/Player.h
+++ b/stepmania/src/Player.h
@@ -17,7 +17,6 @@
 #include "RageTimer.h"
 #include "ProTimingDisplay.h"
 #include "RageSound.h"
-#include "DancingCharacters.h"
 #include "AttackDisplay.h"
 #include "NoteField.h"
 
@@ -82,7 +81,6 @@ protected:
 	AttackDisplay	m_AttackDisplay;
 
 	int m_iDCState;
-//	DancingCharacters* m_pDancingCharacters; // used to adjust the 2D anims dancing states
 	LifeMeter*		m_pLifeMeter;
 	CombinedLifeMeter*		m_pCombinedLifeMeter;
 	ScoreDisplay*	m_pScoreDisplay;
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index b5ee5234e9..e638fac497 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -39,6 +39,7 @@
 #include "PlayerAI.h"	// for NUM_SKILL_LEVELS
 #include "NetworkSyncManager.h"
 #include "Foreach.h"
+#include "DancingCharacters.h"
 
 //
 // Defines
diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp
index ffba6a93eb..065e1f4e1f 100644
--- a/stepmania/src/ScreenHowToPlay.cpp
+++ b/stepmania/src/ScreenHowToPlay.cpp
@@ -11,6 +11,7 @@
 #include "GameManager.h"
 #include "NotesLoaderSM.h"
 #include "GameSoundManager.h"
+#include "Model.h"
 
 #define SECONDS_TO_SHOW						THEME->GetMetricF("ScreenHowToPlay","SecondsToShow")
 #define STEPFILE							THEME->GetMetric ("ScreenHowToPlay","Stepfile")