JANITORIAL: Reduce header dependencies in shared code

Some backends may break as I only compiled SDL

audio/audiostream.cpp

@@ -24,14 +24,14 @@
  */
 
 #include "common/debug.h"
-#include "common/endian.h"
 #include "common/file.h"
+#include "common/mutex.h"
+#include "common/textconsole.h"
 #include "common/queue.h"
 #include "common/util.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"

audio/audiostream.h

@@ -26,16 +26,14 @@
 #ifndef SOUND_AUDIOSTREAM_H
 #define SOUND_AUDIOSTREAM_H
 
-#include "common/util.h"
 #include "common/scummsys.h"
+#include "common/str.h"
 #include "common/types.h"
 
 #include "audio/timestamp.h"
 
 namespace Audio {
 
-class SeekableAudioStream;
-
 /**
  * Generic audio input stream. Subclasses of this are used to feed arbitrary
  * sampled audio data into ScummVM's audio mixer.

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 {

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

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 {

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 {

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"

audio/decoders/flac.h

@@ -54,7 +54,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class SeekableAudioStream;
 
 /**

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"

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 {

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"

audio/decoders/mp3.h

@@ -55,7 +55,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class SeekableAudioStream;
 
 /**

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 {

audio/decoders/raw.h

@@ -38,7 +38,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class SeekableAudioStream;
 
 /**

audio/decoders/vag.h

@@ -40,7 +40,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class RewindableAudioStream;
 
 /**

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"
 

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"

audio/decoders/vorbis.h

@@ -54,7 +54,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class SeekableAudioStream;
 
 /**

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"

audio/fmopl.cpp

@@ -28,6 +28,7 @@
 #include "audio/softsynth/opl/mame.h"
 
 #include "common/config-manager.h"
+#include "common/textconsole.h"
 #include "common/translation.h"
 
 namespace OPL {

audio/mididrv.cpp

@@ -23,14 +23,14 @@
  *
  */
 
-#include "engines/engine.h"
 #include "common/config-manager.h"
+#include "common/error.h"
 #include "common/str.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 #include "audio/mididrv.h"
 #include "audio/musicplugin.h"
-#include "common/translation.h"
 
 const byte MidiDriver::_mt32ToGm[128] = {
 //	  0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F

audio/mididrv.h

@@ -27,17 +27,10 @@
 #define SOUND_MIDIDRV_H
 
 #include "common/scummsys.h"
+#include "common/str.h"
 #include "common/timer.h"
 
 class MidiChannel;
-class MusicDevice;
-
-namespace Audio {
-class Mixer;
-}
-namespace Common {
-class String;
-}
 
 /**
  * Music types that music drivers can implement and engines can rely on.

audio/midiparser.cpp

@@ -25,6 +25,7 @@
 
 #include "audio/midiparser.h"
 #include "audio/mididrv.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 
 //////////////////////////////////////////////////

audio/midiparser.h

@@ -31,7 +31,6 @@
 #include "common/scummsys.h"
 #include "common/endian.h"
 
-class MidiParser;
 class MidiDriver_BASE;
 
 

audio/midiparser_smf.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "audio/midiparser.h"
-#include "audio/mididrv.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 
 /**

audio/midiparser_xmidi.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "audio/midiparser.h"
-#include "audio/mididrv.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 
 /**

audio/mixer.cpp

@@ -25,6 +25,7 @@
 
 #include "common/util.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 
 #include "audio/mixer_intern.h"
 #include "audio/rate.h"

audio/mixer.h

@@ -27,20 +27,13 @@
 #define SOUND_MIXER_H
 
 #include "common/types.h"
-#include "common/mutex.h"
 #include "common/noncopyable.h"
 
-#include "audio/timestamp.h"
-
-class OSystem;
-
-
 namespace Audio {
 
 class AudioStream;
 class Channel;
-class Mixer;
-class MixerImpl;
+class Timestamp;
 
 /**
  * A SoundHandle instances corresponds to a specific sound

audio/mods/infogrames.cpp

@@ -27,6 +27,7 @@
 #include "common/endian.h"
 #include "common/file.h"
 #include "common/memstream.h"
+#include "common/textconsole.h"
 
 namespace Audio {
 

audio/mods/infogrames.h

@@ -33,7 +33,10 @@
 #define SOUND_MODS_INFOGRAMES_H
 
 #include "audio/mods/paula.h"
-#include "common/stream.h"
+
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace Audio {
 

audio/mods/maxtrax.cpp

@@ -24,10 +24,10 @@
  */
 
 #include "common/scummsys.h"
-#include "common/endian.h"
 #include "common/stream.h"
 #include "common/util.h"
 #include "common/debug.h"
+#include "common/textconsole.h"
 
 #include "audio/mods/maxtrax.h"
 

audio/mods/module.cpp

@@ -27,6 +27,8 @@
 
 #include "common/util.h"
 #include "common/endian.h"
+#include "common/stream.h"
+#include "common/textconsole.h"
 
 namespace Modules {
 

audio/mods/module.h

@@ -26,7 +26,11 @@
 #ifndef SOUND_MODS_MODULE_H
 #define SOUND_MODS_MODULE_H
 
-#include "common/stream.h"
+#include "common/scummsys.h"
+
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace Modules {
 

audio/mods/protracker.cpp

@@ -29,6 +29,8 @@
 
 #include "audio/audiostream.h"
 
+#include "common/textconsole.h"
+
 namespace Modules {
 
 class ProtrackerStream : public ::Audio::Paula {

audio/mods/protracker.h

@@ -33,7 +33,9 @@
 #ifndef SOUND_MODS_PROTRACKER_H
 #define SOUND_MODS_PROTRACKER_H
 
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace Audio {
 

audio/mods/rjp1.cpp

@@ -25,10 +25,12 @@
 
 #include "common/debug.h"
 #include "common/endian.h"
+#include "common/stream.h"
+#include "common/textconsole.h"
+#include "common/util.h"
 
 #include "audio/mods/paula.h"
 #include "audio/mods/rjp1.h"
-#include "audio/audiostream.h"
 
 namespace Audio {
 

audio/mods/rjp1.h

@@ -32,7 +32,9 @@
 #ifndef SOUND_MODS_RJP1_H
 #define SOUND_MODS_RJP1_H
 
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace Audio {
 

audio/mods/soundfx.cpp

@@ -24,10 +24,11 @@
  */
 
 #include "common/endian.h"
+#include "common/stream.h"
+#include "common/textconsole.h"
 
 #include "audio/mods/paula.h"
 #include "audio/mods/soundfx.h"
-#include "audio/audiostream.h"
 
 namespace Audio {
 

audio/mods/soundfx.h

@@ -32,7 +32,9 @@
 #ifndef SOUND_MODS_SOUNDFX_H
 #define SOUND_MODS_SOUNDFX_H
 
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace Audio {
 

audio/mods/tfmx.cpp

@@ -26,8 +26,8 @@
 #include "common/scummsys.h"
 #include "common/endian.h"
 #include "common/stream.h"
-#include "common/util.h"
 #include "common/debug.h"
+#include "common/textconsole.h"
 
 #include "audio/mods/tfmx.h"
 

audio/mpu401.h

@@ -34,8 +34,6 @@
 //
 ////////////////////////////////////////
 
-class MidiDriver_MPU401;
-
 class MidiChannel_MPU401 : public MidiChannel {
 
 private:

audio/musicplugin.h

@@ -29,6 +29,10 @@
 #include "audio/mididrv.h"
 #include "common/list.h"
 
+namespace Common {
+class Error;
+}
+
 class MusicPluginObject;
 
 /**

audio/null.cpp

@@ -22,6 +22,7 @@
  * $Id$
  */
 
+#include "common/error.h"
 #include "audio/null.h"
 
 Common::Error NullMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle) const {

audio/rate.cpp

@@ -35,6 +35,7 @@
 #include "audio/rate.h"
 #include "audio/mixer.h"
 #include "common/frac.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 
 namespace Audio {

audio/rate.h

@@ -27,13 +27,11 @@
 #define SOUND_RATE_H
 
 #include "common/scummsys.h"
-#include "engines/engine.h"
-
-class AudioStream;
-
 
 namespace Audio {
 
+class AudioStream;
+
 typedef int16 st_sample_t;
 typedef uint16 st_volume_t;
 typedef uint32 st_size_t;

audio/softsynth/adlib.cpp

@@ -24,6 +24,11 @@
 
 #include "audio/softsynth/emumidi.h"
 #include "common/debug.h"
+#include "common/error.h"
+#include "common/scummsys.h"
+#include "common/system.h"
+#include "common/textconsole.h"
+#include "common/types.h"
 #include "common/util.h"
 #include "audio/fmopl.h"
 #include "audio/musicplugin.h"

audio/softsynth/fluidsynth.cpp

@@ -27,6 +27,9 @@
 #ifdef USE_FLUIDSYNTH
 
 #include "common/config-manager.h"
+#include "common/error.h"
+#include "common/system.h"
+#include "common/textconsole.h"
 #include "audio/musicplugin.h"
 #include "audio/mpu401.h"
 #include "audio/softsynth/emumidi.h"

audio/softsynth/fmtowns_pc98/towns_audio.cpp

@@ -25,6 +25,7 @@
 
 #include "audio/softsynth/fmtowns_pc98/towns_audio.h"
 #include "common/endian.h"
+#include "common/util.h"
 #include "backends/audiocd/audiocd.h"
 
 

audio/softsynth/fmtowns_pc98/towns_euphony.cpp

@@ -25,6 +25,8 @@
 
 #include "audio/softsynth/fmtowns_pc98/towns_euphony.h"
 #include "common/endian.h"
+#include "common/util.h"
+#include "common/textconsole.h"
 
 TownsEuphonyDriver::TownsEuphonyDriver(Audio::Mixer *mixer) : _activeChannels(0), _sustainChannels(0),
 	_assignedChannels(0), _paraCount(0), _command(0), _tEnable(0), _tMode(0), _tOrdr(0), _tLevel(0),

audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp

@@ -25,6 +25,7 @@
 
 #include "audio/softsynth/fmtowns_pc98/towns_pc98_driver.h"
 #include "common/endian.h"
+#include "common/textconsole.h"
 
 class TownsPC98_MusicChannel {
 public:

audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp

@@ -25,6 +25,8 @@
 
 #include "audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h"
 #include "common/endian.h"
+#include "common/textconsole.h"
+#include "common/util.h"
 
 class TownsPC98_FmSynthOperator {
 public:

audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h

@@ -28,7 +28,7 @@
 
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
-#include "common/list.h"
+#include "common/mutex.h"
 
 #ifdef __DS__
 /* This disables the rhythm channel when emulating the PC-98 type 86 sound card.

audio/softsynth/mt32.cpp

@@ -34,15 +34,20 @@
 
 #include "common/config-manager.h"
 #include "common/debug.h"
+#include "common/error.h"
 #include "common/events.h"
 #include "common/file.h"
 #include "common/system.h"
 #include "common/util.h"
 #include "common/archive.h"
+#include "common/textconsole.h"
 #include "common/translation.h"
 
 #include "graphics/fontman.h"
 #include "graphics/surface.h"
+#include "graphics/pixelformat.h"
+#include "graphics/palette.h"
+#include "graphics/font.h"
 
 class MidiChannel_MT32 : public MidiChannel_MPU401 {
 	void effectLevel(byte value) { }

audio/softsynth/mt32/part.h

@@ -24,7 +24,6 @@
 
 namespace MT32Emu {
 
-class PartialManager;
 class Synth;
 
 class Part {

audio/softsynth/mt32/synth.cpp

@@ -25,8 +25,6 @@
 
 #include "mt32emu.h"
 
-#include "common/str.h"
-
 #if defined(MACOSX) || defined(SOLARIS) || defined(__MINGW32__)
 // Older versions of Mac OS X didn't supply a powf function, so using it
 // will cause a binary incompatibility when trying to run a binary built

audio/softsynth/mt32/synth.h

@@ -29,7 +29,6 @@ class revmodel;
 namespace MT32Emu {
 
 class File;
-class TableInitialiser;
 class Partial;
 class PartialManager;
 class Part;

audio/softsynth/opl/dosbox.cpp

@@ -36,6 +36,7 @@
 
 #include "common/system.h"
 #include "common/scummsys.h"
+#include "common/util.h"
 
 #include <math.h>
 #include <string.h>

audio/softsynth/opl/mame.cpp

@@ -33,6 +33,9 @@
 
 #include "mame.h"
 
+#include "common/textconsole.h"
+#include "common/util.h"
+
 #if defined (_WIN32_WCE) || defined (__SYMBIAN32__) || defined(__GP32__) || defined(GP2X) || defined (__MAEMO__) || defined(__DS__) || defined (__MINT__) || defined(__N64__)
 #include "common/config-manager.h"
 #endif

audio/softsynth/opl/mame.h

@@ -30,7 +30,6 @@
 #define SOUND_SOFTSYNTH_OPL_MAME_H
 
 #include "common/scummsys.h"
-#include "common/util.h"
 #include "common/random.h"
 
 #include "audio/fmopl.h"

audio/softsynth/pcspk.h

@@ -26,7 +26,6 @@
 #define SOUND_SOFTSYNTH_PCSPK_H
 
 #include "audio/audiostream.h"
-#include "audio/mixer.h"
 #include "common/mutex.h"
 
 namespace Audio {

audio/softsynth/sid.cpp

@@ -32,7 +32,6 @@
 
 #include "sid.h"
 #include "audio/null.h"
-#include <math.h>
 
 namespace Resid {
 

audio/softsynth/ym2612.cpp

@@ -27,7 +27,11 @@
 #include "audio/softsynth/ym2612.h"
 #include "common/util.h"
 #include "audio/musicplugin.h"
+#include "common/error.h"
+#include "common/system.h"
+#include "common/textconsole.h"
 #include "common/translation.h"
+#include "common/types.h"
 
 ////////////////////////////////////////
 //

backends/audiocd/sdl/sdl-audiocd.cpp

@@ -27,6 +27,7 @@
 
 #if defined(SDL_BACKEND)
 
+#include "common/textconsole.h"
 #include "backends/audiocd/sdl/sdl-audiocd.h"
 
 SdlAudioCDManager::SdlAudioCDManager()

backends/events/sdl/sdl-events.cpp

@@ -31,6 +31,7 @@
 #include "backends/platform/sdl/sdl.h"
 #include "backends/graphics/graphics.h"
 #include "common/config-manager.h"
+#include "common/textconsole.h"
 
 // FIXME move joystick defines out and replace with confile file options
 // we should really allow users to map any key to a joystick button

backends/graphics/opengl/gltexture.h

@@ -42,9 +42,6 @@
 
 #include "graphics/surface.h"
 
-#include "common/rect.h"
-#include "common/array.h"
-
 /**
  * OpenGL texture manager class
  */

backends/graphics/opengl/opengl-graphics.cpp

@@ -32,6 +32,7 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/mutex.h"
+#include "common/textconsole.h"
 #include "common/translation.h"
 #ifdef USE_OSD
 #include "common/tokenizer.h"

backends/graphics/opengl/opengl-graphics.h

@@ -28,7 +28,9 @@
 
 #include "backends/graphics/opengl/gltexture.h"
 #include "backends/graphics/graphics.h"
+#include "common/array.h"
 #include "common/events.h"
+#include "graphics/pixelformat.h"
 
 // Uncomment this to enable the 'on screen display' code.
 #define USE_OSD	1

backends/graphics/openglsdl/openglsdl-graphics.cpp

@@ -30,6 +30,7 @@
 #include "backends/graphics/openglsdl/openglsdl-graphics.h"
 #include "backends/platform/sdl/sdl.h"
 #include "common/config-manager.h"
+#include "common/textconsole.h"
 
 OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager()
 	:

backends/graphics/sdl/sdl-graphics.cpp

@@ -32,6 +32,7 @@
 #include "backends/platform/sdl/sdl.h"
 #include "common/config-manager.h"
 #include "common/mutex.h"
+#include "common/textconsole.h"
 #include "common/translation.h"
 #include "common/util.h"
 #ifdef USE_RGB_COLOR

backends/graphics/sdl/sdl-graphics.h

@@ -27,6 +27,7 @@
 #define BACKENDS_GRAPHICS_SDL_H
 
 #include "backends/graphics/graphics.h"
+#include "graphics/pixelformat.h"
 #include "graphics/scaler.h"
 #include "common/events.h"
 #include "common/system.h"

backends/midi/alsa.cpp

@@ -30,6 +30,8 @@
 #if defined(USE_ALSA)
 
 #include "common/config-manager.h"
+#include "common/error.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 #include "audio/musicplugin.h"
 #include "audio/mpu401.h"

backends/midi/seq.cpp

@@ -35,6 +35,8 @@
 
 #if defined(USE_SEQ_MIDI)
 
+#include "common/error.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 #include "audio/musicplugin.h"
 #include "audio/mpu401.h"

backends/midi/timidity.cpp

@@ -41,13 +41,13 @@
 
 #if defined(USE_TIMIDITY)
 
-#include "common/util.h"
 #include "common/endian.h"
+#include "common/error.h"
 #include "common/str.h"
+#include "common/textconsole.h"
 #include "audio/musicplugin.h"
 #include "audio/mpu401.h"
 
-#include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>

backends/mixer/sdl/sdl-mixer.cpp

@@ -26,8 +26,10 @@
 #if defined(SDL_BACKEND)
 
 #include "backends/mixer/sdl/sdl-mixer.h"
+#include "common/debug.h"
 #include "common/system.h"
 #include "common/config-manager.h"
+#include "common/textconsole.h"
 
 #ifdef GP2X
 #define SAMPLES_PER_SEC 11025

backends/modular-backend.cpp

@@ -26,12 +26,14 @@
 #include "backends/modular-backend.h"
 
 #include "backends/fs/fs-factory.h"
-#include "backends/events/default/default-events.h"
-#include "backends/audiocd/default/default-audiocd.h"
-#include "backends/mutex/null/null-mutex.h"
-#include "backends/graphics/null/null-graphics.h"
+#include "backends/audiocd/audiocd.h"
+#include "backends/graphics/graphics.h"
+#include "backends/mutex/mutex.h"
 
+#include "audio/mixer.h"
+#include "common/events.h"
 #include "gui/message.h"
+#include "graphics/pixelformat.h"
 
 ModularBackend::ModularBackend()
 	:

backends/platform/sdl/sdl.cpp

@@ -32,6 +32,7 @@
 #include "backends/platform/sdl/sdl.h"
 #include "common/config-manager.h"
 #include "common/EventRecorder.h"
+#include "common/textconsole.h"
 
 #include "backends/saves/default/default-saves.h"
 #include "backends/audiocd/sdl/sdl-audiocd.h"

backends/plugins/dynamic-plugin.h

@@ -27,6 +27,7 @@
 #define BACKENDS_PLUGINS_DYNAMICPLUGIN_H
 
 #include "base/plugins.h"
+#include "common/textconsole.h"
 
 
 class DynamicPlugin : public Plugin {

backends/saves/posix/posix-saves.cpp

@@ -31,6 +31,7 @@
 
 #include "common/config-manager.h"
 #include "common/savefile.h"
+#include "common/textconsole.h"
 
 #include <stdio.h>
 #include <string.h>

backends/saves/savefile.cpp

@@ -25,9 +25,7 @@
 
 #include "common/util.h"
 #include "common/savefile.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "common/str.h"
 
 namespace Common {
 

backends/timer/default/default-timer.h

@@ -28,8 +28,6 @@
 #include "common/timer.h"
 #include "common/mutex.h"
 
-class OSystem;
-
 struct TimerSlot;
 
 class DefaultTimerManager : public Common::TimerManager {

backends/timer/sdl/sdl-timer.cpp

@@ -30,6 +30,8 @@
 
 #include "backends/timer/sdl/sdl-timer.h"
 
+#include "common/textconsole.h"
+
 static Uint32 timer_handler(Uint32 interval, void *param) {
 	((DefaultTimerManager *)param)->handler();
 	return interval;

base/commandLine.cpp

@@ -30,6 +30,7 @@
 
 #include "common/config-manager.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 #include "common/fs.h"
 
 #include "gui/ThemeEngine.h"

base/commandLine.h

@@ -23,11 +23,15 @@
  *
  */
 
-#ifndef BASE_OPTIONS_H
-#define BASE_OPTIONS_H
+#ifndef COMMON_COMMAND_LINE_H
+#define COMMON_COMMAND_LINE_H
 
-#include "common/str.h"
-#include "common/config-manager.h"
+#include "common/hash-str.h"
+
+namespace Common {
+class Error;
+class String;
+}
 
 namespace Base {
 

base/main.cpp

@@ -43,14 +43,13 @@
 #include "common/debug-channels.h" /* for debug manager */
 #include "common/events.h"
 #include "common/EventRecorder.h"
-#include "common/file.h"
 #include "common/fs.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 #include "common/tokenizer.h"
 #include "common/translation.h"
 
 #include "gui/gui-manager.h"
-#include "gui/message.h"
 #include "gui/error.h"
 
 #include "audio/mididrv.h"

base/plugins.h

@@ -27,16 +27,10 @@
 #define BASE_PLUGINS_H
 
 #include "common/array.h"
-#include "common/error.h"
-#include "common/singleton.h"
-#include "common/util.h"
+#include "common/fs.h"
+#include "common/str.h"
 #include "backends/plugins/elf/version.h"
 
-namespace Common {
-class FSList;
-class FSNode;
-}
-
 
 /**
  * @page pagePlugins An overview of the ScummVM plugin system

common/EventRecorder.cpp

@@ -28,6 +28,7 @@
 #include "common/config-manager.h"
 #include "common/random.h"
 #include "common/savefile.h"
+#include "common/textconsole.h"
 
 DECLARE_SINGLETON(Common::EventRecorder);
 

common/archive.cpp

@@ -25,8 +25,8 @@
 
 #include "common/archive.h"
 #include "common/fs.h"
-#include "common/util.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 
 namespace Common {
 

common/archive.h

@@ -27,7 +27,6 @@
 #define COMMON_ARCHIVE_H
 
 #include "common/str.h"
-#include "common/hash-str.h"
 #include "common/list.h"
 #include "common/ptr.h"
 #include "common/singleton.h"

common/config-file.cpp

@@ -27,7 +27,7 @@
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/system.h"
-#include "common/util.h"
+#include "common/textconsole.h"
 
 #define MAXLINELEN 256
 

common/config-file.h

@@ -26,13 +26,15 @@
 #ifndef COMMON_CONFIG_FILE_H
 #define COMMON_CONFIG_FILE_H
 
-#include "common/config-manager.h"
+#include "common/hash-str.h"
 #include "common/list.h"
 #include "common/str.h"
-#include "common/stream.h"
 
 namespace Common {
 
+class SeekableReadStream;
+class WriteStream;
+
 /**
  * This class allows reading/writing INI style config files.
  * It is used by the ConfigManager for storage, but can also

common/config-manager.cpp

@@ -24,10 +24,11 @@
  */
 
 #include "common/config-manager.h"
+#include "common/debug.h"
 #include "common/file.h"
 #include "common/fs.h"
-#include "common/util.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 
 DECLARE_SINGLETON(Common::ConfigManager);
 

common/dcl.cpp

@@ -25,11 +25,9 @@
 
 #include "common/dcl.h"
 #include "common/debug.h"
-#include "common/debug-channels.h"
-#include "common/endian.h"
 #include "common/memstream.h"
 #include "common/stream.h"
-#include "common/util.h"
+#include "common/textconsole.h"
 
 namespace Common {
 

common/debug.cpp

@@ -24,8 +24,8 @@
 
 #include "common/debug.h"
 #include "common/debug-channels.h"
-#include "common/util.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 
 #include <stdarg.h>	// For va_list etc.
 

common/error.cpp

@@ -24,7 +24,6 @@
  */
 
 #include "common/error.h"
-#include "common/util.h"
 
 #include "common/translation.h"
 

common/file.cpp

@@ -27,8 +27,7 @@
 #include "common/debug.h"
 #include "common/file.h"
 #include "common/fs.h"
-#include "common/util.h"
-#include "common/system.h"
+#include "common/textconsole.h"
 
 namespace Common {
 

common/file.h

@@ -27,6 +27,7 @@
 #define COMMON_FILE_H
 
 #include "common/scummsys.h"
+#include "common/fs.h"
 #include "common/noncopyable.h"
 #include "common/str.h"
 #include "common/stream.h"
@@ -34,7 +35,6 @@
 namespace Common {
 
 class Archive;
-class FSNode;
 
 /**
  * TODO: vital to document this core class properly!!! For both users and implementors

common/fs.cpp

@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#include "common/util.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 #include "backends/fs/abstract-fs.h"
 #include "backends/fs/fs-factory.h"
 

common/fs.h

@@ -27,6 +27,8 @@
 
 #include "common/array.h"
 #include "common/archive.h"
+#include "common/hash-str.h"
+#include "common/hashmap.h"
 #include "common/ptr.h"
 #include "common/str.h"
 

common/hashmap.h

@@ -47,8 +47,6 @@
 
 
 #include "common/func.h"
-#include "common/str.h"
-#include "common/util.h"
 
 #ifdef DEBUG_HASH_COLLISIONS
 #include "common/debug.h"

common/iff_container.h

@@ -29,7 +29,7 @@
 #include "common/endian.h"
 #include "common/func.h"
 #include "common/stream.h"
-#include "common/util.h"
+#include "common/textconsole.h"
 
 namespace Common {