#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

4 files changed, 4 insertions, 5 deletions

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