diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index c932e661ec..5da1554931 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -6,7 +6,6 @@
 #include "NoteTypes.h"
 #include <map>
 #include <set>
-#include "Attack.h"
 
 #define FOREACH_NONEMPTY_ROW_IN_TRACK( nd, track, row ) \
 	for( int row = -1; (nd).GetNextTapNoteRowForTrack(track,row); )
diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 62d07841b4..694c04a606 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -19,6 +19,7 @@
 #include <float.h>
 #include "BackgroundUtil.h"
 #include "Course.h"
+#include "NoteData.h"
 
 NoteField::NoteField()
 {	
diff --git a/stepmania/src/NoteField.h b/stepmania/src/NoteField.h
index 2910d95936..5a9e42fd05 100644
--- a/stepmania/src/NoteField.h
+++ b/stepmania/src/NoteField.h
@@ -7,11 +7,13 @@
 #include "ActorFrame.h"
 #include "BitmapText.h"
 #include "Quad.h"
-#include "NoteData.h"
 #include "NoteDisplay.h"
 #include "ReceptorArrowRow.h"
 #include "GhostArrowRow.h"
 
+class Attack;
+class NoteData;
+
 class NoteField : public ActorFrame
 {
 public: