diff --git a/stepmania/src/arch/Sound/DSoundHelpers.cpp b/stepmania/src/arch/Sound/DSoundHelpers.cpp
index 4e03b677ae..4318d5bb71 100644
--- a/stepmania/src/arch/Sound/DSoundHelpers.cpp
+++ b/stepmania/src/arch/Sound/DSoundHelpers.cpp
@@ -7,6 +7,9 @@
 #include <mmsystem.h>
 #include <dsound.h>
 
+#pragma comment(lib, "dsound.lib")
+#pragma comment(lib, "dxguid.lib")
+
 DSound::DSound()
 {
 	HRESULT hr;
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
index e8ffacff50..8fbc4889db 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
@@ -19,9 +19,6 @@
 
 RageSoundManager *SOUNDMAN = NULL;
 
-#pragma comment(lib, "dsound.lib")
-#pragma comment(lib, "dxguid.lib")
-
 const int channels = 2;
 const int samplesize = 2 * channels; /* 16-bit */
 const int samplerate = 44100;
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
index ea675f3756..63917fb4e3 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
@@ -2,15 +2,6 @@
 #include "RageSoundDriver_DSound_Software.h"
 #include "DSoundHelpers.h"
 
-/* Known problems:
- *
- * Skips between screen changes in the software mixer.  This is because we use
- * a smaller buffer.  The hardware mixer uses a larger buffer, so the CPU used
- * loading the new screen isn't a problem.  We can't just stop sounds; we want
- * music to keep playing while we're between screens.  Throw a few SDL_Sleep(0)s
- * in strategic places?
- */
-
 #include "../../RageTimer.h"
 #include "../../RageLog.h"
 #include "../../RageSound.h"
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
index 25a23cb9fc..475a386d5c 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
@@ -1,15 +1,7 @@
 #include "../../stdafx.h"
 #include "RageSoundDriver_WaveOut.h"
-// #include "DSoundHelpers.h"
 
-/* Known problems:
- *
- * Skips between screen changes in the software mixer.  This is because we use
- * a smaller buffer.  The hardware mixer uses a larger buffer, so the CPU used
- * loading the new screen isn't a problem.  We can't just stop sounds; we want
- * music to keep playing while we're between screens.  Throw a few SDL_Sleep(0)s
- * in strategic places?
- */
+#pragma comment(lib, "winmm.lib")
 
 #include "../../RageTimer.h"
 #include "../../RageLog.h"