diff --git a/Source/Entities/Actor.h b/Source/Entities/Actor.h
index 6dac4bb04c..dfaa802979 100644
--- a/Source/Entities/Actor.h
+++ b/Source/Entities/Actor.h
@@ -8,6 +8,8 @@
 #include "MOSRotating.h"
 #include "PathFinder.h"
 
+#include <array>
+
 namespace RTE {
 
 #pragma region Global Macro Definitions
diff --git a/Source/Entities/PieMenu.cpp b/Source/Entities/PieMenu.cpp
index c59adcc906..7fa69610dd 100644
--- a/Source/Entities/PieMenu.cpp
+++ b/Source/Entities/PieMenu.cpp
@@ -14,6 +14,8 @@
 #include "GUIFont.h"
 #include "AllegroBitmap.h"
 
+#include <array>
+
 using namespace RTE;
 
 ConcreteClassInfo(PieMenu, Entity, 20);
diff --git a/Source/Entities/TerrainObject.cpp b/Source/Entities/TerrainObject.cpp
index a2ac8b8173..d782348927 100644
--- a/Source/Entities/TerrainObject.cpp
+++ b/Source/Entities/TerrainObject.cpp
@@ -4,6 +4,8 @@
 #include "Draw.h"
 #include "FrameMan.h"
 
+#include <array>
+
 using namespace RTE;
 
 ConcreteClassInfo(TerrainObject, SceneObject, 0);
diff --git a/Source/Managers/ActivityMan.cpp b/Source/Managers/ActivityMan.cpp
index 3503a9f57e..75d802bd93 100644
--- a/Source/Managers/ActivityMan.cpp
+++ b/Source/Managers/ActivityMan.cpp
@@ -33,6 +33,7 @@
 #include "SDL3/SDL_surface.h"
 #include <SDL3_image/SDL_image.h>
 
+#include <array>
 #include <execution>
 
 using namespace RTE;
diff --git a/Source/Managers/AudioMan.cpp b/Source/Managers/AudioMan.cpp
index 2a86e5e1bb..9f42dd2391 100644
--- a/Source/Managers/AudioMan.cpp
+++ b/Source/Managers/AudioMan.cpp
@@ -12,6 +12,7 @@
 #include "WindowMan.h"
 #include "SoundSet.h"
 
+#include <array>
 #include <cstring>
 
 using namespace RTE;
diff --git a/Source/Managers/FrameMan.cpp b/Source/Managers/FrameMan.cpp
index 549cbb7f4c..0799a475c6 100644
--- a/Source/Managers/FrameMan.cpp
+++ b/Source/Managers/FrameMan.cpp
@@ -32,6 +32,8 @@
 #include "tracy/TracyOpenGL.hpp"
 #include <SDL3_image/SDL_image.h>
 
+#include <array>
+
 using namespace RTE;
 
 void BitmapDeleter::operator()(BITMAP* bitmap) const { destroy_bitmap(bitmap); }
diff --git a/Source/Managers/LuaMan.h b/Source/Managers/LuaMan.h
index 62502714c7..1d2b3cbbbc 100644
--- a/Source/Managers/LuaMan.h
+++ b/Source/Managers/LuaMan.h
@@ -7,6 +7,8 @@
 
 #include "BS_thread_pool.hpp"
 
+#include <array>
+
 #define g_LuaMan LuaMan::Instance()
 
 struct lua_State;
diff --git a/Source/Managers/PerformanceMan.cpp b/Source/Managers/PerformanceMan.cpp
index 1232352025..b53759b508 100644
--- a/Source/Managers/PerformanceMan.cpp
+++ b/Source/Managers/PerformanceMan.cpp
@@ -6,6 +6,8 @@
 #include "GUI.h"
 #include "AllegroBitmap.h"
 
+#include <array>
+
 using namespace RTE;
 
 const std::array<std::string, PerformanceMan::PerformanceCounters::PerfCounterCount> PerformanceMan::m_PerfCounterNames = {"Total", "Act AI", "Act Travel", "Act Update", "Prt Travel", "Prt Update", "Activity", "Scripts"};
diff --git a/Source/Managers/PostProcessMan.cpp b/Source/Managers/PostProcessMan.cpp
index 6081b966b1..9c0e0ff2bc 100644
--- a/Source/Managers/PostProcessMan.cpp
+++ b/Source/Managers/PostProcessMan.cpp
@@ -20,6 +20,8 @@
 #include "tracy/Tracy.hpp"
 #include "tracy/TracyOpenGL.hpp"
 
+#include <array>
+
 using namespace RTE;
 
 PostProcessMan::PostProcessMan() {
diff --git a/Source/Managers/PresetMan.cpp b/Source/Managers/PresetMan.cpp
index 5d7a6a5999..65e20b92cd 100644
--- a/Source/Managers/PresetMan.cpp
+++ b/Source/Managers/PresetMan.cpp
@@ -18,6 +18,8 @@
 #include "SettingsMan.h"
 #include "System.h"
 
+#include <array>
+
 using namespace RTE;
 
 const std::array<std::string, 10> PresetMan::c_OfficialModules = {"Base.rte", "Coalition.rte", "Imperatus.rte", "Techion.rte", "Dummy.rte", "Ronin.rte", "Browncoats.rte", "Uzira.rte", "MuIlaak.rte", "Missions.rte"};
diff --git a/Source/Managers/UInputMan.cpp b/Source/Managers/UInputMan.cpp
index 882b481c42..a1d4c261ff 100644
--- a/Source/Managers/UInputMan.cpp
+++ b/Source/Managers/UInputMan.cpp
@@ -14,6 +14,7 @@
 #include "System.h"
 
 #include <SDL3/SDL.h>
+#include <array>
 #include <string>
 #include <unordered_map>
 
diff --git a/Source/Menus/MainMenuGUI.h b/Source/Menus/MainMenuGUI.h
index c56c51e8e7..5e80a505e1 100644
--- a/Source/Menus/MainMenuGUI.h
+++ b/Source/Menus/MainMenuGUI.h
@@ -6,6 +6,8 @@
 #include "SettingsGUI.h"
 #include "ModManagerGUI.h"
 
+#include <array>
+
 namespace RTE {
 
 	class AllegroScreen;
diff --git a/Source/Menus/SettingsInputMappingGUI.cpp b/Source/Menus/SettingsInputMappingGUI.cpp
index 683a3492b2..de28b72a97 100644
--- a/Source/Menus/SettingsInputMappingGUI.cpp
+++ b/Source/Menus/SettingsInputMappingGUI.cpp
@@ -8,6 +8,8 @@
 #include "GUIScrollbar.h"
 #include "GUILabel.h"
 
+#include <array>
+
 using namespace RTE;
 
 std::array<InputElements, 7> SettingsInputMappingGUI::m_InputElementsUsedByMouse = {InputElements::INPUT_FIRE, InputElements::INPUT_PIEMENU_ANALOG, InputElements::INPUT_AIM, InputElements::INPUT_AIM_UP, InputElements::INPUT_AIM_DOWN, InputElements::INPUT_AIM_LEFT, InputElements::INPUT_AIM_RIGHT};
diff --git a/Source/Renderer/GraphicalPrimitive.cpp b/Source/Renderer/GraphicalPrimitive.cpp
index 3b282d1a46..9b9797c78d 100644
--- a/Source/Renderer/GraphicalPrimitive.cpp
+++ b/Source/Renderer/GraphicalPrimitive.cpp
@@ -9,6 +9,8 @@
 #include "AllegroBitmap.h"
 
 #include "Draw.h"
+
+#include <array>
 #include <cmath>
 
 using namespace RTE;
diff --git a/Source/Renderer/Shader.h b/Source/Renderer/Shader.h
index 2cc9cd11fd..14e51df99c 100644
--- a/Source/Renderer/Shader.h
+++ b/Source/Renderer/Shader.h
@@ -6,6 +6,8 @@
 #include "raylib/raylib.h"
 #include "raylib/rlgl.h"
 
+#include <array>
+
 namespace RTE {
 	class Shader: public Entity {
 	public:
diff --git a/Source/System/ContentFile.cpp b/Source/System/ContentFile.cpp
index c11a99faac..6313408117 100644
--- a/Source/System/ContentFile.cpp
+++ b/Source/System/ContentFile.cpp
@@ -12,6 +12,7 @@
 #include "fmod/fmod_errors.h"
 #include <SDL3_image/SDL_image.h>
 
+#include <array>
 #include <cstring>
 
 using namespace RTE;
diff --git a/Source/System/Controller.cpp b/Source/System/Controller.cpp
index 1ea45a8199..e7807102f8 100644
--- a/Source/System/Controller.cpp
+++ b/Source/System/Controller.cpp
@@ -6,6 +6,8 @@
 #include "Actor.h"
 #include "PieMenu.h"
 
+#include <array>
+
 using namespace RTE;
 
 void Controller::Clear() {
diff --git a/Source/System/Entity.h b/Source/System/Entity.h
index 82e2584cd3..07a19751bc 100644
--- a/Source/System/Entity.h
+++ b/Source/System/Entity.h
@@ -3,6 +3,7 @@
 #include "Serializable.h"
 #include "RTEError.h"
 
+#include <mutex>
 #include <list>
 #include <unordered_set>
 
diff --git a/Source/System/PathFinder.cpp b/Source/System/PathFinder.cpp
index a4dc5808c2..16de46f553 100644
--- a/Source/System/PathFinder.cpp
+++ b/Source/System/PathFinder.cpp
@@ -8,6 +8,7 @@
 
 #include "tracy/Tracy.hpp"
 
+#include <array>
 #include <execution>
 
 using namespace RTE;
diff --git a/Source/System/PathFinder.h b/Source/System/PathFinder.h
index d6c448a77c..008bd1add4 100644
--- a/Source/System/PathFinder.h
+++ b/Source/System/PathFinder.h
@@ -3,6 +3,7 @@
 #include "Box.h"
 #include "System/MicroPather/micropather.h"
 
+#include <array>
 #include <atomic>
 #include <list>
 #include <memory>
diff --git a/Source/System/PieQuadrant.cpp b/Source/System/PieQuadrant.cpp
index 1188d21527..0163aa7088 100644
--- a/Source/System/PieQuadrant.cpp
+++ b/Source/System/PieQuadrant.cpp
@@ -2,6 +2,8 @@
 
 #include "RTETools.h"
 
+#include <array>
+
 using namespace RTE;
 
 void PieQuadrant::Clear() {
diff --git a/Source/System/SpatialPartitionGrid.h b/Source/System/SpatialPartitionGrid.h
index 347ce1d59e..79f04fde66 100644
--- a/Source/System/SpatialPartitionGrid.h
+++ b/Source/System/SpatialPartitionGrid.h
@@ -7,6 +7,8 @@
 
 #include "tsl/hopscotch_set.h"
 
+#include <array>
+
 namespace RTE {
 
 	class Box;