10 files changed, 23 insertions, 23 deletions
diff --git a/audio/mods/infogrames.h b/audio/mods/infogrames.h
index 307a26d4e1..8b246eebe7 100644
--- a/audio/mods/infogrames.h
+++ b/audio/mods/infogrames.h
@@ -26,8 +26,8 @@
  *  - gob
  */
 
-#ifndef SOUND_MODS_INFOGRAMES_H
-#define SOUND_MODS_INFOGRAMES_H
+#ifndef AUDIO_MODS_INFOGRAMES_H
+#define AUDIO_MODS_INFOGRAMES_H
 
 #include "audio/mods/paula.h"
 
diff --git a/audio/mods/maxtrax.cpp b/audio/mods/maxtrax.cpp
index 344d678b76..8ed51ae5c3 100644
--- a/audio/mods/maxtrax.cpp
+++ b/audio/mods/maxtrax.cpp
@@ -29,7 +29,7 @@
 #include "audio/mods/maxtrax.h"
 
 // test for engines using this class.
-#if defined(SOUND_MODS_MAXTRAX_H)
+#if defined(AUDIO_MODS_MAXTRAX_H)
 
 namespace {
 
@@ -1034,4 +1034,4 @@ void MaxTrax::outPutScore(const Score &sc, int num) {}
 
 }	// End of namespace Audio
 
-#endif // #if defined(SOUND_MODS_MAXTRAX_H)
+#endif // #if defined(AUDIO_MODS_MAXTRAX_H)
diff --git a/audio/mods/maxtrax.h b/audio/mods/maxtrax.h
index bef6669d2a..c61f4e1b50 100644
--- a/audio/mods/maxtrax.h
+++ b/audio/mods/maxtrax.h
@@ -24,8 +24,8 @@
 #if !defined(ENABLE_KYRA)
 
 // normal Header Guard
-#elif !defined SOUND_MODS_MAXTRAX_H
-#define SOUND_MODS_MAXTRAX_H
+#elif !defined AUDIO_MODS_MAXTRAX_H
+#define AUDIO_MODS_MAXTRAX_H
 
 // #define MAXTRAX_HAS_MODULATION
 // #define MAXTRAX_HAS_MICROTONAL
@@ -219,4 +219,4 @@ private:
 };
 }	// End of namespace Audio
 
-#endif // !defined SOUND_MODS_MAXTRAX_H
+#endif // !defined AUDIO_MODS_MAXTRAX_H
diff --git a/audio/mods/module.h b/audio/mods/module.h
index a57a89225e..eb7cbf260e 100644
--- a/audio/mods/module.h
+++ b/audio/mods/module.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SOUND_MODS_MODULE_H
-#define SOUND_MODS_MODULE_H
+#ifndef AUDIO_MODS_MODULE_H
+#define AUDIO_MODS_MODULE_H
 
 #include "common/scummsys.h"
 
diff --git a/audio/mods/paula.h b/audio/mods/paula.h
index cd797f51cb..5d11cc7bb6 100644
--- a/audio/mods/paula.h
+++ b/audio/mods/paula.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SOUND_MODS_PAULA_H
-#define SOUND_MODS_PAULA_H
+#ifndef AUDIO_MODS_PAULA_H
+#define AUDIO_MODS_PAULA_H
 
 #include "audio/audiostream.h"
 #include "common/frac.h"
diff --git a/audio/mods/protracker.h b/audio/mods/protracker.h
index 15f708d801..d52322f07e 100644
--- a/audio/mods/protracker.h
+++ b/audio/mods/protracker.h
@@ -27,8 +27,8 @@
  *  - parallaction
  */
 
-#ifndef SOUND_MODS_PROTRACKER_H
-#define SOUND_MODS_PROTRACKER_H
+#ifndef AUDIO_MODS_PROTRACKER_H
+#define AUDIO_MODS_PROTRACKER_H
 
 namespace Common {
 class SeekableReadStream;
diff --git a/audio/mods/rjp1.h b/audio/mods/rjp1.h
index 232b1926e9..e7e54dafb3 100644
--- a/audio/mods/rjp1.h
+++ b/audio/mods/rjp1.h
@@ -26,8 +26,8 @@
  *  - queen
  */
 
-#ifndef SOUND_MODS_RJP1_H
-#define SOUND_MODS_RJP1_H
+#ifndef AUDIO_MODS_RJP1_H
+#define AUDIO_MODS_RJP1_H
 
 namespace Common {
 class SeekableReadStream;
diff --git a/audio/mods/soundfx.h b/audio/mods/soundfx.h
index 48ccff2da6..d517c6c78f 100644
--- a/audio/mods/soundfx.h
+++ b/audio/mods/soundfx.h
@@ -26,8 +26,8 @@
  *  - cine
  */
 
-#ifndef SOUND_MODS_SOUNDFX_H
-#define SOUND_MODS_SOUNDFX_H
+#ifndef AUDIO_MODS_SOUNDFX_H
+#define AUDIO_MODS_SOUNDFX_H
 
 namespace Common {
 class SeekableReadStream;
diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp
index a89da78af1..2957529afc 100644
--- a/audio/mods/tfmx.cpp
+++ b/audio/mods/tfmx.cpp
@@ -29,7 +29,7 @@
 #include "audio/mods/tfmx.h"
 
 // test for engines using this class.
-#if defined(SOUND_MODS_TFMX_H)
+#if defined(AUDIO_MODS_TFMX_H)
 
 // couple debug-functions
 namespace {
@@ -876,7 +876,7 @@ const int8 *Tfmx::loadSampleFile(uint32 &sampleLen, Common::SeekableReadStream &
 	const int32 sampleSize = sampleStream.size();
 	if (sampleSize < 4) {
 		warning("Tfmx: Cant load Samplefile");
-		return false;
+		return 0;
 	}
 
 	int8 *sampleAlloc = new int8[sampleSize];
@@ -1187,4 +1187,4 @@ void displayPatternstep(const void * const vptr) {
 } // End of anonymous namespace
 #endif
 
-#endif // #if defined(SOUND_MODS_TFMX_H)
+#endif // #if defined(AUDIO_MODS_TFMX_H)
diff --git a/audio/mods/tfmx.h b/audio/mods/tfmx.h
index 2b07e2e660..4174fbfb27 100644
--- a/audio/mods/tfmx.h
+++ b/audio/mods/tfmx.h
@@ -24,8 +24,8 @@
 #if !defined(ENABLE_SCUMM)
 
 // normal Header Guard
-#elif !defined(SOUND_MODS_TFMX_H)
-#define SOUND_MODS_TFMX_H
+#elif !defined(AUDIO_MODS_TFMX_H)
+#define AUDIO_MODS_TFMX_H
 
 #include "audio/mods/paula.h"
 
@@ -278,4 +278,4 @@ private:
 
 }	// End of namespace Audio
 
-#endif // !defined(SOUND_MODS_TFMX_H)
+#endif // !defined(AUDIO_MODS_TFMX_H)