diff --git a/sound/decoders/wave.cpp b/sound/decoders/wave.cpp
index eeab026ae5c..fcaace5301f 100644
--- a/sound/decoders/wave.cpp
+++ b/sound/decoders/wave.cpp
@@ -90,15 +90,15 @@ bool loadWAVFromStream(Common::SeekableReadStream &stream, int &size, int &rate,
 	if (blockAlign_ != 0)
 		*blockAlign_ = blockAlign;
 #if 0
-	printf("WAVE information:\n");
-	printf("  total size: %d\n", wavLength);
-	printf("  fmt size: %d\n", fmtLength);
-	printf("  type: %d\n", type);
-	printf("  numChannels: %d\n", numChannels);
-	printf("  samplesPerSec: %d\n", samplesPerSec);
-	printf("  avgBytesPerSec: %d\n", avgBytesPerSec);
-	printf("  blockAlign: %d\n", blockAlign);
-	printf("  bitsPerSample: %d\n", bitsPerSample);
+	debug("WAVE information:");
+	debug("  total size: %d", wavLength);
+	debug("  fmt size: %d", fmtLength);
+	debug("  type: %d", type);
+	debug("  numChannels: %d", numChannels);
+	debug("  samplesPerSec: %d", samplesPerSec);
+	debug("  avgBytesPerSec: %d", avgBytesPerSec);
+	debug("  blockAlign: %d", blockAlign);
+	debug("  bitsPerSample: %d", bitsPerSample);
 #endif
 
 	if (type != 1 && type != 2 && type != 17) {
@@ -152,7 +152,7 @@ bool loadWAVFromStream(Common::SeekableReadStream &stream, int &size, int &rate,
 		offset = stream.readUint32LE();
 
 #if 0
-		printf("  found a '%s' tag of size %d\n", buf, offset);
+		debug("  found a '%s' tag of size %d", buf, offset);
 #endif
 	} while (memcmp(buf, "data", 4) != 0);
 
diff --git a/sound/rate_arm.cpp b/sound/rate_arm.cpp
index 5bab6ca59da..63008fcb876 100644
--- a/sound/rate_arm.cpp
+++ b/sound/rate_arm.cpp
@@ -168,18 +168,16 @@ extern "C" int SimpleRate_readFudge(Audio::AudioStream &input,
                                     int16 *a, int b)
 {
 #ifdef DEBUG_RATECONV
-  fprintf(stderr, "Reading ptr=%x n%d\n", a, b);
-  fflush(stderr);
+	debug("Reading ptr=%x n%d", a, b);
 #endif
-  return input.readBuffer(a, b);
+	return input.readBuffer(a, b);
 }
 
 template<bool stereo, bool reverseStereo>
 int SimpleRateConverter<stereo, reverseStereo>::flow(AudioStream &input, st_sample_t *obuf, st_size_t osamp, st_volume_t vol_l, st_volume_t vol_r) {
 
 #ifdef DEBUG_RATECONV
-fprintf(stderr, "Simple st=%d rev=%d\n", stereo, reverseStereo);
-fflush(stderr);
+	debug("Simple st=%d rev=%d", stereo, reverseStereo);
 #endif
 	st_sample_t *ostart = obuf;
 
@@ -318,8 +316,7 @@ template<bool stereo, bool reverseStereo>
 int LinearRateConverter<stereo, reverseStereo>::flow(AudioStream &input, st_sample_t *obuf, st_size_t osamp, st_volume_t vol_l, st_volume_t vol_r) {
 
 #ifdef DEBUG_RATECONV
-fprintf(stderr, "Linear st=%d rev=%d\n", stereo, reverseStereo);
-fflush(stderr);
+	debug("Linear st=%d rev=%d", stereo, reverseStereo);
 #endif
 	st_sample_t *ostart = obuf;
 
@@ -393,8 +390,7 @@ public:
 		assert(input.isStereo() == stereo);
 
 #ifdef DEBUG_RATECONV
-fprintf(stderr, "Copy st=%d rev=%d\n", stereo, reverseStereo);
-fflush(stderr);
+		debug("Copy st=%d rev=%d", stereo, reverseStereo);
 #endif
 		st_size_t len;
                 st_sample_t *ostart = obuf;