diff --git a/gui.cpp b/gui.cpp
index d145c05..379596e 100644
--- a/gui.cpp
+++ b/gui.cpp
@@ -1,16 +1,10 @@
 #include "gui.hpp"
-#include "raycaster.hpp"
 #include <iostream>
 #include <chrono>
 #include <numeric>
 #include <functional>
-#include "constants.hpp"
-#include "stats.hpp"
-#include "levelmanager.hpp"
 #include "components.hpp"
-#include "camera.hpp"
 #include <numbers>
-#include "fsm.hpp"
 
 using namespace components;
 
@@ -21,10 +15,10 @@ namespace gui {
     $text{$font},
     $rayview($window, $textures, RAY_VIEW_WIDTH, RAY_VIEW_HEIGHT)
     {
-      $text.setFillColor({255,255,255});
-      $text.setPosition({10,10});
       $window.setVerticalSyncEnabled(VSYNC);
       $window.setFramerateLimit(FRAME_LIMIT);
+      $text.setFillColor({255,255,255});
+      $text.setPosition({10,10});
       $textures.load_tiles();
       $textures.load_sprites();
       $rayview.init_shaders();
diff --git a/gui.hpp b/gui.hpp
index 8f70a43..aa8540b 100644
--- a/gui.hpp
+++ b/gui.hpp
@@ -1,15 +1,9 @@
 #pragma once
 #include "raycaster.hpp"
-#include <iostream>
-#include <chrono>
-#include <numeric>
-#include <functional>
 #include "constants.hpp"
 #include "stats.hpp"
 #include "levelmanager.hpp"
-#include "components.hpp"
 #include "camera.hpp"
-#include <numbers>
 #include "fsm.hpp"
 
 namespace gui {
diff --git a/raycaster.cpp b/raycaster.cpp
index 6c5ba38..a2f1aff 100644
--- a/raycaster.cpp
+++ b/raycaster.cpp
@@ -1,7 +1,12 @@
 #include "raycaster.hpp"
-#include "texture.hpp"
+#include "dbc.hpp"
+#include "matrix.hpp"
 #include <algorithm>
-#include "constants.hpp"
+#include <cmath>
+#include <cstdlib>
+#include <fmt/core.h>
+#include <memory>
+#include <numbers>
 
 using namespace fmt;
 using std::make_unique;
diff --git a/raycaster.hpp b/raycaster.hpp
index c1a7056..03c5cff 100644
--- a/raycaster.hpp
+++ b/raycaster.hpp
@@ -1,19 +1,11 @@
 #pragma once
 
-#include <fmt/core.h>
 #include <SFML/Graphics.hpp>
-#include <numbers>
-#include <algorithm>
-#include <cmath>
-#include "matrix.hpp"
-#include <cstdlib>
-#include <array>
-#include "dbc.hpp"
-#include <memory>
 #include "texture.hpp"
 #include <SFML/System/Clock.hpp>
 #include "animator.hpp"
 #include "spatialmap.hpp"
+#include "levelmanager.hpp"
 
 using matrix::Matrix;
 using RGBA = uint32_t;