diff --git a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp
index ca503a965f..bcfda1cf89 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp
@@ -8,6 +8,8 @@
 #include "RageUtil.h"
 #include "ALSA9Dynamic.h"
 
+REGISTER_SOUND_DRIVER_CLASS( ALSA9 );
+
 const int channels = 2;
 const int samplerate = 44100;
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.h b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.h
index 7c24cdb78f..a005f6c52e 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.h
@@ -71,7 +71,6 @@ private:
 
 	void GetData();
 };
-#define USE_RAGE_SOUND_ALSA9
 
 #endif
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.cpp
index f13534c665..2d9d1439b0 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.cpp
@@ -14,6 +14,8 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
+REGISTER_SOUND_DRIVER_CLASS2( ALSA-sw, ALSA9_Software );
+
 static const int channels = 2;
 static const int samples_per_frame = channels;
 static const int bytes_per_frame = sizeof(int16_t) * samples_per_frame;
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h
index 0836b6e7e9..1b5b94dc65 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h
@@ -31,7 +31,6 @@ private:
 	Alsa9Buf *m_pPCM;
 	RageThread m_MixingThread;
 };
-#define USE_RAGE_SOUND_ALSA9_SOFTWARE
 
 #endif
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
index 86f1408b12..b497305ffd 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
@@ -14,6 +14,8 @@
 #include "RageLog.h"
 #include "archutils/Win32/ErrorStrings.h"
 
+REGISTER_SOUND_DRIVER_CLASS2( DirectSound, DSound );
+
 const int channels = 2;
 const int bytes_per_frame = 2 * channels; /* 16-bit */
 const int samplerate = 44100;
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound.h b/stepmania/src/arch/Sound/RageSoundDriver_DSound.h
index d69e792e13..8fc4afa656 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound.h
@@ -69,7 +69,6 @@ private:
 
 	int GetSampleRate( int rate ) const { return rate; }
 };
-#define USE_RAGE_SOUND_DSOUND
 
 #endif
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
index 15603be0c7..30f5a21ffc 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
@@ -8,6 +8,8 @@
 #include "PrefsManager.h"
 #include "archutils/Win32/ErrorStrings.h"
 
+REGISTER_SOUND_DRIVER_CLASS2( DirectSound-sw, DSound_Software );
+
 static const int channels = 2;
 static const int bytes_per_frame = channels*2; /* 16-bit */
 static const int safe_writeahead = 1024*4; /* in frames */
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
index 1aa78f9623..bd6f40c856 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
@@ -30,7 +30,6 @@ private:
 	void MixerThread();
 	RageThread m_MixingThread;
 };
-#define USE_RAGE_SOUND_DSOUND_SOFTWARE
 
 #endif
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_OSS.cpp b/stepmania/src/arch/Sound/RageSoundDriver_OSS.cpp
index cf1fcc60fe..2803f010a7 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_OSS.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_OSS.cpp
@@ -14,6 +14,8 @@
 #include <sys/soundcard.h>
 #include <sys/select.h>
 
+REGISTER_SOUND_DRIVER_CLASS( OSS );
+
 /* samples */
 const int channels = 2;
 const int bytes_per_frame = channels*2;		/* 16-bit */
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_OSS.h b/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
index 73b7675df1..14770a4cde 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
@@ -32,7 +32,6 @@ public:
 	RString Init();
 	~RageSound_OSS();
 };
-#define USE_RAGE_SOUND_OSS
 
 #endif
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
index 325bd5a874..78cff391cb 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
@@ -13,6 +13,8 @@
 #include "PrefsManager.h"
 #include "archutils/Win32/ErrorStrings.h"
 
+REGISTER_SOUND_DRIVER_CLASS( WaveOut );
+
 const int channels = 2;
 const int bytes_per_frame = channels*2;		/* 16-bit */
 const int buffersize_frames = 1024*8;	/* in frames */
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
index 103b675671..92d543812a 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
@@ -31,7 +31,6 @@ private:
 	bool m_bShutdown;
 	int m_iLastCursorPos;
 };
-#define USE_RAGE_SOUND_WAVE_OUT
 
 #endif