diff --git a/stepmania/src/ScreenMessage.cpp b/stepmania/src/ScreenMessage.cpp
index c8b2c976df..8d7cdcd68e 100644
--- a/stepmania/src/ScreenMessage.cpp
+++ b/stepmania/src/ScreenMessage.cpp
@@ -2,6 +2,7 @@
 #include "ScreenMessage.h"
 #include "RageLog.h"
 #include "Foreach.h"
+#include <map>
 
 const ScreenMessage SM_Invalid = 999999;
 AutoScreenMessage(SM_None);
@@ -16,9 +17,10 @@ AutoScreenMessage(SM_Pause);
 AutoScreenMessage(SM_Success);
 AutoScreenMessage(SM_Failure);
 
-ASMHClass AutoScreenMessageHandler;
+static map<RString, ScreenMessage> *m_pScreenMessages;
+static ScreenMessage m_iCurScreenMessage;
 
-ScreenMessage ASMHClass::ToMessageNumber( const RString &sName )
+ScreenMessage ScreenMessageHelpers::ToMessageNumber( const RString &sName )
 {
 	if( m_pScreenMessages == NULL )
 	{
@@ -35,7 +37,7 @@ ScreenMessage ASMHClass::ToMessageNumber( const RString &sName )
 	return (*m_pScreenMessages)[sName];
 }
 
-RString	ASMHClass::NumberToString( ScreenMessage SM ) const
+RString	ScreenMessageHelpers::NumberToString( ScreenMessage SM )
 {
 	FOREACHM( RString, ScreenMessage, *m_pScreenMessages, it )
 		if( SM == it->second )
diff --git a/stepmania/src/ScreenMessage.h b/stepmania/src/ScreenMessage.h
index 9bba5c383c..ed13c1a70e 100644
--- a/stepmania/src/ScreenMessage.h
+++ b/stepmania/src/ScreenMessage.h
@@ -3,8 +3,6 @@
 #ifndef SCREEN_MESSAGE_H
 #define SCREEN_MESSAGE_H
 
-#include <map>
-
 typedef int ScreenMessage;
 
 extern const ScreenMessage SM_Invalid;
@@ -20,22 +18,15 @@ extern const ScreenMessage SM_Pause;
 extern const ScreenMessage SM_Success;
 extern const ScreenMessage SM_Failure;
 
-class ASMHClass
+namespace ScreenMessageHelpers
 {
-public:
 	ScreenMessage ToMessageNumber( const RString & Name );
-	RString	NumberToString( ScreenMessage SM ) const;
-
-private:
-	map<RString, ScreenMessage> *m_pScreenMessages;
-	ScreenMessage m_iCurScreenMessage;
+	RString	NumberToString( ScreenMessage SM );
 };
 
-extern ASMHClass AutoScreenMessageHandler;
-
 // Automatically generate a unique ScreenMessage value
 #define AutoScreenMessage( x ) \
-	const ScreenMessage x = AutoScreenMessageHandler.ToMessageNumber( #x );
+	const ScreenMessage x = ScreenMessageHelpers::ToMessageNumber( #x );
 
 
 #endif