diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 8952e649fd5..48b170da75e 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -32,6 +32,7 @@
 #include "agos/intern.h"
 #include "agos/agos.h"
 #include "agos/midi.h"
+#include "agos/sound.h"
 
 #include "backends/audiocd/audiocd.h"
 
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index b6b5e427e1c..551df6e19b9 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -32,8 +32,8 @@
 #include "common/rect.h"
 #include "common/stack.h"
 #include "common/util.h"
+#include "audio/mixer.h"
 
-#include "agos/sound.h"
 #include "agos/vga.h"
 
 /**
@@ -77,10 +77,14 @@ uint fileReadItemID(Common::SeekableReadStream *in);
 class MoviePlayer;
 #endif
 
+class Sound;
 class MidiPlayer;
 
 struct Child;
 struct SubObject;
+struct RoomState;
+struct SubRoom;
+struct SubSuperRoom;
 
 struct Item;
 struct WindowBlock;
diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp
index 65fdc9ec993..19a38116cfb 100644
--- a/engines/agos/cursor.cpp
+++ b/engines/agos/cursor.cpp
@@ -26,6 +26,7 @@
 #include "graphics/cursorman.h"
 
 #include "agos/agos.h"
+#include "agos/intern.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp
index 7ad742c928b..365d84dd3f1 100644
--- a/engines/agos/debugger.cpp
+++ b/engines/agos/debugger.cpp
@@ -25,6 +25,7 @@
 #include "agos/debugger.h"
 #include "agos/agos.h"
 #include "agos/midi.h"
+#include "agos/sound.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/drivers/accolade/adlib.cpp b/engines/agos/drivers/accolade/adlib.cpp
index 294be2b8a7b..3a95d8f1c1b 100644
--- a/engines/agos/drivers/accolade/adlib.cpp
+++ b/engines/agos/drivers/accolade/adlib.cpp
@@ -20,16 +20,13 @@
  *
  */
 
-#include "agos/agos.h"
 #include "agos/drivers/accolade/mididriver.h"
 
-#include "common/file.h"
-#include "common/mutex.h"
 #include "common/system.h"
 #include "common/textconsole.h"
 
 #include "audio/fmopl.h"
-#include "audio/softsynth/emumidi.h"
+#include "audio/mididrv.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/drivers/accolade/driverfile.cpp b/engines/agos/drivers/accolade/driverfile.cpp
index 4ff2fd550fd..1e7fd442dfd 100644
--- a/engines/agos/drivers/accolade/driverfile.cpp
+++ b/engines/agos/drivers/accolade/driverfile.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include "agos/agos.h"
 #include "audio/mididrv.h"
 #include "common/error.h"
 #include "common/file.h"
diff --git a/engines/agos/drivers/accolade/mt32.cpp b/engines/agos/drivers/accolade/mt32.cpp
index 319e0ebf566..321b95f4ca5 100644
--- a/engines/agos/drivers/accolade/mt32.cpp
+++ b/engines/agos/drivers/accolade/mt32.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include "agos/agos.h"
 #include "agos/drivers/accolade/mididriver.h"
 
 #include "audio/mididrv.h"
diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index 5240cdd7713..b70ec674dd2 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -23,6 +23,7 @@
 #include "agos/agos.h"
 #include "agos/animation.h"
 #include "agos/debugger.h"
+#include "agos/sound.h"
 #include "agos/intern.h"
 
 #include "common/events.h"
diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp
index 2db2a52cbcd..364fbf5f15a 100644
--- a/engines/agos/icons.cpp
+++ b/engines/agos/icons.cpp
@@ -27,6 +27,7 @@
 #include "graphics/surface.h"
 
 #include "agos/agos.h"
+#include "agos/intern.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index 686b1c35b22..3b57369f1e0 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -26,6 +26,7 @@
 #include "agos/intern.h"
 #include "agos/agos.h"
 #include "agos/midi.h"
+#include "agos/sound.h"
 #include "agos/vga.h"
 
 namespace AGOS {
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
index 2631f7998e6..76d23905b7f 100644
--- a/engines/agos/res.cpp
+++ b/engines/agos/res.cpp
@@ -31,7 +31,6 @@
 
 #include "agos/agos.h"
 #include "agos/intern.h"
-#include "agos/sound.h"
 
 #include "common/zlib.h"
 
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index 3a092e652cf..81d89cc4d3f 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -28,6 +28,7 @@
 #include "agos/intern.h"
 #include "agos/agos.h"
 #include "agos/midi.h"
+#include "agos/sound.h"
 #include "agos/vga.h"
 
 #include "backends/audiocd/audiocd.h"
diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp
index 1dbb9c255a6..5f4ff4e7736 100644
--- a/engines/agos/script.cpp
+++ b/engines/agos/script.cpp
@@ -27,8 +27,8 @@
 #include "common/system.h"
 #include "common/textconsole.h"
 
-#include "agos/animation.h"
 #include "agos/agos.h"
+#include "agos/intern.h"
 
 #ifdef _WIN32_WCE
 extern bool isSmartphone();
diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp
index a022335ebc4..38b29d475e9 100644
--- a/engines/agos/script_e1.cpp
+++ b/engines/agos/script_e1.cpp
@@ -22,6 +22,7 @@
 
 
 #include "agos/agos.h"
+#include "agos/intern.h"
 #include "agos/vga.h"
 
 namespace AGOS {
diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp
index 21b651ec12d..d0cd015ce99 100644
--- a/engines/agos/script_e2.cpp
+++ b/engines/agos/script_e2.cpp
@@ -23,6 +23,7 @@
 
 
 #include "agos/agos.h"
+#include "agos/intern.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/script_ff.cpp b/engines/agos/script_ff.cpp
index e4fadcf360a..10c9e995d45 100644
--- a/engines/agos/script_ff.cpp
+++ b/engines/agos/script_ff.cpp
@@ -28,6 +28,8 @@
 
 #include "agos/animation.h"
 #include "agos/agos.h"
+#include "agos/intern.h"
+#include "agos/sound.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp
index 60948db35ab..653a1629043 100644
--- a/engines/agos/script_pn.cpp
+++ b/engines/agos/script_pn.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "agos/agos.h"
+#include "agos/intern.h"
 #include "agos/vga.h"
 
 #include "common/endian.h"
diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp
index ec3de9bf942..e7828609d9d 100644
--- a/engines/agos/script_s1.cpp
+++ b/engines/agos/script_s1.cpp
@@ -26,6 +26,8 @@
 #include "graphics/palette.h"
 
 #include "agos/agos.h"
+#include "agos/intern.h"
+#include "agos/sound.h"
 
 #ifdef _WIN32_WCE
 extern bool isSmartphone();
diff --git a/engines/agos/script_s2.cpp b/engines/agos/script_s2.cpp
index 44552ecd8a6..7b1f369d680 100644
--- a/engines/agos/script_s2.cpp
+++ b/engines/agos/script_s2.cpp
@@ -23,6 +23,7 @@
 
 
 #include "agos/agos.h"
+#include "agos/intern.h"
 #include "agos/midi.h"
 
 #include "common/textconsole.h"
diff --git a/engines/agos/script_ww.cpp b/engines/agos/script_ww.cpp
index aff3229f8e5..9394311001d 100644
--- a/engines/agos/script_ww.cpp
+++ b/engines/agos/script_ww.cpp
@@ -23,6 +23,7 @@
 
 
 #include "agos/agos.h"
+#include "agos/intern.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index 1e6ecaa8298..0f6c7673002 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.cpp
@@ -26,6 +26,7 @@
 
 #include "agos/agos.h"
 #include "agos/intern.h"
+#include "agos/sound.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index f761c3fc3fd..2a675bf6e87 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -25,6 +25,7 @@
 
 #include "agos/agos.h"
 #include "agos/intern.h"
+#include "agos/sound.h"
 #include "agos/vga.h"
 
 #include "common/debug-channels.h"
diff --git a/engines/agos/vga_e2.cpp b/engines/agos/vga_e2.cpp
index bc26058640f..a26f189c43f 100644
--- a/engines/agos/vga_e2.cpp
+++ b/engines/agos/vga_e2.cpp
@@ -25,6 +25,7 @@
 
 #include "agos/agos.h"
 #include "agos/intern.h"
+#include "agos/sound.h"
 
 #include "common/endian.h"
 #include "common/system.h"
diff --git a/engines/agos/vga_ff.cpp b/engines/agos/vga_ff.cpp
index 52e30699b0c..c350c374135 100644
--- a/engines/agos/vga_ff.cpp
+++ b/engines/agos/vga_ff.cpp
@@ -26,6 +26,7 @@
 
 #include "agos/agos.h"
 #include "agos/intern.h"
+#include "agos/sound.h"
 
 namespace AGOS {
 
diff --git a/engines/agos/vga_s1.cpp b/engines/agos/vga_s1.cpp
index c5f0f7874d3..9b7e529e4b1 100644
--- a/engines/agos/vga_s1.cpp
+++ b/engines/agos/vga_s1.cpp
@@ -24,6 +24,7 @@
 
 #include "agos/agos.h"
 #include "agos/intern.h"
+#include "agos/sound.h"
 #include "agos/vga.h"
 
 namespace AGOS {
diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp
index 0c716d06c48..5326e0250fe 100644
--- a/engines/agos/vga_s2.cpp
+++ b/engines/agos/vga_s2.cpp
@@ -23,6 +23,7 @@
 #include "agos/agos.h"
 #include "agos/intern.h"
 #include "agos/midi.h"
+#include "agos/sound.h"
 
 #include "graphics/surface.h"