diff --git a/src/app/core/constants.h b/src/app/core/constants.h
index 9cb84a97..a3aacbc3 100644
--- a/src/app/core/constants.h
+++ b/src/app/core/constants.h
@@ -125,15 +125,6 @@ using Bytes = std::vector<uint8_t>;
 
 namespace yaze {
 namespace app {
-
-using OWBlockset = std::vector<std::vector<uint16_t>>;
-struct OWMapTiles {
-  OWBlockset light_world;    // 64 maps
-  OWBlockset dark_world;     // 64 maps
-  OWBlockset special_world;  // 32 maps
-};
-using OWMapTiles = struct OWMapTiles;
-
 namespace core {
 
 constexpr uint32_t kRedPen = 0xFF0000FF;
diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc
index d734023b..30a718a2 100644
--- a/src/app/editor/master_editor.cc
+++ b/src/app/editor/master_editor.cc
@@ -411,7 +411,7 @@ void MasterEditor::DrawYazeMenu() {
     }
     PopStyleColor();
 
-    Text("yaze v%s", core::kYazeVersion.c_str());
+    Text("yaze v%s", core::kYazeVersion.data());
 
     EndMenuBar();
   }
diff --git a/src/app/editor/overworld_editor.cc b/src/app/editor/overworld_editor.cc
index 4fa170ab..5f7ec55b 100644
--- a/src/app/editor/overworld_editor.cc
+++ b/src/app/editor/overworld_editor.cc
@@ -1314,7 +1314,7 @@ absl::Status OverworldEditor::LoadAnimatedMaps() {
     map.DrawAnimatedTiles();
     RETURN_IF_ERROR(map.BuildTileset());
     RETURN_IF_ERROR(map.BuildTiles16Gfx(overworld_.tiles16().size()));
-    OWBlockset blockset;
+    zelda3::OWBlockset blockset;
     if (current_world_ == 0) {
       blockset = overworld_.map_tiles().light_world;
     } else if (current_world_ == 1) {
diff --git a/src/app/editor/overworld_editor.h b/src/app/editor/overworld_editor.h
index bd45c76e..99ca3292 100644
--- a/src/app/editor/overworld_editor.h
+++ b/src/app/editor/overworld_editor.h
@@ -288,7 +288,7 @@ class OverworldEditor : public Editor,
   gfx::BitmapTable sprite_previews_;
   gfx::BitmapTable animated_maps_;
 
-  OWBlockset refresh_blockset_;
+  zelda3::OWBlockset refresh_blockset_;
 
   gui::zeml::Node layout_node_;
   absl::Status status_;
diff --git a/src/app/zelda3/common.h b/src/app/zelda3/common.h
index 7a680024..4318f049 100644
--- a/src/app/zelda3/common.h
+++ b/src/app/zelda3/common.h
@@ -9,6 +9,21 @@ namespace app {
  */
 namespace zelda3 {
 
+/**
+ * @brief Represents tile32 data for the overworld.
+ */
+using OWBlockset = std::vector<std::vector<uint16_t>>;
+
+/**
+ * @brief Overworld map tile32 data.
+ */
+struct OWMapTiles {
+  OWBlockset light_world;    // 64 maps
+  OWBlockset dark_world;     // 64 maps
+  OWBlockset special_world;  // 32 maps
+};
+using OWMapTiles = struct OWMapTiles;
+
 /**
  * @class OverworldEntity
  * @brief Base class for all overworld entities.
diff --git a/src/app/zelda3/overworld/overworld_map.h b/src/app/zelda3/overworld/overworld_map.h
index 881292c5..c1531d43 100644
--- a/src/app/zelda3/overworld/overworld_map.h
+++ b/src/app/zelda3/overworld/overworld_map.h
@@ -1,8 +1,6 @@
 #ifndef YAZE_APP_ZELDA3_OVERWORLD_MAP_H
 #define YAZE_APP_ZELDA3_OVERWORLD_MAP_H
 
-#include "imgui/imgui.h"
-
 #include <cstddef>
 #include <cstdint>
 #include <memory>
@@ -16,6 +14,8 @@
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"
 #include "app/rom.h"
+#include "app/zelda3/common.h"
+#include "imgui/imgui.h"
 
 namespace yaze {
 namespace app {