10 files changed, 17 insertions, 27 deletions
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 39809c65a4..879a8643ce 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -24,7 +24,7 @@
 #define ZVISION_RENDER_MANAGER_H
 
 #include "zvision/graphics/render_table.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 
 #include "common/rect.h"
 #include "common/hashmap.h"
diff --git a/engines/zvision/fonts/truetype_font.cpp b/engines/zvision/graphics/truetype_font.cpp
index a9363d8923..1a0e92087c 100644
--- a/engines/zvision/fonts/truetype_font.cpp
+++ b/engines/zvision/graphics/truetype_font.cpp
@@ -21,22 +21,19 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/fonts/truetype_font.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-
 #include "common/config-manager.h"
 #include "common/debug.h"
 #include "common/file.h"
 #include "common/system.h"
 #include "common/unzip.h"
-
 #include "graphics/font.h"
 #include "graphics/fonts/ttf.h"
 #include "graphics/surface.h"
 
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/graphics/truetype_font.h"
+
 namespace ZVision {
 
 TruetypeFont::TruetypeFont(ZVision *engine, int32 fontHeight)
diff --git a/engines/zvision/fonts/truetype_font.h b/engines/zvision/graphics/truetype_font.h
index 30ef1c73a3..30ef1c73a3 100644
--- a/engines/zvision/fonts/truetype_font.h
+++ b/engines/zvision/graphics/truetype_font.h
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 607a9be4ed..e2beeb593d 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -12,12 +12,12 @@ MODULE_OBJS := \
 	cursors/cursor_manager.o \
 	cursors/cursor.o \
 	detection.o \
-	fonts/truetype_font.o \
 	graphics/effects/fog.o \
 	graphics/effects/light.o \
 	graphics/effects/wave.o \
 	graphics/render_manager.o \
 	graphics/render_table.o \
+	graphics/truetype_font.o \
 	scripting/actions.o \
 	scripting/control.o \
 	scripting/controls/fist_control.o \
diff --git a/engines/zvision/scripting/sidefx/ttytext_node.h b/engines/zvision/scripting/sidefx/ttytext_node.h
index a229129b9d..b6cbed3e34 100644
--- a/engines/zvision/scripting/sidefx/ttytext_node.h
+++ b/engines/zvision/scripting/sidefx/ttytext_node.h
@@ -28,7 +28,7 @@
 
 #include "zvision/scripting/sidefx.h"
 #include "zvision/text/text.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 
 namespace Common {
 class String;
diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index f88f9eaddd..1a04c67988 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -21,20 +21,17 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/zvision.h"
-#include "zvision/core/search_manager.h"
-#include "zvision/text/string_manager.h"
-
-#include "zvision/fonts/truetype_font.h"
-
 #include "common/file.h"
 #include "common/tokenizer.h"
 #include "common/debug.h"
-
 #include "graphics/fontman.h"
 #include "graphics/colormasks.h"
 
+#include "zvision/zvision.h"
+#include "zvision/core/search_manager.h"
+#include "zvision/text/string_manager.h"
+#include "zvision/graphics/truetype_font.h"
+
 namespace ZVision {
 
 StringManager::StringManager(ZVision *engine)
diff --git a/engines/zvision/text/string_manager.h b/engines/zvision/text/string_manager.h
index 61c0d95f51..8d6fbe67a6 100644
--- a/engines/zvision/text/string_manager.h
+++ b/engines/zvision/text/string_manager.h
@@ -24,7 +24,7 @@
 #define ZVISION_STRING_MANAGER_H
 
 #include "zvision/detection.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 
 namespace Graphics {
 class FontManager;
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 6f41416015..0ccca214d7 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -21,23 +21,19 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/text/text.h"
-
-#include "zvision/fonts/truetype_font.h"
-
 #include "common/file.h"
 #include "common/tokenizer.h"
 #include "common/debug.h"
 #include "common/rect.h"
-
 #include "graphics/fontman.h"
 #include "graphics/colormasks.h"
 #include "graphics/surface.h"
 #include "graphics/font.h"
 #include "graphics/fonts/ttf.h"
 
+#include "zvision/text/text.h"
 #include "zvision/graphics/render_manager.h"
+#include "zvision/graphics/truetype_font.h"
 #include "zvision/scripting/script_manager.h"
 
 namespace ZVision {
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index 6b916860f0..01c3fd760c 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -25,7 +25,7 @@
 #define ZVISION_TEXT_H
 
 #include "zvision/detection.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 #include "zvision/zvision.h"
 
 namespace Graphics {
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index d981d14838..af9d26a350 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -33,7 +33,7 @@
 #include "zvision/core/menu.h"
 #include "zvision/core/search_manager.h"
 #include "zvision/text/text.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 #include "zvision/core/midi.h"
 #include "zvision/utility/zfs_archive.h"