#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

21 files changed, 44 insertions, 49 deletions

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; }