diff options
| author | Max Horn | 2010-02-08 21:51:36 +0000 |
|---|---|---|
| committer | Max Horn | 2010-02-08 21:51:36 +0000 |
| commit | 584a58fbce8bc7a4f99689a844a6fb74bfeea765 (patch) | |
| tree | 4352d88475b5a68c876cadaf3caa78c7c658f644 | |
| parent | b3da11ba8afc3925de551ae7cc51ccc73e721211 (diff) | |
| download | scummvm-rg350-584a58fbce8bc7a4f99689a844a6fb74bfeea765.tar.gz scummvm-rg350-584a58fbce8bc7a4f99689a844a6fb74bfeea765.tar.bz2 scummvm-rg350-584a58fbce8bc7a4f99689a844a6fb74bfeea765.zip | |
Reduce header interdependencies
svn-id: r48010
| -rw-r--r-- | common/unarj.cpp | 2 | ||||
| -rw-r--r-- | common/unarj.h | 7 | ||||
| -rw-r--r-- | engines/drascula/drascula.h | 1 | ||||
| -rw-r--r-- | engines/drascula/resource.cpp | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/common/unarj.cpp b/common/unarj.cpp index 895b0928b3..c3bb3308bc 100644 --- a/common/unarj.cpp +++ b/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 { diff --git a/common/unarj.h b/common/unarj.h index 831c8aeb90..04f69e95f0 100644 --- a/common/unarj.h +++ b/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. diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index 0b04d0b001..d32796acd6 100644 --- a/engines/drascula/drascula.h +++ b/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" diff --git a/engines/drascula/resource.cpp b/engines/drascula/resource.cpp index b26c4605fb..efcb1c99ba 100644 --- a/engines/drascula/resource.cpp +++ b/engines/drascula/resource.cpp @@ -24,6 +24,7 @@ */ #include "drascula/drascula.h" +#include "common/unarj.h" namespace Drascula { |