diff --git a/include/Cubed/app.hpp b/include/Cubed/app.hpp
index d28a55d..d0cf141 100644
--- a/include/Cubed/app.hpp
+++ b/include/Cubed/app.hpp
@@ -44,14 +44,14 @@ public:
 private:
     Config m_game_config;
 
+    Window m_window;
+
     TextureManager m_texture_manager;
 
     AudioEngine m_audio;
 
     Renderer m_renderer;
 
-    Window m_window;
-
     SceneManager m_scene_manager;
 
     inline static uint64_t last_tick = 0;
diff --git a/include/Cubed/tools/system_info.hpp b/include/Cubed/tools/system_info.hpp
index 4b9f2fa..c041111 100644
--- a/include/Cubed/tools/system_info.hpp
+++ b/include/Cubed/tools/system_info.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Cubed/tools/log.hpp"
+#include "Cubed/tools/log.hpp" // IWYU pragma: keep
 
 #include <string>
 
diff --git a/src/app.cpp b/src/app.cpp
index 77d7444..9f2fb06 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -17,10 +17,9 @@ namespace Cubed {
 
 App::App()
 
-    : m_game_config(ASSETS_PATH "config.toml"),
+    : m_game_config(ASSETS_PATH "config.toml"), m_window(m_game_config),
       m_texture_manager(m_game_config), m_audio(m_game_config),
-      m_renderer(m_texture_manager, m_game_config), m_window(m_game_config),
-      m_scene_manager(*this) {}
+      m_renderer(m_texture_manager, m_game_config), m_scene_manager(*this) {}
 
 App::~App() { stop_text_input(); }