diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound.h b/stepmania/src/arch/Sound/RageSoundDriver_DSound.h
index 23d3bb69db..17116e579a 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound.h
@@ -33,7 +33,6 @@ class RageSound_DSound: public RageSoundDriver
 	    stream() { pcm = NULL; snd = NULL; state=INACTIVE; }
 		~stream();
 	};
-	friend struct stream;
 
 	/* Pool of available streams. */
 	vector<stream *> stream_pool;
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
index 76331dc2a9..4dd7584e85 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
@@ -14,10 +14,8 @@ class RageSound_DSound_Software: public RageSoundDriver
 	struct sound {
 	    RageSoundBase *snd;
 		RageTimer start_time;
-
 		bool stopping;
-
-		int flush_pos; /* state == STOPPING only */
+		int flush_pos; /* when stopping only */
 
 	    sound() { snd = NULL; stopping=false; }
 	};