diff --git a/src/app/zelda3/dungeon/room.cc b/src/app/zelda3/dungeon/room.cc
index 8e72781b..8b31e551 100644
--- a/src/app/zelda3/dungeon/room.cc
+++ b/src/app/zelda3/dungeon/room.cc
@@ -3,6 +3,7 @@
 #include <cstdint>
 #include <vector>
 
+#include "absl/strings/str_cat.h"
 #include "app/core/constants.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
diff --git a/src/app/zelda3/music/tracker.cc b/src/app/zelda3/music/tracker.cc
index 2f6fa0d4..3bb3774a 100644
--- a/src/app/zelda3/music/tracker.cc
+++ b/src/app/zelda3/music/tracker.cc
@@ -11,14 +11,9 @@
 
 #include <cstdint>
 #include <cstdio>
-#include <memory>
-#include <string>
 #include <vector>
 
-#include "absl/status/status.h"
 #include "app/core/constants.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_tile.h"
 #include "app/rom.h"
 
 namespace yaze {
diff --git a/src/app/zelda3/music/tracker.h b/src/app/zelda3/music/tracker.h
index 9725a3f8..af7bd8fe 100644
--- a/src/app/zelda3/music/tracker.h
+++ b/src/app/zelda3/music/tracker.h
@@ -1,15 +1,9 @@
 #ifndef YAZE_APP_ZELDA3_TRACKER_H
 #define YAZE_APP_ZELDA3_TRACKER_H
 
-#include <cstdint>
-#include <memory>
-#include <string>
 #include <vector>
 
-#include "absl/status/status.h"
 #include "app/core/constants.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_tile.h"
 #include "app/rom.h"
 
 namespace yaze {
@@ -263,4 +257,4 @@ class Tracker {
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/app/zelda3/overworld/overworld_map.h b/src/app/zelda3/overworld/overworld_map.h
index d693e2ac..785246ad 100644
--- a/src/app/zelda3/overworld/overworld_map.h
+++ b/src/app/zelda3/overworld/overworld_map.h
@@ -3,18 +3,14 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <memory>
-#include <unordered_map>
 #include <vector>
 
 #include "absl/status/status.h"
 #include "app/editor/utils/gfx_context.h"
-#include "app/gfx/bitmap.h"
 #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 {
@@ -88,9 +84,7 @@ class OverworldMap : public editor::context::GfxContext {
   auto is_large_map() const { return large_map_; }
   auto is_initialized() const { return initialized_; }
   auto parent() const { return parent_; }
-
   auto mutable_mosaic() { return &mosaic_; }
-
   auto mutable_current_palette() { return &current_palette_; }
 
   auto area_graphics() const { return area_graphics_; }
@@ -197,4 +191,4 @@ class OverworldMap : public editor::context::GfxContext {
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif