4 files changed, 13 insertions, 5 deletions
diff --git a/sound/mods/maxtrax.cpp b/sound/mods/maxtrax.cpp
index a1fae233c6..ad102f854b 100644
--- a/sound/mods/maxtrax.cpp
+++ b/sound/mods/maxtrax.cpp
@@ -31,7 +31,7 @@
 #include "sound/mods/maxtrax.h"
 
 // test for engines using this class.
-#if defined(ENABLE_KYRA)
+#if defined(SOUND_MODS_MAXTRAX_H)
 
 namespace Audio {
 
diff --git a/sound/mods/maxtrax.h b/sound/mods/maxtrax.h
index 65a504fcaf..524d5ba9a6 100644
--- a/sound/mods/maxtrax.h
+++ b/sound/mods/maxtrax.h
@@ -23,7 +23,11 @@
  *
  */
 
-#ifndef SOUND_MODS_MAXTRAX_H
+// see if all engines using this class are DISABLED
+#if !defined(ENABLE_KYRA)
+
+// normal Header Guard
+#elif !defined SOUND_MODS_MAXTRAX_H
 #define SOUND_MODS_MAXTRAX_H
 
 #include "sound/mods/paula.h"
diff --git a/sound/mods/tfmx.cpp b/sound/mods/tfmx.cpp
index 0fd9de0d54..67951b5880 100644
--- a/sound/mods/tfmx.cpp
+++ b/sound/mods/tfmx.cpp
@@ -32,7 +32,7 @@
 #include "sound/mods/tfmx.h"
 
 // test for engines using this class.
-#if defined(ENABLE_SCUMM)
+#if defined(SOUND_MODS_TFMX_H)
 
 // couple debug-functions
 namespace {
diff --git a/sound/mods/tfmx.h b/sound/mods/tfmx.h
index 8ac4b4136a..707eb5952f 100644
--- a/sound/mods/tfmx.h
+++ b/sound/mods/tfmx.h
@@ -23,7 +23,11 @@
  *
  */
 
-#ifndef SOUND_MODS_TFMX_H
+// see if all engines using this class are DISABLED
+#if !defined(ENABLE_SCUMM)
+
+// normal Header Guard
+#elif !defined(SOUND_MODS_TFMX_H)
 #define SOUND_MODS_TFMX_H
 
 #include "sound/mods/paula.h"
@@ -277,4 +281,4 @@ private:
 
 }	// End of namespace Audio
 
-#endif
+#endif // !defined(SOUND_MODS_TFMX_H)