diff --git a/betterRenderer/mashadercompiler/src/shader_compiler.cpp b/betterRenderer/mashadercompiler/src/shader_compiler.cpp
index 6a6188e3..4b2553cf 100644
--- a/betterRenderer/mashadercompiler/src/shader_compiler.cpp
+++ b/betterRenderer/mashadercompiler/src/shader_compiler.cpp
@@ -1,15 +1,15 @@
-#include "shader_compiler.hpp"
-
-#include <fstream>
-#include <iostream>
-
-#include "utils.hpp"
 #include <cstdint>
 #include <filesystem>
+#include <fstream>
+#include <iostream>
 #include <string>
 #include <tuple>
 #include <unordered_map>
 #include <vector>
+#include "shader_compiler.hpp"
+
+
+#include "utils.hpp"
 
 int MaShaderCompiler::Run() {
   ParseOptions();
diff --git a/betterRenderer/mashadercompiler/src/shader_compiler.hpp b/betterRenderer/mashadercompiler/src/shader_compiler.hpp
index 12af5b0f..90598990 100644
--- a/betterRenderer/mashadercompiler/src/shader_compiler.hpp
+++ b/betterRenderer/mashadercompiler/src/shader_compiler.hpp
@@ -1,9 +1,12 @@
 #pragma once
 
+#include <filesystem>
+#include <string>
+#include <tuple>
+#include <vector>
 #include <nvrhi/nvrhi.h>
 #include <yaml-cpp/yaml.h>
 
-#include <filesystem>
 
 #ifndef _WIN32
 #include <WinAdapter.h>
@@ -11,9 +14,6 @@
 #include <Windows.h>
 #endif
 #include <dxcapi.h>
-#include <string>
-#include <tuple>
-#include <vector>
 
 template <typename T>
 using RefCountPtr = nvrhi::RefCountPtr<T>;
diff --git a/betterRenderer/mashadercompiler/src/utils.hpp b/betterRenderer/mashadercompiler/src/utils.hpp
index 0dd83aa9..8331c674 100644
--- a/betterRenderer/mashadercompiler/src/utils.hpp
+++ b/betterRenderer/mashadercompiler/src/utils.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
+#include <cstdint>
+#include <string>
 #include <yaml-cpp/yaml.h>
 
-#include <string>
-#include <cstdint>
 
 inline std::wstring ToWide(const std::string& str) {
   std::wstring wstr{};
diff --git a/betterRenderer/renderer/include/nvrenderer/nvrenderer.h b/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
index e41757bf..ada815f5 100644
--- a/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
+++ b/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
@@ -1,10 +1,23 @@
 #pragma once
 
 //STL includes required by EU07 includes
+#include <array>
+#include <condition_variable>
+#include <cstddef>
+#include <cstdint>
 #include <deque>
-#include <stdexcept>
+#include <functional>
+#include <future>
 #include <memory>
+#include <mutex>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
 #include <variant>
+#include <vector>
 #include <math.h>
 
 // OpenGL includes required by EU07 includes
@@ -18,23 +31,10 @@
 #include <yaml-cpp/yaml.h>
 
 #include <entt/container/dense_map.hpp>
-#include <future>
-#include <mutex>
 
 // EU07 includes. This header is consumed by translation units that include
 // nothing else, so everything it names has to be imported here rather than
 // relied on to arrive from the including file.
-#include <array>
-#include <condition_variable>
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <optional>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-#include <vector>
 
 #include "nvrenderer_enums.h"
 #include "quadtree.h"
diff --git a/betterRenderer/renderer/include/nvrenderer/resource_registry.h b/betterRenderer/renderer/include/nvrenderer/resource_registry.h
index 2199f231..3ee802fa 100644
--- a/betterRenderer/renderer/include/nvrenderer/resource_registry.h
+++ b/betterRenderer/renderer/include/nvrenderer/resource_registry.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <nvrhi/nvrhi.h>
-
-#include <entt/entt.hpp>
 #include <cstddef>
 #include <cstdint>
 #include <memory>
+#include <nvrhi/nvrhi.h>
+
+#include <entt/entt.hpp>
 
 import eu07.glm;
 class NvTextureManager;
diff --git a/betterRenderer/renderer/source/auto_exposure.cpp b/betterRenderer/renderer/source/auto_exposure.cpp
index e3317a02..44b662ab 100644
--- a/betterRenderer/renderer/source/auto_exposure.cpp
+++ b/betterRenderer/renderer/source/auto_exposure.cpp
@@ -1,3 +1,4 @@
+#include <cstdint>
 #include "auto_exposure.h"
 
 #include <nvrhi/utils.h>
@@ -5,7 +6,6 @@
 #include "config.h"
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
-#include <cstdint>
 
 MaAutoExposure::MaAutoExposure(NvRenderer *renderer)
     : MaResourceRegistry(renderer), m_backend(renderer->GetBackend()) {}
diff --git a/betterRenderer/renderer/source/auto_exposure.h b/betterRenderer/renderer/source/auto_exposure.h
index db77f069..c7b6c879 100644
--- a/betterRenderer/renderer/source/auto_exposure.h
+++ b/betterRenderer/renderer/source/auto_exposure.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include <cstdint>
 #include "nvrenderer/resource_registry.h"
 
 #include <nvrhi/nvrhi.h>
-#include <cstdint>
 
 class NvRenderer;
 class NvRendererBackend;
diff --git a/betterRenderer/renderer/source/bloom.h b/betterRenderer/renderer/source/bloom.h
index b7970b12..d1e5cf2e 100644
--- a/betterRenderer/renderer/source/bloom.h
+++ b/betterRenderer/renderer/source/bloom.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <nvrhi/nvrhi.h>
 #include <vector>
+#include <nvrhi/nvrhi.h>
 
 import eu07.glm;
 struct Bloom {
diff --git a/betterRenderer/renderer/source/config.cpp b/betterRenderer/renderer/source/config.cpp
index 96584dd3..14e8e34c 100644
--- a/betterRenderer/renderer/source/config.cpp
+++ b/betterRenderer/renderer/source/config.cpp
@@ -1,10 +1,10 @@
+#include <filesystem>
+#include <string>
+#include <vector>
 #include "config.h"
 
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
-#include <filesystem>
-#include <string>
-#include <vector>
 
 void MaConfig::Init(const std::filesystem::path& config_file) {
   Init(YAML::LoadFile(config_file.generic_string()));
diff --git a/betterRenderer/renderer/source/config.h b/betterRenderer/renderer/source/config.h
index 346e1dad..226b2d6c 100644
--- a/betterRenderer/renderer/source/config.h
+++ b/betterRenderer/renderer/source/config.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <yaml-cpp/yaml.h>
-
-#include <filesystem>
 #include <array>
+#include <filesystem>
 #include <string>
 #include <vector>
+#include <yaml-cpp/yaml.h>
+
 
 struct MaConfig {
   enum MaTonemapType { Default_Srgb = 0, Linear_Rec2020 };
diff --git a/betterRenderer/renderer/source/contactshadows.cpp b/betterRenderer/renderer/source/contactshadows.cpp
index 1630d4ef..a21f17eb 100644
--- a/betterRenderer/renderer/source/contactshadows.cpp
+++ b/betterRenderer/renderer/source/contactshadows.cpp
@@ -1,3 +1,4 @@
+#include <cstdint>
 #include "contactshadows.h"
 
 #include <nvrhi/utils.h>
@@ -5,7 +6,6 @@
 #include "gbuffer.h"
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
-#include <cstdint>
 
 MaContactShadows::MaContactShadows(NvRenderer* renderer, NvGbuffer* gbuffer)
     : m_backend(renderer->GetBackend()),
diff --git a/betterRenderer/renderer/source/contactshadows.h b/betterRenderer/renderer/source/contactshadows.h
index e69a0aab..52859c8a 100644
--- a/betterRenderer/renderer/source/contactshadows.h
+++ b/betterRenderer/renderer/source/contactshadows.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <nvrhi/nvrhi.h>
 #include <cstdint>
+#include <nvrhi/nvrhi.h>
 
 import eu07.glm;
 struct MaContactShadows {
diff --git a/betterRenderer/renderer/source/csm.cpp b/betterRenderer/renderer/source/csm.cpp
index ccd799ac..019b358d 100644
--- a/betterRenderer/renderer/source/csm.cpp
+++ b/betterRenderer/renderer/source/csm.cpp
@@ -1,3 +1,5 @@
+#include <limits>
+#include <vector>
 #include "csm.h"
 
 #include <nvrhi/utils.h>
@@ -5,8 +7,6 @@
 #include "config.h"
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
-#include <limits>
-#include <vector>
 
 MaShadowMap::MaShadowMap(NvRenderer* renderer)
     : MaResourceRegistry(renderer), m_backend(renderer->m_backend.get()) {}
diff --git a/betterRenderer/renderer/source/csm.h b/betterRenderer/renderer/source/csm.h
index 4a7a0359..e614a346 100644
--- a/betterRenderer/renderer/source/csm.h
+++ b/betterRenderer/renderer/source/csm.h
@@ -1,10 +1,10 @@
 #pragma once
 
+#include <array>
+#include <vector>
 #include <nvrhi/nvrhi.h>
 
 #include "nvrenderer/resource_registry.h"
-#include <array>
-#include <vector>
 
 struct MaShadowMap : public MaResourceRegistry {
   MaShadowMap(class NvRenderer* renderer);
diff --git a/betterRenderer/renderer/source/environment.cpp b/betterRenderer/renderer/source/environment.cpp
index baab5960..85cc6c3c 100644
--- a/betterRenderer/renderer/source/environment.cpp
+++ b/betterRenderer/renderer/source/environment.cpp
@@ -1,3 +1,9 @@
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
 #include "environment.h"
 
 #include <fmt/format.h>
@@ -8,12 +14,6 @@
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
 #include "nvtexture.h"
-#include <cstddef>
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
 #include "sky.h"
 
 import eu07.simulation.simulationenvironment;
diff --git a/betterRenderer/renderer/source/environment.h b/betterRenderer/renderer/source/environment.h
index df5fdd6b..cc34c0f6 100644
--- a/betterRenderer/renderer/source/environment.h
+++ b/betterRenderer/renderer/source/environment.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "fullscreenpass.h"
-#include "nvrenderer/resource_registry.h"
-#include "nvrhi/nvrhi.h"
 #include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <string>
+#include "fullscreenpass.h"
+#include "nvrenderer/resource_registry.h"
+#include "nvrhi/nvrhi.h"
 
 struct MaEnvironment : public MaResourceRegistry {
   nvrhi::TextureHandle m_skybox;
diff --git a/betterRenderer/renderer/source/fsr.cpp b/betterRenderer/renderer/source/fsr.cpp
index cecfb8f2..076b9fcd 100644
--- a/betterRenderer/renderer/source/fsr.cpp
+++ b/betterRenderer/renderer/source/fsr.cpp
@@ -1,3 +1,4 @@
+#include <queue>
 #include "fsr.h"
 
 #if LIBMANUL_WITH_D3D12
@@ -16,7 +17,6 @@
 #include "utilities/Globals_macros.h"
 #include "gbuffer.h"
 #include "gbufferblitpass.h"
-#include <queue>
 
 import eu07.utilities.globals;
 import eu07.glm;
diff --git a/betterRenderer/renderer/source/fsr.h b/betterRenderer/renderer/source/fsr.h
index 41ffb72e..f6c9c1fe 100644
--- a/betterRenderer/renderer/source/fsr.h
+++ b/betterRenderer/renderer/source/fsr.h
@@ -1,10 +1,10 @@
 #pragma once
 
+#include <cstddef>
+#include <string>
 #include <ffx-fsr2-api/ffx_fsr2.h>
 
 #include "nvrendererbackend.h"
-#include <cstddef>
-#include <string>
 
 import eu07.glm;
 struct NvFSR {
diff --git a/betterRenderer/renderer/source/gbuffer.cpp b/betterRenderer/renderer/source/gbuffer.cpp
index b3f58fe3..a1d11929 100644
--- a/betterRenderer/renderer/source/gbuffer.cpp
+++ b/betterRenderer/renderer/source/gbuffer.cpp
@@ -1,10 +1,10 @@
+#include <cstdint>
 #include "gbuffer.h"
 
 #include <nvrhi/utils.h>
 
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
-#include <cstdint>
 
 NvGbuffer::NvGbuffer(NvRenderer* renderer)
     : m_backend(renderer->m_backend.get()) {}
diff --git a/betterRenderer/renderer/source/gbuffer.h b/betterRenderer/renderer/source/gbuffer.h
index 537c2ab8..a73dfe2a 100644
--- a/betterRenderer/renderer/source/gbuffer.h
+++ b/betterRenderer/renderer/source/gbuffer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <nvrhi/nvrhi.h>
 #include <cstdint>
 #include <vector>
+#include <nvrhi/nvrhi.h>
 
 struct NvGbuffer {
   NvGbuffer(class NvRenderer* renderer);
diff --git a/betterRenderer/renderer/source/gbufferblitpass.cpp b/betterRenderer/renderer/source/gbufferblitpass.cpp
index d9337380..d6a9f442 100644
--- a/betterRenderer/renderer/source/gbufferblitpass.cpp
+++ b/betterRenderer/renderer/source/gbufferblitpass.cpp
@@ -1,6 +1,6 @@
+#include <chrono>
 #include "gbufferblitpass.h"
 
-#include <chrono>
 #include <nvrhi/utils.h>
 
 #include "contactshadows.h"
diff --git a/betterRenderer/renderer/source/gbufferlighting.cpp b/betterRenderer/renderer/source/gbufferlighting.cpp
index b8434bcf..b886014c 100644
--- a/betterRenderer/renderer/source/gbufferlighting.cpp
+++ b/betterRenderer/renderer/source/gbufferlighting.cpp
@@ -1,3 +1,4 @@
+#include <cstdint>
 #include "gbufferlighting.h"
 
 #include <nvrhi/utils.h>
@@ -7,7 +8,6 @@
 #include "nvrendererbackend.h"
 #include "ssao.h"
 #include "config.h"
-#include <cstdint>
 
 import eu07.glm;
 void GbufferLighting::Init() {
diff --git a/betterRenderer/renderer/source/gbufferlighting.h b/betterRenderer/renderer/source/gbufferlighting.h
index cf62bf94..cebe3052 100644
--- a/betterRenderer/renderer/source/gbufferlighting.h
+++ b/betterRenderer/renderer/source/gbufferlighting.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <nvrenderer/nvrenderer.h>
-#include <nvrhi/nvrhi.h>
 #include <cstddef>
 #include <cstdint>
 #include <vector>
+#include <nvrenderer/nvrenderer.h>
+#include <nvrhi/nvrhi.h>
 
 
 import eu07.glm;
diff --git a/betterRenderer/renderer/source/imgui_nvrhi.cpp b/betterRenderer/renderer/source/imgui_nvrhi.cpp
index 26ddf495..25ecfa26 100644
--- a/betterRenderer/renderer/source/imgui_nvrhi.cpp
+++ b/betterRenderer/renderer/source/imgui_nvrhi.cpp
@@ -44,6 +44,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#include <cstdint>
 #include <stddef.h>
 
 #include <imgui.h>
@@ -53,7 +54,6 @@ SOFTWARE.
 #include "imgui_nvrhi.h"
 #include "nvrendererbackend.h"
 #include "config.h"
-#include <cstdint>
 
 struct VERTEX_CONSTANT_BUFFER
 {
diff --git a/betterRenderer/renderer/source/imgui_nvrhi.h b/betterRenderer/renderer/source/imgui_nvrhi.h
index 4d232796..4c8b7f6c 100644
--- a/betterRenderer/renderer/source/imgui_nvrhi.h
+++ b/betterRenderer/renderer/source/imgui_nvrhi.h
@@ -46,16 +46,16 @@ SOFTWARE.
 
 #pragma once
 
+#include <cstddef>
 #include <memory>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 #include <stdint.h>
 
 #include <nvrhi/nvrhi.h>
 
 #include <imgui/imgui.h>
 #include "nvtexture.h"
-#include <cstddef>
 
 struct ImGui_NVRHI
 {
diff --git a/betterRenderer/renderer/source/instancecache.h b/betterRenderer/renderer/source/instancecache.h
index a26e0b83..e0193dde 100644
--- a/betterRenderer/renderer/source/instancecache.h
+++ b/betterRenderer/renderer/source/instancecache.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "nvrenderer/nvrenderer.h"
 #include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <unordered_map>
 #include <vector>
+#include "nvrenderer/nvrenderer.h"
 
 struct InstanceCacheId {
   gfx::geometry_handle m_geometry;
diff --git a/betterRenderer/renderer/source/ma_dds.cpp b/betterRenderer/renderer/source/ma_dds.cpp
index 93a48da0..8fb8639a 100644
--- a/betterRenderer/renderer/source/ma_dds.cpp
+++ b/betterRenderer/renderer/source/ma_dds.cpp
@@ -1,11 +1,11 @@
-#include "ddspp/ddspp.h"
-#include "nvtexture.h"
-
-#include <sstream>
 #include <cstddef>
 #include <cstdint>
 #include <ios>
+#include <sstream>
 #include <string>
+#include "ddspp/ddspp.h"
+#include "nvtexture.h"
+
 
 bool NvTexture::LoadDDS(std::string &data, int size_bias) {
   ddspp::Descriptor desc{};
diff --git a/betterRenderer/renderer/source/materialparser.cpp b/betterRenderer/renderer/source/materialparser.cpp
index f7df2e6f..4264caf8 100644
--- a/betterRenderer/renderer/source/materialparser.cpp
+++ b/betterRenderer/renderer/source/materialparser.cpp
@@ -1,17 +1,17 @@
+#include <filesystem>
+#include <memory>
+#include <optional>
+#include <sstream>
+#include <string>
+#include <utility>
 #include "materialparser.h"
 
 #include "nvrenderer/nvrenderer.h"
 
 #include "utilities/Globals_macros.h"
-#include <memory>
-#include <optional>
-#include <sstream>
-#include <utility>
 #include <fmt/format.h>
 #include "utilities/utilities_macros.h"
 #include <yaml-cpp/yaml.h>
-#include <string>
-#include <filesystem>
 
 import eu07.utilities.globals;
 import eu07.utilities.logs;
diff --git a/betterRenderer/renderer/source/materialparser.h b/betterRenderer/renderer/source/materialparser.h
index c296e58d..3efe3f07 100644
--- a/betterRenderer/renderer/source/materialparser.h
+++ b/betterRenderer/renderer/source/materialparser.h
@@ -1,12 +1,11 @@
 #pragma once
 
 #include <memory>
-#include <string>
-#include <string_view>
 #include <optional>
-#include <unordered_map>
-
 #include <string>
+#include <unordered_map>
+#include <string_view>
+
 
 import eu07.glm;
 struct MaterialAdapterInternal {
diff --git a/betterRenderer/renderer/source/nvmaterial.cpp b/betterRenderer/renderer/source/nvmaterial.cpp
index bbb00817..6d583ec9 100644
--- a/betterRenderer/renderer/source/nvmaterial.cpp
+++ b/betterRenderer/renderer/source/nvmaterial.cpp
@@ -1,15 +1,15 @@
-#include "nvmaterial.h"
-#include "nvrenderer/nvrenderer.h"
-
-#include <fmt/format.h>
-#include <nvrhi/utils.h>
-
 #include <array>
 #include <cstddef>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include "nvmaterial.h"
+#include "nvrenderer/nvrenderer.h"
+
+#include <fmt/format.h>
+#include <nvrhi/utils.h>
+
 #include "csm.h"
 #include "environment.h"
 #include "gbuffer.h"
diff --git a/betterRenderer/renderer/source/nvrenderer.cpp b/betterRenderer/renderer/source/nvrenderer.cpp
index 11a54113..4eb084f9 100644
--- a/betterRenderer/renderer/source/nvrenderer.cpp
+++ b/betterRenderer/renderer/source/nvrenderer.cpp
@@ -1,9 +1,8 @@
-#include "nvrenderer/nvrenderer.h"
-
-#include <array>
+#include <array>
 #include <cstddef>
 #include <cstdint>
 #include <functional>
+#include <future>
 #include <limits>
 #include <memory>
 #include <mutex>
@@ -11,8 +10,9 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include "nvrenderer/nvrenderer.h"
+
 #include <nvrhi/utils.h>
-#include <future>
 #include "auto_exposure.h"
 #include "bloom.h"
 #include "config.h"
diff --git a/betterRenderer/renderer/source/nvrenderer_d3d12.cpp b/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
index f39c62e4..2890a98a 100644
--- a/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
+++ b/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
@@ -1,12 +1,12 @@
+#include <fstream>
+#include <ios>
+#include <memory>
+#include <string>
 #include "nvrenderer_d3d12.h"
 
 #include <fmt/format.h>
 
 #include "utilities/Globals_macros.h"
-#include <fstream>
-#include <ios>
-#include <memory>
-#include <string>
 #include "config.h"
 #include "nvrenderer/nvrenderer.h"
 
diff --git a/betterRenderer/renderer/source/nvrenderer_d3d12.h b/betterRenderer/renderer/source/nvrenderer_d3d12.h
index 26c75be4..761113f5 100644
--- a/betterRenderer/renderer/source/nvrenderer_d3d12.h
+++ b/betterRenderer/renderer/source/nvrenderer_d3d12.h
@@ -1,11 +1,11 @@
 #pragma once
 
+#include <string>
+#include <vector>
 #include <nvrhi/nvrhi.h>
 
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
-#include <string>
-#include <vector>
 
 #if LIBMANUL_WITH_D3D12
 
diff --git a/betterRenderer/renderer/source/nvrenderer_imgui.h b/betterRenderer/renderer/source/nvrenderer_imgui.h
index 151c4a39..52aa9d5d 100644
--- a/betterRenderer/renderer/source/nvrenderer_imgui.h
+++ b/betterRenderer/renderer/source/nvrenderer_imgui.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <memory>
 #include "imgui_nvrhi.h"
 #include "nvrenderer/nvrenderer.h"
-#include <memory>
 
 class NvImguiRenderer : public imgui_renderer {
   virtual bool Init() override;
diff --git a/betterRenderer/renderer/source/nvrenderer_vulkan.cpp b/betterRenderer/renderer/source/nvrenderer_vulkan.cpp
index feadb545..ab9f3be4 100644
--- a/betterRenderer/renderer/source/nvrenderer_vulkan.cpp
+++ b/betterRenderer/renderer/source/nvrenderer_vulkan.cpp
@@ -1,9 +1,3 @@
-#include "nvrenderer_vulkan.h"
-
-#include <GLFW/glfw3.h>
-#include <fmt/format.h>
-
-#include "utilities/Globals_macros.h"
 #include <cstddef>
 #include <cstdint>
 #include <iostream>
@@ -14,6 +8,12 @@
 #include <string>
 #include <unordered_set>
 #include <vector>
+#include "nvrenderer_vulkan.h"
+
+#include <GLFW/glfw3.h>
+#include <fmt/format.h>
+
+#include "utilities/Globals_macros.h"
 #include "config.h"
 #include "nvrenderer/nvrenderer.h"
 
diff --git a/betterRenderer/renderer/source/nvrenderer_vulkan.h b/betterRenderer/renderer/source/nvrenderer_vulkan.h
index 696738d2..57a10070 100644
--- a/betterRenderer/renderer/source/nvrenderer_vulkan.h
+++ b/betterRenderer/renderer/source/nvrenderer_vulkan.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <nvrhi/nvrhi.h>
-
-#include "nvrenderer/nvrenderer.h"
-#include "nvrendererbackend.h"
 #include <cstdint>
 #include <string>
 #include <unordered_set>
 #include <vector>
+#include <nvrhi/nvrhi.h>
+
+#include "nvrenderer/nvrenderer.h"
+#include "nvrendererbackend.h"
 
 #if LIBMANUL_WITH_VULKAN
 
diff --git a/betterRenderer/renderer/source/nvrendererbackend.cpp b/betterRenderer/renderer/source/nvrendererbackend.cpp
index 7bb07c00..207de922 100644
--- a/betterRenderer/renderer/source/nvrendererbackend.cpp
+++ b/betterRenderer/renderer/source/nvrendererbackend.cpp
@@ -1,8 +1,8 @@
-#include "nvrendererbackend.h"
-
 #include <cstddef>
 #include <string>
 #include <unordered_map>
+#include "nvrendererbackend.h"
+
 #include <fmt/format.h>
 
 import eu07.utilities.logs;
diff --git a/betterRenderer/renderer/source/nvrendererbackend.h b/betterRenderer/renderer/source/nvrendererbackend.h
index 773d13ff..8da7418a 100644
--- a/betterRenderer/renderer/source/nvrendererbackend.h
+++ b/betterRenderer/renderer/source/nvrendererbackend.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <nvrhi/nvrhi.h>
-
-#include "nvrenderer/nvrenderer.h"
 #include <array>
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include <nvrhi/nvrhi.h>
+
+#include "nvrenderer/nvrenderer.h"
 
 struct ShaderDefine {
   std::string m_name;
diff --git a/betterRenderer/renderer/source/nvtexture.cpp b/betterRenderer/renderer/source/nvtexture.cpp
index de058522..2961da73 100644
--- a/betterRenderer/renderer/source/nvtexture.cpp
+++ b/betterRenderer/renderer/source/nvtexture.cpp
@@ -1,8 +1,4 @@
-#include "nvtexture.h"
-#include "nvrenderer/nvrenderer.h"
-
-#include "utilities/Globals_macros.h"
-#include <array>
+#include <array>
 #include <cstddef>
 #include <cstdint>
 #include <fstream>
@@ -11,6 +7,10 @@
 #include <sstream>
 #include <string>
 #include <utility>
+#include "nvtexture.h"
+#include "nvrenderer/nvrenderer.h"
+
+#include "utilities/Globals_macros.h"
 #include <fmt/format.h>
 #include "utilities/utilities_macros.h"
 #include "nvrendererbackend.h"
diff --git a/betterRenderer/renderer/source/nvtexture.h b/betterRenderer/renderer/source/nvtexture.h
index f5084a22..2d86ef99 100644
--- a/betterRenderer/renderer/source/nvtexture.h
+++ b/betterRenderer/renderer/source/nvtexture.h
@@ -1,16 +1,16 @@
 #pragma once
 
 #include <bitset>
+#include <cstddef>
+#include <cstdint>
 #include <memory>
+#include <string>
 #include <unordered_map>
+#include <utility>
+#include <vector>
 #include <nvrhi/nvrhi.h>
 
 #include "global_include/interfaces/ITexture_macros.h"
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <utility>
-#include <vector>
 #include "nvrenderer/nvrenderer_enums.h"
 
 import eu07.global_include.interfaces.itexture;
diff --git a/betterRenderer/renderer/source/quadtree.cpp b/betterRenderer/renderer/source/quadtree.cpp
index b9f2759d..63285d16 100644
--- a/betterRenderer/renderer/source/quadtree.cpp
+++ b/betterRenderer/renderer/source/quadtree.cpp
@@ -1,7 +1,7 @@
-#include "nvrenderer/quadtree.h"
 #include <cstdint>
 #include <limits>
 #include <memory>
+#include "nvrenderer/quadtree.h"
 
 void QuadTreeBuilder::Node::Insert(uint32_t index, glm::dvec3 min_,
                                    glm::dvec3 max_, int level) {
diff --git a/betterRenderer/renderer/source/resource_registry.cpp b/betterRenderer/renderer/source/resource_registry.cpp
index 3d1fb9a7..dc94dbf0 100644
--- a/betterRenderer/renderer/source/resource_registry.cpp
+++ b/betterRenderer/renderer/source/resource_registry.cpp
@@ -1,10 +1,10 @@
-#include "nvrenderer/resource_registry.h"
-
 #include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <stdexcept>
 #include <string>
+#include "nvrenderer/resource_registry.h"
+
 #include "fmt/compile.h"
 #include "nvtexture.h"
 #include "nvrenderer/nvrenderer.h"
diff --git a/betterRenderer/renderer/source/rt_model.cpp b/betterRenderer/renderer/source/rt_model.cpp
index 8c8be396..aeb1ebe5 100644
--- a/betterRenderer/renderer/source/rt_model.cpp
+++ b/betterRenderer/renderer/source/rt_model.cpp
@@ -1,3 +1,10 @@
+#include <array>
+#include <cstddef>
+#include <limits>
+#include <memory>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 #include "rt_model.h"
 
 #include <bvh/v2/bvh.h>
@@ -7,14 +14,7 @@
 #include <bvh/v2/thread_pool.h>
 #include <bvh/v2/tri.h>
 
-#include <vector>
 
-#include <array>
-#include <cstddef>
-#include <limits>
-#include <memory>
-#include <tuple>
-#include <unordered_map>
 
 import eu07.simcore;
 namespace Rt {
diff --git a/betterRenderer/renderer/source/shaders_d3d12.cpp b/betterRenderer/renderer/source/shaders_d3d12.cpp
index 1959e78a..93c36d44 100644
--- a/betterRenderer/renderer/source/shaders_d3d12.cpp
+++ b/betterRenderer/renderer/source/shaders_d3d12.cpp
@@ -1,7 +1,7 @@
+#include <string>
 #include <yaml-cpp/yaml.h>
 
 #include "nvrenderer_d3d12.h"
-#include <string>
 
 #if LIBMANUL_WITH_D3D12
 
diff --git a/betterRenderer/renderer/source/shaders_vulkan.cpp b/betterRenderer/renderer/source/shaders_vulkan.cpp
index 9436d8c3..d5c4c0e5 100644
--- a/betterRenderer/renderer/source/shaders_vulkan.cpp
+++ b/betterRenderer/renderer/source/shaders_vulkan.cpp
@@ -1,8 +1,8 @@
+#include <queue>
+#include <string>
 #include <yaml-cpp/yaml.h>
 
 #include "nvrenderer_vulkan.h"
-#include <queue>
-#include <string>
 
 #if LIBMANUL_WITH_VULKAN
 
diff --git a/betterRenderer/renderer/source/sky.cpp b/betterRenderer/renderer/source/sky.cpp
index 94820e00..a9a935ec 100644
--- a/betterRenderer/renderer/source/sky.cpp
+++ b/betterRenderer/renderer/source/sky.cpp
@@ -1,12 +1,12 @@
+#include <array>
+#include <limits>
+#include <memory>
 #include "sky.h"
 
 #include <nvrhi/utils.h>
 
 #include "environment.h"
 #include "nvrendererbackend.h"
-#include <array>
-#include <limits>
-#include <memory>
 #include "imgui/imgui.h"
 
 import eu07.simulation.simulationenvironment;
diff --git a/betterRenderer/renderer/source/sky.h b/betterRenderer/renderer/source/sky.h
index 7aef2131..ff1cdff4 100644
--- a/betterRenderer/renderer/source/sky.h
+++ b/betterRenderer/renderer/source/sky.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <memory>
 #include "fullscreenpass.h"
 #include "nvrenderer/resource_registry.h"
-#include <memory>
 
 struct Sky : public MaResourceRegistry {
   Sky(class NvRenderer* renderer, struct MaEnvironment *environment);
diff --git a/betterRenderer/renderer/source/ssao.cpp b/betterRenderer/renderer/source/ssao.cpp
index 111b4c94..0b50b89f 100644
--- a/betterRenderer/renderer/source/ssao.cpp
+++ b/betterRenderer/renderer/source/ssao.cpp
@@ -1,3 +1,5 @@
+#include <array>
+#include <cstddef>
 #include "ssao.h"
 
 #include <nvrhi/nvrhi.h>
@@ -9,8 +11,6 @@
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
 #include "imgui/imgui.h"
-#include <array>
-#include <cstddef>
 
 import eu07.glm;
 NvSsao::NvSsao(NvRenderer* renderer)
diff --git a/betterRenderer/renderer/source/ssao.h b/betterRenderer/renderer/source/ssao.h
index 61f78a1c..367ee619 100644
--- a/betterRenderer/renderer/source/ssao.h
+++ b/betterRenderer/renderer/source/ssao.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <nvrhi/nvrhi.h>
-
-#include <memory>
-
-#include "XeGTAO.h"
 #include <array>
 #include <cstddef>
+#include <memory>
+#include <nvrhi/nvrhi.h>
+
+
+#include "XeGTAO.h"
 
 import eu07.glm;
 struct NvSsao {
diff --git a/betterRenderer/renderer/source/track_batching.cpp b/betterRenderer/renderer/source/track_batching.cpp
index f10dd22e..eb8fb874 100644
--- a/betterRenderer/renderer/source/track_batching.cpp
+++ b/betterRenderer/renderer/source/track_batching.cpp
@@ -1,10 +1,4 @@
-#include "config.h"
-#include "gbufferblitpass.h"
-#include "motioncache.h"
-#include "nvrenderer/nvrenderer.h"
-#include "nvrendererbackend.h"
-
-#include <cstddef>
+#include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <limits>
@@ -13,6 +7,12 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
+#include "config.h"
+#include "gbufferblitpass.h"
+#include "motioncache.h"
+#include "nvrenderer/nvrenderer.h"
+#include "nvrendererbackend.h"
+
 #include "utilities/utilities_macros.h"
 import eu07.utilities.timer;
 import eu07.simcore;
diff --git a/betterRenderer/renderer/source/windshield_rain.cpp b/betterRenderer/renderer/source/windshield_rain.cpp
index d03fef63..c770599b 100644
--- a/betterRenderer/renderer/source/windshield_rain.cpp
+++ b/betterRenderer/renderer/source/windshield_rain.cpp
@@ -1,3 +1,4 @@
+#include <cstddef>
 #include "windshield_rain.h"
 
 #include "gbuffer.h"
@@ -5,7 +6,6 @@
 #include "nvrendererbackend.h"
 #include "nvrhi/utils.h"
 #include "nvtexture.h"
-#include <cstddef>
 
 void WindshieldRain::Init(NvRenderer* in_renderer) {
   renderer = in_renderer;
diff --git a/betterRenderer/renderer/source/windshield_rain.h b/betterRenderer/renderer/source/windshield_rain.h
index 32ad7c95..2878d46c 100644
--- a/betterRenderer/renderer/source/windshield_rain.h
+++ b/betterRenderer/renderer/source/windshield_rain.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "nvrenderer/nvrenderer.h"
 #include <cstddef>
 #include <cstdint>
 #include <unordered_map>
+#include "nvrenderer/nvrenderer.h"
 
 struct WindshieldRain {
   void Init(NvRenderer *in_renderer);