diff --git a/src/app/editor/system/resource_manager.h b/src/app/editor/system/resource_manager.h
index 75702160..69ea03ba 100644
--- a/src/app/editor/system/resource_manager.h
+++ b/src/app/editor/system/resource_manager.h
@@ -23,7 +23,6 @@ class ResourceManager {
 };
 
 } // namespace editor
-
 } // namespace yaze
 
 #endif // YAZE_APP_EDITOR_SYSTEM_RESOURCE_MANAGER_H
diff --git a/src/app/gfx/scad_format.cc b/src/app/gfx/scad_format.cc
index a990d56a..06b6b2a2 100644
--- a/src/app/gfx/scad_format.cc
+++ b/src/app/gfx/scad_format.cc
@@ -5,7 +5,6 @@
 #include <cstring>
 #include <fstream>
 #include <iostream>
-#include <memory>
 #include <vector>
 
 #include "absl/status/status.h"
@@ -278,5 +277,4 @@ absl::Status DecodeObjFile(
 
 }  // namespace scad_format
 }  // namespace gfx
-
 }  // namespace yaze
diff --git a/src/app/gfx/scad_format.h b/src/app/gfx/scad_format.h
index e5c173f6..98926fdf 100644
--- a/src/app/gfx/scad_format.h
+++ b/src/app/gfx/scad_format.h
@@ -3,20 +3,14 @@
 
 #include <SDL.h>
 
-#include <cmath>
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
-#include <fstream>
-#include <iostream>
-#include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "app/core/constants.h"
 
 namespace yaze {
 namespace gfx {
@@ -99,7 +93,6 @@ absl::Status DecodeObjFile(
 
 }  // namespace scad_format
 }  // namespace gfx
-
 }  // namespace yaze
 
-#endif  // YAZE_APP_GFX_scad_format_H
\ No newline at end of file
+#endif  // YAZE_APP_GFX_scad_format_H
diff --git a/src/app/gfx/snes_color.cc b/src/app/gfx/snes_color.cc
index 0c71d51e..34fa10b0 100644
--- a/src/app/gfx/snes_color.cc
+++ b/src/app/gfx/snes_color.cc
@@ -99,5 +99,4 @@ std::vector<SnesColor> GetColFileData(uint8_t* data) {
 }
 
 }  // namespace gfx
-
 }  // namespace yaze
diff --git a/src/app/gfx/snes_color.h b/src/app/gfx/snes_color.h
index 5c6e1145..82a37536 100644
--- a/src/app/gfx/snes_color.h
+++ b/src/app/gfx/snes_color.h
@@ -107,7 +107,6 @@ SnesColor GetCgxColor(uint16_t color);
 std::vector<SnesColor> GetColFileData(uint8_t* data);
 
 }  // namespace gfx
-
 }  // namespace yaze
 
 #endif  // YAZE_APP_GFX_SNES_COLOR_H_
diff --git a/src/app/gui/canvas.cc b/src/app/gui/canvas.cc
index 9c379b11..78a8cb1e 100644
--- a/src/app/gui/canvas.cc
+++ b/src/app/gui/canvas.cc
@@ -855,5 +855,4 @@ void BitmapCanvasPipeline(gui::Canvas &canvas, const gfx::Bitmap &bitmap,
 }
 
 }  // namespace gui
-
 }  // namespace yaze