diff --git a/lsfg-vk-v3.1/.clang-tidy-no b/lsfg-vk-v3.1/.clang-tidy
similarity index 100%
rename from lsfg-vk-v3.1/.clang-tidy-no
rename to lsfg-vk-v3.1/.clang-tidy
diff --git a/lsfg-vk-v3.1/CMakeLists.txt b/lsfg-vk-v3.1/CMakeLists.txt
index e40d1f6..dad352d 100644
--- a/lsfg-vk-v3.1/CMakeLists.txt
+++ b/lsfg-vk-v3.1/CMakeLists.txt
@@ -5,6 +5,8 @@ project(lsfg-vk-v3.1
     DESCRIPTION "Lossless Scaling Frame Generation v3.1"
     LANGUAGES CXX)
 
+option(LDFGVK_EXCESS_DEBUG "Enable excessive debug output" OFF)
+
 file(GLOB SOURCES
     "src/core/*.cpp"
     "src/pool/*.cpp"
@@ -33,7 +35,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
         EXPORT_COMPILE_COMMANDS ON)
 endif()
 
-if(LSFGVK_EXCESS_DEBUG STREQUAL "ON")
+if(LSFGVK_EXCESS_DEBUG)
+    message(STATUS "LSFGVK_EXCESS_DEBUG is only compatible with clang")
     target_compile_options(lsfg-vk-v3.1 PRIVATE
         -Weverything
         # disable compat c++ flags
@@ -53,5 +56,5 @@ if(LSFGVK_EXCESS_DEBUG STREQUAL "ON")
     )
 
     set_target_properties(lsfg-vk-v3.1 PROPERTIES
-        CMAKE_CXX_CLANG_TIDY clang-tidy)
+        CXX_CLANG_TIDY clang-tidy)
 endif()
diff --git a/lsfg-vk-v3.1/include/context.hpp b/lsfg-vk-v3.1/include/context.hpp
index df1dae1..6283236 100644
--- a/lsfg-vk-v3.1/include/context.hpp
+++ b/lsfg-vk-v3.1/include/context.hpp
@@ -1,12 +1,22 @@
-#ifndef CONTEXT_HPP
-#define CONTEXT_HPP
+#pragma once
 
+#include "core/image.hpp"
+#include "core/semaphore.hpp"
+#include "core/fence.hpp"
+#include "core/commandbuffer.hpp"
 #include "shaders/alpha.hpp"
 #include "shaders/beta.hpp"
 #include "shaders/delta.hpp"
 #include "shaders/gamma.hpp"
 #include "shaders/generate.hpp"
 #include "shaders/mipmaps.hpp"
+#include "utils/utils.hpp"
+
+#include <vulkan/vulkan_core.h>
+
+#include <vector>
+#include <cstdint>
+#include <array>
 
 namespace LSFG {
 
@@ -71,5 +81,3 @@ namespace LSFG {
     };
 
 }
-
-#endif // CONTEXT_HPP
diff --git a/lsfg-vk-v3.1/include/core/buffer.hpp b/lsfg-vk-v3.1/include/core/buffer.hpp
index a2c369e..1aa1b49 100644
--- a/lsfg-vk-v3.1/include/core/buffer.hpp
+++ b/lsfg-vk-v3.1/include/core/buffer.hpp
@@ -1,10 +1,10 @@
-#ifndef BUFFER_HPP
-#define BUFFER_HPP
+#pragma once
 
 #include "core/device.hpp"
 
 #include <vulkan/vulkan_core.h>
 
+#include <cstddef>
 #include <memory>
 
 namespace LSFG::Core {
@@ -69,5 +69,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // BUFFER_HPP
diff --git a/lsfg-vk-v3.1/include/core/commandbuffer.hpp b/lsfg-vk-v3.1/include/core/commandbuffer.hpp
index d9395db..35eeb57 100644
--- a/lsfg-vk-v3.1/include/core/commandbuffer.hpp
+++ b/lsfg-vk-v3.1/include/core/commandbuffer.hpp
@@ -1,5 +1,4 @@
-#ifndef COMMANDBUFFER_HPP
-#define COMMANDBUFFER_HPP
+#pragma once
 
 #include "core/commandpool.hpp"
 #include "core/fence.hpp"
@@ -8,6 +7,7 @@
 
 #include <vulkan/vulkan_core.h>
 
+#include <cstdint>
 #include <optional>
 #include <vector>
 #include <memory>
@@ -110,5 +110,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // COMMANDBUFFER_HPP
diff --git a/lsfg-vk-v3.1/include/core/commandpool.hpp b/lsfg-vk-v3.1/include/core/commandpool.hpp
index 9946176..7f4539d 100644
--- a/lsfg-vk-v3.1/include/core/commandpool.hpp
+++ b/lsfg-vk-v3.1/include/core/commandpool.hpp
@@ -1,5 +1,4 @@
-#ifndef COMMANDPOOL_HPP
-#define COMMANDPOOL_HPP
+#pragma once
 
 #include "core/device.hpp"
 
@@ -41,5 +40,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // COMMANDPOOL_HPP
diff --git a/lsfg-vk-v3.1/include/core/descriptorpool.hpp b/lsfg-vk-v3.1/include/core/descriptorpool.hpp
index 76ac03c..792f843 100644
--- a/lsfg-vk-v3.1/include/core/descriptorpool.hpp
+++ b/lsfg-vk-v3.1/include/core/descriptorpool.hpp
@@ -1,5 +1,4 @@
-#ifndef DESCRIPTORPOOL_HPP
-#define DESCRIPTORPOOL_HPP
+#pragma once
 
 #include "core/device.hpp"
 
@@ -41,5 +40,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // DESCRIPTORPOOL_HPP
diff --git a/lsfg-vk-v3.1/include/core/descriptorset.hpp b/lsfg-vk-v3.1/include/core/descriptorset.hpp
index cdd15ad..719035d 100644
--- a/lsfg-vk-v3.1/include/core/descriptorset.hpp
+++ b/lsfg-vk-v3.1/include/core/descriptorset.hpp
@@ -1,5 +1,4 @@
-#ifndef DESCRIPTORSET_HPP
-#define DESCRIPTORSET_HPP
+#pragma once
 
 #include "core/buffer.hpp"
 #include "core/commandbuffer.hpp"
@@ -12,6 +11,10 @@
 
 #include <vulkan/vulkan_core.h>
 
+#include <vector>
+#include <cstddef>
+#include <array>
+#include <optional>
 #include <memory>
 
 namespace LSFG::Core {
@@ -119,5 +122,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // DESCRIPTORSET_HPP
diff --git a/lsfg-vk-v3.1/include/core/device.hpp b/lsfg-vk-v3.1/include/core/device.hpp
index b0bdcf7..d03a89c 100644
--- a/lsfg-vk-v3.1/include/core/device.hpp
+++ b/lsfg-vk-v3.1/include/core/device.hpp
@@ -1,5 +1,4 @@
-#ifndef DEVICE_HPP
-#define DEVICE_HPP
+#pragma once
 
 #include "core/instance.hpp"
 
@@ -52,5 +51,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // DEVICE_HPP
diff --git a/lsfg-vk-v3.1/include/core/fence.hpp b/lsfg-vk-v3.1/include/core/fence.hpp
index 6a50eb1..1739220 100644
--- a/lsfg-vk-v3.1/include/core/fence.hpp
+++ b/lsfg-vk-v3.1/include/core/fence.hpp
@@ -1,10 +1,10 @@
-#ifndef FENCE_HPP
-#define FENCE_HPP
+#pragma once
 
 #include "core/device.hpp"
 
 #include <vulkan/vulkan_core.h>
 
+#include <cstdint>
 #include <memory>
 
 namespace LSFG::Core {
@@ -61,5 +61,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // FENCE_HPP
diff --git a/lsfg-vk-v3.1/include/core/image.hpp b/lsfg-vk-v3.1/include/core/image.hpp
index 2d93854..9731bdf 100644
--- a/lsfg-vk-v3.1/include/core/image.hpp
+++ b/lsfg-vk-v3.1/include/core/image.hpp
@@ -1,5 +1,4 @@
-#ifndef IMAGE_HPP
-#define IMAGE_HPP
+#pragma once
 
 #include "core/device.hpp"
 
@@ -86,5 +85,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // IMAGE_HPP
diff --git a/lsfg-vk-v3.1/include/core/instance.hpp b/lsfg-vk-v3.1/include/core/instance.hpp
index 3fb7d26..24cba8a 100644
--- a/lsfg-vk-v3.1/include/core/instance.hpp
+++ b/lsfg-vk-v3.1/include/core/instance.hpp
@@ -1,5 +1,4 @@
-#ifndef INSTANCE_HPP
-#define INSTANCE_HPP
+#pragma once
 
 #include <vulkan/vulkan_core.h>
 
@@ -35,5 +34,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // INSTANCE_HPP
diff --git a/lsfg-vk-v3.1/include/core/pipeline.hpp b/lsfg-vk-v3.1/include/core/pipeline.hpp
index 6e2f981..6eddb5a 100644
--- a/lsfg-vk-v3.1/include/core/pipeline.hpp
+++ b/lsfg-vk-v3.1/include/core/pipeline.hpp
@@ -1,5 +1,4 @@
-#ifndef PIPELINE_HPP
-#define PIPELINE_HPP
+#pragma once
 
 #include "core/commandbuffer.hpp"
 #include "core/shadermodule.hpp"
@@ -54,5 +53,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // PIPELINE_HPP
diff --git a/lsfg-vk-v3.1/include/core/sampler.hpp b/lsfg-vk-v3.1/include/core/sampler.hpp
index dd6ab15..981077c 100644
--- a/lsfg-vk-v3.1/include/core/sampler.hpp
+++ b/lsfg-vk-v3.1/include/core/sampler.hpp
@@ -1,5 +1,4 @@
-#ifndef SAMPLER_HPP
-#define SAMPLER_HPP
+#pragma once
 
 #include "core/device.hpp"
 
@@ -47,5 +46,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // SAMPLER_HPP
diff --git a/lsfg-vk-v3.1/include/core/semaphore.hpp b/lsfg-vk-v3.1/include/core/semaphore.hpp
index 2060c33..773ca0c 100644
--- a/lsfg-vk-v3.1/include/core/semaphore.hpp
+++ b/lsfg-vk-v3.1/include/core/semaphore.hpp
@@ -1,10 +1,10 @@
-#ifndef SEMAPHORE_HPP
-#define SEMAPHORE_HPP
+#pragma once
 
 #include "core/device.hpp"
 
 #include <vulkan/vulkan_core.h>
 
+#include <cstdint>
 #include <optional>
 #include <memory>
 
@@ -78,5 +78,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // SEMAPHORE_HPP
diff --git a/lsfg-vk-v3.1/include/core/shadermodule.hpp b/lsfg-vk-v3.1/include/core/shadermodule.hpp
index d71e7e4..ac38234 100644
--- a/lsfg-vk-v3.1/include/core/shadermodule.hpp
+++ b/lsfg-vk-v3.1/include/core/shadermodule.hpp
@@ -1,10 +1,11 @@
-#ifndef SHADERMODULE_HPP
-#define SHADERMODULE_HPP
+#pragma once
 
 #include "core/device.hpp"
 
 #include <vulkan/vulkan_core.h>
 
+#include <cstdint>
+#include <cstddef>
 #include <utility>
 #include <vector>
 #include <memory>
@@ -49,5 +50,3 @@ namespace LSFG::Core {
     };
 
 }
-
-#endif // SHADERMODULE_HPP
diff --git a/lsfg-vk-v3.1/include/pool/resourcepool.hpp b/lsfg-vk-v3.1/include/pool/resourcepool.hpp
index baa165f..729dfb3 100644
--- a/lsfg-vk-v3.1/include/pool/resourcepool.hpp
+++ b/lsfg-vk-v3.1/include/pool/resourcepool.hpp
@@ -1,11 +1,12 @@
-#ifndef RESOURCEPOOL_HPP
-#define RESOURCEPOOL_HPP
+#pragma once
 
 #include "core/device.hpp"
 #include "core/buffer.hpp"
 #include "core/sampler.hpp"
+
 #include "vulkan/vulkan_core.h"
 
+#include <cstdint>
 #include <unordered_map>
 
 namespace LSFG::Pool {
@@ -66,5 +67,3 @@ namespace LSFG::Pool {
     };
 
 }
-
-#endif // RESOURCEPOOL_HPP
diff --git a/lsfg-vk-v3.1/include/pool/shaderpool.hpp b/lsfg-vk-v3.1/include/pool/shaderpool.hpp
index db42533..e572154 100644
--- a/lsfg-vk-v3.1/include/pool/shaderpool.hpp
+++ b/lsfg-vk-v3.1/include/pool/shaderpool.hpp
@@ -1,13 +1,17 @@
-#ifndef SHADERPOOL_HPP
-#define SHADERPOOL_HPP
+#pragma once
 
 #include "core/device.hpp"
 #include "core/pipeline.hpp"
 #include "core/shadermodule.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <cstdint>
+#include <cstddef>
 #include <functional>
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 namespace LSFG::Pool {
@@ -59,5 +63,3 @@ namespace LSFG::Pool {
     };
 
 }
-
-#endif // SHADERPOOL_HPP
diff --git a/lsfg-vk-v3.1/include/shaders/alpha.hpp b/lsfg-vk-v3.1/include/shaders/alpha.hpp
index 8f254e5..fa48ec2 100644
--- a/lsfg-vk-v3.1/include/shaders/alpha.hpp
+++ b/lsfg-vk-v3.1/include/shaders/alpha.hpp
@@ -1,14 +1,15 @@
-#ifndef ALPHA_HPP
-#define ALPHA_HPP
+#pragma once
 
 #include "core/commandbuffer.hpp"
 #include "core/descriptorset.hpp"
 #include "core/image.hpp"
 #include "core/pipeline.hpp"
+#include "core/sampler.hpp"
 #include "core/shadermodule.hpp"
 #include "utils/utils.hpp"
 
 #include <array>
+#include <cstdint>
 
 namespace LSFG::Shaders {
 
@@ -57,5 +58,3 @@ namespace LSFG::Shaders {
     };
 
 }
-
-#endif // ALPHA_HPP
diff --git a/lsfg-vk-v3.1/include/shaders/beta.hpp b/lsfg-vk-v3.1/include/shaders/beta.hpp
index dccb04f..b8e2a2b 100644
--- a/lsfg-vk-v3.1/include/shaders/beta.hpp
+++ b/lsfg-vk-v3.1/include/shaders/beta.hpp
@@ -1,14 +1,16 @@
-#ifndef BETA_HPP
-#define BETA_HPP
+#pragma once
 
+#include "core/buffer.hpp"
 #include "core/commandbuffer.hpp"
 #include "core/descriptorset.hpp"
 #include "core/image.hpp"
 #include "core/pipeline.hpp"
+#include "core/sampler.hpp"
 #include "core/shadermodule.hpp"
 #include "utils/utils.hpp"
 
 #include <array>
+#include <cstdint>
 
 namespace LSFG::Shaders {
 
@@ -57,5 +59,3 @@ namespace LSFG::Shaders {
     };
 
 }
-
-#endif // BETA_HPP
diff --git a/lsfg-vk-v3.1/include/shaders/delta.hpp b/lsfg-vk-v3.1/include/shaders/delta.hpp
index 93fd127..5e81aec 100644
--- a/lsfg-vk-v3.1/include/shaders/delta.hpp
+++ b/lsfg-vk-v3.1/include/shaders/delta.hpp
@@ -1,15 +1,18 @@
-#ifndef DELTA_HPP
-#define DELTA_HPP
+#pragma once
 
+#include "core/buffer.hpp"
 #include "core/commandbuffer.hpp"
 #include "core/descriptorset.hpp"
 #include "core/image.hpp"
 #include "core/pipeline.hpp"
+#include "core/sampler.hpp"
 #include "core/shadermodule.hpp"
 #include "utils/utils.hpp"
 
 #include <array>
+#include <cstdint>
 #include <optional>
+#include <vector>
 
 namespace LSFG::Shaders {
 
@@ -74,5 +77,3 @@ namespace LSFG::Shaders {
     };
 
 }
-
-#endif // DELTA_HPP
diff --git a/lsfg-vk-v3.1/include/shaders/gamma.hpp b/lsfg-vk-v3.1/include/shaders/gamma.hpp
index a4b70f8..0f09ab3 100644
--- a/lsfg-vk-v3.1/include/shaders/gamma.hpp
+++ b/lsfg-vk-v3.1/include/shaders/gamma.hpp
@@ -1,15 +1,18 @@
-#ifndef GAMMA_HPP
-#define GAMMA_HPP
+#pragma once
 
+#include "core/buffer.hpp"
 #include "core/commandbuffer.hpp"
 #include "core/descriptorset.hpp"
 #include "core/image.hpp"
 #include "core/pipeline.hpp"
+#include "core/sampler.hpp"
 #include "core/shadermodule.hpp"
 #include "utils/utils.hpp"
 
 #include <array>
+#include <cstdint>
 #include <optional>
+#include <vector>
 
 namespace LSFG::Shaders {
 
@@ -66,5 +69,3 @@ namespace LSFG::Shaders {
     };
 
 }
-
-#endif // GAMMA_HPP
diff --git a/lsfg-vk-v3.1/include/shaders/generate.hpp b/lsfg-vk-v3.1/include/shaders/generate.hpp
index 6ad6538..a478172 100644
--- a/lsfg-vk-v3.1/include/shaders/generate.hpp
+++ b/lsfg-vk-v3.1/include/shaders/generate.hpp
@@ -1,14 +1,17 @@
-#ifndef GENERATE_HPP
-#define GENERATE_HPP
+#pragma once
 
+#include "core/buffer.hpp"
 #include "core/commandbuffer.hpp"
 #include "core/descriptorset.hpp"
 #include "core/image.hpp"
 #include "core/pipeline.hpp"
+#include "core/sampler.hpp"
 #include "core/shadermodule.hpp"
 #include "utils/utils.hpp"
 
 #include <array>
+#include <vector>
+#include <cstdint>
 
 namespace LSFG::Shaders {
 
@@ -63,5 +66,3 @@ namespace LSFG::Shaders {
     };
 
 }
-
-#endif // GENERATE_HPP
diff --git a/lsfg-vk-v3.1/include/shaders/mipmaps.hpp b/lsfg-vk-v3.1/include/shaders/mipmaps.hpp
index 8d1f75e..741c93c 100644
--- a/lsfg-vk-v3.1/include/shaders/mipmaps.hpp
+++ b/lsfg-vk-v3.1/include/shaders/mipmaps.hpp
@@ -1,15 +1,16 @@
-#ifndef MIPMAPS_HPP
-#define MIPMAPS_HPP
+#pragma once
 
 #include "core/buffer.hpp"
 #include "core/commandbuffer.hpp"
 #include "core/descriptorset.hpp"
 #include "core/image.hpp"
 #include "core/pipeline.hpp"
+#include "core/sampler.hpp"
 #include "core/shadermodule.hpp"
 #include "utils/utils.hpp"
 
 #include <array>
+#include <cstdint>
 
 namespace LSFG::Shaders {
 
@@ -56,5 +57,3 @@ namespace LSFG::Shaders {
     };
 
 }
-
-#endif // MIPMAPS_HPP
diff --git a/lsfg-vk-v3.1/include/utils/trans.hpp b/lsfg-vk-v3.1/include/utils/trans.hpp
index 5541892..71e28be 100644
--- a/lsfg-vk-v3.1/include/utils/trans.hpp
+++ b/lsfg-vk-v3.1/include/utils/trans.hpp
@@ -1,5 +1,4 @@
-#ifndef TRANS_HPP
-#define TRANS_HPP
+#pragma once
 
 #include <cstdint>
 #include <vector>
@@ -15,5 +14,3 @@ namespace LSFG::Utils::Trans {
     [[nodiscard]] std::vector<uint8_t> translateShader(std::vector<uint8_t> bytecode);
 
 }
-
-#endif // TRANS_HPP
diff --git a/lsfg-vk-v3.1/include/utils/utils.hpp b/lsfg-vk-v3.1/include/utils/utils.hpp
index ee29f15..82e7039 100644
--- a/lsfg-vk-v3.1/include/utils/utils.hpp
+++ b/lsfg-vk-v3.1/include/utils/utils.hpp
@@ -1,15 +1,21 @@
-#ifndef UTILS_HPP
-#define UTILS_HPP
+#pragma once
 
 #include "core/commandbuffer.hpp"
+#include "core/commandpool.hpp"
 #include "core/descriptorpool.hpp"
 #include "core/image.hpp"
 #include "core/device.hpp"
 #include "pool/resourcepool.hpp"
 #include "pool/shaderpool.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <optional>
+#include <cstddef>
+#include <cstdint>
 #include <string>
 #include <array>
+#include <vector>
 
 namespace LSFG::Utils {
 
@@ -100,5 +106,3 @@ namespace LSFG {
         Pool::ResourcePool resources;
     };
 }
-
-#endif // UTILS_HPP
diff --git a/lsfg-vk-v3.1/public/lsfg.hpp b/lsfg-vk-v3.1/public/lsfg.hpp
index d55e185..3ebfee8 100644
--- a/lsfg-vk-v3.1/public/lsfg.hpp
+++ b/lsfg-vk-v3.1/public/lsfg.hpp
@@ -1,10 +1,11 @@
-#ifndef LSFG_3_1_HPP
-#define LSFG_3_1_HPP
+#pragma once
 
 #include <vulkan/vulkan_core.h>
 
 #include <functional>
 #include <stdexcept>
+#include <cstdint>
+#include <string>
 #include <vector>
 
 namespace LSFG {
@@ -22,8 +23,7 @@ namespace LSFG {
     ///
     void initialize(uint64_t deviceUUID,
         bool isHdr, float flowScale, uint64_t generationCount,
-        const std::function<std::vector<uint8_t>(const std::string&)>& loader
-    );
+        const std::function<std::vector<uint8_t>(const std::string&)>& loader);
 
     ///
     /// Create a new LSFG context on a swapchain.
@@ -89,5 +89,3 @@ namespace LSFG {
     };
 
 }
-
-#endif // LSFG_3_1_HPP
diff --git a/lsfg-vk-v3.1/src/core/buffer.cpp b/lsfg-vk-v3.1/src/core/buffer.cpp
index 6a5e225..c18a8ae 100644
--- a/lsfg-vk-v3.1/src/core/buffer.cpp
+++ b/lsfg-vk-v3.1/src/core/buffer.cpp
@@ -1,7 +1,12 @@
 #include "core/buffer.hpp"
+#include "core/device.hpp"
 #include "lsfg.hpp"
 
+#include <vulkan/vulkan_core.h>
+
 #include <algorithm>
+#include <cstdint>
+#include <memory>
 #include <optional>
 
 using namespace LSFG::Core;
diff --git a/lsfg-vk-v3.1/src/core/commandbuffer.cpp b/lsfg-vk-v3.1/src/core/commandbuffer.cpp
index 86a1d0e..84999de 100644
--- a/lsfg-vk-v3.1/src/core/commandbuffer.cpp
+++ b/lsfg-vk-v3.1/src/core/commandbuffer.cpp
@@ -1,6 +1,18 @@
 #include "core/commandbuffer.hpp"
+#include "core/device.hpp"
+#include "core/commandpool.hpp"
+#include "core/fence.hpp"
+#include "core/semaphore.hpp"
 #include "lsfg.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <memory>
+#include <stdexcept>
+#include <cstdint>
+#include <optional>
+#include <vector>
+
 using namespace LSFG::Core;
 
 CommandBuffer::CommandBuffer(const Core::Device& device, const CommandPool& pool) {
diff --git a/lsfg-vk-v3.1/src/core/commandpool.cpp b/lsfg-vk-v3.1/src/core/commandpool.cpp
index f1a6030..377de39 100644
--- a/lsfg-vk-v3.1/src/core/commandpool.cpp
+++ b/lsfg-vk-v3.1/src/core/commandpool.cpp
@@ -1,6 +1,11 @@
 #include "core/commandpool.hpp"
+#include "core/device.hpp"
 #include "lsfg.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <memory>
+
 using namespace LSFG::Core;
 
 CommandPool::CommandPool(const Core::Device& device) {
diff --git a/lsfg-vk-v3.1/src/core/descriptorpool.cpp b/lsfg-vk-v3.1/src/core/descriptorpool.cpp
index 75eb627..ac08956 100644
--- a/lsfg-vk-v3.1/src/core/descriptorpool.cpp
+++ b/lsfg-vk-v3.1/src/core/descriptorpool.cpp
@@ -1,7 +1,12 @@
 #include "core/descriptorpool.hpp"
+#include "core/device.hpp"
 #include "lsfg.hpp"
 
+#include <vulkan/vulkan_core.h>
+
 #include <array>
+#include <cstdint>
+#include <memory>
 
 using namespace LSFG::Core;
 
diff --git a/lsfg-vk-v3.1/src/core/descriptorset.cpp b/lsfg-vk-v3.1/src/core/descriptorset.cpp
index c39454e..b8f95a2 100644
--- a/lsfg-vk-v3.1/src/core/descriptorset.cpp
+++ b/lsfg-vk-v3.1/src/core/descriptorset.cpp
@@ -1,6 +1,19 @@
 #include "core/descriptorset.hpp"
+#include "core/device.hpp"
+#include "core/descriptorpool.hpp"
+#include "core/shadermodule.hpp"
+#include "core/commandbuffer.hpp"
+#include "core/pipeline.hpp"
+#include "core/image.hpp"
+#include "core/sampler.hpp"
+#include "core/buffer.hpp"
 #include "lsfg.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <memory>
+#include <cstdint>
+
 using namespace LSFG::Core;
 
 DescriptorSet::DescriptorSet(const Core::Device& device,
diff --git a/lsfg-vk-v3.1/src/core/device.cpp b/lsfg-vk-v3.1/src/core/device.cpp
index 80594f5..b257517 100644
--- a/lsfg-vk-v3.1/src/core/device.cpp
+++ b/lsfg-vk-v3.1/src/core/device.cpp
@@ -1,6 +1,11 @@
 #include "core/device.hpp"
+#include "core/instance.hpp"
 #include "lsfg.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <cstdint>
+#include <memory>
 #include <optional>
 #include <vector>
 
diff --git a/lsfg-vk-v3.1/src/core/fence.cpp b/lsfg-vk-v3.1/src/core/fence.cpp
index b543df0..52a05a2 100644
--- a/lsfg-vk-v3.1/src/core/fence.cpp
+++ b/lsfg-vk-v3.1/src/core/fence.cpp
@@ -1,6 +1,12 @@
 #include "core/fence.hpp"
+#include "core/device.hpp"
 #include "lsfg.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <memory>
+#include <cstdint>
+
 using namespace LSFG::Core;
 
 Fence::Fence(const Core::Device& device) {
diff --git a/lsfg-vk-v3.1/src/core/image.cpp b/lsfg-vk-v3.1/src/core/image.cpp
index 4affb03..c038373 100644
--- a/lsfg-vk-v3.1/src/core/image.cpp
+++ b/lsfg-vk-v3.1/src/core/image.cpp
@@ -1,6 +1,11 @@
 #include "core/image.hpp"
+#include "core/device.hpp"
 #include "lsfg.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <cstdint>
+#include <memory>
 #include <optional>
 
 using namespace LSFG::Core;
diff --git a/lsfg-vk-v3.1/src/core/instance.cpp b/lsfg-vk-v3.1/src/core/instance.cpp
index c0e670f..29203fc 100644
--- a/lsfg-vk-v3.1/src/core/instance.cpp
+++ b/lsfg-vk-v3.1/src/core/instance.cpp
@@ -1,7 +1,10 @@
 #include "core/instance.hpp"
 #include "lsfg.hpp"
 
+#include <cstdint>
+#include <memory>
 #include <vector>
+#include <vulkan/vulkan_core.h>
 
 using namespace LSFG::Core;
 
diff --git a/lsfg-vk-v3.1/src/core/pipeline.cpp b/lsfg-vk-v3.1/src/core/pipeline.cpp
index 9b2986f..cff1bd6 100644
--- a/lsfg-vk-v3.1/src/core/pipeline.cpp
+++ b/lsfg-vk-v3.1/src/core/pipeline.cpp
@@ -1,6 +1,13 @@
 #include "core/pipeline.hpp"
+#include "core/device.hpp"
+#include "core/shadermodule.hpp"
+#include "core/commandbuffer.hpp"
 #include "lsfg.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <memory>
+
 using namespace LSFG::Core;
 
 Pipeline::Pipeline(const Core::Device& device, const ShaderModule& shader) {
diff --git a/lsfg-vk-v3.1/src/core/sampler.cpp b/lsfg-vk-v3.1/src/core/sampler.cpp
index 961d832..0b82a8f 100644
--- a/lsfg-vk-v3.1/src/core/sampler.cpp
+++ b/lsfg-vk-v3.1/src/core/sampler.cpp
@@ -1,7 +1,11 @@
 #include "core/sampler.hpp"
+#include "core/device.hpp"
 #include "lsfg.hpp"
+
 #include <vulkan/vulkan_core.h>
 
+#include <memory>
+
 using namespace LSFG::Core;
 
 Sampler::Sampler(const Core::Device& device,
diff --git a/lsfg-vk-v3.1/src/core/semaphore.cpp b/lsfg-vk-v3.1/src/core/semaphore.cpp
index 267c8f5..0ef4de9 100644
--- a/lsfg-vk-v3.1/src/core/semaphore.cpp
+++ b/lsfg-vk-v3.1/src/core/semaphore.cpp
@@ -1,6 +1,14 @@
 #include "core/semaphore.hpp"
+#include "core/device.hpp"
 #include "lsfg.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <optional>
+#include <cstdint>
+#include <memory>
+#include <stdexcept>
+
 using namespace LSFG::Core;
 
 Semaphore::Semaphore(const Core::Device& device, std::optional<uint32_t> initial) {
diff --git a/lsfg-vk-v3.1/src/core/shadermodule.cpp b/lsfg-vk-v3.1/src/core/shadermodule.cpp
index df9c2dd..50b36b2 100644
--- a/lsfg-vk-v3.1/src/core/shadermodule.cpp
+++ b/lsfg-vk-v3.1/src/core/shadermodule.cpp
@@ -1,6 +1,15 @@
 #include "core/shadermodule.hpp"
+#include "core/device.hpp"
 #include "lsfg.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <vector>
+#include <cstdint>
+#include <utility>
+#include <cstddef>
+#include <memory>
+
 using namespace LSFG::Core;
 
 ShaderModule::ShaderModule(const Core::Device& device, const std::vector<uint8_t>& code,
diff --git a/lsfg-vk-v3.1/src/pool/resourcepool.cpp b/lsfg-vk-v3.1/src/pool/resourcepool.cpp
index 30b5dbe..804217b 100644
--- a/lsfg-vk-v3.1/src/pool/resourcepool.cpp
+++ b/lsfg-vk-v3.1/src/pool/resourcepool.cpp
@@ -1,7 +1,12 @@
 #include "pool/resourcepool.hpp"
 #include "core/buffer.hpp"
+#include "core/device.hpp"
+#include "core/sampler.hpp"
+
+#include <vulkan/vulkan_core.h>
 
 #include <array>
+#include <cstdint>
 
 using namespace LSFG;
 using namespace LSFG::Pool;
diff --git a/lsfg-vk-v3.1/src/pool/shaderpool.cpp b/lsfg-vk-v3.1/src/pool/shaderpool.cpp
index be9af62..22b4246 100644
--- a/lsfg-vk-v3.1/src/pool/shaderpool.cpp
+++ b/lsfg-vk-v3.1/src/pool/shaderpool.cpp
@@ -1,7 +1,16 @@
 #include "pool/shaderpool.hpp"
+#include "core/shadermodule.hpp"
+#include "core/device.hpp"
+#include "core/pipeline.hpp"
 #include "utils/trans.hpp"
 
+#include <vulkan/vulkan_core.h>
+
+#include <cstddef>
 #include <stdexcept>
+#include <string>
+#include <vector>
+#include <utility>
 
 using namespace LSFG;
 using namespace LSFG::Pool;
diff --git a/lsfg-vk-v3.1/src/shaders/alpha.cpp b/lsfg-vk-v3.1/src/shaders/alpha.cpp
index 198ed02..7eb3019 100644
--- a/lsfg-vk-v3.1/src/shaders/alpha.cpp
+++ b/lsfg-vk-v3.1/src/shaders/alpha.cpp
@@ -1,4 +1,13 @@
 #include "shaders/alpha.hpp"
+#include "utils/utils.hpp"
+#include "core/commandbuffer.hpp"
+#include "core/image.hpp"
+
+#include <vulkan/vulkan_core.h>
+
+#include <utility>
+#include <cstddef>
+#include <cstdint>
 
 using namespace LSFG::Shaders;
 
diff --git a/lsfg-vk-v3.1/src/shaders/beta.cpp b/lsfg-vk-v3.1/src/shaders/beta.cpp
index 151ae3f..afa185a 100644
--- a/lsfg-vk-v3.1/src/shaders/beta.cpp
+++ b/lsfg-vk-v3.1/src/shaders/beta.cpp
@@ -1,4 +1,14 @@
 #include "shaders/beta.hpp"
+#include "utils/utils.hpp"
+#include "core/commandbuffer.hpp"
+#include "core/image.hpp"
+
+#include <vulkan/vulkan_core.h>
+
+#include <array>
+#include <utility>
+#include <cstddef>
+#include <cstdint>
 
 using namespace LSFG::Shaders;
 
diff --git a/lsfg-vk-v3.1/src/shaders/delta.cpp b/lsfg-vk-v3.1/src/shaders/delta.cpp
index ca83cb0..548ab39 100644
--- a/lsfg-vk-v3.1/src/shaders/delta.cpp
+++ b/lsfg-vk-v3.1/src/shaders/delta.cpp
@@ -1,4 +1,15 @@
 #include "shaders/delta.hpp"
+#include "utils/utils.hpp"
+#include "core/commandbuffer.hpp"
+#include "core/image.hpp"
+
+#include <vulkan/vulkan_core.h>
+
+#include <array>
+#include <optional>
+#include <utility>
+#include <cstddef>
+#include <cstdint>
 
 using namespace LSFG::Shaders;
 
diff --git a/lsfg-vk-v3.1/src/shaders/gamma.cpp b/lsfg-vk-v3.1/src/shaders/gamma.cpp
index 0898f2c..647e31a 100644
--- a/lsfg-vk-v3.1/src/shaders/gamma.cpp
+++ b/lsfg-vk-v3.1/src/shaders/gamma.cpp
@@ -1,4 +1,15 @@
 #include "shaders/gamma.hpp"
+#include "utils/utils.hpp"
+#include "core/commandbuffer.hpp"
+#include "core/image.hpp"
+
+#include <vulkan/vulkan_core.h>
+
+#include <array>
+#include <optional>
+#include <utility>
+#include <cstddef>
+#include <cstdint>
 
 using namespace LSFG::Shaders;
 
diff --git a/lsfg-vk-v3.1/src/shaders/generate.cpp b/lsfg-vk-v3.1/src/shaders/generate.cpp
index 2e21b7f..3c18ed9 100644
--- a/lsfg-vk-v3.1/src/shaders/generate.cpp
+++ b/lsfg-vk-v3.1/src/shaders/generate.cpp
@@ -1,4 +1,14 @@
 #include "shaders/generate.hpp"
+#include "utils/utils.hpp"
+#include "core/commandbuffer.hpp"
+#include "core/image.hpp"
+
+#include <vulkan/vulkan_core.h>
+
+#include <vector>
+#include <utility>
+#include <cstddef>
+#include <cstdint>
 
 using namespace LSFG::Shaders;
 
diff --git a/lsfg-vk-v3.1/src/shaders/mipmaps.cpp b/lsfg-vk-v3.1/src/shaders/mipmaps.cpp
index 894c6f8..8bd4a40 100644
--- a/lsfg-vk-v3.1/src/shaders/mipmaps.cpp
+++ b/lsfg-vk-v3.1/src/shaders/mipmaps.cpp
@@ -1,4 +1,13 @@
 #include "shaders/mipmaps.hpp"
+#include "utils/utils.hpp"
+#include "core/image.hpp"
+#include "core/commandbuffer.hpp"
+
+#include <vulkan/vulkan_core.h>
+
+#include <utility>
+#include <cstddef>
+#include <cstdint>
 
 using namespace LSFG::Shaders;
 
diff --git a/lsfg-vk-v3.1/src/utils/trans.cpp b/lsfg-vk-v3.1/src/utils/trans.cpp
index a730d96..25984e3 100644
--- a/lsfg-vk-v3.1/src/utils/trans.cpp
+++ b/lsfg-vk-v3.1/src/utils/trans.cpp
@@ -1,5 +1,8 @@
 #include "utils/trans.hpp"
 
+#include <vector>
+#include <cstdint>
+
 using namespace LSFG::Utils;
 
 std::vector<uint8_t> Trans::translateShader(std::vector<uint8_t> bytecode) {