diff --git a/.clang-format b/.clang-format
index 437dc09..4ce967e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -121,19 +121,49 @@ SpaceInEmptyBlock: true
 PenaltyBreakAssignment: 200
 KeepEmptyLinesAtTheStartOfBlocks: false
 IncludeCategories:
-  - Regex:           '^<Engine/'
-    Priority:        1
-  - Regex:           '^<System/'
-    Priority:        2
-  - Regex:           '^<Utils/'
-    Priority:        3
-  - Regex:           '^<SasquatchBaker/'
-    Priority:        4
+  - Regex:           '^<GraphicsCore/.*_generated\.h(pp)?>$'
+    Priority:        16
+  - Regex:           '^<GraphicsVulkan/.*_generated\.h(pp)?>$'
+    Priority:        17
+  - Regex:           '^<GraphicsInterface/.*_generated\.h(pp)?>$'
+    Priority:        18
+  - Regex:           '^<Engine/.*_generated\.h(pp)?>$'
+    Priority:        19
+  - Regex:           '^<System/.*_generated\.h(pp)?>$'
+    Priority:        20
+  - Regex:           '^<Utils/.*_generated\.h(pp)?>$'
+    Priority:        21
+  - Regex:           '^<SasquatchBaker/.*_generated\.h(pp)?>$'
+    Priority:        22
+  - Regex:           '^<EngineTests/.*_generated\.h(pp)?>$'
+    Priority:        23
+  - Regex:           '^<SystemTests/.*_generated\.h(pp)?>$'
+    Priority:        24
+  - Regex:           '^<UtilsTests/.*_generated\.h(pp)?>$'
+    Priority:        25
+  - Regex:           '^<AssetsForTesting/.*_generated\.h(pp)?>$'
+    Priority:        26
+  - Regex:           '^<SasquatchBakerTests/.*_generated\.h(pp)?>$'
+    Priority:        27
+  - Regex:           '^<EngineBenchmarks/.*_generated\.h(pp)?>$'
+    Priority:        28
+  - Regex:           '^<AssetsForBenchmarking/.*_generated\.h(pp)?>$'
+    Priority:        29
+  - Regex:           '^<SasquatchBakerBenchmarks/.*_generated\.h(pp)?>$'
+    Priority:        30
   - Regex:           '^<GraphicsCore/'
-    Priority:        5
+    Priority:        1
   - Regex:           '^<GraphicsVulkan/'
-    Priority:        6
+    Priority:        2
   - Regex:           '^<GraphicsInterface/'
+    Priority:        3
+  - Regex:           '^<Engine/'
+    Priority:        4
+  - Regex:           '^<System/'
+    Priority:        5
+  - Regex:           '^<Utils/'
+    Priority:        6
+  - Regex:           '^<SasquatchBaker/'
     Priority:        7
   - Regex:           '^<EngineTests/'
     Priority:        8
@@ -152,11 +182,11 @@ IncludeCategories:
   - Regex:           '^<SasquatchBakerBenchmarks/'
     Priority:        15
   - Regex:           '^<[a-zA-Z0-9_/]+\.h>'
-    Priority:        16
+    Priority:        31
   - Regex:           '^<[a-zA-Z0-9_/]+\.hpp>'
-    Priority:        16
+    Priority:        31
   - Regex:           '^<[a-zA-Z0-9_/]+>'
-    Priority:        17
+    Priority:        32
 MainIncludeChar: AngleBracket
 Macros:
   - 'BIGFOOT_OPTIMIZED_ONLY(x)=x'
diff --git a/Bigfoot/Benchmarks/Engine/BigFile/BigFile.cpp b/Bigfoot/Benchmarks/Engine/BigFile/BigFile.cpp
index db46a6f..bac9c56 100644
--- a/Bigfoot/Benchmarks/Engine/BigFile/BigFile.cpp
+++ b/Bigfoot/Benchmarks/Engine/BigFile/BigFile.cpp
@@ -9,11 +9,11 @@
 #include <System/File/File.hpp>
 #include <System/UUID/UUID.hpp>
 
-#include <EngineBenchmarks/BigFileInfo_generated.hpp>
-
 #include <AssetsForBenchmarking/Asset/BenchmarkAsset.hpp>
 #include <AssetsForBenchmarking/Asset/BenchmarkAssetReferred.hpp>
 
+#include <EngineBenchmarks/BigFileInfo_generated.hpp>
+
 #include <EASTL/optional.h>
 #include <EASTL/span.h>
 #include <EASTL/vector.h>
diff --git a/Bigfoot/Benchmarks/Engine/Sasquatch/Sasquatch.cpp b/Bigfoot/Benchmarks/Engine/Sasquatch/Sasquatch.cpp
index ec5be5e..feba45d 100644
--- a/Bigfoot/Benchmarks/Engine/Sasquatch/Sasquatch.cpp
+++ b/Bigfoot/Benchmarks/Engine/Sasquatch/Sasquatch.cpp
@@ -9,11 +9,11 @@
 #include <System/File/File.hpp>
 #include <System/UUID/UUID.hpp>
 
-#include <EngineBenchmarks/SasquatchInfo_generated.hpp>
-
 #include <AssetsForBenchmarking/Asset/BenchmarkAsset.hpp>
 #include <AssetsForBenchmarking/Asset/BenchmarkAssetReferred.hpp>
 
+#include <EngineBenchmarks/SasquatchInfo_generated.hpp>
+
 #include <EASTL/optional.h>
 #include <EASTL/span.h>
 #include <EASTL/vector.h>
diff --git a/Bigfoot/Libs/Engine/Include/Engine/Asset/Asset.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/Asset.hpp
index 44c0161..861ae64 100644
--- a/Bigfoot/Libs/Engine/Include/Engine/Asset/Asset.hpp
+++ b/Bigfoot/Libs/Engine/Include/Engine/Asset/Asset.hpp
@@ -10,9 +10,10 @@
 #include <Engine/Asset/AssetConcepts.hpp>
 #include <Engine/Asset/AssetContainer.hpp>
 #include <Engine/Asset/AssetLibrary.hpp>
-#include <Engine/Asset/Asset_generated.hpp>
 #include <Engine/EngineAssertHandler.hpp>
 
+#include <Engine/Asset/Asset_generated.hpp>
+
 #include <EASTL/span.h>
 #include <EASTL/vector.h>
 #include <ankerl/unordered_dense.h>
diff --git a/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetBase.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetBase.hpp
index 661bb86..4cb4096 100644
--- a/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetBase.hpp
+++ b/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetBase.hpp
@@ -6,10 +6,10 @@
  *********************************************************************/
 #ifndef BIGFOOT_ENGINE_ASSET_ASSETBASE_HPP
 #define BIGFOOT_ENGINE_ASSET_ASSETBASE_HPP
-#include <Engine/Asset/Asset_generated.hpp>
-
 #include <System/UUID/UUID.hpp>
 
+#include <Engine/Asset/Asset_generated.hpp>
+
 #include <EASTL/span.h>
 #include <EASTL/vector.h>
 #include <ankerl/unordered_dense.h>
diff --git a/Bigfoot/Libs/Engine/Include/Engine/EngineAssertHandler.hpp b/Bigfoot/Libs/Engine/Include/Engine/EngineAssertHandler.hpp
index f16a3a3..bba716e 100644
--- a/Bigfoot/Libs/Engine/Include/Engine/EngineAssertHandler.hpp
+++ b/Bigfoot/Libs/Engine/Include/Engine/EngineAssertHandler.hpp
@@ -6,10 +6,10 @@
  *********************************************************************/
 #ifndef BIGFOOT_ENGINE_ENGINEASSERTHANDLER_HPP
 #define BIGFOOT_ENGINE_ENGINEASSERTHANDLER_HPP
-#include <Engine/EngineLogger_generated.hpp>
-
 #include <Utils/Assert/AssertHandler.hpp>
 
+#include <Engine/EngineLogger_generated.hpp>
+
 #ifdef BIGFOOT_NOT_OPTIMIZED
 
 namespace Bigfoot
diff --git a/Bigfoot/Libs/System/Include/System/SystemAssertHandler.hpp b/Bigfoot/Libs/System/Include/System/SystemAssertHandler.hpp
index d10732d..f2711e5 100644
--- a/Bigfoot/Libs/System/Include/System/SystemAssertHandler.hpp
+++ b/Bigfoot/Libs/System/Include/System/SystemAssertHandler.hpp
@@ -6,10 +6,10 @@
  *********************************************************************/
 #ifndef BIGFOOT_SYSTEM_SYSTEMASSERTHANDLER_HPP
 #define BIGFOOT_SYSTEM_SYSTEMASSERTHANDLER_HPP
-#include <System/SystemLogger_generated.hpp>
-
 #include <Utils/Assert/AssertHandler.hpp>
 
+#include <System/SystemLogger_generated.hpp>
+
 #ifdef BIGFOOT_NOT_OPTIMIZED
 
 namespace Bigfoot
diff --git a/Bigfoot/Libs/System/Include/System/UUID/FlatUUID.hpp b/Bigfoot/Libs/System/Include/System/UUID/FlatUUID.hpp
index 7635d32..b2fa9c8 100644
--- a/Bigfoot/Libs/System/Include/System/UUID/FlatUUID.hpp
+++ b/Bigfoot/Libs/System/Include/System/UUID/FlatUUID.hpp
@@ -7,6 +7,7 @@
 #ifndef BIGFOOT_SYSTEM_FLATUUID_HPP
 #define BIGFOOT_SYSTEM_FLATUUID_HPP
 #include <System/UUID/UUID.hpp>
+
 #include <System/UUID/UUID_generated.hpp>
 
 namespace flatbuffers
diff --git a/Bigfoot/Libs/System/Time/Time.cpp b/Bigfoot/Libs/System/Time/Time.cpp
index a04c40a..366f2d4 100644
--- a/Bigfoot/Libs/System/Time/Time.cpp
+++ b/Bigfoot/Libs/System/Time/Time.cpp
@@ -7,6 +7,7 @@
 #include <System/Time/Time.hpp>
 
 #include <System/SystemAssertHandler.hpp>
+
 #include <System/Time/Time_generated.hpp>
 
 namespace
diff --git a/Bigfoot/Libs/Utils/Include/Utils/UtilsAssertHandler.hpp b/Bigfoot/Libs/Utils/Include/Utils/UtilsAssertHandler.hpp
index 05825f4..d3fad67 100644
--- a/Bigfoot/Libs/Utils/Include/Utils/UtilsAssertHandler.hpp
+++ b/Bigfoot/Libs/Utils/Include/Utils/UtilsAssertHandler.hpp
@@ -7,6 +7,7 @@
 #ifndef BIGFOOT_UTILS_UTILSASSERTHANDLER_HPP
 #define BIGFOOT_UTILS_UTILSASSERTHANDLER_HPP
 #include <Utils/Assert/AssertHandler.hpp>
+
 #include <Utils/UtilsLogger_generated.hpp>
 
 #ifdef BIGFOOT_NOT_OPTIMIZED
diff --git a/Bigfoot/Tests/Engine/BigFile/BigFile.cpp b/Bigfoot/Tests/Engine/BigFile/BigFile.cpp
index c23362d..2080042 100644
--- a/Bigfoot/Tests/Engine/BigFile/BigFile.cpp
+++ b/Bigfoot/Tests/Engine/BigFile/BigFile.cpp
@@ -8,12 +8,12 @@
 
 #include <System/File/File.hpp>
 
-#include <EngineTests/BigFileInfo_generated.hpp>
-
 #include <AssetsForTesting/Asset/AssetA.hpp>
 #include <AssetsForTesting/Asset/AssetB.hpp>
 #include <AssetsForTesting/Asset/AssetC.hpp>
 
+#include <EngineTests/BigFileInfo_generated.hpp>
+
 #include <EASTL/array.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
diff --git a/Bigfoot/Tests/Engine/Sasquatch/Sasquatch.cpp b/Bigfoot/Tests/Engine/Sasquatch/Sasquatch.cpp
index 23d0bb9..9ce355e 100644
--- a/Bigfoot/Tests/Engine/Sasquatch/Sasquatch.cpp
+++ b/Bigfoot/Tests/Engine/Sasquatch/Sasquatch.cpp
@@ -8,11 +8,11 @@
 
 #include <System/File/File.hpp>
 
-#include <EngineTests/SasquatchInfo_generated.hpp>
-
 #include <AssetsForTesting/Asset/AssetA.hpp>
 #include <AssetsForTesting/Asset/AssetB.hpp>
 
+#include <EngineTests/SasquatchInfo_generated.hpp>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
diff --git a/Bigfoot/Tests/System/UUID/UUID.cpp b/Bigfoot/Tests/System/UUID/UUID.cpp
index c5fbd17..fc4e4b6 100644
--- a/Bigfoot/Tests/System/UUID/UUID.cpp
+++ b/Bigfoot/Tests/System/UUID/UUID.cpp
@@ -6,10 +6,10 @@
  *********************************************************************/
 #include <System/UUID/UUID.hpp>
 
-#include <System/UUID/UUID_generated.hpp>
-
 #include <Utils/Format.hpp>
 
+#include <System/UUID/UUID_generated.hpp>
+
 #include <ankerl/unordered_dense.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>