12 files changed, 28 insertions, 28 deletions
diff --git a/audio/decoders/aac.h b/audio/decoders/aac.h
index 68e322c844..9ad78b28a4 100644
--- a/audio/decoders/aac.h
+++ b/audio/decoders/aac.h
@@ -26,8 +26,8 @@
  *  - groovie
  */
 
-#ifndef SOUND_AAC_H
-#define SOUND_AAC_H
+#ifndef AUDIO_AAC_H
+#define AUDIO_AAC_H
 
 #include "common/scummsys.h"
 #include "common/types.h"
@@ -59,4 +59,4 @@ Codec *makeAACDecoder(
 } // End of namespace Audio
 
 #endif // #ifdef USE_FAAD
-#endif // #ifndef SOUND_AAC_H
+#endif // #ifndef AUDIO_AAC_H
diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h
index 1dd4d510df..ac8d529917 100644
--- a/audio/decoders/adpcm.h
+++ b/audio/decoders/adpcm.h
@@ -31,8 +31,8 @@
  *  - tinsel
  */
 
-#ifndef SOUND_ADPCM_H
-#define SOUND_ADPCM_H
+#ifndef AUDIO_ADPCM_H
+#define AUDIO_ADPCM_H
 
 #include "common/scummsys.h"
 #include "common/types.h"
diff --git a/audio/decoders/adpcm_intern.h b/audio/decoders/adpcm_intern.h
index 38514d7fca..f7162f5f2a 100644
--- a/audio/decoders/adpcm_intern.h
+++ b/audio/decoders/adpcm_intern.h
@@ -28,8 +28,8 @@
  * ADPCM decoder implementations.
  */
 
-#ifndef SOUND_ADPCM_INTERN_H
-#define SOUND_ADPCM_INTERN_H
+#ifndef AUDIO_ADPCM_INTERN_H
+#define AUDIO_ADPCM_INTERN_H
 
 #include "audio/audiostream.h"
 #include "common/endian.h"
diff --git a/audio/decoders/aiff.h b/audio/decoders/aiff.h
index 558a018f57..59664bb85a 100644
--- a/audio/decoders/aiff.h
+++ b/audio/decoders/aiff.h
@@ -28,8 +28,8 @@
  *  - sword1
  */
 
-#ifndef SOUND_AIFF_H
-#define SOUND_AIFF_H
+#ifndef AUDIO_AIFF_H
+#define AUDIO_AIFF_H
 
 #include "common/scummsys.h"
 #include "common/types.h"
diff --git a/audio/decoders/flac.h b/audio/decoders/flac.h
index 3182b26425..a90675cc20 100644
--- a/audio/decoders/flac.h
+++ b/audio/decoders/flac.h
@@ -37,8 +37,8 @@
  *  - tucker
  */
 
-#ifndef SOUND_FLAC_H
-#define SOUND_FLAC_H
+#ifndef AUDIO_FLAC_H
+#define AUDIO_FLAC_H
 
 #include "common/scummsys.h"
 #include "common/types.h"
@@ -68,4 +68,4 @@ SeekableAudioStream *makeFLACStream(
 } // End of namespace Audio
 
 #endif // #ifdef USE_FLAC
-#endif // #ifndef SOUND_FLAC_H
+#endif // #ifndef AUDIO_FLAC_H
diff --git a/audio/decoders/iff_sound.h b/audio/decoders/iff_sound.h
index b266e629a1..28b2c67227 100644
--- a/audio/decoders/iff_sound.h
+++ b/audio/decoders/iff_sound.h
@@ -26,8 +26,8 @@
  *  - parallaction
  */
 
-#ifndef SOUND_IFF_H
-#define SOUND_IFF_H
+#ifndef AUDIO_IFF_H
+#define AUDIO_IFF_H
 
 namespace Common {
 class ReadStream;
diff --git a/audio/decoders/mac_snd.h b/audio/decoders/mac_snd.h
index cbbd82bbe0..7e960058ae 100644
--- a/audio/decoders/mac_snd.h
+++ b/audio/decoders/mac_snd.h
@@ -26,8 +26,8 @@
  *  - sci
  */
 
-#ifndef SOUND_MAC_SND_H
-#define SOUND_MAC_SND_H
+#ifndef AUDIO_MAC_SND_H
+#define AUDIO_MAC_SND_H
 
 #include "common/scummsys.h"
 #include "common/types.h"
diff --git a/audio/decoders/mp3.h b/audio/decoders/mp3.h
index 86ddc599ea..cb0cc8375d 100644
--- a/audio/decoders/mp3.h
+++ b/audio/decoders/mp3.h
@@ -38,8 +38,8 @@
  *  - tucker
  */
 
-#ifndef SOUND_MP3_H
-#define SOUND_MP3_H
+#ifndef AUDIO_MP3_H
+#define AUDIO_MP3_H
 
 #include "common/scummsys.h"
 #include "common/types.h"
@@ -69,4 +69,4 @@ SeekableAudioStream *makeMP3Stream(
 } // End of namespace Audio
 
 #endif // #ifdef USE_MAD
-#endif // #ifndef SOUND_MP3_H
+#endif // #ifndef AUDIO_MP3_H
diff --git a/audio/decoders/raw.h b/audio/decoders/raw.h
index 5a7897b688..5cbf2c9b79 100644
--- a/audio/decoders/raw.h
+++ b/audio/decoders/raw.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SOUND_RAW_H
-#define SOUND_RAW_H
+#ifndef AUDIO_RAW_H
+#define AUDIO_RAW_H
 
 #include "common/scummsys.h"
 #include "common/types.h"
diff --git a/audio/decoders/voc.h b/audio/decoders/voc.h
index a920eac933..7d96d261b5 100644
--- a/audio/decoders/voc.h
+++ b/audio/decoders/voc.h
@@ -30,8 +30,8 @@
  *  - touche
  */
 
-#ifndef SOUND_VOC_H
-#define SOUND_VOC_H
+#ifndef AUDIO_VOC_H
+#define AUDIO_VOC_H
 
 #include "common/scummsys.h"
 #include "common/types.h"
diff --git a/audio/decoders/vorbis.h b/audio/decoders/vorbis.h
index e3d989e9b8..9e7600af56 100644
--- a/audio/decoders/vorbis.h
+++ b/audio/decoders/vorbis.h
@@ -38,8 +38,8 @@
  *  - tucker
  */
 
-#ifndef SOUND_VORBIS_H
-#define SOUND_VORBIS_H
+#ifndef AUDIO_VORBIS_H
+#define AUDIO_VORBIS_H
 
 #include "common/scummsys.h"
 #include "common/types.h"
@@ -69,4 +69,4 @@ SeekableAudioStream *makeVorbisStream(
 } // End of namespace Audio
 
 #endif // #ifdef USE_VORBIS
-#endif // #ifndef SOUND_VORBIS_H
+#endif // #ifndef AUDIO_VORBIS_H
diff --git a/audio/decoders/wave.h b/audio/decoders/wave.h
index 6a34bc175a..c8ac7fe318 100644
--- a/audio/decoders/wave.h
+++ b/audio/decoders/wave.h
@@ -34,8 +34,8 @@
  *  - tucker
  */
 
-#ifndef SOUND_WAVE_H
-#define SOUND_WAVE_H
+#ifndef AUDIO_WAVE_H
+#define AUDIO_WAVE_H
 
 #include "common/scummsys.h"
 #include "common/types.h"