From d3872061752cfdb59e6ed99a656a49eb8249843f Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Thu, 23 Oct 2008 07:59:10 +0000
Subject: [PATCH] Pushed down some header deps

svn-id: r34845
---
 common/config-manager.cpp         | 1 +
 common/file.h                     | 2 +-
 common/xmlparser.h                | 3 ++-
 engines/agi/wagparser.cpp         | 1 +
 engines/scumm/he/resource_he.cpp  | 1 +
 engines/scumm/he/script_v60he.cpp | 1 +
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/config-manager.cpp b/common/config-manager.cpp
index 0d01c39c4f7..13abe085e24 100644
--- a/common/config-manager.cpp
+++ b/common/config-manager.cpp
@@ -25,6 +25,7 @@
 
 #include "common/config-manager.h"
 #include "common/file.h"
+#include "common/fs.h"
 #include "common/util.h"
 #include "common/system.h"
 
diff --git a/common/file.h b/common/file.h
index 9f401393be2..a9d2a09c611 100644
--- a/common/file.h
+++ b/common/file.h
@@ -27,13 +27,13 @@
 #define COMMON_FILE_H
 
 #include "common/scummsys.h"
-#include "common/archive.h"
 #include "common/noncopyable.h"
 #include "common/str.h"
 #include "common/stream.h"
 
 namespace Common {
 
+class Archive;
 class FSNode;
 
 /**
diff --git a/common/xmlparser.h b/common/xmlparser.h
index 2831eadef86..de006cb4735 100644
--- a/common/xmlparser.h
+++ b/common/xmlparser.h
@@ -27,7 +27,7 @@
 #define XML_PARSER_H
 
 #include "common/scummsys.h"
-#include "graphics/surface.h"
+#include "common/archive.h"
 #include "common/system.h"
 #include "common/xmlparser.h"
 #include "common/stream.h"
@@ -38,6 +38,7 @@
 #include "common/hash-str.h"
 #include "common/stack.h"
 
+
 namespace Common {
 	
 /*
diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp
index ea3893d957d..adf5a0a6cf8 100644
--- a/engines/agi/wagparser.cpp
+++ b/engines/agi/wagparser.cpp
@@ -25,6 +25,7 @@
 
 #include "common/file.h"
 #include "common/util.h"
+#include "common/fs.h"
 
 #include "agi/wagparser.h"
 
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index a26d6fb72e4..d7cd672a529 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -34,6 +34,7 @@
 #include "sound/wave.h"
 #include "graphics/cursorman.h"
 
+#include "common/archive.h"
 #include "common/stream.h"
 #include "common/system.h"
 
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index afe9f6b70b2..1e9581f9c2b 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/archive.h"
 #include "common/savefile.h"
 
 #include "scumm/actor.h"