diff --git a/src/Allocators.cpp b/src/Allocators.cpp
index f9aa4977..a77a4c93 100644
--- a/src/Allocators.cpp
+++ b/src/Allocators.cpp
@@ -1,8 +1,5 @@
 #include "Allocators.hpp"
 
-#include "wheels/allocators/utils.hpp"
-#include "wheels/assert.hpp"
-
 using namespace wheels;
 
 // These are used everywhere and init()/destroy() order relative to other
diff --git a/src/App.cpp b/src/App.cpp
index f2a9d3b8..da14dfee 100644
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -1,7 +1,7 @@
 #include "App.hpp"
 
 #include "Allocators.hpp"
-#include "gfx/DescriptorAllocator.hpp"
+#include "Window.hpp"
 #include "gfx/VkUtils.hpp"
 #include "render/RenderResources.hpp"
 #include "render/Renderer.hpp"
@@ -9,7 +9,6 @@
 #include "scene/World.hpp"
 #include "utils/InputHandler.hpp"
 #include "utils/Logger.hpp"
-#include "utils/Ui.hpp"
 #include "utils/Utils.hpp"
 
 #include <GLFW/glfw3.h>
@@ -18,8 +17,6 @@
 #include <glm/gtx/component_wise.hpp>
 #include <glm/gtx/transform.hpp>
 #include <imgui.h>
-#include <iostream>
-#include <limits>
 #include <stdexcept>
 #include <thread>
 #include <wheels/allocators/linear_allocator.hpp>
diff --git a/src/App.hpp b/src/App.hpp
index 86e75a33..f43eee57 100644
--- a/src/App.hpp
+++ b/src/App.hpp
@@ -1,14 +1,11 @@
 #ifndef PROSPER_APP_HPP
 #define PROSPER_APP_HPP
 
-#include "Window.hpp"
 #include "gfx/Device.hpp"
 #include "gfx/RingBuffer.hpp"
 #include "gfx/Swapchain.hpp"
 #include "render/Fwd.hpp"
-#include "render/RenderResourceHandle.hpp"
 #include "scene/Camera.hpp"
-#include "scene/DrawType.hpp"
 #include "scene/Fwd.hpp"
 #include "utils/Profiler.hpp"
 #include "utils/SceneStats.hpp"
diff --git a/src/Window.cpp b/src/Window.cpp
index e8c28f93..674f382b 100644
--- a/src/Window.cpp
+++ b/src/Window.cpp
@@ -8,7 +8,6 @@
 #include <GLFW/glfw3.h>
 #include <imgui.h>
 #include <imgui_impl_glfw.h>
-#include <iostream>
 
 #ifdef _WIN32
 
diff --git a/src/Window.hpp b/src/Window.hpp
index 3ed9dfa7..03e79440 100644
--- a/src/Window.hpp
+++ b/src/Window.hpp
@@ -1,8 +1,6 @@
 #ifndef PROSPER_WINDOW_HPP
 #define PROSPER_WINDOW_HPP
 
-#include "utils/InputHandler.hpp"
-
 #include <wheels/allocators/tlsf_allocator.hpp>
 #include <wheels/containers/pair.hpp>
 
diff --git a/src/gfx/Device.cpp b/src/gfx/Device.cpp
index 653f06c5..657f8fc5 100644
--- a/src/gfx/Device.cpp
+++ b/src/gfx/Device.cpp
@@ -3,7 +3,6 @@
 #include <cinttypes>
 #include <cstring>
 #include <iostream>
-#include <memory>
 #include <stdexcept>
 
 #ifdef _WIN32
diff --git a/src/gfx/ShaderReflection.cpp b/src/gfx/ShaderReflection.cpp
index b170fe65..ee7c201f 100644
--- a/src/gfx/ShaderReflection.cpp
+++ b/src/gfx/ShaderReflection.cpp
@@ -1,6 +1,7 @@
 #include "ShaderReflection.hpp"
 
 #include "Device.hpp"
+#include "utils/Utils.hpp"
 
 #include <algorithm>
 #include <cstring>
diff --git a/src/gfx/ShaderReflection.hpp b/src/gfx/ShaderReflection.hpp
index 961fac9c..388d26d5 100644
--- a/src/gfx/ShaderReflection.hpp
+++ b/src/gfx/ShaderReflection.hpp
@@ -4,7 +4,6 @@
 #include "Allocators.hpp"
 #include "gfx/Fwd.hpp"
 #include "utils/Hashes.hpp"
-#include "utils/Utils.hpp"
 
 #include <filesystem>
 #include <variant>
diff --git a/src/main.cpp b/src/main.cpp
index f713da3d..5efcfd55 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,9 +11,6 @@
 #include <cstdlib>
 #include <cxxopts.hpp>
 #include <filesystem>
-#include <fstream>
-#include <iostream>
-#include <stdexcept>
 #include <tomlcpp.hpp>
 
 #ifdef LIVEPP_PATH
diff --git a/src/render/ComputePass.cpp b/src/render/ComputePass.cpp
index e3e44219..8fa0763e 100644
--- a/src/render/ComputePass.cpp
+++ b/src/render/ComputePass.cpp
@@ -3,7 +3,6 @@
 #include "gfx/DescriptorAllocator.hpp"
 #include "gfx/Device.hpp"
 #include "gfx/VkUtils.hpp"
-#include "render/RenderTargets.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
diff --git a/src/render/ComputePass.hpp b/src/render/ComputePass.hpp
index a3e4add0..5d185165 100644
--- a/src/render/ComputePass.hpp
+++ b/src/render/ComputePass.hpp
@@ -3,7 +3,6 @@
 
 #include "gfx/Fwd.hpp"
 #include "gfx/ShaderReflection.hpp"
-#include "utils/Fwd.hpp"
 #include "utils/Utils.hpp"
 
 #include <functional>
diff --git a/src/render/DebugRenderer.cpp b/src/render/DebugRenderer.cpp
index fc190abf..2a7e2699 100644
--- a/src/render/DebugRenderer.cpp
+++ b/src/render/DebugRenderer.cpp
@@ -2,7 +2,6 @@
 
 #include "gfx/DescriptorAllocator.hpp"
 #include "gfx/VkUtils.hpp"
-#include "render/LightClustering.hpp"
 #include "render/RenderResources.hpp"
 #include "render/RenderTargets.hpp"
 #include "render/Utils.hpp"
diff --git a/src/render/DebugRenderer.hpp b/src/render/DebugRenderer.hpp
index 61ad8f09..bb17d2ae 100644
--- a/src/render/DebugRenderer.hpp
+++ b/src/render/DebugRenderer.hpp
@@ -2,12 +2,11 @@
 #define PROSPER_RENDER_DEBUG_RENDERER_HPP
 
 #include "gfx/Fwd.hpp"
-#include "gfx/Resources.hpp"
 #include "gfx/ShaderReflection.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/hash_set.hpp>
@@ -52,7 +51,7 @@ class DebugRenderer
 
     bool m_initialized{false};
 
-    wheels::StaticArray<vk::PipelineShaderStageCreateInfo, 2> m_shaderStages{};
+    wheels::StaticArray<vk::PipelineShaderStageCreateInfo, 2> m_shaderStages;
     wheels::Optional<ShaderReflection> m_vertReflection;
     wheels::Optional<ShaderReflection> m_fragReflection;
 
diff --git a/src/render/DeferredShading.cpp b/src/render/DeferredShading.cpp
index 1f35f347..a90bff01 100644
--- a/src/render/DeferredShading.cpp
+++ b/src/render/DeferredShading.cpp
@@ -1,6 +1,5 @@
 #include "DeferredShading.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/GBufferRenderer.hpp"
 #include "render/LightClustering.hpp"
 #include "render/RenderResources.hpp"
@@ -13,7 +12,6 @@
 #include "utils/Profiler.hpp"
 #include "utils/Utils.hpp"
 
-#include <fstream>
 #include <imgui.h>
 
 using namespace glm;
diff --git a/src/render/DeferredShading.hpp b/src/render/DeferredShading.hpp
index d19d6e3d..335238e1 100644
--- a/src/render/DeferredShading.hpp
+++ b/src/render/DeferredShading.hpp
@@ -1,14 +1,11 @@
 #ifndef PROSPER_RENDER_DEFERRED_SHADING_HPP
 #define PROSPER_RENDER_DEFERRED_SHADING_HPP
 
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
 #include "scene/DrawType.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
-#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/ForwardRenderer.cpp b/src/render/ForwardRenderer.cpp
index 1f1f1149..3eef45fe 100644
--- a/src/render/ForwardRenderer.cpp
+++ b/src/render/ForwardRenderer.cpp
@@ -11,8 +11,6 @@
 #include "render/Utils.hpp"
 #include "scene/Camera.hpp"
 #include "scene/Light.hpp"
-#include "scene/Material.hpp"
-#include "scene/Mesh.hpp"
 #include "scene/Scene.hpp"
 #include "scene/World.hpp"
 #include "scene/WorldRenderStructs.hpp"
diff --git a/src/render/ForwardRenderer.hpp b/src/render/ForwardRenderer.hpp
index 3574eb25..edfbfa8a 100644
--- a/src/render/ForwardRenderer.hpp
+++ b/src/render/ForwardRenderer.hpp
@@ -7,7 +7,7 @@
 #include "render/RenderResourceHandle.hpp"
 #include "scene/DrawType.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/inline_array.hpp>
diff --git a/src/render/GBufferRenderer.cpp b/src/render/GBufferRenderer.cpp
index 679ed687..cf48a68c 100644
--- a/src/render/GBufferRenderer.cpp
+++ b/src/render/GBufferRenderer.cpp
@@ -3,13 +3,10 @@
 #include "gfx/DescriptorAllocator.hpp"
 #include "gfx/VkUtils.hpp"
 #include "render/DrawStats.hpp"
-#include "render/LightClustering.hpp"
 #include "render/MeshletCuller.hpp"
 #include "render/RenderResources.hpp"
 #include "render/RenderTargets.hpp"
 #include "scene/Camera.hpp"
-#include "scene/Material.hpp"
-#include "scene/Mesh.hpp"
 #include "scene/Scene.hpp"
 #include "scene/World.hpp"
 #include "scene/WorldRenderStructs.hpp"
diff --git a/src/render/GBufferRenderer.hpp b/src/render/GBufferRenderer.hpp
index e0cbfd27..471fe9bc 100644
--- a/src/render/GBufferRenderer.hpp
+++ b/src/render/GBufferRenderer.hpp
@@ -8,7 +8,6 @@
 #include "render/RenderResourceHandle.hpp"
 #include "scene/DrawType.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/HierarchicalDepthDownsampler.cpp b/src/render/HierarchicalDepthDownsampler.cpp
index 9e10225d..5672dd94 100644
--- a/src/render/HierarchicalDepthDownsampler.cpp
+++ b/src/render/HierarchicalDepthDownsampler.cpp
@@ -1,6 +1,5 @@
 #include "HierarchicalDepthDownsampler.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/ComputePass.hpp"
 #include "render/RenderResources.hpp"
 #include "utils/Profiler.hpp"
diff --git a/src/render/ImGuiRenderer.hpp b/src/render/ImGuiRenderer.hpp
index 15923d92..20840a5e 100644
--- a/src/render/ImGuiRenderer.hpp
+++ b/src/render/ImGuiRenderer.hpp
@@ -5,7 +5,6 @@
 #include "gfx/Fwd.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
-#include "utils/Fwd.hpp"
 
 #include <imgui.h>
 #include <vulkan/vulkan.hpp>
diff --git a/src/render/ImageBasedLighting.hpp b/src/render/ImageBasedLighting.hpp
index 84b25af5..cb29a111 100644
--- a/src/render/ImageBasedLighting.hpp
+++ b/src/render/ImageBasedLighting.hpp
@@ -1,7 +1,6 @@
 #ifndef PROSPER_RENDER_IMAGE_BASED_LIGHTING_HPP
 #define PROSPER_RENDER_IMAGE_BASED_LIGHTING_HPP
 
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "scene/Fwd.hpp"
diff --git a/src/render/LightClustering.cpp b/src/render/LightClustering.cpp
index 27025658..0bd21d80 100644
--- a/src/render/LightClustering.cpp
+++ b/src/render/LightClustering.cpp
@@ -1,6 +1,5 @@
 #include "LightClustering.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/RenderResources.hpp"
 #include "scene/Camera.hpp"
 #include "scene/Light.hpp"
diff --git a/src/render/LightClustering.hpp b/src/render/LightClustering.hpp
index 0c20fe0c..57a770ac 100644
--- a/src/render/LightClustering.hpp
+++ b/src/render/LightClustering.hpp
@@ -1,12 +1,10 @@
 #ifndef PROSPER_RENDER_LIGHT_CLUSTERING_HPP
 #define PROSPER_RENDER_LIGHT_CLUSTERING_HPP
 
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 
diff --git a/src/render/MeshletCuller.hpp b/src/render/MeshletCuller.hpp
index 8c7d994f..27bf329b 100644
--- a/src/render/MeshletCuller.hpp
+++ b/src/render/MeshletCuller.hpp
@@ -1,14 +1,10 @@
 #ifndef PROSPER_RENDER_MESHLET_CULLER_HPP
 #define PROSPER_RENDER_MESHLET_CULLER_HPP
 
-#include "gfx/Fwd.hpp"
-#include "gfx/Resources.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
-#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/hash_set.hpp>
diff --git a/src/render/RenderResourceCollection.hpp b/src/render/RenderResourceCollection.hpp
index c65670be..345eeffb 100644
--- a/src/render/RenderResourceCollection.hpp
+++ b/src/render/RenderResourceCollection.hpp
@@ -3,7 +3,6 @@
 
 #include "Allocators.hpp"
 #include "gfx/Device.hpp"
-#include "render/RenderResourceHandle.hpp"
 #include "utils/Utils.hpp"
 
 #include <vulkan/vulkan.hpp>
diff --git a/src/render/RenderResources.hpp b/src/render/RenderResources.hpp
index ad98b061..2bdaf5e7 100644
--- a/src/render/RenderResources.hpp
+++ b/src/render/RenderResources.hpp
@@ -2,7 +2,6 @@
 #define PROSPER_RENDER_RESOURCES_HPP
 
 #include "gfx/Resources.hpp"
-#include "gfx/RingBuffer.hpp"
 #include "render/RenderImageCollection.hpp"
 #include "render/RenderResourceCollection.hpp"
 #include "scene/DebugGeometry.hpp"
diff --git a/src/render/RenderTargets.hpp b/src/render/RenderTargets.hpp
index 33811f36..2a81434c 100644
--- a/src/render/RenderTargets.hpp
+++ b/src/render/RenderTargets.hpp
@@ -1,7 +1,6 @@
 #ifndef PROSPER_RENDER_TARGETS_HPP
 #define PROSPER_RENDER_TARGETS_HPP
 
-#include "Fwd.hpp"
 #include "RenderResourceHandle.hpp"
 
 #include <vulkan/vulkan.hpp>
diff --git a/src/render/RtReference.hpp b/src/render/RtReference.hpp
index 0aeaf153..bf624520 100644
--- a/src/render/RtReference.hpp
+++ b/src/render/RtReference.hpp
@@ -8,7 +8,6 @@
 #include "render/RenderResourceHandle.hpp"
 #include "scene/DrawType.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
 #include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
diff --git a/src/render/SkyboxRenderer.hpp b/src/render/SkyboxRenderer.hpp
index cafa72ff..df764a11 100644
--- a/src/render/SkyboxRenderer.hpp
+++ b/src/render/SkyboxRenderer.hpp
@@ -6,7 +6,6 @@
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/TemporalAntiAliasing.cpp b/src/render/TemporalAntiAliasing.cpp
index 6922b53f..017ce6c7 100644
--- a/src/render/TemporalAntiAliasing.cpp
+++ b/src/render/TemporalAntiAliasing.cpp
@@ -1,6 +1,5 @@
 #include "TemporalAntiAliasing.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/RenderResources.hpp"
 #include "render/RenderTargets.hpp"
 #include "render/Utils.hpp"
@@ -9,7 +8,6 @@
 #include "utils/Ui.hpp"
 #include "utils/Utils.hpp"
 
-#include <fstream>
 #include <glm/glm.hpp>
 #include <imgui.h>
 
diff --git a/src/render/TemporalAntiAliasing.hpp b/src/render/TemporalAntiAliasing.hpp
index d79946d9..1dbc8a99 100644
--- a/src/render/TemporalAntiAliasing.hpp
+++ b/src/render/TemporalAntiAliasing.hpp
@@ -2,13 +2,10 @@
 #define PROSPER_RENDER_TEMPORAL_ANTI_ALIASING_HPP
 
 #include "RenderResourceHandle.hpp"
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "scene/Fwd.hpp"
 #include "utils/ForEach.hpp"
-#include "utils/Fwd.hpp"
-#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/TextureDebug.cpp b/src/render/TextureDebug.cpp
index 6052985a..f0a5a464 100644
--- a/src/render/TextureDebug.cpp
+++ b/src/render/TextureDebug.cpp
@@ -1,6 +1,5 @@
 #include "TextureDebug.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/RenderResources.hpp"
 #include "utils/Hashes.hpp"
 #include "utils/Profiler.hpp"
@@ -8,7 +7,6 @@
 #include "utils/Utils.hpp"
 
 #include <algorithm>
-#include <fstream>
 #include <imgui.h>
 
 using namespace glm;
diff --git a/src/render/TextureDebug.hpp b/src/render/TextureDebug.hpp
index 9f74b03d..0d028675 100644
--- a/src/render/TextureDebug.hpp
+++ b/src/render/TextureDebug.hpp
@@ -8,7 +8,6 @@
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
 #include "utils/ForEach.hpp"
-#include "utils/Fwd.hpp"
 #include "utils/Utils.hpp"
 
 #include <glm/glm.hpp>
diff --git a/src/render/TextureReadback.cpp b/src/render/TextureReadback.cpp
index 5bf4359b..ec5c1343 100644
--- a/src/render/TextureReadback.cpp
+++ b/src/render/TextureReadback.cpp
@@ -1,6 +1,5 @@
 #include "TextureReadback.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/RenderResources.hpp"
 #include "utils/Profiler.hpp"
 
diff --git a/src/render/TextureReadback.hpp b/src/render/TextureReadback.hpp
index c731a259..33c4d99d 100644
--- a/src/render/TextureReadback.hpp
+++ b/src/render/TextureReadback.hpp
@@ -6,7 +6,6 @@
 #include "gfx/Resources.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
-#include "utils/Fwd.hpp"
 
 #include <glm/glm.hpp>
 #include <wheels/allocators/scoped_scratch.hpp>
diff --git a/src/render/ToneMap.cpp b/src/render/ToneMap.cpp
index 9eae66f7..4674beef 100644
--- a/src/render/ToneMap.cpp
+++ b/src/render/ToneMap.cpp
@@ -1,12 +1,10 @@
 #include "ToneMap.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/RenderResources.hpp"
 #include "render/Utils.hpp"
 #include "utils/Profiler.hpp"
 #include "utils/Utils.hpp"
 
-#include <fstream>
 #include <glm/glm.hpp>
 #include <imgui.h>
 
diff --git a/src/render/ToneMap.hpp b/src/render/ToneMap.hpp
index 9187379c..6bf2b39a 100644
--- a/src/render/ToneMap.hpp
+++ b/src/render/ToneMap.hpp
@@ -2,12 +2,9 @@
 #define PROSPER_RENDER_TONE_MAP_HPP
 
 #include "RenderResourceHandle.hpp"
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "scene/Texture.hpp"
-#include "utils/Fwd.hpp"
-#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/Utils.cpp b/src/render/Utils.cpp
index 1fdde6bb..3afcf92a 100644
--- a/src/render/Utils.cpp
+++ b/src/render/Utils.cpp
@@ -1,5 +1,6 @@
 #include "Utils.hpp"
 
+#include "render/RenderResources.hpp"
 #include "utils/Utils.hpp"
 
 vk::Extent2D getExtent2D(ImageHandle image)
diff --git a/src/render/Utils.hpp b/src/render/Utils.hpp
index 5e778d6c..fe8af2da 100644
--- a/src/render/Utils.hpp
+++ b/src/render/Utils.hpp
@@ -1,7 +1,7 @@
 #ifndef PROSPER_RENDER_UTILS_HPP
 #define PROSPER_RENDER_UTILS_HPP
 
-#include "RenderResources.hpp"
+#include "render/RenderResourceHandle.hpp"
 
 #include <vulkan/vulkan.hpp>
 
diff --git a/src/render/dof/DepthOfField.hpp b/src/render/dof/DepthOfField.hpp
index 014e8c4d..699b4803 100644
--- a/src/render/dof/DepthOfField.hpp
+++ b/src/render/dof/DepthOfField.hpp
@@ -1,9 +1,6 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_HPP
 
-#include "gfx/Fwd.hpp"
-#include "render/Fwd.hpp"
-#include "render/RenderResourceHandle.hpp"
 #include "render/dof/DepthOfFieldCombine.hpp"
 #include "render/dof/DepthOfFieldDilate.hpp"
 #include "render/dof/DepthOfFieldFilter.hpp"
@@ -12,8 +9,6 @@
 #include "render/dof/DepthOfFieldReduce.hpp"
 #include "render/dof/DepthOfFieldSetup.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
-#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/dof/DepthOfFieldCombine.cpp b/src/render/dof/DepthOfFieldCombine.cpp
index 5b6848cc..a4bd3318 100644
--- a/src/render/dof/DepthOfFieldCombine.cpp
+++ b/src/render/dof/DepthOfFieldCombine.cpp
@@ -1,12 +1,9 @@
 #include "DepthOfFieldCombine.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/RenderResources.hpp"
 #include "render/RenderTargets.hpp"
 #include "render/Utils.hpp"
-#include "scene/Camera.hpp"
 #include "utils/Profiler.hpp"
-#include "utils/Utils.hpp"
 
 #include <imgui.h>
 
diff --git a/src/render/dof/DepthOfFieldCombine.hpp b/src/render/dof/DepthOfFieldCombine.hpp
index 4c6d9d4d..be62558d 100644
--- a/src/render/dof/DepthOfFieldCombine.hpp
+++ b/src/render/dof/DepthOfFieldCombine.hpp
@@ -1,13 +1,9 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_COMBINE_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_COMBINE_HPP
 
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
-#include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
-#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/dof/DepthOfFieldDilate.cpp b/src/render/dof/DepthOfFieldDilate.cpp
index 7131eba1..925712e3 100644
--- a/src/render/dof/DepthOfFieldDilate.cpp
+++ b/src/render/dof/DepthOfFieldDilate.cpp
@@ -1,6 +1,5 @@
 #include "DepthOfFieldDilate.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/RenderResources.hpp"
 #include "render/Utils.hpp"
 #include "render/dof/DepthOfField.hpp"
diff --git a/src/render/dof/DepthOfFieldDilate.hpp b/src/render/dof/DepthOfFieldDilate.hpp
index 00fe8748..d809df10 100644
--- a/src/render/dof/DepthOfFieldDilate.hpp
+++ b/src/render/dof/DepthOfFieldDilate.hpp
@@ -1,13 +1,10 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_DILATE_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_DILATE_HPP
 
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
-#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/dof/DepthOfFieldFilter.cpp b/src/render/dof/DepthOfFieldFilter.cpp
index 9237f00b..9835562b 100644
--- a/src/render/dof/DepthOfFieldFilter.cpp
+++ b/src/render/dof/DepthOfFieldFilter.cpp
@@ -1,9 +1,7 @@
 #include "DepthOfFieldFilter.hpp"
 
 #include "render/RenderResources.hpp"
-#include "render/RenderTargets.hpp"
 #include "utils/Profiler.hpp"
-#include "utils/Utils.hpp"
 
 using namespace glm;
 using namespace wheels;
diff --git a/src/render/dof/DepthOfFieldFilter.hpp b/src/render/dof/DepthOfFieldFilter.hpp
index 36cb0c0f..85df9057 100644
--- a/src/render/dof/DepthOfFieldFilter.hpp
+++ b/src/render/dof/DepthOfFieldFilter.hpp
@@ -1,12 +1,9 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_FILTER_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_FILTER_HPP
 
-#include "gfx/Fwd.hpp"
-#include "gfx/Resources.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
-#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 
diff --git a/src/render/dof/DepthOfFieldFlatten.cpp b/src/render/dof/DepthOfFieldFlatten.cpp
index 5008c12c..e661fc0a 100644
--- a/src/render/dof/DepthOfFieldFlatten.cpp
+++ b/src/render/dof/DepthOfFieldFlatten.cpp
@@ -1,6 +1,6 @@
 #include "DepthOfFieldFlatten.hpp"
 
-#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
 #include "render/Utils.hpp"
 #include "utils/Profiler.hpp"
 #include "utils/Utils.hpp"
diff --git a/src/render/dof/DepthOfFieldFlatten.hpp b/src/render/dof/DepthOfFieldFlatten.hpp
index af4c13c3..a3cc4a34 100644
--- a/src/render/dof/DepthOfFieldFlatten.hpp
+++ b/src/render/dof/DepthOfFieldFlatten.hpp
@@ -1,12 +1,9 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_FLATTEN_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_FLATTEN_HPP
 
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
-#include "utils/Fwd.hpp"
-#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/dof/DepthOfFieldGather.cpp b/src/render/dof/DepthOfFieldGather.cpp
index 7237dbc9..d4190708 100644
--- a/src/render/dof/DepthOfFieldGather.cpp
+++ b/src/render/dof/DepthOfFieldGather.cpp
@@ -1,10 +1,7 @@
 #include "DepthOfFieldGather.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/RenderResources.hpp"
-#include "render/RenderTargets.hpp"
 #include "render/Utils.hpp"
-#include "scene/Camera.hpp"
 #include "utils/Profiler.hpp"
 #include "utils/Utils.hpp"
 
diff --git a/src/render/dof/DepthOfFieldGather.hpp b/src/render/dof/DepthOfFieldGather.hpp
index f0c56c37..66e3b973 100644
--- a/src/render/dof/DepthOfFieldGather.hpp
+++ b/src/render/dof/DepthOfFieldGather.hpp
@@ -1,13 +1,9 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_GATHER_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_GATHER_HPP
 
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
-#include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
-#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/dof/DepthOfFieldReduce.cpp b/src/render/dof/DepthOfFieldReduce.cpp
index 9f8175f7..23cd8b11 100644
--- a/src/render/dof/DepthOfFieldReduce.cpp
+++ b/src/render/dof/DepthOfFieldReduce.cpp
@@ -1,9 +1,6 @@
 #include "DepthOfFieldReduce.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/RenderResources.hpp"
-#include "render/RenderTargets.hpp"
-#include "scene/Camera.hpp"
 #include "utils/Profiler.hpp"
 #include "utils/Utils.hpp"
 
diff --git a/src/render/dof/DepthOfFieldReduce.hpp b/src/render/dof/DepthOfFieldReduce.hpp
index 4f75fc67..f4de6d38 100644
--- a/src/render/dof/DepthOfFieldReduce.hpp
+++ b/src/render/dof/DepthOfFieldReduce.hpp
@@ -6,8 +6,6 @@
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
-#include "utils/Fwd.hpp"
-#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/dof/DepthOfFieldSetup.cpp b/src/render/dof/DepthOfFieldSetup.cpp
index 9f06b632..f957bd3c 100644
--- a/src/render/dof/DepthOfFieldSetup.cpp
+++ b/src/render/dof/DepthOfFieldSetup.cpp
@@ -1,6 +1,5 @@
 #include "DepthOfFieldSetup.hpp"
 
-#include "gfx/VkUtils.hpp"
 #include "render/RenderResources.hpp"
 #include "render/RenderTargets.hpp"
 #include "render/Utils.hpp"
diff --git a/src/render/dof/DepthOfFieldSetup.hpp b/src/render/dof/DepthOfFieldSetup.hpp
index 56b67cb8..75d65635 100644
--- a/src/render/dof/DepthOfFieldSetup.hpp
+++ b/src/render/dof/DepthOfFieldSetup.hpp
@@ -1,13 +1,10 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_SETUP_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_SETUP_HPP
 
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
-#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/rtdi/RtDiInitialReservoirs.hpp b/src/render/rtdi/RtDiInitialReservoirs.hpp
index c100b716..8e57feb6 100644
--- a/src/render/rtdi/RtDiInitialReservoirs.hpp
+++ b/src/render/rtdi/RtDiInitialReservoirs.hpp
@@ -1,12 +1,10 @@
 #ifndef PROSPER_RENDER_RTDI_INITIAL_RESERVOIRS_HPP
 #define PROSPER_RENDER_RTDI_INITIAL_RESERVOIRS_HPP
 
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/rtdi/RtDiSpatialReuse.hpp b/src/render/rtdi/RtDiSpatialReuse.hpp
index 51105b08..ad840cb0 100644
--- a/src/render/rtdi/RtDiSpatialReuse.hpp
+++ b/src/render/rtdi/RtDiSpatialReuse.hpp
@@ -1,12 +1,10 @@
 #ifndef PROSPER_RENDER_RTDI_SPATIAL_REUSE_HPP
 #define PROSPER_RENDER_RTDI_SPATIAL_REUSE_HPP
 
-#include "gfx/Fwd.hpp"
 #include "render/ComputePass.hpp"
 #include "render/Fwd.hpp"
 #include "render/RenderResourceHandle.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/rtdi/RtDiTrace.hpp b/src/render/rtdi/RtDiTrace.hpp
index 7840b3c5..c417a566 100644
--- a/src/render/rtdi/RtDiTrace.hpp
+++ b/src/render/rtdi/RtDiTrace.hpp
@@ -8,7 +8,7 @@
 #include "render/RenderResourceHandle.hpp"
 #include "scene/DrawType.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/rtdi/RtDirectIllumination.hpp b/src/render/rtdi/RtDirectIllumination.hpp
index 36051810..caaa14ae 100644
--- a/src/render/rtdi/RtDirectIllumination.hpp
+++ b/src/render/rtdi/RtDirectIllumination.hpp
@@ -2,14 +2,11 @@
 #define PROSPER_RENDER_RTDI_RT_DIRECT_ILLUMINATION_HPP
 
 #include "RtDiTrace.hpp"
-#include "gfx/Fwd.hpp"
 #include "render/Fwd.hpp"
-#include "render/RenderResourceHandle.hpp"
 #include "render/rtdi/RtDiInitialReservoirs.hpp"
 #include "render/rtdi/RtDiSpatialReuse.hpp"
 #include "scene/DrawType.hpp"
 #include "scene/Fwd.hpp"
-#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/scene/Camera.cpp b/src/scene/Camera.cpp
index 774c5f5a..2ac360f7 100644
--- a/src/scene/Camera.cpp
+++ b/src/scene/Camera.cpp
@@ -8,7 +8,6 @@
 
 #include <glm/gtc/matrix_access.hpp>
 #include <imgui.h>
-#include <iostream>
 
 using namespace glm;
 using namespace wheels;
diff --git a/src/scene/Camera.hpp b/src/scene/Camera.hpp
index 3ab00c2c..a4593f8c 100644
--- a/src/scene/Camera.hpp
+++ b/src/scene/Camera.hpp
@@ -3,7 +3,6 @@
 
 #include "gfx/Fwd.hpp"
 #include "gfx/ShaderReflection.hpp"
-#include "utils/Utils.hpp"
 
 #include <glm/glm.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/scene/DeferredLoadingContext.hpp b/src/scene/DeferredLoadingContext.hpp
index 7304e1d2..cbecd1d7 100644
--- a/src/scene/DeferredLoadingContext.hpp
+++ b/src/scene/DeferredLoadingContext.hpp
@@ -9,11 +9,9 @@
 #include "scene/Fwd.hpp"
 #include "scene/Material.hpp"
 #include "utils/Timer.hpp"
-#include "utils/Utils.hpp"
 
 #include <atomic>
 #include <cgltf.h>
-#include <condition_variable>
 #include <filesystem>
 #include <glm/glm.hpp>
 #include <mutex>
@@ -24,6 +22,7 @@
 #include <wheels/containers/optional.hpp>
 #include <wheels/containers/pair.hpp>
 #include <wheels/containers/static_array.hpp>
+#include <wheels/containers/string.hpp>
 
 enum class IndicesType
 {
diff --git a/src/scene/Mesh.hpp b/src/scene/Mesh.hpp
index 75874322..b8698dc6 100644
--- a/src/scene/Mesh.hpp
+++ b/src/scene/Mesh.hpp
@@ -1,7 +1,8 @@
 #ifndef PROSPER_SCENE_MESH_HPP
 #define PROSPER_SCENE_MESH_HPP
 
-#include "gfx/Resources.hpp"
+#include <cstdint>
+#include <vulkan/vulkan.hpp>
 
 constexpr vk::Format sVertexPositionFormat = vk::Format::eR16G16B16A16Sfloat;
 constexpr uint32_t sVertexPositionByteSize = 8;
diff --git a/src/scene/WorldData.cpp b/src/scene/WorldData.cpp
index 49afedd5..4e379066 100644
--- a/src/scene/WorldData.cpp
+++ b/src/scene/WorldData.cpp
@@ -2,6 +2,7 @@
 
 #include "gfx/Device.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Profiler.hpp"
 
 #include <cstdio>
 #include <glm/gtc/type_ptr.hpp>
diff --git a/src/scene/WorldData.hpp b/src/scene/WorldData.hpp
index cacd50a4..b37a51a5 100644
--- a/src/scene/WorldData.hpp
+++ b/src/scene/WorldData.hpp
@@ -13,7 +13,6 @@
 #include "scene/Model.hpp"
 #include "scene/Scene.hpp"
 #include "scene/WorldRenderStructs.hpp"
-#include "utils/Profiler.hpp"
 
 #include <cstdint>
 #include <wheels/allocators/allocator.hpp>
diff --git a/src/scene/WorldRenderStructs.hpp b/src/scene/WorldRenderStructs.hpp
index d6df8975..cfb32b23 100644
--- a/src/scene/WorldRenderStructs.hpp
+++ b/src/scene/WorldRenderStructs.hpp
@@ -3,6 +3,7 @@
 
 #include "gfx/Resources.hpp"
 #include "scene/Texture.hpp"
+#include "utils/Utils.hpp"
 
 #include <cstdint>
 #include <vulkan/vulkan.hpp>
diff --git a/src/utils/Dds.cpp b/src/utils/Dds.cpp
index b023c1b2..ed993a96 100644
--- a/src/utils/Dds.cpp
+++ b/src/utils/Dds.cpp
@@ -4,7 +4,6 @@
 
 #include <fstream>
 #include <iostream>
-#include <string>
 
 using namespace wheels;
 
diff --git a/src/utils/Hashes.hpp b/src/utils/Hashes.hpp
index 8c9d6f85..d6617960 100644
--- a/src/utils/Hashes.hpp
+++ b/src/utils/Hashes.hpp
@@ -1,6 +1,10 @@
 #ifndef PROSPER_UTILS_HASHES_HPP
 #define PROSPER_UTILS_HASHES_HPP
 
+// include-cleaner can't figure out when HashMap/HashSet require these
+// implementations
+// IWYU pragma: always_keep
+
 #include <filesystem>
 #include <wheels/containers/hash.hpp>
 #include <wheels/containers/span.hpp>