JANITORIAL: Reduce header dependencies in shared code

Some backends may break as I only compiled SDL

17 files changed, 13 insertions, 19 deletions

diff --git a/audio/decoders/adpcm.cpp b/audio/decoders/adpcm.cpp
index 3b53ca2fd1..a9284973d5 100644
--- a/audio/decoders/adpcm.cpp
+++ b/audio/decoders/adpcm.cpp
@@ -23,11 +23,12 @@
  *
  */
 
-#include "common/endian.h"
+#include "common/stream.h"
+#include "common/textconsole.h"
+#include "common/util.h"
 
 #include "audio/decoders/adpcm.h"
 #include "audio/decoders/adpcm_intern.h"
-#include "audio/audiostream.h"
 
 
 namespace Audio {
diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h
index b0f0e9ee60..10344101e2 100644
--- a/audio/decoders/adpcm.h
+++ b/audio/decoders/adpcm.h
@@ -47,7 +47,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class RewindableAudioStream;
 
 // There are several types of ADPCM encoding, only some are supported here
diff --git a/audio/decoders/adpcm_intern.h b/audio/decoders/adpcm_intern.h
index dd8c14be79..f875bd88c7 100644
--- a/audio/decoders/adpcm_intern.h
+++ b/audio/decoders/adpcm_intern.h
@@ -37,6 +37,7 @@
 #include "audio/audiostream.h"
 #include "common/endian.h"
 #include "common/stream.h"
+#include "common/textconsole.h"
 
 
 namespace Audio {
diff --git a/audio/decoders/aiff.cpp b/audio/decoders/aiff.cpp
index 0f947752f6..957fb13638 100644
--- a/audio/decoders/aiff.cpp
+++ b/audio/decoders/aiff.cpp
@@ -32,12 +32,10 @@
  */
 
 #include "common/endian.h"
-#include "common/util.h"
 #include "common/stream.h"
+#include "common/textconsole.h"
 
 #include "audio/decoders/aiff.h"
-#include "audio/audiostream.h"
-#include "audio/mixer.h"
 #include "audio/decoders/raw.h"
 
 namespace Audio {
diff --git a/audio/decoders/flac.cpp b/audio/decoders/flac.cpp
index 76b6d35419..fe15877ac6 100644
--- a/audio/decoders/flac.cpp
+++ b/audio/decoders/flac.cpp
@@ -32,6 +32,7 @@
 
 #include "common/debug.h"
 #include "common/stream.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 
 #include "audio/audiostream.h"
diff --git a/audio/decoders/flac.h b/audio/decoders/flac.h
index 211347afcf..69222f22a1 100644
--- a/audio/decoders/flac.h
+++ b/audio/decoders/flac.h
@@ -54,7 +54,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class SeekableAudioStream;
 
 /**
diff --git a/audio/decoders/iff_sound.cpp b/audio/decoders/iff_sound.cpp
index 2ec189c586..8efe017e75 100644
--- a/audio/decoders/iff_sound.cpp
+++ b/audio/decoders/iff_sound.cpp
@@ -25,7 +25,6 @@
 
 #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/audio/decoders/mac_snd.cpp b/audio/decoders/mac_snd.cpp
index 7c1a2f75f0..fc69988860 100644
--- a/audio/decoders/mac_snd.cpp
+++ b/audio/decoders/mac_snd.cpp
@@ -30,11 +30,10 @@
  * We implement both type 1 and type 2 snd resources, but only those that are sampled
  */
 
-#include "common/util.h"
+#include "common/textconsole.h"
 #include "common/stream.h"
 
 #include "audio/decoders/mac_snd.h"
-#include "audio/audiostream.h"
 #include "audio/decoders/raw.h"
 
 namespace Audio {
diff --git a/audio/decoders/mp3.cpp b/audio/decoders/mp3.cpp
index 53d68fa9db..91bd49873a 100644
--- a/audio/decoders/mp3.cpp
+++ b/audio/decoders/mp3.cpp
@@ -29,6 +29,7 @@
 
 #include "common/debug.h"
 #include "common/stream.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 
 #include "audio/audiostream.h"
diff --git a/audio/decoders/mp3.h b/audio/decoders/mp3.h
index 84f7fac6cd..d3a5b70d45 100644
--- a/audio/decoders/mp3.h
+++ b/audio/decoders/mp3.h
@@ -55,7 +55,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class SeekableAudioStream;
 
 /**
diff --git a/audio/decoders/raw.cpp b/audio/decoders/raw.cpp
index 8b833c7838..cf787f9b12 100644
--- a/audio/decoders/raw.cpp
+++ b/audio/decoders/raw.cpp
@@ -25,9 +25,10 @@
 
 #include "common/endian.h"
 #include "common/memstream.h"
+#include "common/textconsole.h"
+#include "common/util.h"
 
 #include "audio/audiostream.h"
-#include "audio/mixer.h"
 #include "audio/decoders/raw.h"
 
 namespace Audio {
diff --git a/audio/decoders/raw.h b/audio/decoders/raw.h
index 6434366c32..23ed02182d 100644
--- a/audio/decoders/raw.h
+++ b/audio/decoders/raw.h
@@ -38,7 +38,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class SeekableAudioStream;
 
 /**
diff --git a/audio/decoders/vag.h b/audio/decoders/vag.h
index 4db9eeefa2..4adc1d3dde 100644
--- a/audio/decoders/vag.h
+++ b/audio/decoders/vag.h
@@ -40,7 +40,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class RewindableAudioStream;
 
 /**
diff --git a/audio/decoders/voc.cpp b/audio/decoders/voc.cpp
index b811a640ec..9c2dc4f337 100644
--- a/audio/decoders/voc.cpp
+++ b/audio/decoders/voc.cpp
@@ -27,9 +27,9 @@
 #include "common/endian.h"
 #include "common/util.h"
 #include "common/stream.h"
+#include "common/textconsole.h"
 
 #include "audio/audiostream.h"
-#include "audio/mixer.h"
 #include "audio/decoders/raw.h"
 #include "audio/decoders/voc.h"
 
diff --git a/audio/decoders/vorbis.cpp b/audio/decoders/vorbis.cpp
index a9bcb6167f..63f7ba8207 100644
--- a/audio/decoders/vorbis.cpp
+++ b/audio/decoders/vorbis.cpp
@@ -32,8 +32,8 @@
 
 #ifdef USE_VORBIS
 
-#include "common/debug.h"
 #include "common/stream.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 
 #include "audio/audiostream.h"
diff --git a/audio/decoders/vorbis.h b/audio/decoders/vorbis.h
index 9829f74a36..51d0b82d5f 100644
--- a/audio/decoders/vorbis.h
+++ b/audio/decoders/vorbis.h
@@ -54,7 +54,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class SeekableAudioStream;
 
 /**
diff --git a/audio/decoders/wave.cpp b/audio/decoders/wave.cpp
index 1f0ddd8ceb..a64874887a 100644
--- a/audio/decoders/wave.cpp
+++ b/audio/decoders/wave.cpp
@@ -24,11 +24,10 @@
  */
 
 #include "common/debug.h"
-#include "common/util.h"
+#include "common/textconsole.h"
 #include "common/stream.h"
 
 #include "audio/audiostream.h"
-#include "audio/mixer.h"
 #include "audio/decoders/wave.h"
 #include "audio/decoders/adpcm.h"
 #include "audio/decoders/raw.h"