diff --git a/stepmania/src/GameDef.h b/stepmania/src/GameDef.h
index 6806b35d63..acc6056466 100644
--- a/stepmania/src/GameDef.h
+++ b/stepmania/src/GameDef.h
@@ -12,7 +12,6 @@
 */
 
 #include "Notes.h"
-#include "NoteData.h"
 #include "GameInput.h"
 #include "MenuInput.h"
 #include "GameConstantsAndTypes.h"
diff --git a/stepmania/src/StyleDef.h b/stepmania/src/StyleDef.h
index a9b0e083bf..cba8db86fe 100644
--- a/stepmania/src/StyleDef.h
+++ b/stepmania/src/StyleDef.h
@@ -22,7 +22,6 @@
 */
 
 #include "Notes.h"
-#include "NoteData.h"
 #include "StyleInput.h"
 #include "GameInput.h"
 #include "Game.h"
@@ -30,6 +29,7 @@
 
 const int MAX_COLS_PER_PLAYER = MAX_NOTE_TRACKS;
 
+class NoteData;
 
 class StyleDef
 {