diff --git a/src/app/core/platform/font_loader.cc b/src/app/core/platform/font_loader.cc
index 0710fdb6..18d8c3a3 100644
--- a/src/app/core/platform/font_loader.cc
+++ b/src/app/core/platform/font_loader.cc
@@ -3,6 +3,7 @@
 #include <string>
 #include <unordered_set>
 #include <vector>
+#include <filesystem>
 
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
diff --git a/src/app/editor/graphics/graphics_editor.h b/src/app/editor/graphics/graphics_editor.h
index 4fd1b517..2d6d7a52 100644
--- a/src/app/editor/graphics/graphics_editor.h
+++ b/src/app/editor/graphics/graphics_editor.h
@@ -1,6 +1,8 @@
 #ifndef YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
 #define YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
 
+#include <stack>
+
 #include "absl/status/status.h"
 #include "app/editor/graphics/palette_editor.h"
 #include "app/editor/editor.h"
diff --git a/src/app/editor/sprite/zsprite.h b/src/app/editor/sprite/zsprite.h
index 1bec0596..5cedb73a 100644
--- a/src/app/editor/sprite/zsprite.h
+++ b/src/app/editor/sprite/zsprite.h
@@ -7,6 +7,7 @@
 #include <string>
 #include <vector>
 
+#include "app/core/constants.h"
 #include "absl/status/status.h"
 #include "app/gfx/snes_tile.h"
 #include "imgui/imgui.h"
diff --git a/src/app/gfx/snes_tile.h b/src/app/gfx/snes_tile.h
index debea5c4..46ab72b3 100644
--- a/src/app/gfx/snes_tile.h
+++ b/src/app/gfx/snes_tile.h
@@ -3,8 +3,10 @@
 
 #include <snes_tile.h>
 
+#include <array>
 #include <cstdint>
 #include <cstring>
+#include <stdexcept>
 #include <vector>
 
 namespace yaze {
diff --git a/src/app/zelda3/common.h b/src/app/zelda3/common.h
index 0c554df6..152d9369 100644
--- a/src/app/zelda3/common.h
+++ b/src/app/zelda3/common.h
@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <cstdint>
+#include <string>
 
 namespace yaze {
 namespace app {