diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp
index 4f5c995b79..a3bf2ed1a3 100644
--- a/stepmania/src/NoteDisplay.cpp
+++ b/stepmania/src/NoteDisplay.cpp
@@ -8,6 +8,8 @@
 #include "ActorUtil.h"
 #include "Game.h"
 #include "PlayerState.h"
+#include "Sprite.h"
+#include "NoteTypes.h"
 #include "LuaBinding.h"
 
 const RString& NoteNotePartToString( NotePart i );
diff --git a/stepmania/src/NoteDisplay.h b/stepmania/src/NoteDisplay.h
index 304a94d96a..503e0a6383 100644
--- a/stepmania/src/NoteDisplay.h
+++ b/stepmania/src/NoteDisplay.h
@@ -1,15 +1,15 @@
 /* NoteDisplay - Draws TapNotes and HoldNotes. */
 
-#ifndef NOTEDISPLAY_H
-#define NOTEDISPLAY_H
+#ifndef NOTE_DISPLAY_H
+#define NOTE_DISPLAY_H
 
-#include "Sprite.h"
+class Actor;
+class Sprite;
 class Model;
-#include "NoteTypes.h"
-
+class PlayerState;
+struct TapNote;
 struct HoldNoteResult;
 struct NoteMetricCache_t;
-class PlayerState;
 
 enum NotePart
 {