Reduce header interdependencies

svn-id: r48010

common/unarj.cpp

@@ -32,6 +32,8 @@
 #include "common/debug.h"
 #include "common/util.h"
 #include "common/unarj.h"
+#include "common/file.h"
+#include "common/hash-str.h"
 
 namespace Common {
 

common/unarj.h

@@ -26,12 +26,11 @@
 #ifndef COMMON_UNARJ_H
 #define COMMON_UNARJ_H
 
-#include "common/file.h"
-#include "common/hash-str.h"
-#include "common/archive.h"
-
 namespace Common {
 
+class Archive;
+class String;
+
 /**
  * This factory method creates an Archive instance corresponding to the content
  * of the ARJ compressed file with the given name.

engines/drascula/drascula.h

@@ -35,7 +35,6 @@
 #include "common/hash-str.h"
 #include "common/events.h"
 #include "common/keyboard.h"
-#include "common/unarj.h"
 #include "common/archive.h"
 
 #include "sound/mixer.h"

engines/drascula/resource.cpp

@@ -24,6 +24,7 @@
  */
 
 #include "drascula/drascula.h"
+#include "common/unarj.h"
 
 namespace Drascula {