AUDIO: Rename sound/ dir to audio/

svn-id: r55850

385 files changed, 870 insertions, 870 deletions

diff --git a/Makefile.common b/Makefile.common
index f8a665ce24..eb3165382f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -27,12 +27,12 @@ MODULES += \
 	engines \
 	video \
 	graphics \
-	sound \
+	audio \
 	common \
 	po
 
 ifdef USE_MT32EMU
-MODULES += sound/softsynth/mt32
+MODULES += audio/softsynth/mt32
 endif
 
 ######################################################################
diff --git a/sound/audiostream.cpp b/audio/audiostream.cpp
index b3efb2cefe..46b2846137 100644
--- a/sound/audiostream.cpp
+++ b/audio/audiostream.cpp
@@ -29,12 +29,12 @@
 #include "common/queue.h"
 #include "common/util.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/flac.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vorbis.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/flac.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vorbis.h"
 
 
 namespace Audio {
diff --git a/sound/audiostream.h b/audio/audiostream.h
index b2c012841d..cd6456cc70 100644
--- a/sound/audiostream.h
+++ b/audio/audiostream.h
@@ -30,7 +30,7 @@
 #include "common/scummsys.h"
 #include "common/types.h"
 
-#include "sound/timestamp.h"
+#include "audio/timestamp.h"
 
 namespace Audio {
 
diff --git a/sound/decoders/adpcm.cpp b/audio/decoders/adpcm.cpp
index 4b5e6a5b84..7def89b688 100644
--- a/sound/decoders/adpcm.cpp
+++ b/audio/decoders/adpcm.cpp
@@ -25,8 +25,8 @@
 
 #include "common/endian.h"
 
-#include "sound/decoders/adpcm.h"
-#include "sound/audiostream.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/audiostream.h"
 
 
 namespace Audio {
diff --git a/sound/decoders/adpcm.h b/audio/decoders/adpcm.h
index 38ec870a27..38ec870a27 100644
--- a/sound/decoders/adpcm.h
+++ b/audio/decoders/adpcm.h
diff --git a/sound/decoders/aiff.cpp b/audio/decoders/aiff.cpp
index ce8c6ad32c..0f947752f6 100644
--- a/sound/decoders/aiff.cpp
+++ b/audio/decoders/aiff.cpp
@@ -35,10 +35,10 @@
 #include "common/util.h"
 #include "common/stream.h"
 
-#include "sound/decoders/aiff.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/aiff.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 namespace Audio {
 
diff --git a/sound/decoders/aiff.h b/audio/decoders/aiff.h
index 06c56ecd38..06c56ecd38 100644
--- a/sound/decoders/aiff.h
+++ b/audio/decoders/aiff.h
diff --git a/sound/decoders/flac.cpp b/audio/decoders/flac.cpp
index 080141f224..76b6d35419 100644
--- a/sound/decoders/flac.cpp
+++ b/audio/decoders/flac.cpp
@@ -26,7 +26,7 @@
 // Disable symbol overrides for FILE as that is used in FLAC headers
 #define FORBIDDEN_SYMBOL_EXCEPTION_FILE
 
-#include "sound/decoders/flac.h"
+#include "audio/decoders/flac.h"
 
 #ifdef USE_FLAC
 
@@ -34,7 +34,7 @@
 #include "common/stream.h"
 #include "common/util.h"
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 #define FLAC__NO_DLL // that MS-magic gave me headaches - just link the library you like
 #include <FLAC/export.h>
diff --git a/sound/decoders/flac.h b/audio/decoders/flac.h
index 17f95ec1fb..17f95ec1fb 100644
--- a/sound/decoders/flac.h
+++ b/audio/decoders/flac.h
diff --git a/sound/decoders/iff_sound.cpp b/audio/decoders/iff_sound.cpp
index 148de5b621..2ec189c586 100644
--- a/sound/decoders/iff_sound.cpp
+++ b/audio/decoders/iff_sound.cpp
@@ -23,10 +23,10 @@
  *
  */
 
-#include "sound/decoders/iff_sound.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/iff_sound.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 #include "common/iff_container.h"
 #include "common/func.h"
 
diff --git a/sound/decoders/iff_sound.h b/audio/decoders/iff_sound.h
index 4e53059380..4e53059380 100644
--- a/sound/decoders/iff_sound.h
+++ b/audio/decoders/iff_sound.h
diff --git a/sound/decoders/mac_snd.cpp b/audio/decoders/mac_snd.cpp
index 48f6886bf4..7c1a2f75f0 100644
--- a/sound/decoders/mac_snd.cpp
+++ b/audio/decoders/mac_snd.cpp
@@ -33,9 +33,9 @@
 #include "common/util.h"
 #include "common/stream.h"
 
-#include "sound/decoders/mac_snd.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/mac_snd.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
 
 namespace Audio {
 
diff --git a/sound/decoders/mac_snd.h b/audio/decoders/mac_snd.h
index 198a61333e..198a61333e 100644
--- a/sound/decoders/mac_snd.h
+++ b/audio/decoders/mac_snd.h
diff --git a/sound/decoders/mp3.cpp b/audio/decoders/mp3.cpp
index e06b82a9e2..53d68fa9db 100644
--- a/sound/decoders/mp3.cpp
+++ b/audio/decoders/mp3.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/decoders/mp3.h"
+#include "audio/decoders/mp3.h"
 
 #ifdef USE_MAD
 
@@ -31,7 +31,7 @@
 #include "common/stream.h"
 #include "common/util.h"
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 #include <mad.h>
 
diff --git a/sound/decoders/mp3.h b/audio/decoders/mp3.h
index 72bc6e1b3e..72bc6e1b3e 100644
--- a/sound/decoders/mp3.h
+++ b/audio/decoders/mp3.h
diff --git a/sound/decoders/raw.cpp b/audio/decoders/raw.cpp
index aedddbf6c4..8b833c7838 100644
--- a/sound/decoders/raw.cpp
+++ b/audio/decoders/raw.cpp
@@ -26,9 +26,9 @@
 #include "common/endian.h"
 #include "common/memstream.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 namespace Audio {
 
diff --git a/sound/decoders/raw.h b/audio/decoders/raw.h
index 3e9426012c..3e9426012c 100644
--- a/sound/decoders/raw.h
+++ b/audio/decoders/raw.h
diff --git a/sound/decoders/vag.cpp b/audio/decoders/vag.cpp
index d3f0811f2b..2c3a36202a 100644
--- a/sound/decoders/vag.cpp
+++ b/audio/decoders/vag.cpp
@@ -23,8 +23,8 @@
  *
  */
 
-#include "sound/decoders/vag.h"
-#include "sound/audiostream.h"
+#include "audio/decoders/vag.h"
+#include "audio/audiostream.h"
 #include "common/stream.h"
 
 namespace Audio {
diff --git a/sound/decoders/vag.h b/audio/decoders/vag.h
index cdf91a8ea1..cdf91a8ea1 100644
--- a/sound/decoders/vag.h
+++ b/audio/decoders/vag.h
diff --git a/sound/decoders/voc.cpp b/audio/decoders/voc.cpp
index e9af7ece3f..b811a640ec 100644
--- a/sound/decoders/voc.cpp
+++ b/audio/decoders/voc.cpp
@@ -28,10 +28,10 @@
 #include "common/util.h"
 #include "common/stream.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/voc.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/voc.h"
 
 
 namespace Audio {
diff --git a/sound/decoders/voc.h b/audio/decoders/voc.h
index 82cc261f2c..82cc261f2c 100644
--- a/sound/decoders/voc.h
+++ b/audio/decoders/voc.h
diff --git a/sound/decoders/vorbis.cpp b/audio/decoders/vorbis.cpp
index 425eb6b751..dc37e852d3 100644
--- a/sound/decoders/vorbis.cpp
+++ b/audio/decoders/vorbis.cpp
@@ -28,7 +28,7 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_FILE
 #define FORBIDDEN_SYMBOL_EXCEPTION_fseek
 
-#include "sound/decoders/vorbis.h"
+#include "audio/decoders/vorbis.h"
 
 #ifdef USE_VORBIS
 
@@ -36,7 +36,7 @@
 #include "common/stream.h"
 #include "common/util.h"
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 #ifdef USE_TREMOR
 #if defined(__GP32__) // custom libtremor locations
diff --git a/sound/decoders/vorbis.h b/audio/decoders/vorbis.h
index 7cc395cccb..7cc395cccb 100644
--- a/sound/decoders/vorbis.h
+++ b/audio/decoders/vorbis.h
diff --git a/sound/decoders/wave.cpp b/audio/decoders/wave.cpp
index fcaace5301..1f0ddd8ceb 100644
--- a/sound/decoders/wave.cpp
+++ b/audio/decoders/wave.cpp
@@ -27,11 +27,11 @@
 #include "common/util.h"
 #include "common/stream.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/wave.h"
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/wave.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/raw.h"
 
 namespace Audio {
 
diff --git a/sound/decoders/wave.h b/audio/decoders/wave.h
index 2bdbe8f0b6..2bdbe8f0b6 100644
--- a/sound/decoders/wave.h
+++ b/audio/decoders/wave.h
diff --git a/sound/fmopl.cpp b/audio/fmopl.cpp
index ee54a79a46..1f61e16101 100644
--- a/sound/fmopl.cpp
+++ b/audio/fmopl.cpp
@@ -22,10 +22,10 @@
  * $Id$
  */
 
-#include "sound/fmopl.h"
+#include "audio/fmopl.h"
 
-#include "sound/softsynth/opl/dosbox.h"
-#include "sound/softsynth/opl/mame.h"
+#include "audio/softsynth/opl/dosbox.h"
+#include "audio/softsynth/opl/mame.h"
 
 #include "common/config-manager.h"
 #include "common/translation.h"
diff --git a/sound/fmopl.h b/audio/fmopl.h
index 33235f3545..33235f3545 100644
--- a/sound/fmopl.h
+++ b/audio/fmopl.h
diff --git a/sound/mididrv.cpp b/audio/mididrv.cpp
index 20d5a4e233..a1487ff69d 100644
--- a/sound/mididrv.cpp
+++ b/audio/mididrv.cpp
@@ -28,8 +28,8 @@
 #include "common/str.h"
 #include "common/system.h"
 #include "common/util.h"
-#include "sound/mididrv.h"
-#include "sound/musicplugin.h"
+#include "audio/mididrv.h"
+#include "audio/musicplugin.h"
 #include "common/translation.h"
 
 const byte MidiDriver::_mt32ToGm[128] = {
diff --git a/sound/mididrv.h b/audio/mididrv.h
index 9e649cba3d..9e649cba3d 100644
--- a/sound/mididrv.h
+++ b/audio/mididrv.h
diff --git a/sound/midiparser.cpp b/audio/midiparser.cpp
index bd51a96d46..e01b8a7fc6 100644
--- a/sound/midiparser.cpp
+++ b/audio/midiparser.cpp
@@ -23,8 +23,8 @@
  *
  */
 
-#include "sound/midiparser.h"
-#include "sound/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mididrv.h"
 #include "common/util.h"
 
 //////////////////////////////////////////////////
diff --git a/sound/midiparser.h b/audio/midiparser.h
index 0b18a19a5b..0b18a19a5b 100644
--- a/sound/midiparser.h
+++ b/audio/midiparser.h
diff --git a/sound/midiparser_smf.cpp b/audio/midiparser_smf.cpp
index a9c6f1eb3b..9e4e8ed293 100644
--- a/sound/midiparser_smf.cpp
+++ b/audio/midiparser_smf.cpp
@@ -23,8 +23,8 @@
  *
  */
 
-#include "sound/midiparser.h"
-#include "sound/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mididrv.h"
 #include "common/util.h"
 
 /**
diff --git a/sound/midiparser_xmidi.cpp b/audio/midiparser_xmidi.cpp
index 343ca34659..edc7c7a943 100644
--- a/sound/midiparser_xmidi.cpp
+++ b/audio/midiparser_xmidi.cpp
@@ -23,8 +23,8 @@
  *
  */
 
-#include "sound/midiparser.h"
-#include "sound/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mididrv.h"
 #include "common/util.h"
 
 /**
diff --git a/sound/mixer.cpp b/audio/mixer.cpp
index c40aa95d73..c2271b1059 100644
--- a/sound/mixer.cpp
+++ b/audio/mixer.cpp
@@ -26,10 +26,10 @@
 #include "common/util.h"
 #include "common/system.h"
 
-#include "sound/mixer_intern.h"
-#include "sound/rate.h"
-#include "sound/audiostream.h"
-#include "sound/timestamp.h"
+#include "audio/mixer_intern.h"
+#include "audio/rate.h"
+#include "audio/audiostream.h"
+#include "audio/timestamp.h"
 
 
 namespace Audio {
diff --git a/sound/mixer.h b/audio/mixer.h
index b2accc550d..a048124ca3 100644
--- a/sound/mixer.h
+++ b/audio/mixer.h
@@ -30,7 +30,7 @@
 #include "common/mutex.h"
 #include "common/noncopyable.h"
 
-#include "sound/timestamp.h"
+#include "audio/timestamp.h"
 
 class OSystem;
 
diff --git a/sound/mixer_intern.h b/audio/mixer_intern.h
index 014be7abf2..c8df9a594d 100644
--- a/sound/mixer_intern.h
+++ b/audio/mixer_intern.h
@@ -28,7 +28,7 @@
 
 #include "common/scummsys.h"
 #include "common/mutex.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 
diff --git a/sound/mods/infogrames.cpp b/audio/mods/infogrames.cpp
index 048872d4a0..27e42c637b 100644
--- a/sound/mods/infogrames.cpp
+++ b/audio/mods/infogrames.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/mods/infogrames.h"
+#include "audio/mods/infogrames.h"
 #include "common/endian.h"
 #include "common/file.h"
 #include "common/memstream.h"
diff --git a/sound/mods/infogrames.h b/audio/mods/infogrames.h
index 1f3d74f38b..c7abebf24e 100644
--- a/sound/mods/infogrames.h
+++ b/audio/mods/infogrames.h
@@ -32,7 +32,7 @@
 #ifndef SOUND_MODS_INFOGRAMES_H
 #define SOUND_MODS_INFOGRAMES_H
 
-#include "sound/mods/paula.h"
+#include "audio/mods/paula.h"
 #include "common/stream.h"
 
 namespace Audio {
diff --git a/sound/mods/maxtrax.cpp b/audio/mods/maxtrax.cpp
index 08e73fb96a..a577c72eed 100644
--- a/sound/mods/maxtrax.cpp
+++ b/audio/mods/maxtrax.cpp
@@ -29,7 +29,7 @@
 #include "common/util.h"
 #include "common/debug.h"
 
-#include "sound/mods/maxtrax.h"
+#include "audio/mods/maxtrax.h"
 
 // test for engines using this class.
 #if defined(SOUND_MODS_MAXTRAX_H)
diff --git a/sound/mods/maxtrax.h b/audio/mods/maxtrax.h
index 2c86b70288..2f890afe2d 100644
--- a/sound/mods/maxtrax.h
+++ b/audio/mods/maxtrax.h
@@ -33,7 +33,7 @@
 // #define MAXTRAX_HAS_MODULATION
 // #define MAXTRAX_HAS_MICROTONAL
 
-#include "sound/mods/paula.h"
+#include "audio/mods/paula.h"
 
 namespace Audio {
 
diff --git a/sound/mods/module.cpp b/audio/mods/module.cpp
index 992c2a28e3..0da6923b5d 100644
--- a/sound/mods/module.cpp
+++ b/audio/mods/module.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/mods/module.h"
+#include "audio/mods/module.h"
 
 #include "common/util.h"
 #include "common/endian.h"
diff --git a/sound/mods/module.h b/audio/mods/module.h
index 550b63617e..550b63617e 100644
--- a/sound/mods/module.h
+++ b/audio/mods/module.h
diff --git a/sound/mods/paula.cpp b/audio/mods/paula.cpp
index c39b37f83d..ef841ac9bf 100644
--- a/sound/mods/paula.cpp
+++ b/audio/mods/paula.cpp
@@ -23,8 +23,8 @@
  *
  */
 
-#include "sound/mods/paula.h"
-#include "sound/null.h"
+#include "audio/mods/paula.h"
+#include "audio/null.h"
 
 namespace Audio {
 
diff --git a/sound/mods/paula.h b/audio/mods/paula.h
index aa3d5b4ab9..f6f159d5a6 100644
--- a/sound/mods/paula.h
+++ b/audio/mods/paula.h
@@ -26,7 +26,7 @@
 #ifndef SOUND_MODS_PAULA_H
 #define SOUND_MODS_PAULA_H
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 #include "common/frac.h"
 #include "common/mutex.h"
 
diff --git a/sound/mods/protracker.cpp b/audio/mods/protracker.cpp
index 797b4c417d..6051338900 100644
--- a/sound/mods/protracker.cpp
+++ b/audio/mods/protracker.cpp
@@ -23,11 +23,11 @@
  *
  */
 
-#include "sound/mods/protracker.h"
-#include "sound/mods/paula.h"
-#include "sound/mods/module.h"
+#include "audio/mods/protracker.h"
+#include "audio/mods/paula.h"
+#include "audio/mods/module.h"
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 namespace Modules {
 
diff --git a/sound/mods/protracker.h b/audio/mods/protracker.h
index af722637c7..af722637c7 100644
--- a/sound/mods/protracker.h
+++ b/audio/mods/protracker.h
diff --git a/sound/mods/rjp1.cpp b/audio/mods/rjp1.cpp
index be376d61a4..7423abb668 100644
--- a/sound/mods/rjp1.cpp
+++ b/audio/mods/rjp1.cpp
@@ -26,9 +26,9 @@
 #include "common/debug.h"
 #include "common/endian.h"
 
-#include "sound/mods/paula.h"
-#include "sound/mods/rjp1.h"
-#include "sound/audiostream.h"
+#include "audio/mods/paula.h"
+#include "audio/mods/rjp1.h"
+#include "audio/audiostream.h"
 
 namespace Audio {
 
diff --git a/sound/mods/rjp1.h b/audio/mods/rjp1.h
index e1960921b2..e1960921b2 100644
--- a/sound/mods/rjp1.h
+++ b/audio/mods/rjp1.h
diff --git a/sound/mods/soundfx.cpp b/audio/mods/soundfx.cpp
index 3af8ca19c6..06a1e29514 100644
--- a/sound/mods/soundfx.cpp
+++ b/audio/mods/soundfx.cpp
@@ -25,9 +25,9 @@
 
 #include "common/endian.h"
 
-#include "sound/mods/paula.h"
-#include "sound/mods/soundfx.h"
-#include "sound/audiostream.h"
+#include "audio/mods/paula.h"
+#include "audio/mods/soundfx.h"
+#include "audio/audiostream.h"
 
 namespace Audio {
 
diff --git a/sound/mods/soundfx.h b/audio/mods/soundfx.h
index 089c19d292..089c19d292 100644
--- a/sound/mods/soundfx.h
+++ b/audio/mods/soundfx.h
diff --git a/sound/mods/tfmx.cpp b/audio/mods/tfmx.cpp
index 6ed1abcfb5..8c69a75ebd 100644
--- a/sound/mods/tfmx.cpp
+++ b/audio/mods/tfmx.cpp
@@ -29,7 +29,7 @@
 #include "common/util.h"
 #include "common/debug.h"
 
-#include "sound/mods/tfmx.h"
+#include "audio/mods/tfmx.h"
 
 // test for engines using this class.
 #if defined(SOUND_MODS_TFMX_H)
diff --git a/sound/mods/tfmx.h b/audio/mods/tfmx.h
index b24df494cd..1930487eb8 100644
--- a/sound/mods/tfmx.h
+++ b/audio/mods/tfmx.h
@@ -30,7 +30,7 @@
 #elif !defined(SOUND_MODS_TFMX_H)
 #define SOUND_MODS_TFMX_H
 
-#include "sound/mods/paula.h"
+#include "audio/mods/paula.h"
 
 namespace Audio {
 
diff --git a/sound/module.mk b/audio/module.mk
index 6cfa165a95..5b93c80d57 100644
--- a/sound/module.mk
+++ b/audio/module.mk
@@ -1,4 +1,4 @@
-MODULE := sound
+MODULE := audio
 
 MODULE_OBJS := \
 	audiostream.o \
diff --git a/sound/mpu401.cpp b/audio/mpu401.cpp
index fe18a3ee85..4f62de930c 100644
--- a/sound/mpu401.cpp
+++ b/audio/mpu401.cpp
@@ -22,7 +22,7 @@
  * $Id$
  */
 
-#include "sound/mpu401.h"
+#include "audio/mpu401.h"
 #include "common/system.h"
 #include "common/timer.h"
 #include "common/util.h"	// for ARRAYSIZE
diff --git a/sound/mpu401.h b/audio/mpu401.h
index 2253ab429c..070eaf636a 100644
--- a/sound/mpu401.h
+++ b/audio/mpu401.h
@@ -26,7 +26,7 @@
 #ifndef SOUND_MPU401_H
 #define SOUND_MPU401_H
 
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 ////////////////////////////////////////
 //
diff --git a/sound/musicplugin.cpp b/audio/musicplugin.cpp
index 8078094616..eb28d2f4c9 100644
--- a/sound/musicplugin.cpp
+++ b/audio/musicplugin.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/musicplugin.h"
+#include "audio/musicplugin.h"
 #include "common/hash-str.h"
 #include "common/translation.h"
 
diff --git a/sound/musicplugin.h b/audio/musicplugin.h
index bbb4ed778c..da0e0ff816 100644
--- a/sound/musicplugin.h
+++ b/audio/musicplugin.h
@@ -26,7 +26,7 @@
 #define SOUND_MUSICPLUGIN_H
 
 #include "base/plugins.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 #include "common/list.h"
 
 class MusicPluginObject;
diff --git a/sound/null.cpp b/audio/null.cpp
index 556b96c14c..152f5da03e 100644
--- a/sound/null.cpp
+++ b/audio/null.cpp
@@ -22,7 +22,7 @@
  * $Id$
  */
 
-#include "sound/null.h"
+#include "audio/null.h"
 
 Common::Error NullMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle) const {
 	*mididriver = new MidiDriver_NULL();
diff --git a/sound/null.h b/audio/null.h
index d9343701fa..5df7493a06 100644
--- a/sound/null.h
+++ b/audio/null.h
@@ -25,8 +25,8 @@
 #ifndef SOUND_NULL_H
 #define SOUND_NULL_H
 
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
 #include "common/translation.h"
 
 /* NULL driver */
diff --git a/sound/rate.cpp b/audio/rate.cpp
index 97521da3e0..1fcf0ade2e 100644
--- a/sound/rate.cpp
+++ b/audio/rate.cpp
@@ -31,9 +31,9 @@
  * improvements over the original code were made.
  */
 
-#include "sound/audiostream.h"
-#include "sound/rate.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/rate.h"
+#include "audio/mixer.h"
 #include "common/frac.h"
 #include "common/util.h"
 
diff --git a/sound/rate.h b/audio/rate.h
index fb231e4c4a..fb231e4c4a 100644
--- a/sound/rate.h
+++ b/audio/rate.h
diff --git a/sound/rate_arm.cpp b/audio/rate_arm.cpp
index 63008fcb87..41944ef698 100644
--- a/sound/rate_arm.cpp
+++ b/audio/rate_arm.cpp
@@ -44,9 +44,9 @@
  * other improvments over the original code were made.
  */
 
-#include "sound/audiostream.h"
-#include "sound/rate.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/rate.h"
+#include "audio/mixer.h"
 #include "common/util.h"
 
 //#define DEBUG_RATECONV
diff --git a/sound/rate_arm_asm.s b/audio/rate_arm_asm.s
index 9431ae0649..9431ae0649 100644
--- a/sound/rate_arm_asm.s
+++ b/audio/rate_arm_asm.s
diff --git a/sound/softsynth/adlib.cpp b/audio/softsynth/adlib.cpp
index ffb359e816..4a9ce54c75 100644
--- a/sound/softsynth/adlib.cpp
+++ b/audio/softsynth/adlib.cpp
@@ -22,11 +22,11 @@
  * $Id$
  */
 
-#include "sound/softsynth/emumidi.h"
+#include "audio/softsynth/emumidi.h"
 #include "common/debug.h"
 #include "common/util.h"
-#include "sound/fmopl.h"
-#include "sound/musicplugin.h"
+#include "audio/fmopl.h"
+#include "audio/musicplugin.h"
 #include "common/translation.h"
 
 #ifdef DEBUG_ADLIB
diff --git a/sound/softsynth/appleiigs.cpp b/audio/softsynth/appleiigs.cpp
index 9004d1f0ab..80159c79ce 100644
--- a/sound/softsynth/appleiigs.cpp
+++ b/audio/softsynth/appleiigs.cpp
@@ -23,7 +23,7 @@
 *
 */
 
-#include "sound/null.h"
+#include "audio/null.h"
 
 //	Plugin interface
 //	(This can only create a null driver since apple II gs support seeems not to be implemented
diff --git a/sound/softsynth/cms.cpp b/audio/softsynth/cms.cpp
index b307146f14..fcc15f127e 100644
--- a/sound/softsynth/cms.cpp
+++ b/audio/softsynth/cms.cpp
@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#include "sound/softsynth/cms.h"
-#include "sound/null.h"
+#include "audio/softsynth/cms.h"
+#include "audio/null.h"
 
 #include "common/textconsole.h"
 #include "common/translation.h"
diff --git a/sound/softsynth/cms.h b/audio/softsynth/cms.h
index d5bb7f0a42..d5bb7f0a42 100644
--- a/sound/softsynth/cms.h
+++ b/audio/softsynth/cms.h
diff --git a/sound/softsynth/emumidi.h b/audio/softsynth/emumidi.h
index 3fb2733b71..35c81490e4 100644
--- a/sound/softsynth/emumidi.h
+++ b/audio/softsynth/emumidi.h
@@ -25,9 +25,9 @@
 #ifndef SOUND_SOFTSYNTH_EMUMIDI_H
 #define SOUND_SOFTSYNTH_EMUMIDI_H
 
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
 
 #define FIXP_SHIFT 16
 
diff --git a/sound/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
index fcb4591a20..bd016548ec 100644
--- a/sound/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@@ -27,9 +27,9 @@
 #ifdef USE_FLUIDSYNTH
 
 #include "common/config-manager.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
-#include "sound/softsynth/emumidi.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
+#include "audio/softsynth/emumidi.h"
 
 #include <fluidsynth.h>
 
diff --git a/sound/softsynth/fmtowns_pc98/towns_audio.cpp b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
index 14bc840326..e019aa2481 100644
--- a/sound/softsynth/fmtowns_pc98/towns_audio.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/softsynth/fmtowns_pc98/towns_audio.h"
+#include "audio/softsynth/fmtowns_pc98/towns_audio.h"
 #include "common/endian.h"
 #include "backends/audiocd/audiocd.h"
 
diff --git a/sound/softsynth/fmtowns_pc98/towns_audio.h b/audio/softsynth/fmtowns_pc98/towns_audio.h
index 95fb1ded59..2819ab2d57 100644
--- a/sound/softsynth/fmtowns_pc98/towns_audio.h
+++ b/audio/softsynth/fmtowns_pc98/towns_audio.h
@@ -26,7 +26,7 @@
 #ifndef TOWNS_AUDIO_H
 #define TOWNS_AUDIO_H
 
-#include "sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
+#include "audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
 
 class TownsAudioInterfacePluginDriver {
 public:
diff --git a/sound/softsynth/fmtowns_pc98/towns_euphony.cpp b/audio/softsynth/fmtowns_pc98/towns_euphony.cpp
index 3a691c407d..7c071c43fb 100644
--- a/sound/softsynth/fmtowns_pc98/towns_euphony.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_euphony.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/softsynth/fmtowns_pc98/towns_euphony.h"
+#include "audio/softsynth/fmtowns_pc98/towns_euphony.h"
 #include "common/endian.h"
 
 TownsEuphonyDriver::TownsEuphonyDriver(Audio::Mixer *mixer) : _activeChannels(0), _sustainChannels(0),
diff --git a/sound/softsynth/fmtowns_pc98/towns_euphony.h b/audio/softsynth/fmtowns_pc98/towns_euphony.h
index fa1f8ba496..dc40373913 100644
--- a/sound/softsynth/fmtowns_pc98/towns_euphony.h
+++ b/audio/softsynth/fmtowns_pc98/towns_euphony.h
@@ -26,7 +26,7 @@
 #ifndef TOWNS_EUP_H
 #define TOWNS_EUP_H
 
-#include "sound/softsynth/fmtowns_pc98/towns_audio.h"
+#include "audio/softsynth/fmtowns_pc98/towns_audio.h"
 
 class TownsEuphonyDriver : public TownsAudioInterfacePluginDriver {
 public:
diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
index 303f08e6b1..79fd95ea0d 100644
--- a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/softsynth/fmtowns_pc98/towns_pc98_driver.h"
+#include "audio/softsynth/fmtowns_pc98/towns_pc98_driver.h"
 #include "common/endian.h"
 
 class TownsPC98_MusicChannel {
diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.h b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.h
index 00fcf7c5d5..1227e2626a 100644
--- a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.h
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.h
@@ -26,7 +26,7 @@
 #ifndef TOWNS_PC98_AUDIODRIVER_H
 #define TOWNS_PC98_AUDIODRIVER_H
 
-#include "sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
+#include "audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
 
 class TownsPC98_MusicChannel;
 class TownsPC98_MusicChannelSSG;
diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
index 62f7d39771..f84fd841a6 100644
--- a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
+#include "audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
 #include "common/endian.h"
 
 class TownsPC98_FmSynthOperator {
diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
index ddd249b1b8..18cca56e29 100644
--- a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
@@ -26,8 +26,8 @@
 #ifndef TOWNS_PC98_FMSYNTH_H
 #define TOWNS_PC98_FMSYNTH_H
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 #include "common/list.h"
 
 #ifdef __DS__
diff --git a/sound/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp
index 09e7e48151..3a3958d494 100644
--- a/sound/softsynth/mt32.cpp
+++ b/audio/softsynth/mt32.cpp
@@ -26,11 +26,11 @@
 
 #ifdef USE_MT32EMU
 
-#include "sound/softsynth/mt32/mt32emu.h"
+#include "audio/softsynth/mt32/mt32emu.h"
 
-#include "sound/softsynth/emumidi.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/softsynth/emumidi.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
 
 #include "common/config-manager.h"
 #include "common/debug.h"
diff --git a/sound/softsynth/mt32/freeverb.cpp b/audio/softsynth/mt32/freeverb.cpp
index 4ee6e20117..c62d4f2cf3 100644
--- a/sound/softsynth/mt32/freeverb.cpp
+++ b/audio/softsynth/mt32/freeverb.cpp
@@ -29,7 +29,7 @@
 // http://www.dreampoint.co.uk
 // This code is public domain
 
-#include "sound/softsynth/mt32/freeverb.h"
+#include "audio/softsynth/mt32/freeverb.h"
 
 comb::comb() {
 	filterstore = 0;
diff --git a/sound/softsynth/mt32/freeverb.h b/audio/softsynth/mt32/freeverb.h
index 8310aca3e3..8310aca3e3 100644
--- a/sound/softsynth/mt32/freeverb.h
+++ b/audio/softsynth/mt32/freeverb.h
diff --git a/sound/softsynth/mt32/i386.cpp b/audio/softsynth/mt32/i386.cpp
index f092189d76..f092189d76 100644
--- a/sound/softsynth/mt32/i386.cpp
+++ b/audio/softsynth/mt32/i386.cpp
diff --git a/sound/softsynth/mt32/i386.h b/audio/softsynth/mt32/i386.h
index e8644411cd..e8644411cd 100644
--- a/sound/softsynth/mt32/i386.h
+++ b/audio/softsynth/mt32/i386.h
diff --git a/sound/softsynth/mt32/module.mk b/audio/softsynth/mt32/module.mk
index 4d5d899ac3..a8329bc98c 100644
--- a/sound/softsynth/mt32/module.mk
+++ b/audio/softsynth/mt32/module.mk
@@ -1,4 +1,4 @@
-MODULE := sound/softsynth/mt32
+MODULE := audio/softsynth/mt32
 
 MODULE_OBJS := \
 	mt32_file.o \
diff --git a/sound/softsynth/mt32/mt32_file.cpp b/audio/softsynth/mt32/mt32_file.cpp
index cdf9fa13f6..cdf9fa13f6 100644
--- a/sound/softsynth/mt32/mt32_file.cpp
+++ b/audio/softsynth/mt32/mt32_file.cpp
diff --git a/sound/softsynth/mt32/mt32_file.h b/audio/softsynth/mt32/mt32_file.h
index e6641660ee..e6641660ee 100644
--- a/sound/softsynth/mt32/mt32_file.h
+++ b/audio/softsynth/mt32/mt32_file.h
diff --git a/sound/softsynth/mt32/mt32emu.h b/audio/softsynth/mt32/mt32emu.h
index 6eedf04bc0..6eedf04bc0 100644
--- a/sound/softsynth/mt32/mt32emu.h
+++ b/audio/softsynth/mt32/mt32emu.h
diff --git a/sound/softsynth/mt32/part.cpp b/audio/softsynth/mt32/part.cpp
index eb087f7ea0..eb087f7ea0 100644
--- a/sound/softsynth/mt32/part.cpp
+++ b/audio/softsynth/mt32/part.cpp
diff --git a/sound/softsynth/mt32/part.h b/audio/softsynth/mt32/part.h
index 54c4999653..54c4999653 100644
--- a/sound/softsynth/mt32/part.h
+++ b/audio/softsynth/mt32/part.h
diff --git a/sound/softsynth/mt32/partial.cpp b/audio/softsynth/mt32/partial.cpp
index 5ba9ef6145..5ba9ef6145 100644
--- a/sound/softsynth/mt32/partial.cpp
+++ b/audio/softsynth/mt32/partial.cpp
diff --git a/sound/softsynth/mt32/partial.h b/audio/softsynth/mt32/partial.h
index 93d8bcd985..93d8bcd985 100644
--- a/sound/softsynth/mt32/partial.h
+++ b/audio/softsynth/mt32/partial.h
diff --git a/sound/softsynth/mt32/partialManager.cpp b/audio/softsynth/mt32/partialManager.cpp
index 3d3b6302db..3d3b6302db 100644
--- a/sound/softsynth/mt32/partialManager.cpp
+++ b/audio/softsynth/mt32/partialManager.cpp
diff --git a/sound/softsynth/mt32/partialManager.h b/audio/softsynth/mt32/partialManager.h
index b10f93ff02..b10f93ff02 100644
--- a/sound/softsynth/mt32/partialManager.h
+++ b/audio/softsynth/mt32/partialManager.h
diff --git a/sound/softsynth/mt32/structures.h b/audio/softsynth/mt32/structures.h
index ef58c1d20f..ef58c1d20f 100644
--- a/sound/softsynth/mt32/structures.h
+++ b/audio/softsynth/mt32/structures.h
diff --git a/sound/softsynth/mt32/synth.cpp b/audio/softsynth/mt32/synth.cpp
index 16460795a5..16460795a5 100644
--- a/sound/softsynth/mt32/synth.cpp
+++ b/audio/softsynth/mt32/synth.cpp
diff --git a/sound/softsynth/mt32/synth.h b/audio/softsynth/mt32/synth.h
index 3fc303d322..3fc303d322 100644
--- a/sound/softsynth/mt32/synth.h
+++ b/audio/softsynth/mt32/synth.h
diff --git a/sound/softsynth/mt32/tables.cpp b/audio/softsynth/mt32/tables.cpp
index eba4d2a520..eba4d2a520 100644
--- a/sound/softsynth/mt32/tables.cpp
+++ b/audio/softsynth/mt32/tables.cpp
diff --git a/sound/softsynth/mt32/tables.h b/audio/softsynth/mt32/tables.h
index d9af5114b2..d9af5114b2 100644
--- a/sound/softsynth/mt32/tables.h
+++ b/audio/softsynth/mt32/tables.h
diff --git a/sound/softsynth/opl/dbopl.cpp b/audio/softsynth/opl/dbopl.cpp
index 47e263b6b9..47e263b6b9 100644
--- a/sound/softsynth/opl/dbopl.cpp
+++ b/audio/softsynth/opl/dbopl.cpp
diff --git a/sound/softsynth/opl/dbopl.h b/audio/softsynth/opl/dbopl.h
index 87d1045fab..87d1045fab 100644
--- a/sound/softsynth/opl/dbopl.h
+++ b/audio/softsynth/opl/dbopl.h
diff --git a/sound/softsynth/opl/dosbox.cpp b/audio/softsynth/opl/dosbox.cpp
index 29993ce3d8..29993ce3d8 100644
--- a/sound/softsynth/opl/dosbox.cpp
+++ b/audio/softsynth/opl/dosbox.cpp
diff --git a/sound/softsynth/opl/dosbox.h b/audio/softsynth/opl/dosbox.h
index 958310611d..1e92c7f7c9 100644
--- a/sound/softsynth/opl/dosbox.h
+++ b/audio/softsynth/opl/dosbox.h
@@ -34,7 +34,7 @@
 
 #ifndef DISABLE_DOSBOX_OPL
 
-#include "sound/fmopl.h"
+#include "audio/fmopl.h"
 
 namespace OPL {
 namespace DOSBox {
diff --git a/sound/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp
index c875080e8f..c875080e8f 100644
--- a/sound/softsynth/opl/mame.cpp
+++ b/audio/softsynth/opl/mame.cpp
diff --git a/sound/softsynth/opl/mame.h b/audio/softsynth/opl/mame.h
index ec812d0c4e..58ef5f18dc 100644
--- a/sound/softsynth/opl/mame.h
+++ b/audio/softsynth/opl/mame.h
@@ -33,7 +33,7 @@
 #include "common/util.h"
 #include "common/random.h"
 
-#include "sound/fmopl.h"
+#include "audio/fmopl.h"
 
 namespace OPL {
 namespace MAME {
diff --git a/sound/softsynth/pcspk.cpp b/audio/softsynth/pcspk.cpp
index bdf9f112e8..69ba113c8b 100644
--- a/sound/softsynth/pcspk.cpp
+++ b/audio/softsynth/pcspk.cpp
@@ -23,8 +23,8 @@
 *
 */
 
-#include "sound/softsynth/pcspk.h"
-#include "sound/null.h"
+#include "audio/softsynth/pcspk.h"
+#include "audio/null.h"
 
 namespace Audio {
 
diff --git a/sound/softsynth/pcspk.h b/audio/softsynth/pcspk.h
index 3cd8734a7e..c0d85bbceb 100644
--- a/sound/softsynth/pcspk.h
+++ b/audio/softsynth/pcspk.h
@@ -25,8 +25,8 @@
 #ifndef SOUND_SOFTSYNTH_PCSPK_H
 #define SOUND_SOFTSYNTH_PCSPK_H
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 #include "common/mutex.h"
 
 namespace Audio {
diff --git a/sound/softsynth/sid.cpp b/audio/softsynth/sid.cpp
index c05ae2e8f5..241766fa0a 100644
--- a/sound/softsynth/sid.cpp
+++ b/audio/softsynth/sid.cpp
@@ -31,7 +31,7 @@
 #ifndef DISABLE_SID
 
 #include "sid.h"
-#include "sound/null.h"
+#include "audio/null.h"
 #include <math.h>
 
 namespace Resid {
diff --git a/sound/softsynth/sid.h b/audio/softsynth/sid.h
index c78f538441..c78f538441 100644
--- a/sound/softsynth/sid.h
+++ b/audio/softsynth/sid.h
diff --git a/sound/softsynth/wave6581.cpp b/audio/softsynth/wave6581.cpp
index d1ddad1623..d1ddad1623 100644
--- a/sound/softsynth/wave6581.cpp
+++ b/audio/softsynth/wave6581.cpp
diff --git a/sound/softsynth/ym2612.cpp b/audio/softsynth/ym2612.cpp
index 08331c6244..94fcfb97db 100644
--- a/sound/softsynth/ym2612.cpp
+++ b/audio/softsynth/ym2612.cpp
@@ -24,9 +24,9 @@
 
 #include <math.h>
 
-#include "sound/softsynth/ym2612.h"
+#include "audio/softsynth/ym2612.h"
 #include "common/util.h"
-#include "sound/musicplugin.h"
+#include "audio/musicplugin.h"
 #include "common/translation.h"
 
 ////////////////////////////////////////
diff --git a/sound/softsynth/ym2612.h b/audio/softsynth/ym2612.h
index 5fb2f32ef0..f652b2d9e4 100644
--- a/sound/softsynth/ym2612.h
+++ b/audio/softsynth/ym2612.h
@@ -27,7 +27,7 @@
 
 #include "common/scummsys.h"
 
-#include "sound/softsynth/emumidi.h"
+#include "audio/softsynth/emumidi.h"
 
 ////////////////////////////////////////
 //
diff --git a/sound/timestamp.cpp b/audio/timestamp.cpp
index 1e49e1b476..cdc5bc3a02 100644
--- a/sound/timestamp.cpp
+++ b/audio/timestamp.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/timestamp.h"
+#include "audio/timestamp.h"
 #include "common/algorithm.h"
 
 namespace Audio {
diff --git a/sound/timestamp.h b/audio/timestamp.h
index 4130793fc8..4130793fc8 100644
--- a/sound/timestamp.h
+++ b/audio/timestamp.h
diff --git a/backends/audiocd/default/default-audiocd.cpp b/backends/audiocd/default/default-audiocd.cpp
index 6d16b26652..0acc64b7f2 100644
--- a/backends/audiocd/default/default-audiocd.cpp
+++ b/backends/audiocd/default/default-audiocd.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "backends/audiocd/default/default-audiocd.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 #include "common/system.h"
 
 DefaultAudioCDManager::DefaultAudioCDManager() {
diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h
index 3f9df0bbbb..d3e0150fb6 100644
--- a/backends/audiocd/default/default-audiocd.h
+++ b/backends/audiocd/default/default-audiocd.h
@@ -27,7 +27,7 @@
 #define BACKENDS_AUDIOCD_DEFAULT_H
 
 #include "backends/audiocd/audiocd.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 /**
  * The default audio cd manager. Implements emulation of audio cd playback.
diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp
index fd32777a1b..953b088958 100644
--- a/backends/midi/alsa.cpp
+++ b/backends/midi/alsa.cpp
@@ -31,8 +31,8 @@
 
 #include "common/config-manager.h"
 #include "common/util.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
 
 #include <alsa/asoundlib.h>
 
diff --git a/backends/midi/camd.cpp b/backends/midi/camd.cpp
index 7bf702de58..57251b45e1 100644
--- a/backends/midi/camd.cpp
+++ b/backends/midi/camd.cpp
@@ -31,8 +31,8 @@
 
 #include "common/endian.h"
 #include "common/util.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
 
 #include <proto/camd.h>
 #include <proto/exec.h>
diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp
index 62e9a6d0f4..75c512cad7 100644
--- a/backends/midi/coreaudio.cpp
+++ b/backends/midi/coreaudio.cpp
@@ -42,8 +42,8 @@
 
 #include "common/config-manager.h"
 #include "common/util.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
 
 #include <CoreServices/CoreServices.h>
 #include <AudioToolbox/AUGraph.h>
diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp
index 2df9f78383..c0663352cb 100644
--- a/backends/midi/coremidi.cpp
+++ b/backends/midi/coremidi.cpp
@@ -31,8 +31,8 @@
 
 #include "common/config-manager.h"
 #include "common/util.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
 
 #include <CoreMIDI/CoreMIDI.h>
 
diff --git a/backends/midi/dmedia.cpp b/backends/midi/dmedia.cpp
index ce4ea571e0..f0ab84c934 100644
--- a/backends/midi/dmedia.cpp
+++ b/backends/midi/dmedia.cpp
@@ -37,8 +37,8 @@
 #include "common/scummsys.h"
 #include "common/util.h"
 #include "common/config-manager.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
 
 #include <dmedia/midi.h>
 #include <sys/types.h>
diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp
index 74a92257bc..cc514117fb 100644
--- a/backends/midi/seq.cpp
+++ b/backends/midi/seq.cpp
@@ -36,8 +36,8 @@
 #if defined(USE_SEQ_MIDI)
 
 #include "common/util.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/backends/midi/stmidi.cpp b/backends/midi/stmidi.cpp
index 6e4d69f255..562c3c7ece 100644
--- a/backends/midi/stmidi.cpp
+++ b/backends/midi/stmidi.cpp
@@ -42,9 +42,9 @@
 #if defined __MINT__
 
 #include <osbind.h>
-#include "sound/mpu401.h"
+#include "audio/mpu401.h"
 #include "common/util.h"
-#include "sound/musicplugin.h"
+#include "audio/musicplugin.h"
 
 class MidiDriver_STMIDI : public MidiDriver_MPU401 {
 public:
diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp
index f0dd24bcbd..4c0cefa156 100644
--- a/backends/midi/timidity.cpp
+++ b/backends/midi/timidity.cpp
@@ -44,8 +44,8 @@
 #include "common/util.h"
 #include "common/endian.h"
 #include "common/str.h"
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp
index a50fb4259f..b585b71fbe 100644
--- a/backends/midi/windows.cpp
+++ b/backends/midi/windows.cpp
@@ -34,8 +34,8 @@
 // winnt.h defines ARRAYSIZE, but we want our own one...
 #undef ARRAYSIZE
 
-#include "sound/musicplugin.h"
-#include "sound/mpu401.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
 #include "common/config-manager.h"
 #include "common/translation.h"
 
diff --git a/backends/mixer/sdl/sdl-mixer.h b/backends/mixer/sdl/sdl-mixer.h
index 42129358aa..afb38f7f36 100644
--- a/backends/mixer/sdl/sdl-mixer.h
+++ b/backends/mixer/sdl/sdl-mixer.h
@@ -27,7 +27,7 @@
 #define BACKENDS_MIXER_SDL_H
 
 #include "backends/platform/sdl/sdl-sys.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 
 /**
  * SDL mixer manager. It wraps the actual implementation
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index b790dab036..efcee488a5 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -56,7 +56,7 @@
 #include "backends/saves/default/default-saves.h"
 #include "backends/timer/default/default-timer.h"
 #include "backends/plugins/posix/posix-provider.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 
 #include "backends/platform/android/asset-archive.h"
 
diff --git a/backends/platform/dc/audio.cpp b/backends/platform/dc/audio.cpp
index b5667e74b0..ae63186d8c 100644
--- a/backends/platform/dc/audio.cpp
+++ b/backends/platform/dc/audio.cpp
@@ -25,7 +25,7 @@
 
 #include <common/scummsys.h>
 #include "engines/engine.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 #include "dc.h"
 
 EXTERN_C void *memcpy4s(void *s1, const void *s2, unsigned int n);
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index f1d7454007..76c4b8cfd2 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -30,7 +30,7 @@
 #include "backends/timer/default/default-timer.h"
 #include "backends/audiocd/default/default-audiocd.h"
 #include "backends/fs/fs-factory.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 
 #define NUM_BUFFERS 4
 #define SOUND_BUFFER_SHIFT 3
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index 531bfe2fda..bbd4f994f7 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -34,7 +34,7 @@
 #include <common/memstream.h>
 
 #include "backends/plugins/dc/dc-provider.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 
 
 Icon icon;
diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h
index 27d75e5124..7feed7541f 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.h
+++ b/backends/platform/ds/arm9/source/osystem_ds.h
@@ -33,7 +33,7 @@
 #include "gbampsave.h"
 #include "backends/saves/default/default-saves.h"
 #include "backends/timer/default/default-timer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 #include "graphics/surface.h"
 #include "graphics/colormasks.h"
 
diff --git a/backends/platform/gph/gph-main.cpp b/backends/platform/gph/gph-main.cpp
index efb71040f5..e711135c15 100644
--- a/backends/platform/gph/gph-main.cpp
+++ b/backends/platform/gph/gph-main.cpp
@@ -43,7 +43,7 @@
 #include "backends/saves/default/default-saves.h"
 
 #include "backends/timer/default/default-timer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp
index 9dc4e202c4..813adfbc43 100644
--- a/backends/platform/iphone/osys_main.cpp
+++ b/backends/platform/iphone/osys_main.cpp
@@ -41,8 +41,8 @@
 
 #include "backends/saves/default/default-saves.h"
 #include "backends/timer/default/default-timer.h"
-#include "sound/mixer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer.h"
+#include "audio/mixer_intern.h"
 
 #include "osys_main.h"
 
diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h
index df01af798a..5e88510980 100644
--- a/backends/platform/iphone/osys_main.h
+++ b/backends/platform/iphone/osys_main.h
@@ -27,7 +27,7 @@
 #include "iphone_common.h"
 #include "backends/base-backend.h"
 #include "common/events.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 #include "backends/fs/posix/posix-fs-factory.h"
 #include "graphics/colormasks.h"
 
diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h
index 4b2164cc9f..5264a8a82e 100644
--- a/backends/platform/n64/osys_n64.h
+++ b/backends/platform/n64/osys_n64.h
@@ -39,7 +39,7 @@
 #include "graphics/colormasks.h"
 #include "graphics/pixelformat.h"
 
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 
 #include <libn64.h>
 #include <n64utils.h>
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index 9b2b2ca78e..772b2b4722 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -29,7 +29,7 @@
 #if defined(USE_NULL_DRIVER)
 #include "backends/saves/default/default-saves.h"
 #include "backends/timer/default/default-timer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 #include "common/scummsys.h"
 
 /*
diff --git a/backends/platform/openpandora/op-main.cpp b/backends/platform/openpandora/op-main.cpp
index 8b181ef3b0..6e64baddc7 100644
--- a/backends/platform/openpandora/op-main.cpp
+++ b/backends/platform/openpandora/op-main.cpp
@@ -44,7 +44,7 @@
 #include "backends/saves/default/default-saves.h"
 
 #include "backends/timer/default/default-timer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index da5d55b3fc..ab7839e18f 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -57,7 +57,7 @@
 #include "graphics/surface.h"
 #include "graphics/font.h"
 #include "backends/timer/default/default-timer.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 #include "common/events.h"
 #include "backends/platform/ps2/ps2debug.h"
 #include "backends/fs/ps2/ps2-fs-factory.h"
diff --git a/backends/platform/psp/mp3.cpp b/backends/platform/psp/mp3.cpp
index 0e88418f13..54476dabfd 100644
--- a/backends/platform/psp/mp3.cpp
+++ b/backends/platform/psp/mp3.cpp
@@ -30,7 +30,7 @@
 #include "common/singleton.h"
 #include "common/mutex.h"
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 #include <pspaudiocodec.h>
 #include <psputility_modules.h>
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index 73a030f5d1..bb7c1ff7d5 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -42,7 +42,7 @@
 #include "backends/saves/psp/psp-saves.h"
 #include "backends/timer/default/default-timer.h"
 #include "graphics/surface.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 
 //#define __PSP_DEBUG_FUNCS__	/* For debugging function calls */
 //#define __PSP_DEBUG_PRINT__	/* For debug printouts */
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index 8d274bb5bd..051449d4a0 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -29,7 +29,7 @@
 #include "common/scummsys.h"
 #include "graphics/surface.h"
 #include "graphics/colormasks.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 #include "backends/base-backend.h"
 #include "backends/fs/psp/psp-fs-factory.h"
 
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index 9ed4b16d79..3c992b8bdc 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -37,7 +37,7 @@
 #include "backends/timer/default/default-timer.h"
 #include "graphics/colormasks.h"
 #include "graphics/surface.h"
-#include "sound/mixer_intern.h"
+#include "audio/mixer_intern.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index 02f107fe9e..ade90b2dfb 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -40,8 +40,8 @@
 #include "base/main.h"
 #include "base/plugins.h"
 
-#include "sound/mixer_intern.h"
-#include "sound/fmopl.h"
+#include "audio/mixer_intern.h"
+#include "audio/fmopl.h"
 
 #include "backends/timer/default/default-timer.h"
 
diff --git a/backends/plugins/elf/memory-manager.cpp b/backends/plugins/elf/memory-manager.cpp
index 3682a7235d..b2ac497771 100644
--- a/backends/plugins/elf/memory-manager.cpp
+++ b/backends/plugins/elf/memory-manager.cpp
@@ -28,7 +28,7 @@
 #if defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER)
 
 #include "backends/plugins/elf/memory-manager.h"
-#include "common/util.h"

+#include "common/util.h"
 #include <malloc.h>
  
 DECLARE_SINGLETON(ELFMemoryManager); 
diff --git a/base/main.cpp b/base/main.cpp
index 2c432c1af9..8c613b8e85 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -54,8 +54,8 @@
 #include "gui/message.h"
 #include "gui/error.h"
 
-#include "sound/mididrv.h"
-#include "sound/musicplugin.h"  /* for music manager */
+#include "audio/mididrv.h"
+#include "audio/musicplugin.h"  /* for music manager */
 
 #include "backends/keymapper/keymapper.h"
 
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 5f01329df8..1db9c0d499 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -622,7 +622,7 @@ const EnginePlugin::List &EngineManager::getPlugins() const {
 
 // Music plugins
 
-#include "sound/musicplugin.h"
+#include "audio/musicplugin.h"
 
 DECLARE_SINGLETON(MusicManager);
 
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 885704b9c6..fdc05f0ba9 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -40,8 +40,8 @@
 
 #include "graphics/cursorman.h"
 
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
 
 #include "agi/agi.h"
 #include "agi/graphics.h"
diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp
index 1a5698dffc..fe864d7659 100644
--- a/engines/agi/preagi.cpp
+++ b/engines/agi/preagi.cpp
@@ -27,7 +27,7 @@
 #include "common/debug-channels.h"
 #include "common/random.h"
 
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 #include "agi/preagi.h"
 #include "agi/graphics.h"
diff --git a/engines/agi/preagi.h b/engines/agi/preagi.h
index 45b50f2eed..58e08945b6 100644
--- a/engines/agi/preagi.h
+++ b/engines/agi/preagi.h
@@ -29,7 +29,7 @@
 #include "agi/agi.h"
 #include "agi/preagi_common.h"
 
-#include "sound/softsynth/pcspk.h"
+#include "audio/softsynth/pcspk.h"
 
 namespace Agi {
 
diff --git a/engines/agi/sound.h b/engines/agi/sound.h
index 63b36e017c..b858493cb8 100644
--- a/engines/agi/sound.h
+++ b/engines/agi/sound.h
@@ -26,7 +26,7 @@
 #ifndef AGI_SOUND_H
 #define AGI_SOUND_H
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Agi {
 
diff --git a/engines/agi/sound_2gs.h b/engines/agi/sound_2gs.h
index 12dede0b69..391646d6ce 100644
--- a/engines/agi/sound_2gs.h
+++ b/engines/agi/sound_2gs.h
@@ -27,7 +27,7 @@
 #define AGI_SOUND_2GS_H
 
 #include "common/frac.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 namespace Agi {
 
diff --git a/engines/agi/sound_coco3.h b/engines/agi/sound_coco3.h
index b60f1937cd..a1cc271871 100644
--- a/engines/agi/sound_coco3.h
+++ b/engines/agi/sound_coco3.h
@@ -26,7 +26,7 @@
 #ifndef AGI_SOUND_COCO3_H
 #define AGI_SOUND_COCO3_H
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 namespace Agi {
 
diff --git a/engines/agi/sound_midi.cpp b/engines/agi/sound_midi.cpp
index 9011ecaa86..47cab0019f 100644
--- a/engines/agi/sound_midi.cpp
+++ b/engines/agi/sound_midi.cpp
@@ -42,9 +42,9 @@
 
 // MIDI and digital music class
 
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/memstream.h"
diff --git a/engines/agi/sound_midi.h b/engines/agi/sound_midi.h
index 26b75e0d70..059d41208c 100644
--- a/engines/agi/sound_midi.h
+++ b/engines/agi/sound_midi.h
@@ -28,8 +28,8 @@
 #ifndef AGI_SOUND_MIDI_H
 #define AGI_SOUND_MIDI_H
 
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
 #include "common/mutex.h"
 
 namespace Agi {
diff --git a/engines/agi/sound_pcjr.h b/engines/agi/sound_pcjr.h
index fe0e762f4e..3aad29d2ce 100644
--- a/engines/agi/sound_pcjr.h
+++ b/engines/agi/sound_pcjr.h
@@ -26,7 +26,7 @@
 #ifndef AGI_SOUND_PCJR_H
 #define AGI_SOUND_PCJR_H
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 namespace Agi {
 
diff --git a/engines/agi/sound_sarien.cpp b/engines/agi/sound_sarien.cpp
index 4ede50a749..4ed7f8d029 100644
--- a/engines/agi/sound_sarien.cpp
+++ b/engines/agi/sound_sarien.cpp
@@ -29,7 +29,7 @@
 #include "common/random.h"
 #include "common/str-array.h"
 
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 #include "agi/agi.h"
 
diff --git a/engines/agi/sound_sarien.h b/engines/agi/sound_sarien.h
index 54222ba624..cea396255c 100644
--- a/engines/agi/sound_sarien.h
+++ b/engines/agi/sound_sarien.h
@@ -26,7 +26,7 @@
 #ifndef AGI_SOUND_SARIEN_H
 #define AGI_SOUND_SARIEN_H
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 namespace Agi {
 
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index d37a627da0..ae95bb0d2b 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -41,8 +41,8 @@
 
 #include "graphics/surface.h"
 
-#include "sound/mididrv.h"
-#include "sound/mods/protracker.h"
+#include "audio/mididrv.h"
+#include "audio/mods/protracker.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index cdb0fd2626..4c01f6b826 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -39,8 +39,8 @@
 #include "agos/intern.h"
 #include "agos/agos.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/wave.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/wave.h"
 
 #include "gui/message.h"
 
diff --git a/engines/agos/animation.h b/engines/agos/animation.h
index ed22ffea5b..77b02ffd13 100644
--- a/engines/agos/animation.h
+++ b/engines/agos/animation.h
@@ -30,7 +30,7 @@
 
 #include "video/dxa_decoder.h"
 #include "video/smk_decoder.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/midi.h b/engines/agos/midi.h
index d76997737a..9c8303ba3c 100644
--- a/engines/agos/midi.h
+++ b/engines/agos/midi.h
@@ -26,8 +26,8 @@
 #ifndef AGOS_MIDI_H
 #define AGOS_MIDI_H
 
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
 #include "common/mutex.h"
 
 namespace Common {
diff --git a/engines/agos/midiparser_s1d.cpp b/engines/agos/midiparser_s1d.cpp
index 568135ef8c..156dc6ecaa 100644
--- a/engines/agos/midiparser_s1d.cpp
+++ b/engines/agos/midiparser_s1d.cpp
@@ -26,8 +26,8 @@
 #include "common/debug.h"
 #include "common/util.h"
 
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index 7f11367d0f..fe09e746ff 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -33,9 +33,9 @@
 
 #include "backends/audiocd/audiocd.h"
 
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/mods/protracker.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/mods/protracker.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index 20deb47be8..35301793bf 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -30,14 +30,14 @@
 #include "agos/agos.h"
 #include "agos/sound.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/flac.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/voc.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/wave.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/flac.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/voc.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/wave.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/sound.h b/engines/agos/sound.h
index 10ff14d5ac..9739cfb58f 100644
--- a/engines/agos/sound.h
+++ b/engines/agos/sound.h
@@ -26,8 +26,8 @@
 #ifndef AGOS_SOUND_H
 #define AGOS_SOUND_H
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 #include "agos/intern.h"
 #include "common/str.h"
 
diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp
index 23e9db9670..f0c0668e33 100644
--- a/engines/cine/sound.cpp
+++ b/engines/cine/sound.cpp
@@ -30,10 +30,10 @@
 #include "cine/cine.h"
 #include "cine/sound.h"
 
-#include "sound/audiostream.h"
-#include "sound/fmopl.h"
-#include "sound/decoders/raw.h"
-#include "sound/mods/soundfx.h"
+#include "audio/audiostream.h"
+#include "audio/fmopl.h"
+#include "audio/decoders/raw.h"
+#include "audio/mods/soundfx.h"
 
 namespace Cine {
 
diff --git a/engines/cine/sound.h b/engines/cine/sound.h
index 6982468035..e9a797989e 100644
--- a/engines/cine/sound.h
+++ b/engines/cine/sound.h
@@ -27,7 +27,7 @@
 #define CINE_SOUND_H_
 
 #include "common/util.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 	class AudioStream;
diff --git a/engines/cruise/sound.cpp b/engines/cruise/sound.cpp
index 3cb499c6a4..8a4b1d0d2b 100644
--- a/engines/cruise/sound.cpp
+++ b/engines/cruise/sound.cpp
@@ -30,9 +30,9 @@
 #include "cruise/sound.h"
 #include "cruise/volume.h"
 
-#include "sound/audiostream.h"
-#include "sound/fmopl.h"
-#include "sound/mods/soundfx.h"
+#include "audio/audiostream.h"
+#include "audio/fmopl.h"
+#include "audio/mods/soundfx.h"
 
 namespace Cruise {
 
diff --git a/engines/cruise/sound.h b/engines/cruise/sound.h
index fdea5bed1b..61985ce802 100644
--- a/engines/cruise/sound.h
+++ b/engines/cruise/sound.h
@@ -26,9 +26,9 @@
 #ifndef CRUISE_SOUND_H
 #define CRUISE_SOUND_H
 
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mixer.h"
 
 #include "common/config-manager.h"
 #include "common/serializer.h"
diff --git a/engines/draci/music.cpp b/engines/draci/music.cpp
index 95b7ae08da..caa82c2cc0 100644
--- a/engines/draci/music.cpp
+++ b/engines/draci/music.cpp
@@ -25,9 +25,9 @@
 
 // MIDI and digital music class
 
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 
diff --git a/engines/draci/music.h b/engines/draci/music.h
index 2d3da47e46..f6f3a5ae50 100644
--- a/engines/draci/music.h
+++ b/engines/draci/music.h
@@ -28,8 +28,8 @@
 #ifndef DRACI_MUSIC_H
 #define DRACI_MUSIC_H
 
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
 #include "common/mutex.h"
 
 namespace Draci {
diff --git a/engines/draci/sound.cpp b/engines/draci/sound.cpp
index af096256ea..dc8f548d6b 100644
--- a/engines/draci/sound.cpp
+++ b/engines/draci/sound.cpp
@@ -36,12 +36,12 @@
 #include "draci/draci.h"
 #include "draci/game.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/flac.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
 
 namespace Draci {
 
diff --git a/engines/draci/sound.h b/engines/draci/sound.h
index 6e9aae1b6e..4f69af7ff0 100644
--- a/engines/draci/sound.h
+++ b/engines/draci/sound.h
@@ -29,7 +29,7 @@
 #include "common/str.h"
 #include "common/file.h"
 #include "common/list.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Common {
 class Archive;
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index b931eb191c..e84e80ccd3 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -37,7 +37,7 @@
 
 #include "engines/util.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "drascula/drascula.h"
 #include "drascula/console.h"
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 4608624614..ac3f86b9ba 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -38,7 +38,7 @@
 #include "common/system.h"
 #include "common/util.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "engines/engine.h"
 
diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp
index 094f9ba817..48e7492b11 100644
--- a/engines/drascula/sound.cpp
+++ b/engines/drascula/sound.cpp
@@ -23,10 +23,10 @@
  *
  */
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/voc.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/voc.h"
 
 #include "common/config-manager.h"
 
diff --git a/engines/engine.cpp b/engines/engine.cpp
index b8ddc631df..0d92c1aef1 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -48,7 +48,7 @@
 #include "gui/message.h"
 #include "gui/gui-manager.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "graphics/cursorman.h"
 
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 4d36933fef..b65bbe0d0f 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -32,7 +32,7 @@
 #include "base/plugins.h"
 #include "common/config-manager.h"
 #include "common/md5.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 #include "gui/gui-manager.h"
 #include "gui/dialog.h"
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index bb27dd0888..63b2d7f681 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -28,8 +28,8 @@
 
 #include "gui/message.h"
 
-#include "sound/mixer.h"
-#include "sound/mods/infogrames.h"
+#include "audio/mixer.h"
+#include "audio/mods/infogrames.h"
 
 #include "gob/gob.h"
 #include "gob/inter.h"
diff --git a/engines/gob/sound/adlib.h b/engines/gob/sound/adlib.h
index 3f7b46643f..090841b9d6 100644
--- a/engines/gob/sound/adlib.h
+++ b/engines/gob/sound/adlib.h
@@ -27,9 +27,9 @@
 #define GOB_SOUND_ADLIB_H
 
 #include "common/mutex.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/fmopl.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/fmopl.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/bgatmosphere.h b/engines/gob/sound/bgatmosphere.h
index aabf6a7e9e..71a2263341 100644
--- a/engines/gob/sound/bgatmosphere.h
+++ b/engines/gob/sound/bgatmosphere.h
@@ -26,7 +26,7 @@
 #ifndef GOB_SOUND_BGATMOSPHERE_H
 #define GOB_SOUND_BGATMOSPHERE_H
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 #include "common/mutex.h"
 #include "common/random.h"
 
diff --git a/engines/gob/sound/infogrames.h b/engines/gob/sound/infogrames.h
index 4a20dceb22..cdcb0a7c39 100644
--- a/engines/gob/sound/infogrames.h
+++ b/engines/gob/sound/infogrames.h
@@ -26,8 +26,8 @@
 #ifndef GOB_SOUND_INFOGRAMES_H
 #define GOB_SOUND_INFOGRAMES_H
 
-#include "sound/mixer.h"
-#include "sound/mods/infogrames.h"
+#include "audio/mixer.h"
+#include "audio/mods/infogrames.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/pcspeaker.h b/engines/gob/sound/pcspeaker.h
index 8c4fb08021..f83d65a615 100644
--- a/engines/gob/sound/pcspeaker.h
+++ b/engines/gob/sound/pcspeaker.h
@@ -26,8 +26,8 @@
 #ifndef GOB_SOUND_PCSPEAKER_H
 #define GOB_SOUND_PCSPEAKER_H
 
-#include "sound/mixer.h"
-#include "sound/softsynth/pcspk.h"
+#include "audio/mixer.h"
+#include "audio/softsynth/pcspk.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/protracker.cpp b/engines/gob/sound/protracker.cpp
index 9c7de72c29..445d8f8cfb 100644
--- a/engines/gob/sound/protracker.cpp
+++ b/engines/gob/sound/protracker.cpp
@@ -25,7 +25,7 @@
 
 #include "common/file.h"
 
-#include "sound/mods/protracker.h"
+#include "audio/mods/protracker.h"
 
 #include "gob/sound/protracker.h"
 
diff --git a/engines/gob/sound/protracker.h b/engines/gob/sound/protracker.h
index 73cae0d510..0397efb3b7 100644
--- a/engines/gob/sound/protracker.h
+++ b/engines/gob/sound/protracker.h
@@ -26,8 +26,8 @@
 #ifndef GOB_SOUND_PROTRACKER_H
 #define GOB_SOUND_PROTRACKER_H
 
-#include "sound/mixer.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/audiostream.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/soundblaster.h b/engines/gob/sound/soundblaster.h
index a2dc87267c..ffe46801dc 100644
--- a/engines/gob/sound/soundblaster.h
+++ b/engines/gob/sound/soundblaster.h
@@ -27,7 +27,7 @@
 #define GOB_SOUND_SOUNDBLASTER_H
 
 #include "common/mutex.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "gob/sound/soundmixer.h"
 
diff --git a/engines/gob/sound/sounddesc.cpp b/engines/gob/sound/sounddesc.cpp
index 8903597bb0..d33ea89147 100644
--- a/engines/gob/sound/sounddesc.cpp
+++ b/engines/gob/sound/sounddesc.cpp
@@ -25,9 +25,9 @@
 
 #include "common/util.h"
 #include "common/memstream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/wave.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/wave.h"
 
 #include "gob/sound/sounddesc.h"
 #include "gob/resources.h"
diff --git a/engines/gob/sound/soundmixer.cpp b/engines/gob/sound/soundmixer.cpp
index 1f5cf2e053..b6082c577c 100644
--- a/engines/gob/sound/soundmixer.cpp
+++ b/engines/gob/sound/soundmixer.cpp
@@ -26,7 +26,7 @@
 #include "gob/sound/soundmixer.h"
 #include "gob/sound/sounddesc.h"
 
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/soundmixer.h b/engines/gob/sound/soundmixer.h
index 9e66c474e9..5b283b2d84 100644
--- a/engines/gob/sound/soundmixer.h
+++ b/engines/gob/sound/soundmixer.h
@@ -28,8 +28,8 @@
 
 #include "common/mutex.h"
 #include "common/frac.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Gob {
 
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index f280da8f56..4a4f5e0de5 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -40,7 +40,7 @@
 #include "backends/audiocd/audiocd.h"
 #include "engines/util.h"
 #include "graphics/fontman.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Groovie {
 
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index fd2cc2bec8..011409155c 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -31,7 +31,7 @@
 #include "common/config-manager.h"
 #include "common/macresman.h"
 #include "common/memstream.h"
-#include "sound/midiparser.h"
+#include "audio/midiparser.h"
 
 namespace Groovie {
 
diff --git a/engines/groovie/music.h b/engines/groovie/music.h
index 5b5f5bd346..74bb6f98e5 100644
--- a/engines/groovie/music.h
+++ b/engines/groovie/music.h
@@ -28,7 +28,7 @@
 
 #include "common/array.h"
 #include "common/mutex.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 class MidiParser;
 
diff --git a/engines/groovie/player.h b/engines/groovie/player.h
index bb156d7929..c9f47b8100 100644
--- a/engines/groovie/player.h
+++ b/engines/groovie/player.h
@@ -27,7 +27,7 @@
 #define GROOVIE_PLAYER_H
 
 #include "common/system.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 namespace Groovie {
 
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 6772a5a40f..540465050d 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -36,8 +36,8 @@
 // Required for the YUV to RGB conversion
 #include "graphics/conversion.h"
 #endif
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 namespace Groovie {
 
diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp
index 3ab8608031..10177dad34 100644
--- a/engines/groovie/vdx.cpp
+++ b/engines/groovie/vdx.cpp
@@ -29,8 +29,8 @@
 #include "groovie/lzss.h"
 
 #include "common/debug-channels.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 #define TILE_SIZE 4			// Size of each tile on the image: only ever seen 4 so far
 #define VDX_IDENT 0x9267	// 37479
diff --git a/engines/hugo/sound.cpp b/engines/hugo/sound.cpp
index b382f449b0..ecf1bd1a86 100644
--- a/engines/hugo/sound.cpp
+++ b/engines/hugo/sound.cpp
@@ -35,8 +35,8 @@
 #include "common/system.h"
 #include "common/config-manager.h"
 
-#include "sound/decoders/raw.h"
-#include "sound/audiostream.h"
+#include "audio/decoders/raw.h"
+#include "audio/audiostream.h"
 
 #include "hugo/hugo.h"
 #include "hugo/game.h"
diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h
index 0e8905c762..e39f932741 100644
--- a/engines/hugo/sound.h
+++ b/engines/hugo/sound.h
@@ -33,10 +33,10 @@
 #ifndef HUGO_SOUND_H
 #define HUGO_SOUND_H
 
-#include "sound/mixer.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/softsynth/pcspk.h"
+#include "audio/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/softsynth/pcspk.h"
 
 namespace Hugo {
 
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 26c4001578..f5b96410e8 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -27,8 +27,8 @@
 #include "common/debug-channels.h"
 #include "common/EventRecorder.h"
 
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
 
 #include "kyra/kyra_v1.h"
 #include "kyra/sound_intern.h"
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 31c07336a6..12b9fb5942 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -34,7 +34,7 @@
 #include "common/hashmap.h"
 #include "common/system.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "kyra/script.h"
 #include "kyra/item.h"
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 87bd67b40b..36bc0c99d7 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -34,8 +34,8 @@
 #include "kyra/util.h"
 #include "kyra/debugger.h"
 
-#include "sound/decoders/voc.h"
-#include "sound/audiostream.h"
+#include "audio/decoders/voc.h"
+#include "audio/audiostream.h"
 
 #include "common/config-manager.h"
 #include "common/endian.h"
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index a1d88a3005..9dd046e50b 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -30,14 +30,14 @@
 #include "kyra/resource.h"
 #include "kyra/sound.h"
 
-#include "sound/mixer.h"
-#include "sound/decoders/voc.h"
-#include "sound/audiostream.h"
-
-#include "sound/decoders/flac.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vorbis.h"
+#include "audio/mixer.h"
+#include "audio/decoders/voc.h"
+#include "audio/audiostream.h"
+
+#include "audio/decoders/flac.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vorbis.h"
 
 namespace Kyra {
 
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index 8b83796d46..326fef94d1 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -31,7 +31,7 @@
 #include "common/scummsys.h"
 #include "common/str.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 class AudioStream;
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index a45972ece7..758d66192d 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -45,9 +45,9 @@
 #include "kyra/resource.h"
 #include "kyra/sound_intern.h"
 
-#include "sound/mixer.h"
-#include "sound/fmopl.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/fmopl.h"
+#include "audio/audiostream.h"
 
 // Basic AdLib Programming:
 // http://www.gamedev.net/reference/articles/article446.asp
diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp
index 5ded3e31e7..c5e9f6171d 100644
--- a/engines/kyra/sound_amiga.cpp
+++ b/engines/kyra/sound_amiga.cpp
@@ -28,9 +28,9 @@
 #include "kyra/resource.h"
 #include "kyra/sound_intern.h"
 
-#include "sound/mixer.h"
-#include "sound/mods/maxtrax.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/mods/maxtrax.h"
+#include "audio/audiostream.h"
 
 namespace Kyra {
 
diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp
index 150bafbef3..3d318b7e24 100644
--- a/engines/kyra/sound_digital.cpp
+++ b/engines/kyra/sound_digital.cpp
@@ -27,11 +27,11 @@
 #include "kyra/resource.h"
 #include "kyra/kyra_mr.h"
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/flac.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
 
 namespace Kyra {
 
diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h
index bc1c2be1e2..7b33fc218c 100644
--- a/engines/kyra/sound_intern.h
+++ b/engines/kyra/sound_intern.h
@@ -31,11 +31,11 @@
 
 #include "common/mutex.h"
 
-#include "sound/softsynth/fmtowns_pc98/towns_pc98_driver.h"
-#include "sound/softsynth/fmtowns_pc98/towns_euphony.h"
+#include "audio/softsynth/fmtowns_pc98/towns_pc98_driver.h"
+#include "audio/softsynth/fmtowns_pc98/towns_euphony.h"
 
-#include "sound/softsynth/emumidi.h"
-#include "sound/midiparser.h"
+#include "audio/softsynth/emumidi.h"
+#include "audio/midiparser.h"
 
 namespace Audio {
 class PCSpeaker;
diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp
index c233987120..87679f5bfb 100644
--- a/engines/kyra/sound_lol.cpp
+++ b/engines/kyra/sound_lol.cpp
@@ -29,7 +29,7 @@
 #include "kyra/lol.h"
 #include "kyra/resource.h"
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 namespace Kyra {
 
diff --git a/engines/kyra/sound_pcspk.cpp b/engines/kyra/sound_pcspk.cpp
index 0f3cce1c55..46f35af3ab 100644
--- a/engines/kyra/sound_pcspk.cpp
+++ b/engines/kyra/sound_pcspk.cpp
@@ -25,8 +25,8 @@
 
 #include "kyra/sound_intern.h"
 
-#include "sound/mixer.h"
-#include "sound/softsynth/pcspk.h"
+#include "audio/mixer.h"
+#include "audio/softsynth/pcspk.h"
 
 namespace Kyra {
 
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 1bd5af07de..416ad520bb 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -32,8 +32,8 @@
 
 #include "backends/audiocd/audiocd.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
 
 #include "common/util.h"
 
diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp
index 674a5755cf..382ec2429d 100644
--- a/engines/kyra/vqa.cpp
+++ b/engines/kyra/vqa.cpp
@@ -35,9 +35,9 @@
 #include "kyra/vqa.h"
 
 #include "common/system.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 #include "kyra/sound.h"
 #include "kyra/screen.h"
diff --git a/engines/kyra/vqa.h b/engines/kyra/vqa.h
index 129d526e98..b618b2f044 100644
--- a/engines/kyra/vqa.h
+++ b/engines/kyra/vqa.h
@@ -28,7 +28,7 @@
 
 #include "common/scummsys.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 class OSystem;
 
diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp
index b98e490215..bd2320726a 100644
--- a/engines/lastexpress/data/snd.cpp
+++ b/engines/lastexpress/data/snd.cpp
@@ -30,8 +30,8 @@
 
 #include "lastexpress/debug.h"
 
-#include "sound/decoders/adpcm.h"
-#include "sound/audiostream.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/audiostream.h"
 #include "common/memstream.h"
 
 namespace LastExpress {
diff --git a/engines/lastexpress/data/snd.h b/engines/lastexpress/data/snd.h
index f76f8ff6ca..2d28404f42 100644
--- a/engines/lastexpress/data/snd.h
+++ b/engines/lastexpress/data/snd.h
@@ -39,7 +39,7 @@
 	    byte {x}     - IMA ADPCM sample codes
 */
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 	class AudioStream;
diff --git a/engines/lure/lure.h b/engines/lure/lure.h
index 297fb20f59..99e9e3d93e 100644
--- a/engines/lure/lure.h
+++ b/engines/lure/lure.h
@@ -28,7 +28,7 @@
 
 #include "engines/engine.h"
 #include "common/rect.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/util.h"
diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp
index 85beba8447..5f954eb337 100644
--- a/engines/lure/sound.cpp
+++ b/engines/lure/sound.cpp
@@ -32,7 +32,7 @@
 #include "common/algorithm.h"
 #include "common/config-manager.h"
 #include "common/endian.h"
-#include "sound/midiparser.h"
+#include "audio/midiparser.h"
 
 DECLARE_SINGLETON(Lure::SoundManager);
 
diff --git a/engines/lure/sound.h b/engines/lure/sound.h
index 6d248fbd20..f50748ab0a 100644
--- a/engines/lure/sound.h
+++ b/engines/lure/sound.h
@@ -32,8 +32,8 @@
 
 #include "common/singleton.h"
 #include "common/ptr.h"
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
 
 class MidiParser;
 
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index 73dba87e99..d557ef991b 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -61,7 +61,7 @@
 #include "common/debug-channels.h"
 #include "engines/util.h"
 #include "graphics/surface.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 namespace M4 {
 
diff --git a/engines/m4/m4.h b/engines/m4/m4.h
index 8069c960f1..f665df262b 100644
--- a/engines/m4/m4.h
+++ b/engines/m4/m4.h
@@ -29,7 +29,7 @@
 #include "common/scummsys.h"
 #include "common/util.h"
 #include "common/random.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 #include "engines/engine.h"
 
diff --git a/engines/m4/midi.h b/engines/m4/midi.h
index 45cf23b58d..8344f8d485 100644
--- a/engines/m4/midi.h
+++ b/engines/m4/midi.h
@@ -28,8 +28,8 @@
 #ifndef M4_MIDI_H
 #define M4_MIDI_H
 
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
 #include "common/mutex.h"
 
 namespace M4 {
diff --git a/engines/m4/sound.cpp b/engines/m4/sound.cpp
index 76f0cded46..14c60c1c58 100644
--- a/engines/m4/sound.cpp
+++ b/engines/m4/sound.cpp
@@ -29,9 +29,9 @@
 
 #include "common/stream.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 namespace M4 {
 
diff --git a/engines/m4/sound.h b/engines/m4/sound.h
index 5587810506..8962e67dfd 100644
--- a/engines/m4/sound.h
+++ b/engines/m4/sound.h
@@ -30,10 +30,10 @@
 
 #include "common/file.h"
 #include "common/array.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/flac.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
 
 namespace M4 {
 
diff --git a/engines/made/made.cpp b/engines/made/made.cpp
index ba22074bec..11f7734495 100644
--- a/engines/made/made.cpp
+++ b/engines/made/made.cpp
@@ -40,7 +40,7 @@
 #include "base/plugins.h"
 #include "base/version.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "made/made.h"
 #include "made/database.h"
diff --git a/engines/made/made.h b/engines/made/made.h
index 302c8f5275..780f59e442 100644
--- a/engines/made/made.h
+++ b/engines/made/made.h
@@ -39,9 +39,9 @@
 
 #include "graphics/surface.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/voc.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/voc.h"
 
 #include "engines/engine.h"
 
diff --git a/engines/made/music.cpp b/engines/made/music.cpp
index 3124fc069e..8c9248a262 100644
--- a/engines/made/music.cpp
+++ b/engines/made/music.cpp
@@ -27,9 +27,9 @@
 
 // MIDI and digital music class
 
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 
diff --git a/engines/made/music.h b/engines/made/music.h
index 116ea7d5fd..9840c50cfa 100644
--- a/engines/made/music.h
+++ b/engines/made/music.h
@@ -28,8 +28,8 @@
 #ifndef MADE_MUSIC_H
 #define MADE_MUSIC_H
 
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
 #include "common/mutex.h"
 
 #include "made/resource.h"
diff --git a/engines/made/pmvplayer.cpp b/engines/made/pmvplayer.cpp
index a21d767998..34163a940d 100644
--- a/engines/made/pmvplayer.cpp
+++ b/engines/made/pmvplayer.cpp
@@ -26,7 +26,7 @@
 #include "made/pmvplayer.h"
 #include "made/screen.h"
 
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
 
 namespace Made {
 
diff --git a/engines/made/pmvplayer.h b/engines/made/pmvplayer.h
index 3a5295711d..8014a5a0f1 100644
--- a/engines/made/pmvplayer.h
+++ b/engines/made/pmvplayer.h
@@ -31,8 +31,8 @@
 #include "common/file.h"
 #include "common/endian.h"
 #include "graphics/surface.h"
-#include "sound/mixer.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/audiostream.h"
 
 #include "made/graphics.h"
 #include "made/sound.h"
diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp
index 6140e7e0de..f8582aec40 100644
--- a/engines/made/resource.cpp
+++ b/engines/made/resource.cpp
@@ -25,8 +25,8 @@
 
 #include "common/endian.h"
 #include "common/memstream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 #include "made/resource.h"
 #include "made/graphics.h"
diff --git a/engines/made/resource.h b/engines/made/resource.h
index ca71dc86f7..5d5664b4c7 100644
--- a/engines/made/resource.h
+++ b/engines/made/resource.h
@@ -31,7 +31,7 @@
 #include "common/stream.h"
 #include "common/hashmap.h"
 #include "graphics/surface.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 #include "made/sound.h"
 
diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp
index 1a17beb19b..4f1937c057 100644
--- a/engines/made/scriptfuncs.cpp
+++ b/engines/made/scriptfuncs.cpp
@@ -29,7 +29,7 @@
 
 #include "backends/audiocd/audiocd.h"
 #include "graphics/cursorman.h"
-#include "sound/softsynth/pcspk.h"
+#include "audio/softsynth/pcspk.h"
 
 #include "made/made.h"
 #include "made/resource.h"
diff --git a/engines/mohawk/cstime.h b/engines/mohawk/cstime.h
index 3b5be08c2c..40293916db 100644
--- a/engines/mohawk/cstime.h
+++ b/engines/mohawk/cstime.h
@@ -33,7 +33,7 @@
 #include "common/random.h"
 #include "common/list.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Mohawk {
 
diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h
index 7b072e61de..68b9ac6461 100644
--- a/engines/mohawk/livingbooks.h
+++ b/engines/mohawk/livingbooks.h
@@ -36,7 +36,7 @@
 #include "common/queue.h"
 #include "common/random.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "livingbooks_code.h"
 
diff --git a/engines/mohawk/mohawk.cpp b/engines/mohawk/mohawk.cpp
index fbe52da998..a3db630c6a 100644
--- a/engines/mohawk/mohawk.cpp
+++ b/engines/mohawk/mohawk.cpp
@@ -38,7 +38,7 @@
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Mohawk {
 
diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp
index 1583baf2b0..e5528e64f4 100644
--- a/engines/mohawk/sound.cpp
+++ b/engines/mohawk/sound.cpp
@@ -27,11 +27,11 @@
 
 #include "common/util.h"
 
-#include "sound/musicplugin.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/wave.h"
+#include "audio/musicplugin.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/wave.h"
 
 namespace Mohawk {
 
diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h
index 33fd167d9f..938f15fcb2 100644
--- a/engines/mohawk/sound.h
+++ b/engines/mohawk/sound.h
@@ -29,11 +29,11 @@
 #include "common/scummsys.h"
 #include "common/str.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/adpcm.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mixer.h"
 
 #include "mohawk/mohawk.h"
 #include "mohawk/resource.h"
diff --git a/engines/parallaction/sound.h b/engines/parallaction/sound.h
index 1efbb17395..7b3eff37cb 100644
--- a/engines/parallaction/sound.h
+++ b/engines/parallaction/sound.h
@@ -29,10 +29,10 @@
 #include "common/util.h"
 #include "common/mutex.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/iff_sound.h"
-#include "sound/mixer.h"
-#include "sound/mididrv.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/iff_sound.h"
+#include "audio/mixer.h"
+#include "audio/mididrv.h"
 
 #define PATH_LEN 200
 
diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp
index 7aaafa8be3..978d809a61 100644
--- a/engines/parallaction/sound_br.cpp
+++ b/engines/parallaction/sound_br.cpp
@@ -23,15 +23,15 @@
  *
  */
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 #include "common/stream.h"
 #include "common/util.h"
 
-#include "sound/mixer.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/mods/protracker.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mods/protracker.h"
+#include "audio/decoders/raw.h"
 
 #include "parallaction/disk.h"
 #include "parallaction/parallaction.h"
diff --git a/engines/parallaction/sound_ns.cpp b/engines/parallaction/sound_ns.cpp
index 1ed45befa9..15fdede571 100644
--- a/engines/parallaction/sound_ns.cpp
+++ b/engines/parallaction/sound_ns.cpp
@@ -27,10 +27,10 @@
 
 #include "common/stream.h"
 
-#include "sound/mixer.h"
-#include "sound/midiparser.h"
-#include "sound/mods/protracker.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/midiparser.h"
+#include "audio/mods/protracker.h"
+#include "audio/decoders/raw.h"
 
 #include "parallaction/sound.h"
 #include "parallaction/parallaction.h"
diff --git a/engines/queen/midiadlib.cpp b/engines/queen/midiadlib.cpp
index 904952b1c5..c3bc6d1c17 100644
--- a/engines/queen/midiadlib.cpp
+++ b/engines/queen/midiadlib.cpp
@@ -25,8 +25,8 @@
 
 #include "common/endian.h"
 
-#include "sound/fmopl.h"
-#include "sound/softsynth/emumidi.h"
+#include "audio/fmopl.h"
+#include "audio/softsynth/emumidi.h"
 
 namespace Queen {
 
diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp
index be6b0dc773..4dc698dac9 100644
--- a/engines/queen/music.cpp
+++ b/engines/queen/music.cpp
@@ -32,7 +32,7 @@
 #include "queen/resource.h"
 #include "queen/sound.h"
 
-#include "sound/midiparser.h"
+#include "audio/midiparser.h"
 
 
 namespace Queen {
diff --git a/engines/queen/music.h b/engines/queen/music.h
index 16c2012973..fe45d56fde 100644
--- a/engines/queen/music.h
+++ b/engines/queen/music.h
@@ -29,7 +29,7 @@
 #include "common/util.h"
 #include "common/mutex.h"
 #include "common/random.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 class MidiParser;
 
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index 503e46fc48..6eb7362338 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -35,12 +35,12 @@
 #include "queen/queen.h"
 #include "queen/resource.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/flac.h"
-#include "sound/mididrv.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vorbis.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/flac.h"
+#include "audio/mididrv.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vorbis.h"
 
 #define	SB_HEADER_SIZE_V104 110
 #define	SB_HEADER_SIZE_V110 122
diff --git a/engines/queen/sound.h b/engines/queen/sound.h
index 331034f746..cee0463ed1 100644
--- a/engines/queen/sound.h
+++ b/engines/queen/sound.h
@@ -27,8 +27,8 @@
 #define QUEEN_SOUND_H
 
 #include "common/util.h"
-#include "sound/mixer.h"
-#include "sound/mods/rjp1.h"
+#include "audio/mixer.h"
+#include "audio/mods/rjp1.h"
 #include "queen/defs.h"
 
 namespace Common {
diff --git a/engines/saga/introproc_saga2.cpp b/engines/saga/introproc_saga2.cpp
index 2752ddd933..5ae80b14c9 100644
--- a/engines/saga/introproc_saga2.cpp
+++ b/engines/saga/introproc_saga2.cpp
@@ -31,7 +31,7 @@
 #include "saga/scene.h"
 #include "saga/gfx.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 #include "graphics/surface.h"
 #include "video/smk_decoder.h"
 
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 3c0ce75db0..dd3034cdb9 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -30,10 +30,10 @@
 #include "saga/resource.h"
 #include "saga/music.h"
 
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/decoders/raw.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/substream.h"
diff --git a/engines/saga/music.h b/engines/saga/music.h
index c7fef7225b..7d599d91c2 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -28,12 +28,12 @@
 #ifndef SAGA_MUSIC_H
 #define SAGA_MUSIC_H
 
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/flac.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
 #include "common/mutex.h"
 
 namespace Saga {
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp
index abd681ce87..2e34b49dc5 100644
--- a/engines/saga/saga.cpp
+++ b/engines/saga/saga.cpp
@@ -30,7 +30,7 @@
 #include "common/events.h"
 #include "common/EventRecorder.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "saga/saga.h"
 
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 149f1cb580..52c4b824e7 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -31,7 +31,7 @@
 #include "common/array.h"
 #include "common/random.h"
 #include "common/memstream.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 #include "saga/gfx.h"
 
diff --git a/engines/saga/shorten.cpp b/engines/saga/shorten.cpp
index a87e427f9a..685cb26aa7 100644
--- a/engines/saga/shorten.cpp
+++ b/engines/saga/shorten.cpp
@@ -37,8 +37,8 @@
 #include "common/endian.h"
 #include "common/util.h"
 
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 namespace Saga {
 
diff --git a/engines/saga/shorten.h b/engines/saga/shorten.h
index 368d2ac985..f320e1dcc5 100644
--- a/engines/saga/shorten.h
+++ b/engines/saga/shorten.h
@@ -35,7 +35,7 @@
 #include "common/scummsys.h"
 #include "common/stream.h"
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 namespace Saga {
 
diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp
index 74fde3e497..46b13727a0 100644
--- a/engines/saga/sndres.cpp
+++ b/engines/saga/sndres.cpp
@@ -34,12 +34,12 @@
 
 #include "common/file.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/aiff.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/voc.h"
-#include "sound/decoders/wave.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/aiff.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/voc.h"
+#include "audio/decoders/wave.h"
 #ifdef ENABLE_SAGA2
 #include "saga/shorten.h"
 #endif
diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp
index b3fcf4def3..07e8487ee4 100644
--- a/engines/saga/sound.cpp
+++ b/engines/saga/sound.cpp
@@ -28,10 +28,10 @@
 #include "saga/saga.h"
 #include "saga/sound.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/raw.h"
 
 namespace Saga {
 
diff --git a/engines/saga/sound.h b/engines/saga/sound.h
index b5f82369f4..15003b515c 100644
--- a/engines/saga/sound.h
+++ b/engines/saga/sound.h
@@ -29,10 +29,10 @@
 #define SAGA_SOUND_H
 
 #include "common/file.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/flac.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
 
 namespace Saga {
 
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index f6ec60acb6..e006e22482 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -31,7 +31,7 @@
 #include "sci/sound/audio.h"
 #include "sci/sound/soundcmd.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index b376ba947c..73f471b247 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -35,14 +35,14 @@
 #include "common/memstream.h"
 #include "common/system.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/aiff.h"
-#include "sound/decoders/flac.h"
-#include "sound/decoders/mac_snd.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/wave.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/aiff.h"
+#include "audio/decoders/flac.h"
+#include "audio/decoders/mac_snd.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/wave.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sound/audio.h b/engines/sci/sound/audio.h
index 92d7b946f5..4cc8575a21 100644
--- a/engines/sci/sound/audio.h
+++ b/engines/sci/sound/audio.h
@@ -28,7 +28,7 @@
 #define SCI_AUDIO_H
 
 #include "sci/engine/vm_types.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 class RewindableAudioStream;
diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp
index 20bac4a2c0..057b7c177f 100644
--- a/engines/sci/sound/drivers/adlib.cpp
+++ b/engines/sci/sound/drivers/adlib.cpp
@@ -27,8 +27,8 @@
 
 #include "common/file.h"
 
-#include "sound/fmopl.h"
-#include "sound/softsynth/emumidi.h"
+#include "audio/fmopl.h"
+#include "audio/softsynth/emumidi.h"
 
 #include "sci/resource.h"
 #include "sci/sound/drivers/mididriver.h"
diff --git a/engines/sci/sound/drivers/amigamac.cpp b/engines/sci/sound/drivers/amigamac.cpp
index 7cf798a27e..0ec4c283f7 100644
--- a/engines/sci/sound/drivers/amigamac.cpp
+++ b/engines/sci/sound/drivers/amigamac.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/softsynth/emumidi.h"
+#include "audio/softsynth/emumidi.h"
 #include "sci/sound/drivers/mididriver.h"
 #include "sci/resource.h"
 
diff --git a/engines/sci/sound/drivers/cms.cpp b/engines/sci/sound/drivers/cms.cpp
index cd7b101f03..ff38e1c554 100644
--- a/engines/sci/sound/drivers/cms.cpp
+++ b/engines/sci/sound/drivers/cms.cpp
@@ -25,9 +25,9 @@
 
 #include "sci/sound/drivers/mididriver.h"
 
-#include "sound/softsynth/emumidi.h"
-#include "sound/softsynth/cms.h"
-#include "sound/mixer.h"
+#include "audio/softsynth/emumidi.h"
+#include "audio/softsynth/cms.h"
+#include "audio/mixer.h"
 
 #include "sci/resource.h"
 
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index c274c8bce2..b9a973ad7d 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -29,8 +29,8 @@
 #include "common/file.h"
 #include "common/memstream.h"
 
-#include "sound/fmopl.h"
-#include "sound/softsynth/emumidi.h"
+#include "audio/fmopl.h"
+#include "audio/softsynth/emumidi.h"
 
 #include "sci/resource.h"
 #include "sci/engine/features.h"
diff --git a/engines/sci/sound/drivers/mididriver.h b/engines/sci/sound/drivers/mididriver.h
index dabe869a8f..f745d62716 100644
--- a/engines/sci/sound/drivers/mididriver.h
+++ b/engines/sci/sound/drivers/mididriver.h
@@ -27,7 +27,7 @@
 #define SCI_SFX_SOFTSEQ_MIDIDRIVER_H
 
 #include "sci/sci.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 #include "common/error.h"
 
 namespace Sci {
diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp
index e1c3302fef..063332577e 100644
--- a/engines/sci/sound/drivers/pcjr.cpp
+++ b/engines/sci/sound/drivers/pcjr.cpp
@@ -25,7 +25,7 @@
 
 #include "sci/sound/drivers/mididriver.h"
 
-#include "sound/softsynth/emumidi.h"
+#include "audio/softsynth/emumidi.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h
index fa24a209e4..39de425e18 100644
--- a/engines/sci/sound/midiparser_sci.h
+++ b/engines/sci/sound/midiparser_sci.h
@@ -28,7 +28,7 @@
 
 #include "sci/resource.h"
 #include "sci/sound/music.h"
-#include "sound/midiparser.h"
+#include "audio/midiparser.h"
 
 /*
  Sound drivers info: (from driver cmd0)
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index d9be4ed0fe..f0963e7d64 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -23,8 +23,8 @@
  *
  */
 
-#include "sound/audiostream.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
 #include "common/config-manager.h"
 
 #include "sci/sci.h"
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index f735fcd6c5..dfe5ad1586 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -29,8 +29,8 @@
 #include "common/serializer.h"
 #include "common/mutex.h"
 
-#include "sound/mixer.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/audiostream.h"
 
 #include "sci/sci.h"
 #include "sci/resource.h"
diff --git a/engines/sci/sound/soundcmd.h b/engines/sci/sound/soundcmd.h
index 45b93e9a09..cae72e2cdb 100644
--- a/engines/sci/sound/soundcmd.h
+++ b/engines/sci/sound/soundcmd.h
@@ -27,7 +27,7 @@
 #define SCI_SOUNDCMD_H
 
 #include "common/list.h"
-#include "sound/mididrv.h"	// for MusicType
+#include "audio/mididrv.h"	// for MusicType
 #include "sci/engine/state.h"
 
 namespace Sci {
diff --git a/engines/sci/video/robot_decoder.cpp b/engines/sci/video/robot_decoder.cpp
index 8dd60cd9a6..bf52de67d5 100644
--- a/engines/sci/video/robot_decoder.cpp
+++ b/engines/sci/video/robot_decoder.cpp
@@ -31,7 +31,7 @@
 #include "common/util.h"
 
 #include "graphics/surface.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
 
 #include "sci/resource.h"
 #include "sci/util.h"
diff --git a/engines/sci/video/robot_decoder.h b/engines/sci/video/robot_decoder.h
index b8ca0ee857..52bf0bad07 100644
--- a/engines/sci/video/robot_decoder.h
+++ b/engines/sci/video/robot_decoder.h
@@ -30,8 +30,8 @@
 #include "common/rect.h"
 #include "common/stream.h"
 #include "common/substream.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 #include "video/video_decoder.h"
 
 namespace Sci {
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 729e66b310..e396d37e30 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -46,8 +46,8 @@
 #include "scumm/imuse/imuse.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/verbs.h"
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
 
 #ifndef DISABLE_HELP
 #include "scumm/help.h"
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp
index 80cfcfcd0b..7840b9df20 100644
--- a/engines/scumm/he/animation_he.cpp
+++ b/engines/scumm/he/animation_he.cpp
@@ -28,7 +28,7 @@
 #include "scumm/he/animation_he.h"
 #include "scumm/he/intern_he.h"
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h
index 7914d09f40..f5000bca59 100644
--- a/engines/scumm/he/animation_he.h
+++ b/engines/scumm/he/animation_he.h
@@ -28,7 +28,7 @@
 
 #include "video/smk_decoder.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index 2045b8084c..516ff6b977 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -27,9 +27,9 @@
 
 #include "common/system.h"
 #include "common/memstream.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 #include "scumm/scumm.h"
 #include "scumm/util.h"
 #include "scumm/he/intern_he.h"
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 135af1bb38..72e7052034 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -34,7 +34,7 @@
 #include "scumm/he/resource_he.h"
 #include "scumm/he/sound_he.h"
 
-#include "sound/decoders/wave.h"
+#include "audio/decoders/wave.h"
 #include "graphics/cursorman.h"
 
 #include "common/archive.h"
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 6feeb2bb8f..4770f28cbc 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -36,15 +36,15 @@
 #include "common/timer.h"
 #include "common/util.h"
 
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/flac.h"
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/voc.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/wave.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/flac.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/voc.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/wave.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h
index 172bcaecd4..0014480894 100644
--- a/engines/scumm/imuse/imuse_internal.h
+++ b/engines/scumm/imuse/imuse_internal.h
@@ -29,7 +29,7 @@
 #include "scumm/imuse/imuse.h"
 #include "scumm/imuse/instrument.h"
 #include "scumm/saveload.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 class MidiParser;
 class OSystem;
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index a90915e438..ac2b2d4203 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -31,7 +31,7 @@
 #include "scumm/saveload.h"
 #include "scumm/scumm.h"
 
-#include "sound/midiparser.h"
+#include "audio/midiparser.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp
index 57a842f297..02996c53d3 100644
--- a/engines/scumm/imuse/instrument.cpp
+++ b/engines/scumm/imuse/instrument.cpp
@@ -26,7 +26,7 @@
 #include "scumm/scumm.h"
 #include "scumm/saveload.h"
 #include "scumm/imuse/instrument.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index ceca557f06..516a0497fa 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -33,9 +33,9 @@
 #include "scumm/imuse_digi/dimuse_bndmgr.h"
 #include "scumm/imuse_digi/dimuse_track.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/imuse_digi/dimuse.h b/engines/scumm/imuse_digi/dimuse.h
index bf5feeb08f..236edb5a89 100644
--- a/engines/scumm/imuse_digi/dimuse.h
+++ b/engines/scumm/imuse_digi/dimuse.h
@@ -34,8 +34,8 @@
 #include "scumm/music.h"
 #include "scumm/sound.h"
 
-#include "sound/mixer.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/audiostream.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp
index 06a629072e..02395eed4d 100644
--- a/engines/scumm/imuse_digi/dimuse_script.cpp
+++ b/engines/scumm/imuse_digi/dimuse_script.cpp
@@ -33,8 +33,8 @@
 #include "scumm/imuse_digi/dimuse_bndmgr.h"
 #include "scumm/imuse_digi/dimuse_track.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index 4054843163..00074a951a 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -26,10 +26,10 @@
 #include "common/scummsys.h"
 #include "common/util.h"
 
-#include "sound/decoders/flac.h"
-#include "sound/decoders/voc.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/mp3.h"
+#include "audio/decoders/flac.h"
+#include "audio/decoders/voc.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/mp3.h"
 
 #include "scumm/scumm.h"
 #include "scumm/util.h"
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h
index aa7a1b77ca..7ae9fdccb0 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.h
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h
@@ -27,7 +27,7 @@
 
 
 #include "common/scummsys.h"
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 #include "scumm/imuse_digi/dimuse_bndmgr.h"
 
 namespace Scumm {
diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp
index c56ca40cd0..2a08d56163 100644
--- a/engines/scumm/imuse_digi/dimuse_track.cpp
+++ b/engines/scumm/imuse_digi/dimuse_track.cpp
@@ -32,8 +32,8 @@
 #include "scumm/imuse_digi/dimuse_bndmgr.h"
 #include "scumm/imuse_digi/dimuse_track.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/midiparser_ro.cpp b/engines/scumm/midiparser_ro.cpp
index 2ef4cecfac..e737d747ac 100644
--- a/engines/scumm/midiparser_ro.cpp
+++ b/engines/scumm/midiparser_ro.cpp
@@ -24,8 +24,8 @@
  */
 
 
-#include "sound/midiparser.h"
-#include "sound/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/mididrv.h"
 #include "common/util.h"
 
 namespace Scumm {
diff --git a/engines/scumm/player_mod.cpp b/engines/scumm/player_mod.cpp
index 930c85dadf..657595fab1 100644
--- a/engines/scumm/player_mod.cpp
+++ b/engines/scumm/player_mod.cpp
@@ -25,9 +25,9 @@
 
 
 #include "scumm/player_mod.h"
-#include "sound/mixer.h"
-#include "sound/rate.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/rate.h"
+#include "audio/decoders/raw.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/player_mod.h b/engines/scumm/player_mod.h
index 7c0e5916a3..67d1bb4cbf 100644
--- a/engines/scumm/player_mod.h
+++ b/engines/scumm/player_mod.h
@@ -27,8 +27,8 @@
 #define SCUMM_PLAYER_MOD_H
 
 #include "scumm/scumm.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 	class RateConverter;
diff --git a/engines/scumm/player_nes.cpp b/engines/scumm/player_nes.cpp
index 96396e7a08..5f792401e0 100644
--- a/engines/scumm/player_nes.cpp
+++ b/engines/scumm/player_nes.cpp
@@ -28,7 +28,7 @@
 #include "engines/engine.h"
 #include "scumm/player_nes.h"
 #include "scumm/scumm.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/player_nes.h b/engines/scumm/player_nes.h
index 89292f7c24..5f6e8f2d8d 100644
--- a/engines/scumm/player_nes.h
+++ b/engines/scumm/player_nes.h
@@ -28,8 +28,8 @@
 
 #include "common/scummsys.h"
 #include "scumm/music.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/player_pce.h b/engines/scumm/player_pce.h
index a87b6feb64..3f5033f724 100644
--- a/engines/scumm/player_pce.h
+++ b/engines/scumm/player_pce.h
@@ -28,8 +28,8 @@
 
 #include "common/scummsys.h"
 #include "scumm/music.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 // PCE sound engine is only used by Loom, which requires 16bit color support
 #ifdef USE_RGB_COLOR
diff --git a/engines/scumm/player_sid.cpp b/engines/scumm/player_sid.cpp
index 35671e094b..34654a68c5 100644
--- a/engines/scumm/player_sid.cpp
+++ b/engines/scumm/player_sid.cpp
@@ -28,7 +28,7 @@
 #include "engines/engine.h"
 #include "scumm/player_sid.h"
 #include "scumm/scumm.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/player_sid.h b/engines/scumm/player_sid.h
index 9e883abe74..71497cc6f4 100644
--- a/engines/scumm/player_sid.h
+++ b/engines/scumm/player_sid.h
@@ -29,9 +29,9 @@
 #include "common/mutex.h"
 #include "common/scummsys.h"
 #include "scumm/music.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/softsynth/sid.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/softsynth/sid.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/player_towns.h b/engines/scumm/player_towns.h
index e5023d25c2..fda8bd4042 100644
--- a/engines/scumm/player_towns.h
+++ b/engines/scumm/player_towns.h
@@ -28,7 +28,7 @@
 
 #include "scumm/scumm.h"
 #include "scumm/imuse/imuse.h"
-#include "sound/softsynth/fmtowns_pc98/towns_euphony.h"
+#include "audio/softsynth/fmtowns_pc98/towns_euphony.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/player_v2base.h b/engines/scumm/player_v2base.h
index 7b90ae98cf..bd910b8a78 100644
--- a/engines/scumm/player_v2base.h
+++ b/engines/scumm/player_v2base.h
@@ -29,8 +29,8 @@
 #include "common/scummsys.h"
 #include "common/mutex.h"
 #include "scumm/music.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/player_v2cms.cpp b/engines/scumm/player_v2cms.cpp
index 7bec171173..b081a68428 100644
--- a/engines/scumm/player_v2cms.cpp
+++ b/engines/scumm/player_v2cms.cpp
@@ -25,9 +25,9 @@
 
 #include "scumm/player_v2cms.h"
 #include "scumm/scumm.h"
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
-#include "sound/softsynth/cms.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
+#include "audio/softsynth/cms.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/player_v4a.h b/engines/scumm/player_v4a.h
index abacd8e511..108dbcf317 100644
--- a/engines/scumm/player_v4a.h
+++ b/engines/scumm/player_v4a.h
@@ -28,8 +28,8 @@
 
 #include "common/scummsys.h"
 #include "scumm/music.h"
-#include "sound/mixer.h"
-#include "sound/mods/tfmx.h"
+#include "audio/mixer.h"
+#include "audio/mods/tfmx.h"
 
 class Mixer;
 
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 7273f9f871..bdae4c5f6a 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -44,7 +44,7 @@
 #include "scumm/he/sprite_he.h"
 #include "scumm/verbs.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "backends/audiocd/audiocd.h"
 
diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp
index f2addff19f..1250a82d33 100644
--- a/engines/scumm/script_v8.cpp
+++ b/engines/scumm/script_v8.cpp
@@ -39,7 +39,7 @@
 #include "scumm/verbs.h"
 #include "scumm/smush/smush_player.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index e6110ee976..83df53d8d0 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -77,7 +77,7 @@
 
 #include "backends/audiocd/audiocd.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 using Common::File;
 
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 1f083db4a0..587d1be776 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -42,7 +42,7 @@
 #include "scumm/detection.h"
 #include "scumm/script.h"
 
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 #ifdef __DS__
 /* This disables the dual layer mode which is used in FM-Towns versions
diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp
index eca1ebdcab..4ab0d7c733 100644
--- a/engines/scumm/smush/smush_mixer.cpp
+++ b/engines/scumm/smush/smush_mixer.cpp
@@ -32,8 +32,8 @@
 #include "scumm/sound.h"
 #include "scumm/imuse/imuse.h"
 
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 
 namespace Scumm {
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 29dbb57670..ad8a135a7c 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -49,10 +49,10 @@
 
 #include "scumm/insane/insane.h"
 
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vorbis.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vorbis.h"
 
 #include "common/zlib.h"
 
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index ee8825d946..cff1618c18 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -38,15 +38,15 @@
 
 #include "backends/audiocd/audiocd.h"
 
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/flac.h"
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/voc.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/wave.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/flac.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/voc.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/wave.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/sound.h b/engines/scumm/sound.h
index 4fe46f32f0..39b4af805d 100644
--- a/engines/scumm/sound.h
+++ b/engines/scumm/sound.h
@@ -26,8 +26,8 @@
 #define SCUMM_SOUND_H
 
 #include "common/scummsys.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 #include "scumm/saveload.h"
 
 namespace Audio {
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index 68e84d616d..129de9c129 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -38,8 +38,8 @@
 #include "sky/struc.h"
 #include "sky/text.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
 
 namespace Sky {
 
diff --git a/engines/sky/intro.h b/engines/sky/intro.h
index 213361eae5..d7a55b95bb 100644
--- a/engines/sky/intro.h
+++ b/engines/sky/intro.h
@@ -28,7 +28,7 @@
 
 
 #include "common/scummsys.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Sky {
 
diff --git a/engines/sky/music/adlibchannel.h b/engines/sky/music/adlibchannel.h
index 628ceabdb9..cbcf722e4e 100644
--- a/engines/sky/music/adlibchannel.h
+++ b/engines/sky/music/adlibchannel.h
@@ -27,7 +27,7 @@
 #define SKY_MUSIC_ADLIBCHANNEL_H
 
 #include "sky/music/musicbase.h"
-#include "sound/fmopl.h"
+#include "audio/fmopl.h"
 
 namespace Sky {
 
diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp
index 0b593f555b..da46964ef9 100644
--- a/engines/sky/music/adlibmusic.cpp
+++ b/engines/sky/music/adlibmusic.cpp
@@ -28,7 +28,7 @@
 
 #include "sky/music/adlibmusic.h"
 #include "sky/music/adlibchannel.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 #include "sky/sky.h"
 
 namespace Sky {
diff --git a/engines/sky/music/adlibmusic.h b/engines/sky/music/adlibmusic.h
index f3356a91a8..848c8eaf29 100644
--- a/engines/sky/music/adlibmusic.h
+++ b/engines/sky/music/adlibmusic.h
@@ -27,9 +27,9 @@
 #define SKY_MUSIC_ADLIBMUSIC_H
 
 #include "sky/music/musicbase.h"
-#include "sound/audiostream.h"
-#include "sound/fmopl.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/fmopl.h"
+#include "audio/mixer.h"
 
 namespace Sky {
 
diff --git a/engines/sky/music/gmchannel.cpp b/engines/sky/music/gmchannel.cpp
index e589642458..3852a69068 100644
--- a/engines/sky/music/gmchannel.cpp
+++ b/engines/sky/music/gmchannel.cpp
@@ -25,7 +25,7 @@
 
 #include "gmchannel.h"
 #include "common/util.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 namespace Sky {
 
diff --git a/engines/sky/music/gmmusic.cpp b/engines/sky/music/gmmusic.cpp
index e7b3a24170..22964f3f56 100644
--- a/engines/sky/music/gmmusic.cpp
+++ b/engines/sky/music/gmmusic.cpp
@@ -28,7 +28,7 @@
 #include "sky/sky.h"
 #include "common/util.h"
 #include "common/endian.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 namespace Sky {
 
diff --git a/engines/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp
index bdefa66709..51df95e451 100644
--- a/engines/sky/music/mt32music.cpp
+++ b/engines/sky/music/mt32music.cpp
@@ -28,7 +28,7 @@
 #include "common/util.h"
 #include "common/system.h"
 #include "common/endian.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 namespace Sky {
 
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index 30f67bf5ef..14d57465af 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -44,8 +44,8 @@
 #include "sky/text.h"
 #include "sky/compact.h"
 
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
 
 #include "engines/util.h"
 
diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp
index dc76cb8f0d..3d247ed334 100644
--- a/engines/sky/sound.cpp
+++ b/engines/sky/sound.cpp
@@ -33,8 +33,8 @@
 #include "sky/sound.h"
 #include "sky/struc.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
 
 namespace Sky {
 
diff --git a/engines/sky/sound.h b/engines/sky/sound.h
index 2aecd6ab7f..ce060ce689 100644
--- a/engines/sky/sound.h
+++ b/engines/sky/sound.h
@@ -28,7 +28,7 @@
 
 
 #include "common/scummsys.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Sky {
 
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index de35b8122c..fa876b565f 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -27,7 +27,7 @@
 #include "sword1/sword1.h"
 #include "sword1/animation.h"
 #include "sword1/text.h"
-#include "sound/decoders/vorbis.h"
+#include "audio/decoders/vorbis.h"
 
 #include "common/config-manager.h"
 #include "common/endian.h"
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index 566ca31c2f..7bfd839826 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -32,7 +32,7 @@
 
 #include "common/array.h"
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 #include "sword1/screen.h"
 #include "sword1/sound.h"
diff --git a/engines/sword1/logic.h b/engines/sword1/logic.h
index 4ec8ad15c5..989b852e77 100644
--- a/engines/sword1/logic.h
+++ b/engines/sword1/logic.h
@@ -31,7 +31,7 @@
 #include "sword1/objectman.h"
 #include "common/util.h"
 #include "common/random.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Sword1 {
 
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp
index d860e1c69d..2b81ae1eb4 100644
--- a/engines/sword1/music.cpp
+++ b/engines/sword1/music.cpp
@@ -32,14 +32,14 @@
 #include "sword1/sword1.h"
 #include "sword1/music.h"
 
-#include "sound/mixer.h"
-#include "sound/audiostream.h"
-#include "sound/decoders/aiff.h"
-#include "sound/decoders/flac.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/wave.h"
-#include "sound/decoders/vag.h"
+#include "audio/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/aiff.h"
+#include "audio/decoders/flac.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/wave.h"
+#include "audio/decoders/vag.h"
 
 #define SMP_BUFSIZE 8192
 
diff --git a/engines/sword1/music.h b/engines/sword1/music.h
index 6487a1c3e5..7a3d1e5de6 100644
--- a/engines/sword1/music.h
+++ b/engines/sword1/music.h
@@ -29,9 +29,9 @@
 #include "common/scummsys.h"
 #include "common/mutex.h"
 #include "common/file.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/rate.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/rate.h"
 
 namespace Sword1 {
 
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index ff2f1060ee..f8219eb21a 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -37,13 +37,13 @@
 #include "sword1/logic.h"
 #include "sword1/sword1.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/flac.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/wave.h"
-#include "sound/decoders/vag.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/flac.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/wave.h"
+#include "audio/decoders/vag.h"
 
 namespace Sword1 {
 
diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h
index ececb95875..ae96132241 100644
--- a/engines/sword1/sound.h
+++ b/engines/sword1/sound.h
@@ -31,7 +31,7 @@
 #include "common/file.h"
 #include "common/util.h"
 #include "common/random.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 	class Mixer;
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index b90726537c..550ac0fac4 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -31,7 +31,7 @@
 #include "video/dxa_decoder.h"
 #include "video/smk_decoder.h"
 #include "video/video_decoder.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "sword2/screen.h"
 
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index 1519c5d73f..aa91843432 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -37,12 +37,12 @@
 #include "common/substream.h"
 #include "common/system.h"
 
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/flac.h"
-#include "sound/decoders/wave.h"
-#include "sound/decoders/vag.h"
-#include "sound/rate.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
+#include "audio/decoders/wave.h"
+#include "audio/decoders/vag.h"
+#include "audio/rate.h"
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp
index abacbd16f0..261c8293bd 100644
--- a/engines/sword2/sound.cpp
+++ b/engines/sword2/sound.cpp
@@ -48,8 +48,8 @@
 #include "sword2/resman.h"
 #include "sword2/sound.h"
 
-#include "sound/decoders/wave.h"
-#include "sound/decoders/vag.h"
+#include "audio/decoders/wave.h"
+#include "audio/decoders/vag.h"
 
 #define Debug_Printf _vm->_debugger->DebugPrintf
 
diff --git a/engines/sword2/sound.h b/engines/sword2/sound.h
index 5acc39179f..2c4c8364c7 100644
--- a/engines/sword2/sound.h
+++ b/engines/sword2/sound.h
@@ -39,8 +39,8 @@
 #define SWORD2_SOUND_H
 
 #include "common/file.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 // Max number of sound fx
 #define MAXMUS 2
diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp
index b72542f95a..e9901c04b0 100644
--- a/engines/sword25/fmv/theora_decoder.cpp
+++ b/engines/sword25/fmv/theora_decoder.cpp
@@ -42,7 +42,7 @@
 #ifdef USE_THEORADEC
 #include "common/system.h"
 #include "graphics/conversion.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
 #include "sword25/kernel/common.h"
 
 namespace Sword25 {
diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h
index 5e2675b629..a753bc58ac 100644
--- a/engines/sword25/fmv/theora_decoder.h
+++ b/engines/sword25/fmv/theora_decoder.h
@@ -31,8 +31,8 @@
 #ifdef USE_THEORADEC
 
 #include "video/video_decoder.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 #include <theora/theoradec.h>
 #include <vorbis/codec.h>
diff --git a/engines/sword25/sfx/soundengine.cpp b/engines/sword25/sfx/soundengine.cpp
index f28ad26fe7..03cdaf82b7 100644
--- a/engines/sword25/sfx/soundengine.cpp
+++ b/engines/sword25/sfx/soundengine.cpp
@@ -37,7 +37,7 @@
 #include "sword25/package/packagemanager.h"
 #include "sword25/kernel/resource.h"
 
-#include "sound/decoders/vorbis.h"
+#include "audio/decoders/vorbis.h"
 
 namespace Sword25 {
 
diff --git a/engines/sword25/sfx/soundengine.h b/engines/sword25/sfx/soundengine.h
index 29b3043a68..576582b478 100644
--- a/engines/sword25/sfx/soundengine.h
+++ b/engines/sword25/sfx/soundengine.h
@@ -52,8 +52,8 @@
 #include "sword25/kernel/resservice.h"
 #include "sword25/kernel/persistable.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Sword25 {
 
diff --git a/engines/teenagent/music.h b/engines/teenagent/music.h
index c1f5765a55..52a347bf10 100644
--- a/engines/teenagent/music.h
+++ b/engines/teenagent/music.h
@@ -26,7 +26,7 @@
 #ifndef TEEN_MUSIC_H
 #define TEEN_MUSIC_H
 
-#include "sound/mods/paula.h"
+#include "audio/mods/paula.h"
 #include "common/array.h"
 
 namespace TeenAgent {
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index 523c0e1700..a492237adb 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -33,8 +33,8 @@
 #include "engines/advancedDetector.h"
 #include "engines/util.h"
 
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 #include "graphics/cursorman.h"
 #include "graphics/thumbnail.h"
diff --git a/engines/teenagent/teenagent.h b/engines/teenagent/teenagent.h
index 7c70866285..a43ee68f56 100644
--- a/engines/teenagent/teenagent.h
+++ b/engines/teenagent/teenagent.h
@@ -29,8 +29,8 @@
 #include "teenagent/pack.h"
 #include "teenagent/resources.h"
 #include "teenagent/inventory.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 #include "common/random.h"
 
 struct ADGameDescription;
diff --git a/engines/testbed/midi.cpp b/engines/testbed/midi.cpp
index 499c44e50a..673f5d8547 100644
--- a/engines/testbed/midi.cpp
+++ b/engines/testbed/midi.cpp
@@ -28,7 +28,7 @@
 
 #include "graphics/cursorman.h"
 
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 #include "testbed/midi.h"
 #include "testbed/testbed.h"
diff --git a/engines/testbed/midi.h b/engines/testbed/midi.h
index 0fb5cf80d5..676229570e 100644
--- a/engines/testbed/midi.h
+++ b/engines/testbed/midi.h
@@ -26,7 +26,7 @@
 #define TESTBED_MIDI_H
 
 #include "common/stream.h"
-#include "sound/midiparser.h"
+#include "audio/midiparser.h"
 #include "testbed/testsuite.h"
 
 // This file can be used as template for header files of other newer testsuites.
diff --git a/engines/testbed/sound.cpp b/engines/testbed/sound.cpp
index 8354e7bad0..76f9e850c0 100644
--- a/engines/testbed/sound.cpp
+++ b/engines/testbed/sound.cpp
@@ -22,7 +22,7 @@
  * $Id$
  */
 
-#include "sound/softsynth/pcspk.h"
+#include "audio/softsynth/pcspk.h"
 
 #include "backends/audiocd/audiocd.h"
 
diff --git a/engines/testbed/sound.h b/engines/testbed/sound.h
index 24dcf45b99..b797ecb2b0 100644
--- a/engines/testbed/sound.h
+++ b/engines/testbed/sound.h
@@ -26,7 +26,7 @@
 #define TESTBED_SOUND_H
 
 #include "gui/dialog.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 #include "testbed/config.h"
 #include "testbed/testsuite.h"
 
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index f74f3e34c3..3f56288aca 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -42,7 +42,7 @@
 #include "tinsel/tinlib.h"
 #include "tinsel/tinsel.h"
 
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
 
 namespace Tinsel {
 
diff --git a/engines/tinsel/bmv.h b/engines/tinsel/bmv.h
index a0359d497d..2644504cab 100644
--- a/engines/tinsel/bmv.h
+++ b/engines/tinsel/bmv.h
@@ -29,8 +29,8 @@
 
 #include "common/file.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 #include "tinsel/coroutine.h"
 #include "tinsel/object.h"
diff --git a/engines/tinsel/config.cpp b/engines/tinsel/config.cpp
index 43e54dc4ea..a206ebf03b 100644
--- a/engines/tinsel/config.cpp
+++ b/engines/tinsel/config.cpp
@@ -34,7 +34,7 @@
 #include "common/file.h"
 #include "common/config-manager.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Tinsel {
 
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 23ef28a99c..29d4dbc92d 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -27,10 +27,10 @@
 
 // MIDI and digital music class
 
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/decoders/adpcm.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/decoders/adpcm.h"
 
 #include "backends/audiocd/audiocd.h"
 
diff --git a/engines/tinsel/music.h b/engines/tinsel/music.h
index 069c03c979..e2a3b4c2c1 100644
--- a/engines/tinsel/music.h
+++ b/engines/tinsel/music.h
@@ -28,10 +28,10 @@
 #ifndef TINSEL_MUSIC_H
 #define TINSEL_MUSIC_H
 
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 #include "common/mutex.h"
 
 namespace Tinsel {
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index 7fab3624a4..5fc2820986 100644
--- a/engines/tinsel/sound.cpp
+++ b/engines/tinsel/sound.cpp
@@ -40,13 +40,13 @@
 #include "common/memstream.h"
 #include "common/system.h"
 
-#include "sound/mixer.h"
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/flac.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vag.h"
-#include "sound/decoders/vorbis.h"
+#include "audio/mixer.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/flac.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vag.h"
+#include "audio/decoders/vorbis.h"
 
 #include "gui/message.h"
 
diff --git a/engines/tinsel/sound.h b/engines/tinsel/sound.h
index b8990f0106..2b0ef4599e 100644
--- a/engines/tinsel/sound.h
+++ b/engines/tinsel/sound.h
@@ -30,7 +30,7 @@
 #include "common/file.h"
 #include "common/file.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "tinsel/dw.h"
 #include "tinsel/tinsel.h"
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h
index b4f77d18f2..009f6fe26d 100644
--- a/engines/tinsel/tinsel.h
+++ b/engines/tinsel/tinsel.h
@@ -34,8 +34,8 @@
 #include "common/random.h"
 #include "common/util.h"
 
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
 
 #include "engines/engine.h"
 #include "tinsel/debugger.h"
diff --git a/engines/toon/audio.h b/engines/toon/audio.h
index e8c6c44e03..7c1eedfee9 100644
--- a/engines/toon/audio.h
+++ b/engines/toon/audio.h
@@ -26,8 +26,8 @@
 #ifndef TOON_AUDIO_H
 #define TOON_AUDIO_H
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 #include "toon/toon.h"
 
 namespace Toon {
diff --git a/engines/touche/midi.cpp b/engines/touche/midi.cpp
index ee7602abf7..0b15643767 100644
--- a/engines/touche/midi.cpp
+++ b/engines/touche/midi.cpp
@@ -26,7 +26,7 @@
 #include "common/config-manager.h"
 #include "common/stream.h"
 
-#include "sound/midiparser.h"
+#include "audio/midiparser.h"
 
 #include "touche/midi.h"
 
diff --git a/engines/touche/midi.h b/engines/touche/midi.h
index a518a4bb29..8e43c12037 100644
--- a/engines/touche/midi.h
+++ b/engines/touche/midi.h
@@ -29,7 +29,7 @@
 #include "common/util.h"
 #include "common/mutex.h"
 
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 class MidiParser;
 
diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp
index f76084d556..df7992f26c 100644
--- a/engines/touche/resource.cpp
+++ b/engines/touche/resource.cpp
@@ -25,13 +25,13 @@
 
 
 
-#include "sound/decoders/flac.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/voc.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/raw.h"
-#include "sound/audiostream.h"
+#include "audio/decoders/flac.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/voc.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/raw.h"
+#include "audio/audiostream.h"
 
 #include "touche/midi.h"
 #include "touche/touche.h"
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index e8d9be87d1..ff8b0d944e 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -34,7 +34,7 @@
 
 #include "engines/util.h"
 #include "graphics/cursorman.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 #include "touche/midi.h"
 #include "touche/touche.h"
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index 926dab04b2..50a5c6e439 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -33,7 +33,7 @@
 #include "common/rect.h"
 #include "common/util.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "engines/engine.h"
 
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index 1d1daf5adc..6b6ab1e600 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -25,11 +25,11 @@
 
 #include "common/file.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/flac.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/wave.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/flac.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/wave.h"
 
 #include "tucker/tucker.h"
 #include "tucker/graphics.h"
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index 4a7a5f16d7..73018b8c00 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -25,9 +25,9 @@
 
 #include "common/system.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/wave.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/wave.h"
 
 #include "tucker/tucker.h"
 #include "tucker/graphics.h"
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index feb63c301b..4d7b530bbc 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -35,7 +35,7 @@
 
 #include "video/flic_decoder.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "engines/engine.h"
 
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 49133002b6..1d209ce71a 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -49,7 +49,7 @@
 
 #include "graphics/cursorman.h"
 
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 
 using Common::ConfigManager;
diff --git a/gui/options.cpp b/gui/options.cpp
index 59346da967..a540fbb9d1 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -39,10 +39,10 @@
 
 #include "graphics/scaler.h"
 
-#include "sound/mididrv.h"
-#include "sound/musicplugin.h"
-#include "sound/mixer.h"
-#include "sound/fmopl.h"
+#include "audio/mididrv.h"
+#include "audio/musicplugin.h"
+#include "audio/mixer.h"
+#include "audio/fmopl.h"
 
 namespace GUI {
 
diff --git a/gui/options.h b/gui/options.h
index 1c105046bb..eba1779b69 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -27,7 +27,7 @@
 
 #include "gui/dialog.h"
 #include "common/str.h"
-#include "sound/musicplugin.h"
+#include "audio/musicplugin.h"
 
 #ifdef SMALL_SCREEN_DEVICE
 #include "gui/KeysDialog.h"
diff --git a/po/POTFILES b/po/POTFILES
index 48e2e58d3e..8ba37f7bf3 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -30,17 +30,17 @@ engines/cruise/menu.cpp
 engines/sci/engine/kfile.cpp
 engines/agos/saveload.cpp
 
-sound/fmopl.cpp
-sound/musicplugin.cpp
-sound/null.h
-sound/null.cpp
-sound/mods/paula.cpp
-sound/softsynth/adlib.cpp
-sound/softsynth/appleiigs.cpp
-sound/softsynth/sid.cpp
-sound/softsynth/mt32.cpp
-sound/softsynth/pcspk.cpp
-sound/softsynth/ym2612.cpp
+audio/fmopl.cpp
+audio/musicplugin.cpp
+audio/null.h
+audio/null.cpp
+audio/mods/paula.cpp
+audio/softsynth/adlib.cpp
+audio/softsynth/appleiigs.cpp
+audio/softsynth/sid.cpp
+audio/softsynth/mt32.cpp
+audio/softsynth/pcspk.cpp
+audio/softsynth/ym2612.cpp
 
 backends/keymapper/remap-dialog.cpp
 backends/midi/windows.cpp
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 0b654ac4b8..993aee9874 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -157,7 +157,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<per defecte>"
 
@@ -1776,51 +1776,51 @@ msgstr "Desa la partida:"
 msgid "Restore"
 msgstr "Restaura"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Emulador OPL de MAME"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Emulador OPL DOSBox"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Sense música"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulador d'àudio Amiga"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Emulador d'AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Emulador d'Apple II GS (NO IMPLEMENTAT)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulador d'àudio C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Iniciant l'Emulador de MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Emulador de MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Emulador Altaveu PC"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Emulador d'IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Emulador de FM Towns"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 69be496a79..865e9647ff 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -159,7 +159,7 @@ msgstr "Jazyk hry. Toto z Va¹í ©panìlské verze neudìlá Anglickou"
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<výchozí>"
 
@@ -1746,51 +1746,51 @@ msgstr "Obnovit hru"
 msgid "Restore"
 msgstr "Obnovit"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME OPL Emulátor"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox OPL Emulátor"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Bez hudby"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulátor zvuku Amiga"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib Emulátor"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS Emulátor (NENÍ ZAVEDEN)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulátor zvuku C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Spou¹tím MT-32 Emulátor"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32 Emulátor"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC Speaker Emulátor"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM PCjr Emulátor"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM Towns Emulátor"
 
diff --git a/po/da_DA.po b/po/da_DA.po
index d1b8bb7a7f..429d4493cb 100644
--- a/po/da_DA.po
+++ b/po/da_DA.po
@@ -157,7 +157,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<standard>"
 
@@ -1743,51 +1743,51 @@ msgstr "Gendan spil:"
 msgid "Restore"
 msgstr "Gendan"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME OPL emulator"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox OPL emulator"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Ingen musik"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Amiga lyd emulator"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib emulator"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS emulator (IKKE IMPLEMENTERET)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64 lyd emulator"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Initialisere MT-32 emulator"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32 emulator"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC Speaker emulator"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM PCjr emulator"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM Towns emulator"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 79af360652..a3a7cdfd23 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -159,7 +159,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<Standard>"
 
@@ -1757,51 +1757,51 @@ msgstr "Spiel laden:"
 msgid "Restore"
 msgstr "Laden"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME-OPL-Emulator"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox-OPL-Emulator"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Keine Musik"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Amiga-Audio-Emulator"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib-Emulator"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple-II-GS-Emulator (NICHT INTEGRIERT)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64-Audio-Emulator"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "MT-32-Emulator wird gestartet..."
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32-Emulation"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC-Lautsprecher-Emulator"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM-PCjr-Emulator"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM-Towns-Emulator"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 6e954d54fd..8b3c57fdb0 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -157,7 +157,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<por defecto>"
 
@@ -1770,51 +1770,51 @@ msgstr "Cargar partida:"
 msgid "Restore"
 msgstr "Cargar"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Emulador OPL de MAME"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Emulador OPL de DOSBox"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Sin música"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulador de Amiga Audio"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Emulador de AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Emulador de Apple II GS (NO IMPLEMENTADO)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulador de C64 Audio"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Iniciando emulador de MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Emulador de MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Emulador del altavoz de PC"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Emulador de IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Emulador de FM Towns"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index f2785b3e63..cdadf119cd 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -158,7 +158,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<defaut>"
 
@@ -1760,51 +1760,51 @@ msgstr "Charger le jeu:"
 msgid "Restore"
 msgstr "Charger"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Émulateur MAME OPL"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Émulateur DOSBox OPL"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Pas de musique"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Émulateur Amiga Audio"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Émulateur AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Émulateur Apple II GS (PAS IMPLÉMENTÉ)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Émulateur C64 Audio"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Initialisation de l'Émulateur MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Émulateur MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Émulateur Haut Parleur PC"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Émulateur IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Émulateur FM Towns"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index fc282f9dbb..80b40da1f4 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -159,7 +159,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<alapértelmezett>"
 
@@ -1745,51 +1745,51 @@ msgstr "Játékmenet visszaállítása:"
 msgid "Restore"
 msgstr "Visszaállítás"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME OPL emulátor"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox OPL emulátor"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Nincs zene"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Amiga Audió Emulátor"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib Emulátor"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS Emulátor (NEM TÁMOGATOTT)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64 Audio Emulátor"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "MT-32 Emulátor inicializálás"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32 Emulátor"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC Speaker Emulátor"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM PCjr Emulátor"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM Towns Emulátor"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 2f2da61979..705a6b4fb4 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -156,7 +156,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<predefinito>"
 
@@ -1771,51 +1771,51 @@ msgstr "Ripristina gioco:"
 msgid "Restore"
 msgstr "Ripristina"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Emulatore OPL MAME"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Emulatore OPL DOSBox"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Nessuna musica"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulatore audio Amiga"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Emulatore AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Emulatore Apple II GS (NON IMPLEMENTATO)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulatore audio C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Avvio in corso dell'emulatore MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Emulatore MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Emulatore PC Speaker"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Emulatore IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Emulatore FM Towns"
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 7b9c61744a..54bc891595 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -161,7 +161,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<standard>"
 
@@ -1747,51 +1747,51 @@ msgstr "Gjennopprett spill:"
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME OPL emulator"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox OPL emulator"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Ingen musikk"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Amiga Lydemulator"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib Emulator"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS Emulator (IKKE IMPLEMENTERT)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64 Lydemulator"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Initialiserer MT-32-Emulator"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32 Emulator"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC Speaker Emulator"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM PCjr Emulator"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM Towns Emulator"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index f690618228..7b2c54eed8 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -161,7 +161,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<standard>"
 
@@ -1741,51 +1741,51 @@ msgstr "Gjenopprett spel:"
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "MAME OPL emulator"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "DOSBox OPL emulator"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Ingen musikk"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Amiga Lydemulator"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "AdLib Emulator"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS Emulator (IKKJE IMPLEMENTERT)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64 Lydemulator"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Initialiserar MT-32-emulator"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "MT-32 Emulator"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "PC Speaker Emulator"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "IBM PCjr Emulator"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "FM Towns Emulator"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index c9f8b2caf0..6d27cc8c65 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -159,7 +159,7 @@ msgstr "Jêzyk gry. Nie zmieni to hiszpañskiej wersji gry w angielsk±."
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<domy¶lne>"
 
@@ -1747,51 +1747,51 @@ msgstr "Wznów grê:"
 msgid "Restore"
 msgstr "Wznów"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Emulator OPL MAME"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Emulator OPL DOSBox"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Brak muzyki"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulator d¼wiêku Amigi"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Emulator AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Emulator Apple II GS (NIE ZAIMPLEMENTOWANY)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulator d¼wiêku C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Inicjalizacja emulatora MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Emulator MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Emulator brzêczyka"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Emulator IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Emulator FM Towns"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 193967446f..3c477faa88 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -159,7 +159,7 @@ msgstr "Idioma do jogo. Isto não irá passar seu jogo Inglês para Português"
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<padrão>"
 
@@ -1754,51 +1754,51 @@ msgstr "Restaurar jogo:"
 msgid "Restore"
 msgstr "Restaurar"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Emulador MAME OPL"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Emulador DOSBox OPL"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "Sem música"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "Emulador Som Amiga"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "Emulador AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Emulador Apple II GS (NÃO IMPLEMENTADO)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "Emulador Som C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "Inicializando Emulador MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "Emulador MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "Emulador PC Speaker"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "Emulador IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "Emulador FM Towns"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 0148944466..01f73849d4 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -159,7 +159,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<ßÞ ãÜÞÛçÐÝØî>"
 
@@ -1773,51 +1773,51 @@ msgstr "²ÞááâÐÝÞÒØâì ØÓàã: "
 msgid "Restore"
 msgstr "²ÞááâÒÝÞÒØâì"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "ÍÜãÛïâÞà MAME OPL"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "ÍÜãÛïâÞà DOSBox OPL"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "±Õ× Üã×ëÚØ"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "ÍÜãÛïâÞà ×ÒãÚÐ Amiga"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "ÍÜãÛïâÞà AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "ÍÜãÛïâÞà Apple II GS (ÞâáãâáâÒãÕâ)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "ÍÜãÛïâÞà ×ÒãÚÐ C64"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "½ÐáâàÐØÒÐî íÜãÛïâÞà MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "ÍÜãÛïâÞà MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "ÍÜãÛïâÞà PC áßØÚÕàÐ"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "ÍÜãÛïâÞà IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "ÍÜãÛïâÞà FM Towns"
 
diff --git a/po/scummvm.pot b/po/scummvm.pot
index 523d48ee1e..e1be51f70b 100644
--- a/po/scummvm.pot
+++ b/po/scummvm.pot
@@ -153,7 +153,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr ""
 
@@ -1721,51 +1721,51 @@ msgstr ""
 msgid "Restore"
 msgstr ""
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr ""
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr ""
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr ""
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr ""
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr ""
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr ""
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr ""
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr ""
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr ""
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr ""
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr ""
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr ""
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 56d1880e1f..50e7871355 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -159,7 +159,7 @@ msgstr ""
 
 #: gui/launcher.cpp:191 gui/launcher.cpp:205 gui/options.cpp:80
 #: gui/options.cpp:646 gui/options.cpp:656 gui/options.cpp:1087
-#: sound/null.cpp:42
+#: audio/null.cpp:42
 msgid "<default>"
 msgstr "<×Ð ãÜÞÒçÐÝÝïÜ>"
 
@@ -1769,51 +1769,51 @@ msgstr "²öÔÝÞÒØâØ Óàã: "
 msgid "Restore"
 msgstr "²öÔÝÞÒØâØ"
 
-#: sound/fmopl.cpp:51
+#: audio/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "µÜãÛïâÞà MAME OPL:"
 
-#: sound/fmopl.cpp:53
+#: audio/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "µÜãÛïâÞà DOSBox OPL"
 
-#: sound/null.h:45
+#: audio/null.h:45
 msgid "No music"
 msgstr "±Õ× Üã×ØÚØ"
 
-#: sound/mods/paula.cpp:192
+#: audio/mods/paula.cpp:192
 msgid "Amiga Audio Emulator"
 msgstr "°ÜöÓÐ °ãÔöÞ µÜãÛïâÞà"
 
-#: sound/softsynth/adlib.cpp:1590
+#: audio/softsynth/adlib.cpp:1590
 msgid "AdLib Emulator"
 msgstr "µÜãÛïâÞà AdLib"
 
-#: sound/softsynth/appleiigs.cpp:36
+#: audio/softsynth/appleiigs.cpp:36
 msgid "Apple II GS Emulator (NOT IMPLEMENTED)"
 msgstr "Apple II GS µÜãÛïâÞà (½µ Àµ°»¦·¾²°½¾)"
 
-#: sound/softsynth/sid.cpp:1434
+#: audio/softsynth/sid.cpp:1434
 msgid "C64 Audio Emulator"
 msgstr "C64 °ãÔöÞ µÜãÛïâÞà"
 
-#: sound/softsynth/mt32.cpp:327
+#: audio/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr "½ÐáâàÞîî ÕÜãÛïâÞà MT-32"
 
-#: sound/softsynth/mt32.cpp:541
+#: audio/softsynth/mt32.cpp:541
 msgid "MT-32 Emulator"
 msgstr "µÜãÛïâÞà MT-32"
 
-#: sound/softsynth/pcspk.cpp:142
+#: audio/softsynth/pcspk.cpp:142
 msgid "PC Speaker Emulator"
 msgstr "µÜãÛïâÞà PC áßöÚÕàÐ"
 
-#: sound/softsynth/pcspk.cpp:161
+#: audio/softsynth/pcspk.cpp:161
 msgid "IBM PCjr Emulator"
 msgstr "µÜãÛïâÞà IBM PCjr"
 
-#: sound/softsynth/ym2612.cpp:762
+#: audio/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
 msgstr "µÜãÛïâÞà FM Towns"
 
diff --git a/test/sound/audiostream.h b/test/audio/audiostream.h
index ba3adcb34c..1ffb2308ec 100644
--- a/test/sound/audiostream.h
+++ b/test/audio/audiostream.h
@@ -1,6 +1,6 @@
 #include <cxxtest/TestSuite.h>
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 
 #include "helper.h"
 
diff --git a/test/sound/helper.h b/test/audio/helper.h
index 394287c884..262ca1c060 100644
--- a/test/sound/helper.h
+++ b/test/audio/helper.h
@@ -1,7 +1,7 @@
 #ifndef TEST_SOUND_HELPER_H
 #define TEST_SOUND_HELPER_H
 
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
 
 #include "common/stream.h"
 #include "common/endian.h"
diff --git a/test/sound/raw.h b/test/audio/raw.h
index b8f7b2dae6..51ec067f7e 100644
--- a/test/sound/raw.h
+++ b/test/audio/raw.h
@@ -1,6 +1,6 @@
 #include <cxxtest/TestSuite.h>
 
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
 
 #include "helper.h"
 
diff --git a/test/sound/timestamp.h b/test/audio/timestamp.h
index d7188f8f44..ca56e34a4d 100644
--- a/test/sound/timestamp.h
+++ b/test/audio/timestamp.h
@@ -1,6 +1,6 @@
 #include <cxxtest/TestSuite.h>
 
-#include "sound/timestamp.h"
+#include "audio/timestamp.h"
 
 class TimestampTestSuite : public CxxTest::TestSuite
 {
diff --git a/test/module.mk b/test/module.mk
index 20425b6359..3542ae2903 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -5,8 +5,8 @@
 #
 ######################################################################
 
-TESTS        := $(srcdir)/test/common/*.h $(srcdir)/test/sound/*.h
-TEST_LIBS    := sound/libsound.a common/libcommon.a
+TESTS        := $(srcdir)/test/common/*.h $(srcdir)/test/audio/*.h
+TEST_LIBS    := audio/libaudio.a common/libcommon.a
 
 #
 TEST_FLAGS   := --runner=StdioPrinter
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index 1e2515680f..757d2b740b 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -28,14 +28,14 @@
 #include "common/stream.h"
 #include "common/events.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 #include "video/avi_decoder.h"
 
 // Audio Codecs
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/raw.h"
 
 // Video Codecs
 #include "video/codecs/cinepak.h"
diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 063df1ee72..c2551454db 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -28,8 +28,8 @@
 
 #include "video/video_decoder.h"
 #include "video/codecs/codec.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Video {
 
diff --git a/video/codecs/qdm2.cpp b/video/codecs/qdm2.cpp
index eac1954435..8678c94acd 100644
--- a/video/codecs/qdm2.cpp
+++ b/video/codecs/qdm2.cpp
@@ -30,7 +30,7 @@
 
 #ifdef GRAPHICS_QDM2_H
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 #include "video/codecs/qdm2data.h"
 
 #include "common/array.h"
diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index 3c092d5cf9..c8beb3b604 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -32,8 +32,8 @@
 
 #ifdef VIDEO_COKTELDECODER_H
 
-#include "sound/audiostream.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
 #include "common/memstream.h"
 
 static const uint32 kVideoCodecIndeo3 = MKID_BE('iv32');
diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h
index 152cf5941d..9c8263be9d 100644
--- a/video/coktel_decoder.h
+++ b/video/coktel_decoder.h
@@ -39,7 +39,7 @@
 
 #include "video/video_decoder.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 	class QueuingAudioStream;
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 379dc5d7a2..c855360e2b 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -41,8 +41,8 @@
 #include "common/zlib.h"
 
 // Audio codecs
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/raw.h"
 #include "video/codecs/qdm2.h"
 
 // Video codecs
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index 47da683f39..809c8a718d 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -41,8 +41,8 @@
 #include "video/video_decoder.h"
 #include "video/codecs/codec.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Common {
 	class File;
diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp
index d7412e99c3..a9f2eeeb5b 100644
--- a/video/smk_decoder.cpp
+++ b/video/smk_decoder.cpp
@@ -35,9 +35,9 @@
 #include "common/stream.h"
 #include "common/system.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 namespace Video {
 
diff --git a/video/smk_decoder.h b/video/smk_decoder.h
index 146d8a7935..2d01909a44 100644
--- a/video/smk_decoder.h
+++ b/video/smk_decoder.h
@@ -27,7 +27,7 @@
 #define VIDEO_SMK_PLAYER_H
 
 #include "video/video_decoder.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 	class QueuingAudioStream;
diff --git a/video/video_decoder.h b/video/video_decoder.h
index 5b6c882d09..97cd133bc0 100644
--- a/video/video_decoder.h
+++ b/video/video_decoder.h
@@ -33,7 +33,7 @@
 #include "graphics/surface.h"
 #include "graphics/pixelformat.h"
 
-#include "sound/timestamp.h"	// TODO: Move this to common/ ?
+#include "audio/timestamp.h"	// TODO: Move this to common/ ?
 
 
 namespace Common {