diff --git a/Source/Editor/Cooker/CookingData.h b/Source/Editor/Cooker/CookingData.h
index 56b15af23..94d5591c9 100644
--- a/Source/Editor/Cooker/CookingData.h
+++ b/Source/Editor/Cooker/CookingData.h
@@ -7,6 +7,7 @@
 #include "Engine/Core/Collections/Array.h"
 #include "Engine/Core/Collections/HashSet.h"
 #include "Engine/Core/Collections/Dictionary.h"
+#include "Engine/Core/Types/Guid.h"
 
 class GameCooker;
 class PlatformTools;
diff --git a/Source/Engine/Animations/AnimationData.h b/Source/Engine/Animations/AnimationData.h
index 139c06aa9..6a782d8d6 100644
--- a/Source/Engine/Animations/AnimationData.h
+++ b/Source/Engine/Animations/AnimationData.h
@@ -2,7 +2,8 @@
 
 #pragma once
 
-#include "Curve.h"
+#include "Engine/Core/Types/String.h"
+#include "Engine/Animations/Curve.h"
 #include "Engine/Core/Math/Transform.h"
 
 /// <summary>
diff --git a/Source/Engine/CSG/HalfEdge.h b/Source/Engine/CSG/HalfEdge.h
index 3a054aff0..e9bd38a34 100644
--- a/Source/Engine/CSG/HalfEdge.h
+++ b/Source/Engine/CSG/HalfEdge.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include "Engine/Core/Types/BaseTypes.h"
+
 namespace CSG
 {
     /// <summary>
diff --git a/Source/Engine/Content/Loading/ContentLoadTask.h b/Source/Engine/Content/Loading/ContentLoadTask.h
index 94e8d5ec7..df13c8c43 100644
--- a/Source/Engine/Content/Loading/ContentLoadTask.h
+++ b/Source/Engine/Content/Loading/ContentLoadTask.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "Engine/Threading/Task.h"
+#include "Engine/Core/Types/String.h"
 
 class Asset;
 class LoadingThread;
diff --git a/Source/Engine/Content/Upgraders/ModelAssetUpgrader.h b/Source/Engine/Content/Upgraders/ModelAssetUpgrader.h
index 17b2bda38..98bc630cb 100644
--- a/Source/Engine/Content/Upgraders/ModelAssetUpgrader.h
+++ b/Source/Engine/Content/Upgraders/ModelAssetUpgrader.h
@@ -8,6 +8,7 @@
 #include "Engine/Serialization/MemoryReadStream.h"
 #include "Engine/Serialization/MemoryWriteStream.h"
 #include "Engine/Graphics/Models/ModelData.h"
+#include "Engine/Content/Asset.h"
 
 /// <summary>
 /// Model Asset Upgrader
diff --git a/Source/Engine/Content/Upgraders/ShaderAssetUpgrader.h b/Source/Engine/Content/Upgraders/ShaderAssetUpgrader.h
index 827197009..d85079304 100644
--- a/Source/Engine/Content/Upgraders/ShaderAssetUpgrader.h
+++ b/Source/Engine/Content/Upgraders/ShaderAssetUpgrader.h
@@ -4,6 +4,7 @@
 
 #include "BinaryAssetUpgrader.h"
 #include "Engine/Platform/Platform.h"
+#include "Engine/Graphics/Shaders/Cache/ShaderStorage.h"
 
 /// <summary>
 /// Material Asset and Shader Asset Upgrader
diff --git a/Source/Engine/Content/Upgraders/SkinnedModelAssetUpgrader.h b/Source/Engine/Content/Upgraders/SkinnedModelAssetUpgrader.h
index 9a5b4c5ae..ef0a21b6d 100644
--- a/Source/Engine/Content/Upgraders/SkinnedModelAssetUpgrader.h
+++ b/Source/Engine/Content/Upgraders/SkinnedModelAssetUpgrader.h
@@ -6,6 +6,11 @@
 #include "Engine/Platform/Platform.h"
 #include "Engine/Serialization/MemoryReadStream.h"
 #include "Engine/Serialization/MemoryWriteStream.h"
+#include "Engine/Graphics/Models/Types.h"
+#include "Engine/Core/Math/BoundingBox.h"
+#include "Engine/Core/Math/BoundingSphere.h"
+#include "Engine/Core/Math/Matrix.h"
+#include "Engine/Core/Math/Transform.h"
 
 /// <summary>
 /// Skinned Model Asset Upgrader
diff --git a/Source/Engine/Core/Config/LayersTagsSettings.h b/Source/Engine/Core/Config/LayersTagsSettings.h
index 066b5cdd5..c72ab3974 100644
--- a/Source/Engine/Core/Config/LayersTagsSettings.h
+++ b/Source/Engine/Core/Config/LayersTagsSettings.h
@@ -3,6 +3,8 @@
 #pragma once
 
 #include "Engine/Core/Config/Settings.h"
+#include "Engine/Core/Types/String.h"
+#include "Engine/Core/Collections/Array.h"
 
 /// <summary>
 /// Layers and objects tags settings.
diff --git a/Source/Engine/Graphics/Models/SkeletonData.h b/Source/Engine/Graphics/Models/SkeletonData.h
index 5f336d8be..3e5700304 100644
--- a/Source/Engine/Graphics/Models/SkeletonData.h
+++ b/Source/Engine/Graphics/Models/SkeletonData.h
@@ -5,6 +5,8 @@
 #include "Engine/Core/Math/Transform.h"
 #include "Engine/Core/Math/Matrix.h"
 #include "Engine/Core/Types/String.h"
+#include "Engine/Core/Types/StringView.h"
+#include "Engine/Core/Collections/Array.h"
 
 /// <summary>
 /// Describes a single skeleton node data. Used by the runtime.
diff --git a/Source/Engine/Input/InputSettings.h b/Source/Engine/Input/InputSettings.h
index 7771028e8..fd594f3ee 100644
--- a/Source/Engine/Input/InputSettings.h
+++ b/Source/Engine/Input/InputSettings.h
@@ -5,6 +5,7 @@
 #include "Engine/Core/Config/Settings.h"
 #include "Engine/Serialization/JsonTools.h"
 #include "VirtualInput.h"
+#include "Engine/Core/Collections/Array.h"
 
 /// <summary>
 /// Input settings container.
diff --git a/Source/Engine/Platform/IGuiData.h b/Source/Engine/Platform/IGuiData.h
index a285d62cb..05cc3c6f8 100644
--- a/Source/Engine/Platform/IGuiData.h
+++ b/Source/Engine/Platform/IGuiData.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "Engine/Core/Types/String.h"
+#include "Engine/Core/Collections/Array.h"
 
 /// <summary>
 /// Interface for GUI data object container.
diff --git a/Source/Engine/Platform/Win32/Win32ConditionVariable.h b/Source/Engine/Platform/Win32/Win32ConditionVariable.h
index ad3bdcff0..8273d914d 100644
--- a/Source/Engine/Platform/Win32/Win32ConditionVariable.h
+++ b/Source/Engine/Platform/Win32/Win32ConditionVariable.h
@@ -5,6 +5,7 @@
 #if PLATFORM_WIN32
 
 #include "Win32CriticalSection.h"
+#include "Engine/Core/Types/BaseTypes.h"
 
 /// <summary>
 /// Win32 implementation of a condition variables. Condition variables are synchronization primitives that enable threads to wait until a particular condition occurs. Condition variables enable threads to atomically release a lock and enter the sleeping state.
diff --git a/Source/Engine/Scripting/ScriptingCalls.h b/Source/Engine/Scripting/ScriptingCalls.h
index 1a48755e8..d76361bee 100644
--- a/Source/Engine/Scripting/ScriptingCalls.h
+++ b/Source/Engine/Scripting/ScriptingCalls.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include "Engine/Scripting/ManagedCLR/MTypes.h"
+
 typedef void (*Thunk_Void_0)(MonoObject** exception);
 typedef void (*Thunk_Void_1)(void* param_1, MonoObject** exception);
 typedef void (*Thunk_Void_2)(void* param_1, void* param_2, MonoObject** exception);