diff --git a/src/app/core/common.cc b/src/app/core/common.cc
index 4473b974..135f3365 100644
--- a/src/app/core/common.cc
+++ b/src/app/core/common.cc
@@ -2,21 +2,15 @@
 
 #include <zlib.h>
 
-#include <chrono>
 #include <cstdint>
 #include <cstring>
-#include <fstream>
-#include <functional>
-#include <iostream>
 #include <memory>
-#include <stack>
 #include <string>
 #include <vector>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "app/core/constants.h"
-#include "imgui/imgui.h"
 
 namespace yaze {
 namespace app {
diff --git a/src/app/editor/graphics/graphics_editor.h b/src/app/editor/graphics/graphics_editor.h
index d2c216c0..f50a4483 100644
--- a/src/app/editor/graphics/graphics_editor.h
+++ b/src/app/editor/graphics/graphics_editor.h
@@ -1,20 +1,16 @@
 #ifndef YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
 #define YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
 
-#include "ImGuiFileDialog/ImGuiFileDialog.h"
 #include "absl/status/status.h"
-#include "absl/status/statusor.h"
 #include "app/editor/graphics/palette_editor.h"
 #include "app/editor/utils/editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_tile.h"
 #include "app/gui/modules/asset_browser.h"
 #include "app/gui/canvas.h"
-#include "app/gui/input.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"
-#include "imgui/misc/cpp/imgui_stdlib.h"
 #include "imgui_memory_editor.h"
 
 namespace yaze {