ZVISION: Standardize includes order and format

Format is:
common/scummsys.h    (Only if a .cpp file)

header file for this file (Only if a .cpp file)

zengine includes

other includes, grouped by module

54 files changed, 186 insertions, 138 deletions

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 75b771c143..eae4ec2ed5 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -22,11 +22,8 @@
 
 #include "common/scummsys.h"
 
-#include "common/file.h"
-
-#include "audio/decoders/wave.h"
-
 #include "zvision/actions.h"
+
 #include "zvision/zvision.h"
 #include "zvision/script_manager.h"
 #include "zvision/render_manager.h"
@@ -35,6 +32,11 @@
 #include "zvision/timer_node.h"
 #include "zvision/animation_control.h"
 
+#include "common/file.h"
+
+#include "audio/decoders/wave.h"
+
+
 namespace ZVision {
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index 206b5e16b1..afa3e3a2ac 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -23,13 +23,10 @@
 #ifndef ZVISION_ACTIONS_H
 #define ZVISION_ACTIONS_H
 
-#include "common/scummsys.h"
+#include "common/str.h"
 
 #include "audio/mixer.h"
 
-namespace Common {
-class String;
-}
 
 namespace ZVision {
 
diff --git a/engines/zvision/animation_control.cpp b/engines/zvision/animation_control.cpp
index bb810a86d0..1143380501 100644
--- a/engines/zvision/animation_control.cpp
+++ b/engines/zvision/animation_control.cpp
@@ -22,15 +22,18 @@
 
 #include "common/scummsys.h"
 
-#include "video/video_decoder.h"
-
 #include "zvision/animation_control.h"
+
 #include "zvision/zvision.h"
 #include "zvision/render_manager.h"
 #include "zvision/script_manager.h"
 #include "zvision/rlf_animation.h"
 #include "zvision/zork_avi_decoder.h"
 
+#include "video/video_decoder.h"
+
+#include "graphics/surface.h"
+
 
 namespace ZVision {
 
diff --git a/engines/zvision/animation_control.h b/engines/zvision/animation_control.h
index 935f4abb4b..2ac3691483 100644
--- a/engines/zvision/animation_control.h
+++ b/engines/zvision/animation_control.h
@@ -23,15 +23,21 @@
 #ifndef ZVISION_ANIMATION_CONTROL_H
 #define ZVISION_ANIMATION_CONTROL_H
 
-#include "common/types.h"
-
 #include "zvision/control.h"
 
 
+namespace Common {
+class String;
+}
+
 namespace Video {
 class VideoDecoder;
 }
 
+namespace Graphics {
+struct Surface;
+}
+
 namespace ZVision {
 
 class ZVision;
diff --git a/engines/zvision/clock.cpp b/engines/zvision/clock.cpp
index fe322525f8..c8ee717a33 100644
--- a/engines/zvision/clock.cpp
+++ b/engines/zvision/clock.cpp
@@ -23,9 +23,10 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/clock.h"
+
 #include "common/system.h"
 
-#include "zvision/clock.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/console.cpp b/engines/zvision/console.cpp
index 0d290a661a..a095d3fa6a 100644
--- a/engines/zvision/console.cpp
+++ b/engines/zvision/console.cpp
@@ -22,13 +22,8 @@
 
 #include "common/scummsys.h"
 
-#include "common/system.h"
-#include "gui/debugger.h"
-#include "common/file.h"
-#include "common/bufferedstream.h"
-#include "audio/mixer.h"
-
 #include "zvision/console.h"
+
 #include "zvision/zvision.h"
 #include "zvision/script_manager.h"
 #include "zvision/render_manager.h"
@@ -38,6 +33,14 @@
 #include "zvision/utility.h"
 #include "zvision/cursor.h"
 
+#include "common/system.h"
+#include "common/file.h"
+#include "common/bufferedstream.h"
+
+#include "gui/debugger.h"
+
+#include "audio/mixer.h"
+
 
 namespace ZVision {
 
diff --git a/engines/zvision/control.cpp b/engines/zvision/control.cpp
index ad0a4c5013..bcbdabc143 100644
--- a/engines/zvision/control.cpp
+++ b/engines/zvision/control.cpp
@@ -22,13 +22,14 @@
 
 #include "common/scummsys.h"
 
-#include "common/stream.h"
-
 #include "zvision/control.h"
+
 #include "zvision/zvision.h"
 #include "zvision/render_manager.h"
 #include "zvision/utility.h"
 
+#include "common/stream.h"
+
 
 namespace ZVision {
 
diff --git a/engines/zvision/control.h b/engines/zvision/control.h
index a279381298..770c540a12 100644
--- a/engines/zvision/control.h
+++ b/engines/zvision/control.h
@@ -23,8 +23,6 @@
 #ifndef ZVISION_CONTROL_H
 #define ZVISION_CONTROL_H
 
-#include "common/types.h"
-
 #include "common/keyboard.h"
 
 
diff --git a/engines/zvision/cursor.cpp b/engines/zvision/cursor.cpp
index bb0700cebe..9023d97e0d 100644
--- a/engines/zvision/cursor.cpp
+++ b/engines/zvision/cursor.cpp
@@ -22,11 +22,11 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/cursor.h"
+
 #include "common/str.h"
 #include "common/file.h"
 
-#include "zvision/cursor.h"
-
 
 namespace ZVision {
 
diff --git a/engines/zvision/cursor.h b/engines/zvision/cursor.h
index 805a8e7982..18ac28ce8b 100644
--- a/engines/zvision/cursor.h
+++ b/engines/zvision/cursor.h
@@ -23,10 +23,9 @@
 #ifndef ZVISION_CURSOR_H
 #define ZVISION_CURSOR_H
 
-#include "common/types.h"
-
 #include "graphics/surface.h"
 
+
 namespace Common {
 class String;
 }
diff --git a/engines/zvision/cursor_manager.cpp b/engines/zvision/cursor_manager.cpp
index 0f524bf807..595e7946dd 100644
--- a/engines/zvision/cursor_manager.cpp
+++ b/engines/zvision/cursor_manager.cpp
@@ -22,13 +22,15 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/cursor_manager.h"
+
+#include "zvision/zvision.h"
+
 #include "common/system.h"
+
 #include "graphics/pixelformat.h"
 #include "graphics/cursorman.h"
 
-#include "zvision/zvision.h"
-#include "zvision/cursor_manager.h"
-
 
 namespace ZVision {
 
diff --git a/engines/zvision/cursor_manager.h b/engines/zvision/cursor_manager.h
index 1c09620b7e..0a369aaf9e 100644
--- a/engines/zvision/cursor_manager.h
+++ b/engines/zvision/cursor_manager.h
@@ -23,10 +23,10 @@
 #ifndef ZVISION_CURSOR_MANAGER_H
 #define ZVISION_CURSOR_MANAGER_H
 
-#include "common/types.h"
-
 #include "zvision/cursor.h"
 
+#include "common/str.h"
+
 
 namespace Graphics {
 struct PixelFormat;
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 28b7134fae..06e921dfa8 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -21,16 +21,18 @@
  *
  */
 
+#include "common/scummsys.h"
+
 #include "base/plugins.h"
 
+#include "zvision/zvision.h"
+#include "zvision/detection.h"
+
 #include "common/translation.h"
 #include "common/savefile.h"
 #include "common/str-array.h"
 #include "common/system.h"
 
-#include "zvision/zvision.h"
-#include "zvision/detection.h"
-
 
 namespace ZVision {
 
diff --git a/engines/zvision/detection.h b/engines/zvision/detection.h
index f9acb4d144..34417601e8 100644
--- a/engines/zvision/detection.h
+++ b/engines/zvision/detection.h
@@ -25,6 +25,7 @@
 
 #include "engines/advancedDetector.h"
 
+
 namespace ZVision {
 
 enum ZVisionGameId {
diff --git a/engines/zvision/events.cpp b/engines/zvision/events.cpp
index c1b894c290..1103dc3000 100644
--- a/engines/zvision/events.cpp
+++ b/engines/zvision/events.cpp
@@ -23,17 +23,20 @@
 #include "common/scummsys.h"
 
 #include "zvision/zvision.h"
-#include "zvision/console.h"
-#include "common/events.h"
-#include "engines/util.h"
-#include "common/system.h"
-#include "common/rational.h"
 
+#include "zvision/console.h"
 #include "zvision/cursor_manager.h"
 #include "zvision/render_manager.h"
 #include "zvision/script_manager.h"
 #include "zvision/rlf_animation.h"
 
+#include "common/events.h"
+#include "common/system.h"
+#include "common/rational.h"
+
+#include "engines/util.h"
+
+
 namespace ZVision {
 
 void ZVision::processEvents() {
diff --git a/engines/zvision/input_control.cpp b/engines/zvision/input_control.cpp
index ab4cc6bd62..a445e1aae5 100644
--- a/engines/zvision/input_control.cpp
+++ b/engines/zvision/input_control.cpp
@@ -22,17 +22,18 @@
 
 #include "common/scummsys.h"
 
-#include "common/str.h"
-#include "common/stream.h"
-#include "common/rect.h"
-
 #include "zvision/input_control.h"
+
 #include "zvision/zvision.h"
 #include "zvision/script_manager.h"
 #include "zvision/string_manager.h"
 #include "zvision/render_manager.h"
 #include "zvision/utility.h"
 
+#include "common/str.h"
+#include "common/stream.h"
+#include "common/rect.h"
+
 
 namespace ZVision {
 
diff --git a/engines/zvision/input_control.h b/engines/zvision/input_control.h
index 33a1b34313..aab2c991dc 100644
--- a/engines/zvision/input_control.h
+++ b/engines/zvision/input_control.h
@@ -23,11 +23,11 @@
 #ifndef ZVISION_INPUT_CONTROL_H
 #define ZVISION_INPUT_CONTROL_H
 
-#include "common/types.h"
-
 #include "zvision/control.h"
 #include "zvision/string_manager.h"
 
+#include "common/rect.h"
+
 
 namespace ZVision {
 
diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index 4e04ed4263..79049b8fcb 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -22,14 +22,8 @@
 
 #include "common/scummsys.h"
 
-#include "common/stream.h"
-#include "common/file.h"
-#include "common/tokenizer.h"
-#include "common/system.h"
-
-#include "graphics/surface.h"
-
 #include "zvision/lever_control.h"
+
 #include "zvision/zvision.h"
 #include "zvision/script_manager.h"
 #include "zvision/render_manager.h"
@@ -38,6 +32,14 @@
 #include "zvision/zork_avi_decoder.h"
 #include "zvision/utility.h"
 
+#include "common/stream.h"
+#include "common/file.h"
+#include "common/tokenizer.h"
+#include "common/system.h"
+
+#include "graphics/surface.h"
+
+
 namespace ZVision {
 
 LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
diff --git a/engines/zvision/lever_control.h b/engines/zvision/lever_control.h
index 80fda4f5fd..8ef8f06fec 100644
--- a/engines/zvision/lever_control.h
+++ b/engines/zvision/lever_control.h
@@ -23,13 +23,11 @@
 #ifndef ZVISION_LEVER_CONTROL_H
 #define ZVISION_LEVER_CONTROL_H
 
-#include "common/types.h"
+#include "zvision/control.h"
 
 #include "common/list.h"
 #include "common/rect.h"
 
-#include "zvision/control.h"
-
 
 namespace ZVision {
 
diff --git a/engines/zvision/lzss_read_stream.cpp b/engines/zvision/lzss_read_stream.cpp
index a90f40b3e4..bbbda6f526 100644
--- a/engines/zvision/lzss_read_stream.cpp
+++ b/engines/zvision/lzss_read_stream.cpp
@@ -24,6 +24,7 @@
 
 #include "zvision/lzss_read_stream.h"
 
+
 namespace ZVision {
 
 LzssReadStream::LzssReadStream(Common::SeekableReadStream *source)
diff --git a/engines/zvision/lzss_read_stream.h b/engines/zvision/lzss_read_stream.h
index 25a8b67222..f6b1eb1a65 100644
--- a/engines/zvision/lzss_read_stream.h
+++ b/engines/zvision/lzss_read_stream.h
@@ -23,10 +23,10 @@
 #ifndef ZVISION_LZSS_STREAM_H
 #define ZVISION_LZSS_STREAM_H
 
-#include "common/types.h"
 #include "common/stream.h"
 #include "common/array.h"
 
+
 namespace Common {
 class SeekableReadStream;
 }
diff --git a/engines/zvision/push_toggle_control.cpp b/engines/zvision/push_toggle_control.cpp
index f4c0bc987e..689311ba5b 100644
--- a/engines/zvision/push_toggle_control.cpp
+++ b/engines/zvision/push_toggle_control.cpp
@@ -22,14 +22,16 @@
 
 #include "common/scummsys.h"
 
-#include "common/stream.h"
-
 #include "zvision/push_toggle_control.h"
+
 #include "zvision/zvision.h"
 #include "zvision/script_manager.h"
 #include "zvision/cursor_manager.h"
 #include "zvision/utility.h"
 
+#include "common/stream.h"
+
+
 namespace ZVision {
 
 PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
diff --git a/engines/zvision/push_toggle_control.h b/engines/zvision/push_toggle_control.h
index 8ab6f619bb..2a407cada9 100644
--- a/engines/zvision/push_toggle_control.h
+++ b/engines/zvision/push_toggle_control.h
@@ -23,12 +23,10 @@
 #ifndef ZVISION_PUSH_TOGGLE_CONTROL_H
 #define ZVISION_PUSH_TOGGLE_CONTROL_H
 
-#include "common/types.h"
+#include "zvision/control.h"
 
 #include "common/rect.h"
 
-#include "zvision/control.h"
-
 
 namespace ZVision {
 
diff --git a/engines/zvision/puzzle.h b/engines/zvision/puzzle.h
index 97b839f9a7..1e730365dc 100644
--- a/engines/zvision/puzzle.h
+++ b/engines/zvision/puzzle.h
@@ -23,11 +23,11 @@
 #ifndef ZVISION_PUZZLE_H
 #define ZVISION_PUZZLE_H
 
+#include "zvision/actions.h"
 
 #include "common/list.h"
 #include "common/ptr.h"
 
-#include "zvision/actions.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index b8286266da..a8ceabcd74 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -22,15 +22,18 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/render_manager.h"
+
+#include "zvision/lzss_read_stream.h"
+
 #include "common/file.h"
 #include "common/system.h"
 #include "common/stream.h"
 
 #include "engines/util.h"
+
 #include "graphics/decoders/tga.h"
 
-#include "zvision/render_manager.h"
-#include "zvision/lzss_read_stream.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h
index 71f4807c29..64d36f5c9d 100644
--- a/engines/zvision/render_manager.h
+++ b/engines/zvision/render_manager.h
@@ -23,14 +23,14 @@
 #ifndef ZVISION_RENDER_MANAGER_H
 #define ZVISION_RENDER_MANAGER_H
 
-#include "common/types.h"
+#include "zvision/render_table.h"
+#include "zvision/truetype_font.h"
+
 #include "common/rect.h"
 #include "common/hashmap.h"
 
 #include "graphics/surface.h"
 
-#include "zvision/render_table.h"
-#include "zvision/truetype_font.h"
 
 class OSystem;
 
diff --git a/engines/zvision/render_table.cpp b/engines/zvision/render_table.cpp
index ce247e23fd..f4437101db 100644
--- a/engines/zvision/render_table.cpp
+++ b/engines/zvision/render_table.cpp
@@ -22,11 +22,13 @@
 
 #include "common/scummsys.h"
 
-#include "graphics/colormasks.h"
-
 #include "zvision/render_table.h"
+
 #include "zvision/vector2.h"
 
+#include "graphics/colormasks.h"
+
+
 namespace ZVision {
 
 RenderTable::RenderTable(uint numColumns, uint numRows)
diff --git a/engines/zvision/render_table.h b/engines/zvision/render_table.h
index 7c8e7d6a2d..b188b1492f 100644
--- a/engines/zvision/render_table.h
+++ b/engines/zvision/render_table.h
@@ -23,11 +23,10 @@
 #ifndef ZVISION_RENDER_TABLE_H
 #define ZVISION_RENDER_TABLE_H
 
-#include "common/types.h"
-#include "common/rect.h"
-
 #include "zvision/vector2.h"
 
+#include "common/rect.h"
+
 namespace ZVision {
 
 class RenderTable {
diff --git a/engines/zvision/rlf_animation.cpp b/engines/zvision/rlf_animation.cpp
index f0d5ac5284..94e48d3609 100644
--- a/engines/zvision/rlf_animation.cpp
+++ b/engines/zvision/rlf_animation.cpp
@@ -22,6 +22,8 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/rlf_animation.h"
+
 #include "common/str.h"
 #include "common/file.h"
 #include "common/textconsole.h"
@@ -30,8 +32,6 @@
 
 #include "graphics/colormasks.h"
 
-#include "zvision/rlf_animation.h"
-
 
 namespace ZVision {
 
diff --git a/engines/zvision/rlf_animation.h b/engines/zvision/rlf_animation.h
index 53247eb4ab..fe5b0d68b4 100644
--- a/engines/zvision/rlf_animation.h
+++ b/engines/zvision/rlf_animation.h
@@ -23,9 +23,8 @@
 #ifndef ZVISION_RLF_ANIMATION_H
 #define ZVISION_RLF_ANIMATION_H
 
-#include "common/types.h"
-
 #include "common/file.h"
+
 #include "graphics/surface.h"
 
 
diff --git a/engines/zvision/save_manager.cpp b/engines/zvision/save_manager.cpp
index 9cc664ce5a..c3deadd703 100644
--- a/engines/zvision/save_manager.cpp
+++ b/engines/zvision/save_manager.cpp
@@ -22,6 +22,12 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/save_manager.h"
+
+#include "zvision/zvision.h"
+#include "zvision/script_manager.h"
+#include "zvision/render_manager.h"
+
 #include "common/system.h"
 
 #include "graphics/surface.h"
@@ -29,11 +35,6 @@
 
 #include "gui/message.h"
 
-#include "zvision/save_manager.h"
-#include "zvision/zvision.h"
-#include "zvision/script_manager.h"
-#include "zvision/render_manager.h"
-
 
 namespace ZVision {
 
diff --git a/engines/zvision/save_manager.h b/engines/zvision/save_manager.h
index 6445f10caf..b4770e68b2 100644
--- a/engines/zvision/save_manager.h
+++ b/engines/zvision/save_manager.h
@@ -23,14 +23,16 @@
 #ifndef ZVISION_SAVE_MANAGER_H
 #define ZVISION_SAVE_MANAGER_H
 
-#include "common/types.h"
-
 #include "common/savefile.h"
 
 namespace Common {
 class String;
 }
 
+namespace Graphics {
+struct Surface;
+}
+
 namespace ZVision {
 
 class ZVision;
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index fa89f756e4..e90408cf0d 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -23,6 +23,7 @@
 #include "common/scummsys.h"
 
 #include "zvision/script_manager.h"
+
 #include "zvision/utility.h"
 #include "zvision/puzzle.h"
 #include "zvision/actions.h"
@@ -33,6 +34,7 @@
 #include "common/file.h"
 #include "common/tokenizer.h"
 
+
 namespace ZVision {
 
 void ScriptManager::parseScrFile(const Common::String &fileName, bool isGlobal) {
diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 31983a684e..f3e14e6f5b 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -22,19 +22,21 @@
 
 #include "common/scummsys.h"
 
-#include "common/algorithm.h"
-#include "common/hashmap.h"
-#include "common/debug.h"
-#include "common/stream.h"
+#include "zvision/script_manager.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
 #include "zvision/render_manager.h"
 #include "zvision/cursor_manager.h"
 #include "zvision/save_manager.h"
 #include "zvision/actions.h"
 #include "zvision/utility.h"
 
+#include "common/algorithm.h"
+#include "common/hashmap.h"
+#include "common/debug.h"
+#include "common/stream.h"
+
+
 namespace ZVision {
 
 ScriptManager::ScriptManager(ZVision *engine)
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 349f259198..6276095e12 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -23,11 +23,12 @@
 #ifndef ZVISION_SCRIPT_MANAGER_H
 #define ZVISION_SCRIPT_MANAGER_H
 
+#include "zvision/puzzle.h"
+#include "zvision/control.h"
+
 #include "common/hashmap.h"
 #include "common/queue.h"
 
-#include "zvision/puzzle.h"
-#include "zvision/control.h"
 
 namespace Common {
 class String;
diff --git a/engines/zvision/single_value_container.cpp b/engines/zvision/single_value_container.cpp
index 0fd758a85e..837bd8d7fc 100644
--- a/engines/zvision/single_value_container.cpp
+++ b/engines/zvision/single_value_container.cpp
@@ -22,10 +22,11 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/single_value_container.h"
+
 #include "common/textconsole.h"
 #include "common/str.h"
 
-#include "zvision/single_value_container.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/string_manager.cpp b/engines/zvision/string_manager.cpp
index 3c9a3c6f0c..fde99c02a1 100644
--- a/engines/zvision/string_manager.cpp
+++ b/engines/zvision/string_manager.cpp
@@ -22,6 +22,10 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/string_manager.h"
+
+#include "zvision/truetype_font.h"
+
 #include "common/file.h"
 #include "common/tokenizer.h"
 #include "common/debug.h"
@@ -29,9 +33,6 @@
 #include "graphics/fontman.h"
 #include "graphics/colormasks.h"
 
-#include "zvision/string_manager.h"
-#include "zvision/truetype_font.h"
-
 
 namespace ZVision {
 
diff --git a/engines/zvision/string_manager.h b/engines/zvision/string_manager.h
index 74d13cd994..9cfed5261b 100644
--- a/engines/zvision/string_manager.h
+++ b/engines/zvision/string_manager.h
@@ -24,8 +24,6 @@
 #ifndef ZVISION_STRING_MANAGER_H
 #define ZVISION_STRING_MANAGER_H
 
-#include "common/types.h"
-
 #include "zvision/detection.h"
 #include "zvision/truetype_font.h"
 
diff --git a/engines/zvision/timer_node.cpp b/engines/zvision/timer_node.cpp
index 81468dbb0b..55dfa51dfe 100644
--- a/engines/zvision/timer_node.cpp
+++ b/engines/zvision/timer_node.cpp
@@ -22,12 +22,14 @@
 
 #include "common/scummsys.h"
 
-#include "common/stream.h"
-
 #include "zvision/timer_node.h"
+
 #include "zvision/zvision.h"
 #include "zvision/script_manager.h"
 
+#include "common/stream.h"
+
+
 namespace ZVision {
 
 TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds) 
diff --git a/engines/zvision/timer_node.h b/engines/zvision/timer_node.h
index 4bc8397ff0..32dca71548 100644
--- a/engines/zvision/timer_node.h
+++ b/engines/zvision/timer_node.h
@@ -23,8 +23,6 @@
 #ifndef ZVISION_TIMER_NODE_H
 #define ZVISION_TIMER_NODE_H
 
-#include "common/types.h"
-
 #include "zvision/control.h"
 
 namespace ZVision {
diff --git a/engines/zvision/truetype_font.cpp b/engines/zvision/truetype_font.cpp
index 80d0d6bddb..8d6aaca51e 100644
--- a/engines/zvision/truetype_font.cpp
+++ b/engines/zvision/truetype_font.cpp
@@ -22,6 +22,11 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/truetype_font.h"
+
+#include "zvision/zvision.h"
+#include "zvision/render_manager.h"
+
 #include "common/debug.h"
 #include "common/file.h"
 #include "common/system.h"
@@ -30,10 +35,6 @@
 #include "graphics/fonts/ttf.h"
 #include "graphics/surface.h"
 
-#include "zvision/truetype_font.h"
-#include "zvision/zvision.h"
-#include "zvision/render_manager.h"
-
 
 namespace ZVision {
 
diff --git a/engines/zvision/truetype_font.h b/engines/zvision/truetype_font.h
index c7475d1adb..4f2ff864a8 100644
--- a/engines/zvision/truetype_font.h
+++ b/engines/zvision/truetype_font.h
@@ -25,11 +25,10 @@
 #ifndef ZVISION_TRUETYPE_FONT_H
 #define ZVISION_TRUETYPE_FONT_H
 
-#include "common/types.h"
-
 #include "graphics/font.h"
 #include "graphics/pixelformat.h"
 
+
 namespace Graphics {
 struct Surface;
 }
diff --git a/engines/zvision/utility.cpp b/engines/zvision/utility.cpp
index fb4fe22ff8..d973cb2f4c 100644
--- a/engines/zvision/utility.cpp
+++ b/engines/zvision/utility.cpp
@@ -22,13 +22,15 @@
 
 #include "common/scummsys.h"
 
-#include "common/tokenizer.h"
-#include "common/file.h"
-
 #include "zvision/utility.h"
+
 #include "zvision/zvision.h"
 #include "zvision/zork_raw.h"
 
+#include "common/tokenizer.h"
+#include "common/file.h"
+
+
 namespace ZVision {
 
 void writeFileContentsToFile(const Common::String &sourceFile, const Common::String &destFile) {
diff --git a/engines/zvision/utility.h b/engines/zvision/utility.h
index 14077080f5..4aceec6e4f 100644
--- a/engines/zvision/utility.h
+++ b/engines/zvision/utility.h
@@ -26,6 +26,7 @@
 
 #include "common/array.h"
 
+
 namespace Common {
 class String;
 }
diff --git a/engines/zvision/vector2.h b/engines/zvision/vector2.h
index 575915c87d..9616a43218 100644
--- a/engines/zvision/vector2.h
+++ b/engines/zvision/vector2.h
@@ -25,6 +25,9 @@
 
 #include "common/scummsys.h"
 
+#include "common/util.h"
+
+
 namespace ZVision {
 
 /**
diff --git a/engines/zvision/video.cpp b/engines/zvision/video.cpp
index 2fe4d231ef..cd11618e67 100644
--- a/engines/zvision/video.cpp
+++ b/engines/zvision/video.cpp
@@ -22,14 +22,18 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/zvision.h"
+
+#include "zvision/clock.h"
+#include "zvision/render_manager.h"
+
 #include "common/system.h"
+
 #include "video/video_decoder.h"
+
 #include "engines/util.h"
-#include "graphics/surface.h"
 
-#include "zvision/clock.h"
-#include "zvision/render_manager.h"
-#include "zvision/zvision.h"
+#include "graphics/surface.h"
 
 
 namespace ZVision {
diff --git a/engines/zvision/zfs_archive.cpp b/engines/zvision/zfs_archive.cpp
index b0444fa511..24cff27fc4 100644
--- a/engines/zvision/zfs_archive.cpp
+++ b/engines/zvision/zfs_archive.cpp
@@ -22,13 +22,12 @@
 
 #include "common/scummsys.h"
 
-#include "common/hashmap.h"
+#include "zvision/zfs_archive.h"
+
 #include "common/memstream.h"
 #include "common/debug.h"
 #include "common/file.h"
 
-#include "zvision/zfs_archive.h"
-
 namespace ZVision {
 
 ZfsArchive::ZfsArchive(const Common::String &fileName) : _fileName(fileName) {
diff --git a/engines/zvision/zfs_archive.h b/engines/zvision/zfs_archive.h
index 3bf492578c..d7b45e4b47 100644
--- a/engines/zvision/zfs_archive.h
+++ b/engines/zvision/zfs_archive.h
@@ -25,6 +25,7 @@
 
 #include "common/archive.h"
 #include "common/hashmap.h"
+#include "common/hash-str.h"
 
 
 namespace Common {
diff --git a/engines/zvision/zork_avi_decoder.cpp b/engines/zvision/zork_avi_decoder.cpp
index d9b9511175..a614f77bb7 100644
--- a/engines/zvision/zork_avi_decoder.cpp
+++ b/engines/zvision/zork_avi_decoder.cpp
@@ -23,11 +23,14 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/zork_avi_decoder.h"
+
+#include "zvision/zork_raw.h"
+
 #include "common/stream.h"
+
 #include "audio/audiostream.h"
 
-#include "zvision/zork_avi_decoder.h"
-#include "zvision/zork_raw.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/zork_avi_decoder.h b/engines/zvision/zork_avi_decoder.h
index 1ce2508828..ec2be1bb13 100644
--- a/engines/zvision/zork_avi_decoder.h
+++ b/engines/zvision/zork_avi_decoder.h
@@ -26,6 +26,7 @@
 
 #include "video/avi_decoder.h"
  
+
 namespace ZVision {
 
 class ZorkAVIDecoder : public Video::AVIDecoder {
diff --git a/engines/zvision/zork_raw.cpp b/engines/zvision/zork_raw.cpp
index 55ad2076e0..55493da9b3 100644
--- a/engines/zvision/zork_raw.cpp
+++ b/engines/zvision/zork_raw.cpp
@@ -22,19 +22,22 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/zork_raw.h"
+
+#include "zvision/zvision.h"
+#include "zvision/detection.h"
+#include "zvision/utility.h"
+
 #include "common/file.h"
 #include "common/str.h"
 #include "common/stream.h"
 #include "common/memstream.h"
 #include "common/bufferedstream.h"
 #include "common/util.h"
+
 #include "audio/audiostream.h"
 #include "audio/decoders/raw.h"
 
-#include "zvision/zork_raw.h"
-#include "zvision/zvision.h"
-#include "zvision/detection.h"
-#include "zvision/utility.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/zork_raw.h b/engines/zvision/zork_raw.h
index 51248e341a..481ea79f2d 100644
--- a/engines/zvision/zork_raw.h
+++ b/engines/zvision/zork_raw.h
@@ -23,9 +23,9 @@
 #ifndef ZVISION_ZORK_RAW_H
 #define ZVISION_ZORK_RAW_H
 
-#include "common/types.h"
 #include "audio/audiostream.h"
 
+
 namespace Common {
 class SeekableReadStream;
 }
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 6cdc144424..6d8ae6d5a7 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -22,6 +22,17 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/zvision.h"
+
+#include "zvision/console.h"
+#include "zvision/script_manager.h"
+#include "zvision/render_manager.h"
+#include "zvision/cursor_manager.h"
+#include "zvision/save_manager.h"
+#include "zvision/string_manager.h"
+#include "zvision/zfs_archive.h"
+#include "zvision/detection.h"
+
 #include "common/config-manager.h"
 #include "common/debug.h"
 #include "common/debug-channels.h"
@@ -33,18 +44,7 @@
 #include "engines/util.h"
 
 #include "audio/mixer.h"
- 
-#include "zvision/zvision.h"
-#include "zvision/console.h"
-#include "zvision/script_manager.h"
-#include "zvision/render_manager.h"
-#include "zvision/cursor_manager.h"
-#include "zvision/save_manager.h"
-#include "zvision/string_manager.h"
-#include "zvision/zfs_archive.h"
-#include "zvision/detection.h"
 
-#include "zvision/utility.h"
 
 namespace ZVision {
  
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 13bdb3c755..84784d9a89 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -24,6 +24,9 @@
 #ifndef ZVISION_ZVISION_H
 #define ZVISION_ZVISION_H
 
+#include "zvision/detection.h"
+#include "zvision/clock.h"
+
 #include "common/random.h"
 #include "common/events.h"
 
@@ -31,9 +34,6 @@
 
 #include "graphics/pixelformat.h"
 
-#include "zvision/detection.h"
-#include "zvision/clock.h"
-
 #include "gui/debugger.h"