diff --git a/Source/Editor/Tools/Terrain/TerrainTools.cpp b/Source/Editor/Tools/Terrain/TerrainTools.cpp
index 6bf4f8fd4..e89b5e3e9 100644
--- a/Source/Editor/Tools/Terrain/TerrainTools.cpp
+++ b/Source/Editor/Tools/Terrain/TerrainTools.cpp
@@ -2,7 +2,7 @@
 
 #include "TerrainTools.h"
 #include "Engine/Core/Cache.h"
-#include "Engine/Core/Math/VectorInt.h"
+#include "Engine/Core/Math/Int2.h"
 #include "Engine/Core/Math/Color32.h"
 #include "Engine/Core/Collections/CollectionPoolCache.h"
 #include "Engine/Terrain/TerrainPatch.h"
diff --git a/Source/Editor/Utilities/EditorUtilities.cpp b/Source/Editor/Utilities/EditorUtilities.cpp
index d7136a5c8..fc266ec13 100644
--- a/Source/Editor/Utilities/EditorUtilities.cpp
+++ b/Source/Editor/Utilities/EditorUtilities.cpp
@@ -6,10 +6,8 @@
 #include "Engine/Core/Log.h"
 #include "Engine/Graphics/Textures/TextureData.h"
 #include "Engine/Graphics/PixelFormatExtensions.h"
-#include "Engine/Serialization/FileReadStream.h"
 #include "Engine/Tools/TextureTool/TextureTool.h"
 #include "Engine/Core/Math/Color32.h"
-#include "Engine/Core/Math/VectorInt.h"
 #include "Engine/Core/Config/GameSettings.h"
 #include "Engine/Content/Content.h"
 #include "Engine/Content/AssetReference.h"
diff --git a/Source/Engine/Core/Math/Vector2.cpp b/Source/Engine/Core/Math/Vector2.cpp
index 6a0468033..c23e79d19 100644
--- a/Source/Engine/Core/Math/Vector2.cpp
+++ b/Source/Engine/Core/Math/Vector2.cpp
@@ -4,8 +4,8 @@
 #include "Vector3.h"
 #include "Vector4.h"
 #include "Color.h"
+#include "Int2.h"
 #include "../Types/String.h"
-#include "VectorInt.h"
 
 static_assert(sizeof(Vector2) == 8, "Invalid Vector2 type size.");
 
diff --git a/Source/Engine/Core/Math/Vector3.cpp b/Source/Engine/Core/Math/Vector3.cpp
index e3ff349ba..f66bbcbbd 100644
--- a/Source/Engine/Core/Math/Vector3.cpp
+++ b/Source/Engine/Core/Math/Vector3.cpp
@@ -6,7 +6,7 @@
 #include "Color.h"
 #include "Quaternion.h"
 #include "Matrix.h"
-#include "VectorInt.h"
+#include "Int3.h"
 #include "../Types/String.h"
 
 static_assert(sizeof(Vector3) == 12, "Invalid Vector3 type size.");
diff --git a/Source/Engine/Core/Math/Vector4.cpp b/Source/Engine/Core/Math/Vector4.cpp
index 3caaab985..34fa27aac 100644
--- a/Source/Engine/Core/Math/Vector4.cpp
+++ b/Source/Engine/Core/Math/Vector4.cpp
@@ -6,7 +6,7 @@
 #include "Color.h"
 #include "Matrix.h"
 #include "Rectangle.h"
-#include "VectorInt.h"
+#include "Int4.h"
 #include "../Types/String.h"
 
 static_assert(sizeof(Vector4) == 16, "Invalid Vector4 type size.");
diff --git a/Source/Engine/Graphics/Models/ModelData.h b/Source/Engine/Graphics/Models/ModelData.h
index 1e4b59d0a..a3bb47fcc 100644
--- a/Source/Engine/Graphics/Models/ModelData.h
+++ b/Source/Engine/Graphics/Models/ModelData.h
@@ -5,7 +5,7 @@
 #include "Engine/Core/Common.h"
 #include "Engine/Core/Math/BoundingSphere.h"
 #include "Engine/Core/Math/BoundingBox.h"
-#include "Engine/Core/Math/VectorInt.h"
+#include "Engine/Core/Math/Int4.h"
 #include "Engine/Serialization/Stream.h"
 #include "Engine/Graphics/Enums.h"
 #include "Types.h"
diff --git a/Source/Engine/Graphics/Models/Types.h b/Source/Engine/Graphics/Models/Types.h
index 248988243..9a95b8815 100644
--- a/Source/Engine/Graphics/Models/Types.h
+++ b/Source/Engine/Graphics/Models/Types.h
@@ -9,7 +9,7 @@
 #include "Engine/Core/Math/Vector4.h"
 #include "Engine/Core/Math/Color.h"
 #include "Engine/Core/Math/Color32.h"
-#include "Engine/Core/Math/VectorInt.h"
+#include "Engine/Core/Math/Int4.h"
 
 class Model;
 class SkinnedModel;
diff --git a/Source/Engine/Navigation/NavMeshBuilder.cpp b/Source/Engine/Navigation/NavMeshBuilder.cpp
index b8e9a7544..2220d2cb6 100644
--- a/Source/Engine/Navigation/NavMeshBuilder.cpp
+++ b/Source/Engine/Navigation/NavMeshBuilder.cpp
@@ -4,7 +4,6 @@
 
 #include "NavMeshBuilder.h"
 #include "Engine/Core/Math/BoundingBox.h"
-#include "Engine/Core/Math/VectorInt.h"
 #include "Engine/Physics/Colliders/BoxCollider.h"
 #include "Engine/Physics/Colliders/MeshCollider.h"
 #include "Engine/Threading/ThreadPoolTask.h"
@@ -15,6 +14,7 @@
 #include "Engine/Level/Level.h"
 #include "Engine/Level/SceneQuery.h"
 #include "Engine/Core/Log.h"
+#include "Engine/Core/Math/Int3.h"
 #include "NavigationScene.h"
 #include "NavigationSettings.h"
 #include "NavMeshBoundsVolume.h"
diff --git a/Source/Engine/Platform/Linux/LinuxWindow.cpp b/Source/Engine/Platform/Linux/LinuxWindow.cpp
index 0ed5341ec..768df66bd 100644
--- a/Source/Engine/Platform/Linux/LinuxWindow.cpp
+++ b/Source/Engine/Platform/Linux/LinuxWindow.cpp
@@ -10,7 +10,7 @@
 #include "Engine/Core/Log.h"
 #include "Engine/Core/Math/Math.h"
 #include "Engine/Core/Math/Color32.h"
-#include "Engine/Core/Math/VectorInt.h"
+#include "Engine/Core/Math/Int2.h"
 #include "Engine/Core/Collections/Array.h"
 #include "Engine/Core/Collections/Dictionary.h"
 #include "Engine/Utilities/StringConverter.h"
diff --git a/Source/Engine/Renderer/EyeAdaptationPass.cpp b/Source/Engine/Renderer/EyeAdaptationPass.cpp
index 754c1489f..a85e0a72b 100644
--- a/Source/Engine/Renderer/EyeAdaptationPass.cpp
+++ b/Source/Engine/Renderer/EyeAdaptationPass.cpp
@@ -2,6 +2,7 @@
 
 #include "EyeAdaptationPass.h"
 #include "RenderList.h"
+#include "Engine/Core/Math/Int2.h"
 #include "Engine/Content/Assets/Shader.h"
 #include "Engine/Content/Content.h"
 #include "Engine/Graphics/PostProcessBase.h"
diff --git a/Source/Engine/Terrain/TerrainPatch.cpp b/Source/Engine/Terrain/TerrainPatch.cpp
index d0050d455..791e93c7f 100644
--- a/Source/Engine/Terrain/TerrainPatch.cpp
+++ b/Source/Engine/Terrain/TerrainPatch.cpp
@@ -5,7 +5,6 @@
 #include "Engine/Serialization/Serialization.h"
 #include "Engine/Graphics/RenderView.h"
 #include "Engine/Core/Math/Color32.h"
-#include "Engine/Core/Math/VectorInt.h"
 #include "Engine/Profiler/ProfilerCPU.h"
 #include "Engine/Physics/Utilities.h"
 #include "Engine/Physics/Physics.h"
diff --git a/Source/Engine/Terrain/TerrainPatch.h b/Source/Engine/Terrain/TerrainPatch.h
index fcd97f4ec..b09848d61 100644
--- a/Source/Engine/Terrain/TerrainPatch.h
+++ b/Source/Engine/Terrain/TerrainPatch.h
@@ -5,7 +5,7 @@
 #include "Terrain.h"
 #include "TerrainChunk.h"
 #include "Engine/Core/Math/Color32.h"
-#include "Engine/Core/Math/VectorInt.h"
+#include "Engine/Core/Math/Int2.h"
 #include "Engine/Physics/Types.h"
 #include "Engine/Level/Scene/Lightmap.h"
 #include "Engine/Content/Assets/RawDataAsset.h"
diff --git a/Source/Engine/Tools/TextureTool/TextureTool.cpp b/Source/Engine/Tools/TextureTool/TextureTool.cpp
index e6502bb6f..67e4d7679 100644
--- a/Source/Engine/Tools/TextureTool/TextureTool.cpp
+++ b/Source/Engine/Tools/TextureTool/TextureTool.cpp
@@ -7,7 +7,7 @@
 #include "Engine/Core/Types/DateTime.h"
 #include "Engine/Core/Math/Packed.h"
 #include "Engine/Core/Math/Color32.h"
-#include "Engine/Core/Math/VectorInt.h"
+#include "Engine/Core/Math/Int2.h"
 #include "Engine/Platform/FileSystem.h"
 #include "Engine/Serialization/JsonWriter.h"
 #include "Engine/Serialization/JsonTools.h"