diff --git a/src/app/editor/graphics/palette_editor.cc b/src/app/editor/graphics/palette_editor.cc
index 9ecfaaa8..1dbfd4b3 100644
--- a/src/app/editor/graphics/palette_editor.cc
+++ b/src/app/editor/graphics/palette_editor.cc
@@ -1,6 +1,5 @@
 #include "palette_editor.h"
 
-#include <gui/style.h>
 #include <imgui/imgui.h>
 
 #include "absl/status/status.h"
@@ -8,6 +7,7 @@
 #include "app/gui/canvas.h"
 #include "app/gui/color.h"
 #include "app/gui/icons.h"
+#include "app/gui/style.h"
 
 namespace yaze {
 namespace app {
@@ -466,4 +466,4 @@ absl::Status PaletteEditor::ResetColorToOriginal(
 
 }  // namespace editor
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/editor/settings_editor.cc b/src/app/editor/settings_editor.cc
index 96c77ccb..762e49cb 100644
--- a/src/app/editor/settings_editor.cc
+++ b/src/app/editor/settings_editor.cc
@@ -1,10 +1,11 @@
-#include <editor/settings_editor.h>
-#include <editor/utils/flags.h>
+
 #include <imgui/imgui.h>
 
 #include "absl/status/status.h"
 #include "app/editor/utils/flags.h"
 #include "app/editor/utils/keyboard_shortcuts.h"
+#include "app/editor/settings_editor.h"
+#include "app/editor/utils/flags.h"
 
 namespace yaze {
 namespace app {
diff --git a/src/app/editor/sprite/sprite_editor.cc b/src/app/editor/sprite/sprite_editor.cc
index 03d02e5b..bd03da0f 100644
--- a/src/app/editor/sprite/sprite_editor.cc
+++ b/src/app/editor/sprite/sprite_editor.cc
@@ -1,9 +1,9 @@
 #include "sprite_editor.h"
 
-#include <core/platform/file_dialog.h>
-#include <editor/sprite/zsprite.h>
-#include <gui/icons.h>
-#include <gui/input.h>
+#include "app/core/platform/file_dialog.h"
+#include "app/editor/sprite/zsprite.h"
+#include "app/gui/icons.h"
+#include "app/gui/input.h"
 
 namespace yaze {
 namespace app {
@@ -275,4 +275,4 @@ void SpriteEditor::DrawCustomSpritesMetadata() {
 
 }  // namespace editor
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/editor/sprite/zsprite.h b/src/app/editor/sprite/zsprite.h
index 1903e602..1408469c 100644
--- a/src/app/editor/sprite/zsprite.h
+++ b/src/app/editor/sprite/zsprite.h
@@ -1,7 +1,6 @@
 #ifndef YAZE_APP_EDITOR_SPRITE_ZSPRITE_H
 #define YAZE_APP_EDITOR_SPRITE_ZSPRITE_H
 
-#include <gfx/snes_tile.h>
 #include <imgui/imgui.h>
 
 #include <algorithm>
@@ -11,6 +10,7 @@
 #include <vector>
 
 #include "absl/status/status.h"
+#include "app/gfx/snes_tile.h"
 
 namespace yaze {
 namespace app {
@@ -393,4 +393,4 @@ struct ZSprite {
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_EDITOR_SPRITE_ZSPRITE_H
\ No newline at end of file
+#endif  // YAZE_APP_EDITOR_SPRITE_ZSPRITE_H
diff --git a/src/app/editor/utils/flags.h b/src/app/editor/utils/flags.h
index 1102ab03..4608f953 100644
--- a/src/app/editor/utils/flags.h
+++ b/src/app/editor/utils/flags.h
@@ -1,9 +1,10 @@
 #ifndef YAZE_APP_EDITOR_UTILS_FLAGS_H
 #define YAZE_APP_EDITOR_UTILS_FLAGS_H
 
-#include <core/common.h>
 #include <imgui/imgui.h>
 
+#include "core/common.h"
+
 namespace yaze {
 namespace app {
 namespace editor {
@@ -64,4 +65,4 @@ struct FlagsMenu : public core::ExperimentFlags {
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_EDITOR_UTILS_FLAGS_H_
\ No newline at end of file
+#endif  // YAZE_APP_EDITOR_UTILS_FLAGS_H_
diff --git a/src/app/gui/style.cc b/src/app/gui/style.cc
index 3b7968b4..35f105ca 100644
--- a/src/app/gui/style.cc
+++ b/src/app/gui/style.cc
@@ -1,7 +1,7 @@
 #include "style.h"
 
-#include "imgui/imgui.h"
-#include "imgui/imgui_internal.h"
+#include <imgui/imgui.h>
+#include <imgui/imgui_internal.h>
 
 namespace yaze {
 namespace app {
@@ -608,4 +608,4 @@ TextEditor::LanguageDefinition GetAssemblyLanguageDef() {
 
 }  // namespace gui
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze