include cleanup (not much of a win)

stepmania/src/ConditionalBGA.h

@@ -4,6 +4,7 @@
 #include "PlayerOptions.h"
 #include "GameConstantsAndTypes.h"
 #include "BGAnimation.h"
+#include "Difficulty.h"
 
 class Style;
 

stepmania/src/DifficultyDisplay.h

@@ -4,6 +4,7 @@
 #include "GameConstantsAndTypes.h"
 #include "Sprite.h"
 #include "ActorFrame.h"
+#include "Difficulty.h"
 
 class Song;
 

stepmania/src/DifficultyIcon.h

@@ -6,6 +6,7 @@
 #include "Sprite.h"
 #include "PlayerNumber.h"
 #include "GameConstantsAndTypes.h"
+#include "Difficulty.h"
 class Steps;
 class Trail;
 

stepmania/src/DifficultyMeter.h

@@ -8,6 +8,7 @@
 #include "ActorFrame.h"
 #include "GameConstantsAndTypes.h"
 #include "ActorUtil.h"
+#include "Difficulty.h"
 
 class Steps;
 class Trail;

stepmania/src/GameCommand.h

@@ -5,6 +5,7 @@
 
 #include "GameConstantsAndTypes.h"
 #include "PlayerNumber.h"
+#include "Difficulty.h"
 #include <map>
 
 class Song;

stepmania/src/GameConstantsAndTypes.h

@@ -4,7 +4,6 @@
 #define GAME_CONSTANTS_AND_TYPES_H
 
 #include "PlayerNumber.h"	// TODO: Get rid of this dependency.  -Chris
-#include "Difficulty.h"		// TODO: Get rid of this dependency.
 #include "EnumHelper.h"
 
 

stepmania/src/GameState.h

@@ -8,6 +8,7 @@
 #include "Grade.h"
 #include "Attack.h"
 #include "RageTimer.h"
+#include "Difficulty.h"
 
 #include <map>
 #include <deque>

stepmania/src/GrooveGraph.h

@@ -6,6 +6,7 @@
 #include "ActorFrame.h"
 #include "Sprite.h"
 #include "GameConstantsAndTypes.h"
+#include "Difficulty.h"
 class Song;
 
 

stepmania/src/JukeboxMenu.h

@@ -8,6 +8,7 @@
 #include "GameConstantsAndTypes.h"
 #include "RandomSample.h"
 #include "BitmapText.h"
+#include "Difficulty.h"
 
 class Style;
 

stepmania/src/ScreenRanking.h

@@ -8,6 +8,7 @@
 #include "Banner.h"
 #include "ListDisplay.h"
 #include "ActorUtil.h"
+#include "Difficulty.h"
 
 class Course;
 class Song;

stepmania/src/SongManager.h

@@ -15,6 +15,7 @@ struct PlayerOptions;
 #include "SongOptions.h"
 #include "PlayerOptions.h"
 #include "PlayerNumber.h"
+#include "Difficulty.h"
 
 class SongManager
 {

stepmania/src/SongUtil.h

@@ -4,6 +4,7 @@
 #define SONG_UTIL_H
 
 #include "GameConstantsAndTypes.h"
+#include "Difficulty.h"
 
 class Song;
 class Profile;

stepmania/src/Steps.h

@@ -7,6 +7,7 @@
 #include "PlayerNumber.h"
 #include "Grade.h"
 #include "RadarValues.h"
+#include "Difficulty.h"
 class NoteData;
 class Profile;
 

stepmania/src/StepsUtil.h

@@ -2,6 +2,7 @@
 #define STEPSUTIL_H
 
 #include "GameConstantsAndTypes.h"
+#include "Difficulty.h"
 
 class Steps;
 class Song;

stepmania/src/Trail.h

@@ -5,6 +5,7 @@
 
 #include "Attack.h"
 #include "RadarValues.h"
+#include "Difficulty.h"
 
 class Song;
 class Steps;

stepmania/src/TrailUtil.h

@@ -2,6 +2,7 @@
 #define TRAIL_UTIL_H
 
 #include "GameConstantsAndTypes.h"
+#include "Difficulty.h"
 
 class Song;
 class Trail;

stepmania/src/song.h

@@ -7,6 +7,7 @@
 #include "GameConstantsAndTypes.h"
 #include "Grade.h"
 #include "TimingData.h"
+#include "Difficulty.h"
 
 class Steps;
 class Style;