diff --git a/stepmania/src/BitmapText.h b/stepmania/src/BitmapText.h
index 94e60a26a5..90b1025c7b 100644
--- a/stepmania/src/BitmapText.h
+++ b/stepmania/src/BitmapText.h
@@ -6,6 +6,9 @@
 #include "Actor.h"
 class RageTexture;
 
+class Font;
+
+
 template<class T>
 class LunaBitmapText : public LunaActor<T>
 {
@@ -24,8 +27,6 @@ public:
 };
 
 
-class Font;
-
 class BitmapText : public Actor
 {
 public:
diff --git a/stepmania/src/MessageManager.h b/stepmania/src/MessageManager.h
index c1d184cc1f..aace0cd5e4 100644
--- a/stepmania/src/MessageManager.h
+++ b/stepmania/src/MessageManager.h
@@ -6,8 +6,6 @@
 #include <set>
 #include <map>
 class Actor;
-struct XNode;
-
 
 
 class MessageManager
diff --git a/stepmania/src/ScoreDisplayNormal.cpp b/stepmania/src/ScoreDisplayNormal.cpp
index 67d276f5b5..265e7419d5 100644
--- a/stepmania/src/ScoreDisplayNormal.cpp
+++ b/stepmania/src/ScoreDisplayNormal.cpp
@@ -10,10 +10,6 @@
 #include "CommonMetrics.h"
 
 
-const float SCORE_TWEEN_TIME = 0.2f;
-const int NUM_SCORE_DIGITS	=	9;
-
-
 ScoreDisplayNormal::ScoreDisplayNormal()
 {
 	LOG->Trace( "ScoreDisplayNormal::ScoreDisplayNormal()" );