diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index e402312426..59f8a17e36 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -20,6 +20,7 @@
 #include "PrefsManager.h"
 #include "RageException.h"
 #include "arch/LoadingWindow/LoadingWindow.h"
+#include "Course.h"
 
 #include "AnnouncerManager.h"
 #include "ThemeManager.h"
@@ -624,6 +625,8 @@ RageColor SongManager::GetSongColor( const Song* pSong )
 	for( unsigned i=0; i<pSong->m_apNotes.size(); i++ )
 	{
 		const Notes* pNotes = pSong->m_apNotes[i];
+		if( pNotes->GetDifficulty() == DIFFICULTY_CHALLENGE )
+			continue;
 
 //		if(pNotes->m_NotesType != nt)
 //			continue;
diff --git a/stepmania/src/SongManager.h b/stepmania/src/SongManager.h
index a265821e0b..4e9d655974 100644
--- a/stepmania/src/SongManager.h
+++ b/stepmania/src/SongManager.h
@@ -13,13 +13,19 @@
 */
 
 
-#include "Course.h"
-
 class LoadingWindow;
 class Song;
 class StyleDef;
+class Course;
+class Notes;
 struct PlayerOptions;
 
+#include "RageTypes.h"
+#include "GameConstantsAndTypes.h"
+#include "SongOptions.h"
+#include "PlayerOptions.h"
+#include "PlayerNumber.h"
+
 class SongManager
 {
 public: