Replacing some #includes by forward declarations

svn-id: r41632

12 files changed, 29 insertions, 13 deletions

diff --git a/engines/gob/sound/bgatmosphere.cpp b/engines/gob/sound/bgatmosphere.cpp
index 12ceb031b7..6ce184155e 100644
--- a/engines/gob/sound/bgatmosphere.cpp
+++ b/engines/gob/sound/bgatmosphere.cpp
@@ -27,6 +27,7 @@
 #include "common/events.h"
 
 #include "gob/sound/bgatmosphere.h"
+#include "gob/sound/sounddesc.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/bgatmosphere.h b/engines/gob/sound/bgatmosphere.h
index 3fa648b94d..aa8cf58e10 100644
--- a/engines/gob/sound/bgatmosphere.h
+++ b/engines/gob/sound/bgatmosphere.h
@@ -29,11 +29,12 @@
 #include "sound/mixer.h"
 #include "common/mutex.h"
 
-#include "gob/sound/sounddesc.h"
 #include "gob/sound/soundmixer.h"
 
 namespace Gob {
 
+class SoundDesc;
+
 class BackgroundAtmosphere : private SoundMixer {
 public:
 	enum PlayMode {
diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp
index ec9b2aaccb..0694970950 100644
--- a/engines/gob/sound/cdrom.cpp
+++ b/engines/gob/sound/cdrom.cpp
@@ -30,6 +30,7 @@
 #include "gob/gob.h"
 #include "gob/sound/cdrom.h"
 #include "gob/helper.h"
+#include "gob/dataio.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/cdrom.h b/engines/gob/sound/cdrom.h
index 201f7adb75..6f01e6f90a 100644
--- a/engines/gob/sound/cdrom.h
+++ b/engines/gob/sound/cdrom.h
@@ -26,10 +26,10 @@
 #ifndef GOB_SOUND_CDROM_H
 #define GOB_SOUND_CDROM_H
 
-#include "gob/dataio.h"
-
 namespace Gob {
 
+class DataStream;
+
 class CDROM {
 public:
 	CDROM();
diff --git a/engines/gob/sound/protracker.cpp b/engines/gob/sound/protracker.cpp
index 891580ef40..3e33cfd494 100644
--- a/engines/gob/sound/protracker.cpp
+++ b/engines/gob/sound/protracker.cpp
@@ -25,6 +25,8 @@
 
 #include "common/file.h"
 
+#include "sound/mods/protracker.h"
+
 #include "gob/sound/protracker.h"
 
 namespace Gob {
diff --git a/engines/gob/sound/protracker.h b/engines/gob/sound/protracker.h
index 6270530427..73cae0d510 100644
--- a/engines/gob/sound/protracker.h
+++ b/engines/gob/sound/protracker.h
@@ -28,7 +28,6 @@
 
 #include "sound/mixer.h"
 #include "sound/audiostream.h"
-#include "sound/mods/protracker.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 3401931c8b..fba9ca3554 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -31,6 +31,13 @@
 #include "gob/game.h"
 #include "gob/inter.h"
 
+#include "gob/sound/pcspeaker.h"
+#include "gob/sound/soundblaster.h"
+#include "gob/sound/adlib.h"
+#include "gob/sound/infogrames.h"
+#include "gob/sound/protracker.h"
+#include "gob/sound/cdrom.h"
+
 namespace Gob {
 
 Sound::Sound(GobEngine *vm) : _vm(vm) {
diff --git a/engines/gob/sound/sound.h b/engines/gob/sound/sound.h
index 1c37891a50..a48002df4a 100644
--- a/engines/gob/sound/sound.h
+++ b/engines/gob/sound/sound.h
@@ -27,16 +27,18 @@
 #define GOB_SOUND_SOUND_H
 
 #include "gob/sound/sounddesc.h"
-#include "gob/sound/pcspeaker.h"
-#include "gob/sound/soundblaster.h"
-#include "gob/sound/adlib.h"
-#include "gob/sound/infogrames.h"
-#include "gob/sound/protracker.h"
-#include "gob/sound/cdrom.h"
 #include "gob/sound/bgatmosphere.h"
 
 namespace Gob {
 
+class GobEngine;
+class PCSpeaker;
+class SoundBlaster;
+class AdLib;
+class Infogrames;
+class Protracker;
+class CDROM;
+
 class Sound {
 public:
 	static const int kSoundsCount = 60;
diff --git a/engines/gob/sound/soundblaster.cpp b/engines/gob/sound/soundblaster.cpp
index 23eea90688..69610dc949 100644
--- a/engines/gob/sound/soundblaster.cpp
+++ b/engines/gob/sound/soundblaster.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "gob/sound/soundblaster.h"
+#include "gob/sound/sounddesc.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/soundblaster.h b/engines/gob/sound/soundblaster.h
index c57e4a443e..a2dc87267c 100644
--- a/engines/gob/sound/soundblaster.h
+++ b/engines/gob/sound/soundblaster.h
@@ -29,11 +29,12 @@
 #include "common/mutex.h"
 #include "sound/mixer.h"
 
-#include "gob/sound/sounddesc.h"
 #include "gob/sound/soundmixer.h"
 
 namespace Gob {
 
+class SoundDesc;
+
 class SoundBlaster : public SoundMixer {
 public:
 	SoundBlaster(Audio::Mixer &mixer);
diff --git a/engines/gob/sound/soundmixer.cpp b/engines/gob/sound/soundmixer.cpp
index ea1dd2ef82..68a96d3b01 100644
--- a/engines/gob/sound/soundmixer.cpp
+++ b/engines/gob/sound/soundmixer.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "gob/sound/soundmixer.h"
+#include "gob/sound/sounddesc.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/soundmixer.h b/engines/gob/sound/soundmixer.h
index f32beb149f..20376b5152 100644
--- a/engines/gob/sound/soundmixer.h
+++ b/engines/gob/sound/soundmixer.h
@@ -31,10 +31,10 @@
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 
-#include "gob/sound/sounddesc.h"
-
 namespace Gob {
 
+class SoundDesc;
+
 class SoundMixer : public Audio::AudioStream {
 public:
 	SoundMixer(Audio::Mixer &mixer, Audio::Mixer::SoundType type);