#include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level)

svn-id: r9359

45 files changed, 76 insertions, 83 deletions

diff --git a/backends/PalmOS/Src/palm.h b/backends/PalmOS/Src/palm.h
index c2524c95aa..4512124b68 100644
--- a/backends/PalmOS/Src/palm.h
+++ b/backends/PalmOS/Src/palm.h
@@ -24,7 +24,7 @@
 #define PALM_H
 
 #include <SonyClie.h>
-#include "system.h"
+#include "common/system.h"
 
 Err HwrDisplayPalette(UInt8 operation, Int16 startIndex, 
 			 	  			 UInt16 paletteEntries, RGBColorType *tableP)
diff --git a/backends/null/null.cpp b/backends/null/null.cpp
index 8098445a89..b4eb5f87c9 100644
--- a/backends/null/null.cpp
+++ b/backends/null/null.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "stdafx.h"
-#include "scummsys.h"
-#include "system.h"
+#include "common/scummsys.h"
+#include "common/system.h"
 
 
 #if defined(USE_NULL_DRIVER)
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h
index b1024d1f15..a626858382 100644
--- a/backends/sdl/sdl-common.h
+++ b/backends/sdl/sdl-common.h
@@ -22,9 +22,9 @@
 #ifndef SDL_COMMON_H
 #define SDL_COMMON_H
 
-#include "stdafx.h"
-#include "scummsys.h"
-#include "system.h"
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+#include "common/system.h"
 #include "backends/intern.h"
 
 #include <SDL.h>
diff --git a/common/config-file.cpp b/common/config-file.cpp
index 58c37ff125..9294a6a52a 100644
--- a/common/config-file.cpp
+++ b/common/config-file.cpp
@@ -21,11 +21,8 @@
  */
 
 #include "stdafx.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "config-file.h"
-#include "engine.h" // for debug()
+#include "common/config-file.h"
+#include "common/engine.h" // for debug()
 
 #define MAXLINELEN 256
 
diff --git a/common/config-file.h b/common/config-file.h
index 82bc60a87a..287d6d6812 100644
--- a/common/config-file.h
+++ b/common/config-file.h
@@ -23,10 +23,10 @@
 #ifndef CONFIG_FILE_H
 #define CONFIG_FILE_H
 
-#include "common/util.h"
-#include "common/map.h"
 #include "common/list.h"
+#include "common/map.h"
 #include "common/str.h"
+#include "common/util.h"
 
 class Config {
 public:
diff --git a/common/engine.cpp b/common/engine.cpp
index 0b56146149..c206908387 100644
--- a/common/engine.cpp
+++ b/common/engine.cpp
@@ -19,10 +19,10 @@
  */
 
 #include "stdafx.h"
-#include "engine.h"
-#include "config-file.h"
-#include "gameDetector.h"
-#include "timer.h"
+#include "common/config-file.h"
+#include "common/engine.h"
+#include "common/gameDetector.h"
+#include "common/timer.h"
 #include "sound/mixer.h"
 
 /*
diff --git a/common/engine.h b/common/engine.h
index e1385ea428..6731effd62 100644
--- a/common/engine.h
+++ b/common/engine.h
@@ -21,8 +21,8 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include "scummsys.h"
-#include "system.h"
+#include "common/scummsys.h"
+#include "common/system.h"
 
 extern const char *gScummVMVersion;		// e.g. "0.4.1"
 extern const char *gScummVMBuildDate;	// e.g. "2003-06-24"
diff --git a/common/file.cpp b/common/file.cpp
index 635d9ddfc2..24861d095d 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -19,9 +19,9 @@
  *
  */
 
-#include "file.h"
-#include "util.h"
-#include "engine.h"	// For debug/warning/error
+#include "common/engine.h"	// For debug/warning/error
+#include "common/file.h"
+#include "common/util.h"
 
 FILE *File::fopenNoCase(const char *filename, const char *directory, const char *mode) {
 	FILE *file;
diff --git a/common/file.h b/common/file.h
index 2690e6fd6e..7d6ab8f395 100644
--- a/common/file.h
+++ b/common/file.h
@@ -22,9 +22,8 @@
 #ifndef COMMON_FILE_H
 #define COMMON_FILE_H
 
-#include <stdio.h>
 #include "stdafx.h"
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 class File {
 private:
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index 7ac15e925b..3d6c7d06e6 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -22,11 +22,11 @@
 
 #include "stdafx.h"
 #include "backends/intern.h"
+#include "common/config-file.h"
+#include "common/engine.h"
+#include "common/gameDetector.h"
+#include "common/scaler.h"	// Only for gfx_modes
 #include "sound/mididrv.h"
-#include "engine.h"
-#include "gameDetector.h"
-#include "config-file.h"
-#include "scaler.h"	// Only for gfx_modes
 
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
diff --git a/common/list.h b/common/list.h
index 710edb30bf..213b77ccb9 100644
--- a/common/list.h
+++ b/common/list.h
@@ -21,7 +21,7 @@
 #ifndef COMMON_LIST_H
 #define COMMON_LIST_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include <assert.h>
 
 namespace ScummVM {
diff --git a/common/main.cpp b/common/main.cpp
index ef5b2fe1a0..eab5f60f2a 100644
--- a/common/main.cpp
+++ b/common/main.cpp
@@ -29,10 +29,10 @@
  */
  
 #include "stdafx.h"
-#include "engine.h"
-#include "gameDetector.h"
-#include "config-file.h"
-#include "scaler.h"	// For GFX_NORMAL
+#include "common/config-file.h"
+#include "common/engine.h"
+#include "common/gameDetector.h"
+#include "common/scaler.h"	// For GFX_NORMAL
 #include "gui/newgui.h"
 #include "gui/launcher.h"
 #include "gui/message.h"
diff --git a/common/map.h b/common/map.h
index fb71bbe9bb..8098afa1bd 100644
--- a/common/map.h
+++ b/common/map.h
@@ -21,7 +21,7 @@
 #ifndef COMMON_MAP_H
 #define COMMON_MAP_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 namespace ScummVM {
 
diff --git a/common/rect.h b/common/rect.h
index e4a711958c..c5a62cab22 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -22,8 +22,8 @@
 #ifndef COMMON_RECT_H
 #define COMMON_RECT_H
 
-#include "scummsys.h"
-#include "util.h"
+#include "common/scummsys.h"
+#include "common/util.h"
 
 namespace ScummVM {
 
diff --git a/common/scaler.cpp b/common/scaler.cpp
index 2858e4887b..2f59d6d4d4 100644
--- a/common/scaler.cpp
+++ b/common/scaler.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "stdafx.h"
-#include "scummsys.h"
-#include "scaler.h"
+#include "common/scummsys.h"
+#include "common/scaler.h"
 
 // TODO: get rid of the colorMask etc. variables and instead use templates.
 // This should give a respectable boost, since variable access (i.e. memory reads)
diff --git a/common/scaler.h b/common/scaler.h
index 2c1b73b9d0..bf09604552 100644
--- a/common/scaler.h
+++ b/common/scaler.h
@@ -18,8 +18,8 @@
  * $Header$
  */
 
-#ifndef SCALER_H
-#define SCALER_H
+#ifndef COMMON_SCALER_H
+#define COMMON_SCALER_H
 
 extern int Init_2xSaI (uint32 BitFormat);
 
diff --git a/common/stdafx.h b/common/stdafx.h
index cb5d884a48..af23816b01 100644
--- a/common/stdafx.h
+++ b/common/stdafx.h
@@ -81,7 +81,6 @@
 #include <stdarg.h>
 #include <fcntl.h>
 #include <conio.h>
-#include <malloc.h>
 #include <assert.h>
 #include <mmsystem.h>
 #include <ctype.h>
diff --git a/common/str.cpp b/common/str.cpp
index 91ba683838..526841c58f 100644
--- a/common/str.cpp
+++ b/common/str.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "stdafx.h"
-#include "str.h"
+#include "common/str.h"
 
 #include <ctype.h>
 
diff --git a/common/str.h b/common/str.h
index 2e95c86e4b..955f5ab7f1 100644
--- a/common/str.h
+++ b/common/str.h
@@ -21,7 +21,7 @@
 #ifndef COMMON_STRING_H
 #define COMMON_STRING_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "common/list.h"
 
 #include <assert.h>
diff --git a/common/system.h b/common/system.h
index 029206d263..5814e7a3c8 100644
--- a/common/system.h
+++ b/common/system.h
@@ -23,8 +23,8 @@
 #ifndef COMMON_SYSTEM_H
 #define COMMON_SYSTEM_H
 
-#include "scummsys.h"
-#include "savefile.h"
+#include "common/scummsys.h"
+#include "common/savefile.h"
 
 /**
  * Interface for ScummVM backends. If you want to port ScummVM to a system
diff --git a/common/timer.cpp b/common/timer.cpp
index 126e86e573..2de3170b19 100644
--- a/common/timer.cpp
+++ b/common/timer.cpp
@@ -21,8 +21,8 @@
 #ifndef __MORPHOS__
 
 #include "stdafx.h"
-#include "scummsys.h"
-#include "timer.h"
+#include "common/scummsys.h"
+#include "common/timer.h"
 
 static Timer *g_timer = NULL;
 
diff --git a/common/timer.h b/common/timer.h
index 0277f46709..7d194e47d9 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -18,11 +18,11 @@
  * $Header$
  */
 
-#ifndef TIMER_H
-#define TIMER_H
+#ifndef COMMON_TIMER_H
+#define COMMON_TIMER_H
 
-#include "scummsys.h"
-#include "engine.h"
+#include "common/scummsys.h"
+#include "common/engine.h"
 
 #define MAX_TIMERS 5
 
diff --git a/common/util.cpp b/common/util.cpp
index 378019b40e..60bbd14df7 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -19,8 +19,8 @@
  */
 
 #include "stdafx.h"
-#include "engine.h"
-#include "util.h"
+#include "common/engine.h"
+#include "common/util.h"
 
 //
 // 8-bit alpha blending routines
diff --git a/common/util.h b/common/util.h
index 3a77445567..fe35ee38a4 100644
--- a/common/util.h
+++ b/common/util.h
@@ -21,8 +21,8 @@
 #ifndef COMMON_UTIL_H
 #define COMMON_UTIL_H
 
-#include "scummsys.h"
-#include "system.h"
+#include "common/scummsys.h"
+#include "common/system.h"
 
 template<typename T> inline T ABS (T x)			{ return (x>=0) ? x : -x; }
 template<typename T> inline T MIN (T a, T b)	{ return (a<b) ? a : b; }
diff --git a/gui/dialog.h b/gui/dialog.h
index 4c184b70ab..e3286fa475 100644
--- a/gui/dialog.h
+++ b/gui/dialog.h
@@ -21,7 +21,7 @@
 #ifndef DIALOG_H
 #define DIALOG_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "widget.h"	// For CommandReceiver
 
 class NewGui;
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index 27aae30d22..5bdcb77df7 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "stdafx.h"
-#include "util.h"
+#include "common/util.h"
 #include "newgui.h"
 #include "dialog.h"
 
diff --git a/gui/newgui.h b/gui/newgui.h
index c3aceaf902..b7969a3900 100644
--- a/gui/newgui.h
+++ b/gui/newgui.h
@@ -21,8 +21,8 @@
 #ifndef NEWGUI_H
 #define NEWGUI_H
 
-#include "scummsys.h"
-#include "system.h"	// For events
+#include "common/scummsys.h"
+#include "common/system.h"	// For events
 #include "common/str.h"
 
 class Dialog;
diff --git a/gui/widget.h b/gui/widget.h
index 87421e6715..e1c77b959f 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -21,7 +21,7 @@
 #ifndef WIDGET_H
 #define WIDGET_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "common/str.h"
 
 class Dialog;
diff --git a/scumm/base-costume.h b/scumm/base-costume.h
index 391b592439..bd20a07767 100644
--- a/scumm/base-costume.h
+++ b/scumm/base-costume.h
@@ -23,7 +23,7 @@
 #ifndef BASE_COSTUME_H
 #define BASE_COSTUME_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "actor.h"		// for CostumeData
 
 #if !defined(__GNUC__)
diff --git a/scumm/bundle.cpp b/scumm/bundle.cpp
index 2f4ab2f487..329929a4a9 100644
--- a/scumm/bundle.cpp
+++ b/scumm/bundle.cpp
@@ -19,10 +19,9 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "scummsys.h"
-#include "bundle.h"
-#include "file.h"
+#include "common/scummsys.h"
+#include "scumm/scumm.h"
+#include "scumm/bundle.h"
 
 static const int16 imcTable[] = {
 	0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x0010, 0x0011,
diff --git a/scumm/bundle.h b/scumm/bundle.h
index 851e816c87..a94ce6fe17 100644
--- a/scumm/bundle.h
+++ b/scumm/bundle.h
@@ -21,8 +21,8 @@
 #ifndef BUNDLE_H
 #define BUNDLE_H
 
-#include "scummsys.h"
-#include "file.h"
+#include "common/scummsys.h"
+#include "common/file.h"
 
 class Bundle {
 
diff --git a/scumm/imuse.h b/scumm/imuse.h
index ff3d809101..e436e0ab20 100644
--- a/scumm/imuse.h
+++ b/scumm/imuse.h
@@ -23,7 +23,7 @@
 #ifndef IMUSE_H
 #define IMUSE_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "common/system.h"
 
 class IMuseInternal;
diff --git a/scumm/imuse_digi.h b/scumm/imuse_digi.h
index 9c1bc431cc..1c4a854890 100644
--- a/scumm/imuse_digi.h
+++ b/scumm/imuse_digi.h
@@ -23,7 +23,7 @@
 #ifndef IMUSE_DIGI_H
 #define IMUSE_DIGI_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 #define MAX_DIGITAL_CHANNELS 8
 #define MAX_IMUSE_JUMPS 1
diff --git a/scumm/saveload.h b/scumm/saveload.h
index 79de7528bd..722420b914 100644
--- a/scumm/saveload.h
+++ b/scumm/saveload.h
@@ -22,7 +22,7 @@
 #ifndef SAVELOAD_H
 #define SAVELOAD_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 // Support for "old" savegames (made with 2501 CVS build)
 // Can be useful for other ports too :)
diff --git a/scumm/sound.h b/scumm/sound.h
index 8e9183659b..2cd1763233 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -21,7 +21,7 @@
 #ifndef SOUND_H
 #define SOUND_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "sound/mixer.h"
 
 class Bundle;
diff --git a/simon/midi.cpp b/simon/midi.cpp
index ae562a58a8..1a738d651c 100644
--- a/simon/midi.cpp
+++ b/simon/midi.cpp
@@ -21,7 +21,7 @@
 
 
 #include "stdafx.h"
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "common/system.h"
 #include "common/file.h"
 #include "sound/mixer.h"
diff --git a/sound/audiostream.h b/sound/audiostream.h
index a40e27aaef..6611018c3d 100644
--- a/sound/audiostream.h
+++ b/sound/audiostream.h
@@ -22,8 +22,8 @@
 #ifndef AUDIOSTREAM_H
 #define AUDIOSTREAM_H
 
-#include "scummsys.h"
-#include <assert.h>
+#include "stdafx.h"
+#include "common/scummsys.h"
 #ifdef USE_MAD
 #include <mad.h>
 #endif
diff --git a/sound/fmopl.h b/sound/fmopl.h
index 5faed21849..fceda63c56 100644
--- a/sound/fmopl.h
+++ b/sound/fmopl.h
@@ -26,7 +26,7 @@
 #ifndef FMOPL_H_
 #define FMOPL_H_
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 enum {
 	FMOPL_ENV_BITS_HQ = 16,
diff --git a/sound/mididrv.h b/sound/mididrv.h
index 58bbe0dcdf..b72959428f 100644
--- a/sound/mididrv.h
+++ b/sound/mididrv.h
@@ -23,7 +23,7 @@
 #ifndef SOUND_MIDIDRV_H
 #define SOUND_MIDIDRV_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 class MidiChannel;
 
diff --git a/sound/mixer.h b/sound/mixer.h
index 2c46f3c8b0..ff156b5a08 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -23,6 +23,7 @@
 #ifndef MIXER_H
 #define MIXER_H
 
+#include "stdafx.h"
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
 #endif
@@ -32,7 +33,6 @@
 #ifdef USE_VORBIS
 #include <vorbis/vorbisfile.h>
 #endif
-#include "stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/sound/rate.h b/sound/rate.h
index d0ebf0ae05..31f90dc5f8 100644
--- a/sound/rate.h
+++ b/sound/rate.h
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "common/engine.h"
 #include "common/util.h"
 
diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h
index 5a65643aa2..9904fd14f2 100644
--- a/sword2/driver/driver96.h
+++ b/sword2/driver/driver96.h
@@ -1053,8 +1053,6 @@
 #include "common/scummsys.h"
 #include "common/engine.h" // for warning()
 #include "common/system.h"
-#include "system.h"
-#include "file.h"
 //#include "ddraw.h"
 //#include "dsound.h"
 
diff --git a/sword2/driver/rdwin.cpp b/sword2/driver/rdwin.cpp
index a42d92fb26..101c4cf7e2 100644
--- a/sword2/driver/rdwin.cpp
+++ b/sword2/driver/rdwin.cpp
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include "common/stdafx.h"
-#include "engine.h"
+#include "common/engine.h"
 
 #include "driver96.h"
 
diff --git a/sword2/resman.cpp b/sword2/resman.cpp
index 6e6ef28fb8..20350b7325 100644
--- a/sword2/resman.cpp
+++ b/sword2/resman.cpp
@@ -23,7 +23,8 @@
 
 #include "stdafx.h"
 
-#include "engine.h"
+#include "common/engine.h"
+#include "common/file.h"
 
 #include "driver/driver96.h"
 #include "build_display.h"
diff --git a/sword2/sound.h b/sword2/sound.h
index bca28ad66f..5a504a88a4 100644
--- a/sword2/sound.h
+++ b/sword2/sound.h
@@ -30,7 +30,7 @@
 #ifndef SOUND_H
 #define SOUND_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 // fx types
 #define FX_SPOT		0