diff --git a/src/app/zelda3/common.h b/src/app/zelda3/common.h
index 987743ec..0c554df6 100644
--- a/src/app/zelda3/common.h
+++ b/src/app/zelda3/common.h
@@ -1,6 +1,9 @@
 #ifndef YAZE_APP_ZELDA3_COMMON_H
 #define YAZE_APP_ZELDA3_COMMON_H
 
+#include <vector>
+#include <cstdint>
+
 namespace yaze {
 namespace app {
 /**
@@ -318,4 +321,4 @@ static const std::string TileTypeNames[] = {
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_ZELDA3_COMMON_H
\ No newline at end of file
+#endif  // YAZE_APP_ZELDA3_COMMON_H
diff --git a/src/app/zelda3/dungeon/room_object.h b/src/app/zelda3/dungeon/room_object.h
index 0df3962a..62e762bc 100644
--- a/src/app/zelda3/dungeon/room_object.h
+++ b/src/app/zelda3/dungeon/room_object.h
@@ -1,9 +1,7 @@
 #ifndef YAZE_APP_ZELDA3_DUNGEON_ROOM_OBJECT_H
 #define YAZE_APP_ZELDA3_DUNGEON_ROOM_OBJECT_H
 
-#include <array>
 #include <cstdint>
-#include <stdexcept>
 #include <string>
 #include <vector>
 
@@ -264,4 +262,4 @@ class Subtype3 : public RoomObject {
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_ZELDA3_DUNGEON_ROOM_OBJECT_H
\ No newline at end of file
+#endif  // YAZE_APP_ZELDA3_DUNGEON_ROOM_OBJECT_H
diff --git a/src/app/zelda3/sprite/sprite.h b/src/app/zelda3/sprite/sprite.h
index c3fd8e4f..67ad5475 100644
--- a/src/app/zelda3/sprite/sprite.h
+++ b/src/app/zelda3/sprite/sprite.h
@@ -4,15 +4,9 @@
 #include <SDL.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"
 #include "app/zelda3/common.h"
 
 namespace yaze {
@@ -387,4 +381,4 @@ class Sprite : public GameEntity {
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif