diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
index bec6a0a6d4..902da70590 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
@@ -45,7 +45,7 @@ static void DoCrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *u
 	if( !IsFatalSignal(signal) )
 		return;
 
-	CrashSignalHandler( signal, si, uc );
+	CrashHandler::CrashSignalHandler( signal, si, uc );
 }
 #endif
 
@@ -151,8 +151,8 @@ ArchHooks_Unix::ArchHooks_Unix()
 	SignalHandler::OnClose( DoCleanShutdown );
 
 #if defined(CRASH_HANDLER)
-	CrashHandlerHandleArgs( g_argc, g_argv );
-	InitializeCrashHandler();
+	CrashHandler::CrashHandlerHandleArgs( g_argc, g_argv );
+	CrashHandler::InitializeCrashHandler();
 	SignalHandler::OnClose( DoCrashSignalHandler );
 #endif
 
diff --git a/stepmania/src/archutils/Unix/CrashHandler.cpp b/stepmania/src/archutils/Unix/CrashHandler.cpp
index c80de91166..f8744c4e16 100644
--- a/stepmania/src/archutils/Unix/CrashHandler.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandler.cpp
@@ -352,7 +352,7 @@ static void RunCrashHandler( const CrashData *crash )
 	}
 }
 
-void ForceCrashHandler( const char *reason )
+void CrashHandler::ForceCrash( const char *reason )
 {
 	CrashData crash;
 	memset( &crash, 0, sizeof(crash) );
@@ -366,7 +366,7 @@ void ForceCrashHandler( const char *reason )
 	RunCrashHandler( &crash );
 }
 
-void ForceCrashHandlerDeadlock( CString reason, uint64_t iID )
+void CrashHandler::ForceDeadlock( CString reason, uint64_t iID )
 {
 	CrashData crash;
 	memset( &crash, 0, sizeof(crash) );
@@ -417,7 +417,7 @@ void ForceCrashHandlerDeadlock( CString reason, uint64_t iID )
 
 /* XXX test for recursive crashes here (eg. GetBacktrace crashing) */
 
-void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc )
+void CrashHandler::CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc )
 {
 	CrashData crash;
 	memset( &crash, 0, sizeof(crash) );
@@ -435,7 +435,7 @@ void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc )
 	RunCrashHandler( &crash );
 }
 
-void InitializeCrashHandler()
+void CrashHandler::InitializeCrashHandler()
 {
 	InitializeBacktrace();
 }
diff --git a/stepmania/src/archutils/Unix/CrashHandler.h b/stepmania/src/archutils/Unix/CrashHandler.h
index 232affdfeb..622afa9238 100644
--- a/stepmania/src/archutils/Unix/CrashHandler.h
+++ b/stepmania/src/archutils/Unix/CrashHandler.h
@@ -1,15 +1,18 @@
 #ifndef CRASH_HANDLER_H
 #define CRASH_HANDLER_H
 
-void ForceCrashHandler( const char *reason );
-struct BacktraceContext;
-void ForceCrashHandlerDeadlock( CString reason, uint64_t CrashHandle );
-void CrashHandlerHandleArgs( int argc, char* argv[] );
-void InitializeCrashHandler();
-	
 #include <csignal>
 #include <ucontext.h>
-void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc );
+struct BacktraceContext;
+
+namespace CrashHandler
+{
+	void CrashHandlerHandleArgs( int argc, char* argv[] );
+	void InitializeCrashHandler();
+	void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc );
+	void ForceCrash( const char *reason );
+	void ForceDeadlock( CString reason, uint64_t CrashHandle );
+}
 
 #endif
 
diff --git a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
index f5f9c89fee..1aee0d3c9b 100644
--- a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
@@ -366,7 +366,7 @@ static void child_process()
 }
 
 
-void CrashHandlerHandleArgs( int argc, char* argv[] )
+void CrashHandler::CrashHandlerHandleArgs( int argc, char* argv[] )
 {
 	g_pCrashHandlerArgv0 = argv[0];
 	if( argc == 2 && !strcmp(argv[1], CHILD_MAGIC_PARAMETER) )