diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp
index 93d9f567ef..c26dccd2e4 100644
--- a/stepmania/src/NotesLoaderKSF.cpp
+++ b/stepmania/src/NotesLoaderKSF.cpp
@@ -7,6 +7,8 @@
 #include "RageUtil.h"
 #include "NoteData.h"
 #include "NoteTypes.h"
+#include "song.h"
+#include "Steps.h"
 
 #if 0
 void KSFLoader::RemoveHoles( NoteData &out, const Song &song )
diff --git a/stepmania/src/NotesLoaderKSF.h b/stepmania/src/NotesLoaderKSF.h
index f3d6c3567a..b645dd8ed5 100644
--- a/stepmania/src/NotesLoaderKSF.h
+++ b/stepmania/src/NotesLoaderKSF.h
@@ -3,10 +3,12 @@
 #ifndef NOTES_LOADER_KSF_H
 #define NOTES_LOADER_KSF_H
 
-#include "song.h"
-#include "Steps.h"
 #include "NotesLoader.h"
 
+class Song;
+class Steps;
+class NoteData;
+
 class KSFLoader: public NotesLoader
 {
 	bool LoadFromKSFFile( const CString &sPath, Steps &out, const Song &song );
diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp
index 3eac033a35..90dc148c7b 100644
--- a/stepmania/src/NotesLoaderSM.cpp
+++ b/stepmania/src/NotesLoaderSM.cpp
@@ -9,6 +9,8 @@
 #include "RageFileManager.h"
 #include "NoteTypes.h"
 #include "BackgroundUtil.h"
+#include "song.h"
+#include "Steps.h"
 
 #define MAX_EDIT_SIZE_BYTES  20*1024	// 20 KB
 
diff --git a/stepmania/src/NotesLoaderSM.h b/stepmania/src/NotesLoaderSM.h
index 10b2ee41ae..f07f6da199 100644
--- a/stepmania/src/NotesLoaderSM.h
+++ b/stepmania/src/NotesLoaderSM.h
@@ -3,11 +3,13 @@
 #ifndef NOTES_LOADER_SM_H
 #define NOTES_LOADER_SM_H
 
-#include "song.h"
-#include "Steps.h"
 #include "NotesLoader.h"
+#include "GameConstantsAndTypes.h"
 
 class MsdFile;
+class Song;
+class Steps;
+class TimingData;
 
 class SMLoader: public NotesLoader
 {
diff --git a/stepmania/src/NotesWriterDWI.cpp b/stepmania/src/NotesWriterDWI.cpp
index 4a0a1e9085..a64826ddbb 100644
--- a/stepmania/src/NotesWriterDWI.cpp
+++ b/stepmania/src/NotesWriterDWI.cpp
@@ -7,6 +7,8 @@
 #include "RageFile.h"
 #include "NoteDataUtil.h"
 #include "RageFile.h"
+#include "song.h"
+#include "Steps.h"
 
 /* Output is an angle bracket expression without angle brackets, eg. "468". */
 CString NotesWriterDWI::NotesToDWIString( const TapNote tnCols[6] )
diff --git a/stepmania/src/NotesWriterDWI.h b/stepmania/src/NotesWriterDWI.h
index e660b820ea..d747be59e5 100644
--- a/stepmania/src/NotesWriterDWI.h
+++ b/stepmania/src/NotesWriterDWI.h
@@ -3,11 +3,11 @@
 #ifndef NOTES_WRITER_DWI_H
 #define NOTES_WRITER_DWI_H
 
-#include "song.h"
-#include "Steps.h"
 #include "NoteTypes.h"
 
 class RageFile;
+class Song;
+class Steps;
 class NotesWriterDWI
 {
 	CString NotesToDWIString( TapNote cNoteCol1, TapNote cNoteCol2, TapNote cNoteCol3, TapNote cNoteCol4, TapNote cNoteCol5, TapNote cNoteCol6 );
diff --git a/stepmania/src/ScoreKeeperMAX2.h b/stepmania/src/ScoreKeeperMAX2.h
index db050dd50f..1c63003e00 100644
--- a/stepmania/src/ScoreKeeperMAX2.h
+++ b/stepmania/src/ScoreKeeperMAX2.h
@@ -5,9 +5,9 @@
 
 #include "ScoreKeeper.h"
 #include "Attack.h"
-#include "song.h"
-#include "Steps.h"
 class Steps;
+class Song;
+struct RadarValues;
 
 class ScoreKeeperMAX2: public ScoreKeeper
 {