diff --git a/stepmania/src/Judgment.cpp b/stepmania/src/Judgment.cpp
index f88af5b8fe..8ba4a7804a 100644
--- a/stepmania/src/Judgment.cpp
+++ b/stepmania/src/Judgment.cpp
@@ -18,12 +18,12 @@
 #include "ThemeManager.h"
 
 
-CachedThemeMetric	MARVELOUS_COMMAND	("Judgment","MarvelousCommand");
-CachedThemeMetric	PERFECT_COMMAND		("Judgment","PerfectCommand");
-CachedThemeMetric	GREAT_COMMAND		("Judgment","GreatCommand");
-CachedThemeMetric	GOOD_COMMAND		("Judgment","GoodCommand");
-CachedThemeMetric	BOO_COMMAND			("Judgment","BooCommand");
-CachedThemeMetric	MISS_COMMAND		("Judgment","MissCommand");
+static CachedThemeMetric	MARVELOUS_COMMAND	("Judgment","MarvelousCommand");
+static CachedThemeMetric	PERFECT_COMMAND		("Judgment","PerfectCommand");
+static CachedThemeMetric	GREAT_COMMAND		("Judgment","GreatCommand");
+static CachedThemeMetric	GOOD_COMMAND		("Judgment","GoodCommand");
+static CachedThemeMetric	BOO_COMMAND			("Judgment","BooCommand");
+static CachedThemeMetric	MISS_COMMAND		("Judgment","MissCommand");
 
 
 Judgment::Judgment()
@@ -41,16 +41,6 @@ Judgment::Judgment()
 	this->AddChild( &m_sprJudgment );
 }
 
-void Judgment::Update( float fDeltaTime )
-{
-	ActorFrame::Update( fDeltaTime );
-}
-
-void Judgment::DrawPrimitives()
-{
-	ActorFrame::DrawPrimitives();
-}
-
 
 void Judgment::Reset()
 {
diff --git a/stepmania/src/Judgment.h b/stepmania/src/Judgment.h
index 02387b7d46..b5d79ea093 100644
--- a/stepmania/src/Judgment.h
+++ b/stepmania/src/Judgment.h
@@ -13,19 +13,14 @@
 
 #include "Sprite.h"
 #include "ActorFrame.h"
-#include "song.h"
+#include "GameConstantsAndTypes.h"
 #include "BitmapText.h"
-#include "PrefsManager.h"
 
 
 class Judgment : public ActorFrame
 {
 public:
 	Judgment();
-	virtual ~Judgment() { }
-
-	virtual void Update( float fDeltaTime );
-	virtual void DrawPrimitives();
 
 	void Reset();
 	void SetJudgment( TapNoteScore score );