diff --git a/engines/zvision/lzss_read_stream.h b/engines/zvision/lzss_read_stream.h
index b2d6085a29e..08142207289 100644
--- a/engines/zvision/lzss_read_stream.h
+++ b/engines/zvision/lzss_read_stream.h
@@ -25,9 +25,12 @@
 
 #include "common/types.h"
 #include "common/stream.h"
-#include "common/memstream.h"
 #include "common/array.h"
 
+namespace Common {
+class SeekableReadStream;
+}
+
 namespace ZVision {
 
 class LzssReadStream : public Common::ReadStream {
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 7924eee4c08..2d9bcc3fd55 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -23,14 +23,17 @@
 #ifndef ZVISION_SCRIPT_MANAGER_H
 #define ZVISION_SCRIPT_MANAGER_H
 
-#include "common/str.h"
-#include "common/stream.h"
 #include "common/hashmap.h"
 #include "common/stack.h"
 
 #include "zvision/puzzle.h"
 #include "zvision/control.h"
 
+namespace Common {
+class String;
+class SeekableReadStream;
+}
+
 namespace ZVision {
 
 class ZVision;
diff --git a/engines/zvision/single_value_container.cpp b/engines/zvision/single_value_container.cpp
index 7e27098377e..0fd758a85eb 100644
--- a/engines/zvision/single_value_container.cpp
+++ b/engines/zvision/single_value_container.cpp
@@ -21,7 +21,9 @@
  */
 
 #include "common/scummsys.h"
+
 #include "common/textconsole.h"
+#include "common/str.h"
 
 #include "zvision/single_value_container.h"
 
diff --git a/engines/zvision/single_value_container.h b/engines/zvision/single_value_container.h
index 49c7267f770..593f11c7378 100644
--- a/engines/zvision/single_value_container.h
+++ b/engines/zvision/single_value_container.h
@@ -23,7 +23,9 @@
 #ifndef ZVISION_OBJECT_H
 #define ZVISION_OBJECT_H
 
-#include "common/str.h"
+namespace Common {
+class String;
+}
 
 namespace ZVision {
 
diff --git a/engines/zvision/utility.cpp b/engines/zvision/utility.cpp
index 42fadc78c4c..bf8e5c91d61 100644
--- a/engines/zvision/utility.cpp
+++ b/engines/zvision/utility.cpp
@@ -23,6 +23,7 @@
 #include "common/scummsys.h"
 
 #include "common/tokenizer.h"
+#include "common/file.h"
 
 #include "zvision/utility.h"
 #include "zvision/zvision.h"
diff --git a/engines/zvision/utility.h b/engines/zvision/utility.h
index 46f81efb332..e68d0de4491 100644
--- a/engines/zvision/utility.h
+++ b/engines/zvision/utility.h
@@ -24,10 +24,12 @@
 #ifndef ZVISION_UTILITY_H
 #define ZVISION_UTILITY_H
 
-#include "common/str.h"
-#include "common/file.h"
 #include "common/array.h"
 
+namespace Common {
+class String;
+}
+
 namespace ZVision {
 
 class ZVision;
diff --git a/engines/zvision/zfs_archive.cpp b/engines/zvision/zfs_archive.cpp
index fbfe3d3dc42..f815d9ccd36 100644
--- a/engines/zvision/zfs_archive.cpp
+++ b/engines/zvision/zfs_archive.cpp
@@ -22,10 +22,12 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/zfs_archive.h"
 #include "common/hashmap.h"
 #include "common/memstream.h"
 #include "common/debug.h"
+#include "common/file.h"
+
+#include "zvision/zfs_archive.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/zfs_archive.h b/engines/zvision/zfs_archive.h
index cb371f2c878..e683ac1b535 100644
--- a/engines/zvision/zfs_archive.h
+++ b/engines/zvision/zfs_archive.h
@@ -24,8 +24,12 @@
 #define ZVISION_ZFS_ARCHIVE_H
 
 #include "common/archive.h"
-#include "common/file.h"
-#include "common/fs.h"
+#include "common/hashmap.h"
+
+
+namespace Common {
+class String;
+}
 
 namespace ZVision {
 
@@ -48,7 +52,7 @@ struct ZfsEntryHeader {
 	uint32 unknown;
 };
 
-typedef Common::HashMap<Common::String, ZfsEntryHeader*, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> ZfsEntryHeaderMap;
+typedef Common::HashMap<Common::String, ZfsEntryHeader*> ZfsEntryHeaderMap;
 
 class ZfsArchive : public Common::Archive {
 public: