diff --git a/src/app/gfx/bitmap.cc b/src/app/gfx/bitmap.cc
index 77b8a36c..3fc195f7 100644
--- a/src/app/gfx/bitmap.cc
+++ b/src/app/gfx/bitmap.cc
@@ -9,8 +9,6 @@
 #include <memory>
 
 #include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
 #include "app/core/constants.h"
 #include "app/gfx/snes_palette.h"
 
diff --git a/src/app/gfx/bitmap.h b/src/app/gfx/bitmap.h
index 64c32854..68a6e365 100644
--- a/src/app/gfx/bitmap.h
+++ b/src/app/gfx/bitmap.h
@@ -6,10 +6,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
 #include "app/core/constants.h"
 #include "app/core/utils/sdl_deleter.h"
 #include "app/gfx/snes_palette.h"
diff --git a/src/app/gfx/compression.h b/src/app/gfx/compression.h
index 001fb492..d2a0aa92 100644
--- a/src/app/gfx/compression.h
+++ b/src/app/gfx/compression.h
@@ -1,7 +1,6 @@
 #ifndef YAZE_APP_GFX_COMPRESSION_H
 #define YAZE_APP_GFX_COMPRESSION_H
 
-#include <iostream>
 #include <memory>
 #include <string>
 
@@ -249,4 +248,4 @@ absl::StatusOr<std::vector<uint8_t>> DecompressOverworld(const std::vector<uint8
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_GFX_COMPRESSION_H
\ No newline at end of file
+#endif  // YAZE_APP_GFX_COMPRESSION_H
diff --git a/src/app/gfx/snes_color.h b/src/app/gfx/snes_color.h
index 61e8d13c..02ed4028 100644
--- a/src/app/gfx/snes_color.h
+++ b/src/app/gfx/snes_color.h
@@ -4,8 +4,8 @@
 #include <cstdint>
 #include <vector>
 
-#include "incl/snes_color.h"
 #include "imgui/imgui.h"
+#include "incl/snes_color.h"
 
 namespace yaze {
 namespace app {