5 files changed, 18 insertions, 11 deletions
diff --git a/sound/iff.cpp b/sound/iff_sound.cpp
index 1df58b178c..60a1486ed5 100644
--- a/sound/iff.cpp
+++ b/sound/iff_sound.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/iff.h"
+#include "sound/iff_sound.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 #include "common/func.h"
diff --git a/sound/iff.h b/sound/iff_sound.h
index 82106cb75e..82106cb75e 100644
--- a/sound/iff.h
+++ b/sound/iff_sound.h
diff --git a/sound/module.mk b/sound/module.mk
index dba9501a38..3bcdd47c56 100644
--- a/sound/module.mk
+++ b/sound/module.mk
@@ -5,7 +5,7 @@ MODULE_OBJS := \
 	aiff.o \
 	audiocd.o \
 	audiostream.o \
-	iff.o \
+	iff_sound.o \
 	flac.o \
 	fmopl.o \
 	mididrv.o \
diff --git a/sound/shorten.cpp b/sound/shorten.cpp
index d1031aed3a..e8066a49be 100644
--- a/sound/shorten.cpp
+++ b/sound/shorten.cpp
@@ -23,13 +23,9 @@
  *
  */
 
-// The code in this file is currently only used in SAGA2 (in the
-// SAGA engine), so if that engine isn't enabled, we will skip
-// compiling it. If you plan to use this code in another engine,
-// you will have to add the proper define check here.
-// Also please add the define check at the comment after the
-// matching #endif further down this file.
-#if defined(ENABLE_SAGA2)
+#include "sound/shorten.h"
+
+#ifdef SOUND_SHORTEN_H
 
 // Based on etree's Shorten tool, version 3.6.1
 // http://etree.org/shnutils/shorten/
@@ -40,7 +36,6 @@
 #include "common/util.h"
 #include "common/stream.h"
 
-#include "sound/shorten.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 
@@ -535,5 +530,5 @@ AudioStream *makeShortenStream(Common::SeekableReadStream &stream) {
 
 } // End of namespace Audio
 
-#endif // defined(ENABLE_SAGA2)
+#endif // defined(SOUND_SHORTEN_H)
 
diff --git a/sound/shorten.h b/sound/shorten.h
index fa45ecc65d..c2a40280d3 100644
--- a/sound/shorten.h
+++ b/sound/shorten.h
@@ -23,6 +23,14 @@
  *
  */
 
+// The code in this file is currently only used in SAGA2 (in the
+// SAGA engine), so if that engine isn't enabled, we will skip
+// compiling it. If you plan to use this code in another engine,
+// you will have to add the proper define check here.
+// Also please add the define check at the comment after the
+// matching #endif further down this file.
+#if defined(ENABLE_SAGA2)
+
 #ifndef SOUND_SHORTEN_H
 #define SOUND_SHORTEN_H
 
@@ -53,3 +61,7 @@ AudioStream *makeShortenStream(Common::ReadStream &stream);
 } // End of namespace Audio
 
 #endif
+
+#endif // defined(ENABLE_SAGA2)
+
+