diff --git a/examples/cpp/circles_bruteforce/src/main.cu b/examples/cpp/circles_bruteforce/src/main.cu
index a0517b5c3..ce1737dba 100644
--- a/examples/cpp/circles_bruteforce/src/main.cu
+++ b/examples/cpp/circles_bruteforce/src/main.cu
@@ -1,4 +1,5 @@
 #include <float.h>
+#include <cstdio>
 #include "flamegpu/flamegpu.h"
 
 FLAMEGPU_AGENT_FUNCTION(output_message, flamegpu::MessageNone, flamegpu::MessageBruteForce) {
diff --git a/examples/cpp/circles_spatial3D/src/main.cu b/examples/cpp/circles_spatial3D/src/main.cu
index 524bdad69..e8a7b6a5f 100644
--- a/examples/cpp/circles_spatial3D/src/main.cu
+++ b/examples/cpp/circles_spatial3D/src/main.cu
@@ -1,4 +1,5 @@
 #include <float.h>
+#include <cstdio>
 #include "flamegpu/flamegpu.h"
 
 FLAMEGPU_AGENT_FUNCTION(output_message, flamegpu::MessageNone, flamegpu::MessageSpatial3D) {
diff --git a/examples/cpp/ensemble/src/main.cu b/examples/cpp/ensemble/src/main.cu
index 528891426..b0521b4bd 100644
--- a/examples/cpp/ensemble/src/main.cu
+++ b/examples/cpp/ensemble/src/main.cu
@@ -1,3 +1,6 @@
+#include <cstdio>
+#include <map>
+
 #include "flamegpu/flamegpu.h"
 
 FLAMEGPU_AGENT_FUNCTION(AddOffset, flamegpu::MessageNone, flamegpu::MessageNone) {
diff --git a/examples/cpp/host_functions/src/main.cu b/examples/cpp/host_functions/src/main.cu
index 5bd2a0c2f..b4d7aa7e1 100644
--- a/examples/cpp/host_functions/src/main.cu
+++ b/examples/cpp/host_functions/src/main.cu
@@ -1,3 +1,6 @@
+#include <cstdio>
+#include <vector>
+
 #include "flamegpu/flamegpu.h"
 
 const unsigned int AGENT_COUNT = 1024;
diff --git a/examples/cpp/sugarscape/src/main.cu b/examples/cpp/sugarscape/src/main.cu
index a4b2b73a1..a4bddae62 100644
--- a/examples/cpp/sugarscape/src/main.cu
+++ b/examples/cpp/sugarscape/src/main.cu
@@ -3,6 +3,7 @@
 #include <cstdlib>
 #include <fstream>
 #include <array>
+#include <vector>
 
 #include "flamegpu/flamegpu.h"
 
diff --git a/include/flamegpu/visualiser/color/Color.h b/include/flamegpu/visualiser/color/Color.h
index c983bb24e..10c87bd4f 100644
--- a/include/flamegpu/visualiser/color/Color.h
+++ b/include/flamegpu/visualiser/color/Color.h
@@ -3,6 +3,7 @@
 
 #include <cstring>
 #include <array>
+#include <cstdio>
 
 #include "flamegpu/exception/FLAMEGPUException.h"
 
diff --git a/src/flamegpu/detail/JitifyCache.cu b/src/flamegpu/detail/JitifyCache.cu
index 1c55047a0..2ea2a26c9 100644
--- a/src/flamegpu/detail/JitifyCache.cu
+++ b/src/flamegpu/detail/JitifyCache.cu
@@ -6,6 +6,9 @@
 #include <regex>
 #include <array>
 #include <filesystem>
+#include <vector>
+#include <memory>
+#include <string>
 
 #include "flamegpu/version.h"
 #include "flamegpu/exception/FLAMEGPUException.h"
diff --git a/src/flamegpu/detail/TestSuiteTelemetry.cpp b/src/flamegpu/detail/TestSuiteTelemetry.cpp
index 6ec9cc2b9..0a29edc3b 100644
--- a/src/flamegpu/detail/TestSuiteTelemetry.cpp
+++ b/src/flamegpu/detail/TestSuiteTelemetry.cpp
@@ -1,4 +1,6 @@
 #include <cstdio>
+#include <map>
+#include <string>
 
 #include "flamegpu/detail/TestSuiteTelemetry.h"
 
diff --git a/src/flamegpu/detail/compute_capability.cu b/src/flamegpu/detail/compute_capability.cu
index cfd8f3e12..e5bd35765 100644
--- a/src/flamegpu/detail/compute_capability.cu
+++ b/src/flamegpu/detail/compute_capability.cu
@@ -1,6 +1,8 @@
 #include <nvrtc.h>
 
 #include <cassert>
+#include <vector>
+#include <string>
 
 #include "flamegpu/detail/compute_capability.cuh"
 #include "flamegpu/simulation/detail/CUDAErrorChecking.cuh"
diff --git a/src/flamegpu/exception/FLAMEGPUDeviceException.cu b/src/flamegpu/exception/FLAMEGPUDeviceException.cu
index 517752a94..7759635d6 100644
--- a/src/flamegpu/exception/FLAMEGPUDeviceException.cu
+++ b/src/flamegpu/exception/FLAMEGPUDeviceException.cu
@@ -1,3 +1,6 @@
+#include <cstdio>
+#include <string>
+
 #include "flamegpu/exception/FLAMEGPUDeviceException.cuh"
 
 #include "flamegpu/simulation/detail/CUDAErrorChecking.cuh"
diff --git a/src/flamegpu/exception/FLAMEGPUException.cpp b/src/flamegpu/exception/FLAMEGPUException.cpp
index e3ed2003e..37959927e 100644
--- a/src/flamegpu/exception/FLAMEGPUException.cpp
+++ b/src/flamegpu/exception/FLAMEGPUException.cpp
@@ -4,6 +4,7 @@
 #include <cstring>
 #include <sstream>
 #include <limits>
+#include <string>
 
 namespace flamegpu {
 namespace exception {
diff --git a/src/flamegpu/io/JSONGraphReader.cpp b/src/flamegpu/io/JSONGraphReader.cpp
index fb40795a8..5df686436 100644
--- a/src/flamegpu/io/JSONGraphReader.cpp
+++ b/src/flamegpu/io/JSONGraphReader.cpp
@@ -8,6 +8,8 @@
 #include <string>
 #include <map>
 #include <set>
+#include <cstdio>
+#include <memory>
 
 #include "flamegpu/exception/FLAMEGPUException.h"
 #include "flamegpu/simulation/detail/CUDAEnvironmentDirectedGraphBuffers.cuh"
diff --git a/src/flamegpu/io/JSONGraphWriter.cpp b/src/flamegpu/io/JSONGraphWriter.cpp
index 9a2eb931e..ed1423c2c 100644
--- a/src/flamegpu/io/JSONGraphWriter.cpp
+++ b/src/flamegpu/io/JSONGraphWriter.cpp
@@ -4,6 +4,10 @@
 #include <rapidjson/prettywriter.h>
 #include <rapidjson/stringbuffer.h>
 #include <fstream>
+#include <cstdio>
+#include <utility>
+#include <string>
+#include <memory>
 
 #include "flamegpu/exception/FLAMEGPUException.h"
 #include "flamegpu/simulation/detail/CUDAEnvironmentDirectedGraphBuffers.cuh"
diff --git a/src/flamegpu/io/JSONStateReader.cu b/src/flamegpu/io/JSONStateReader.cu
index 219f55ef5..893cba4f1 100644
--- a/src/flamegpu/io/JSONStateReader.cu
+++ b/src/flamegpu/io/JSONStateReader.cu
@@ -9,6 +9,10 @@
 #include <unordered_map>
 #include <cerrno>
 #include <numeric>
+#include <cstdio>
+#include <vector>
+#include <functional>
+#include <memory>
 
 #include "flamegpu/exception/FLAMEGPUException.h"
 #include "flamegpu/simulation/AgentVector.h"
diff --git a/src/flamegpu/io/JSONStateWriter.cu b/src/flamegpu/io/JSONStateWriter.cu
index 312d09df7..c010b7593 100644
--- a/src/flamegpu/io/JSONStateWriter.cu
+++ b/src/flamegpu/io/JSONStateWriter.cu
@@ -9,6 +9,9 @@
 #include <numeric>
 #include <set>
 #include <algorithm>
+#include <memory>
+#include <map>
+#include <functional>
 
 #include "flamegpu/exception/FLAMEGPUException.h"
 #include "flamegpu/model/AgentDescription.h"
diff --git a/src/flamegpu/io/StateReader.cu b/src/flamegpu/io/StateReader.cu
index 9e05d5627..222fd4119 100644
--- a/src/flamegpu/io/StateReader.cu
+++ b/src/flamegpu/io/StateReader.cu
@@ -1,5 +1,9 @@
 #include "flamegpu/io/StateReader.h"
 
+#include <vector>
+#include <unordered_map>
+#include <string>
+
 namespace flamegpu {
 namespace io {
 
diff --git a/src/flamegpu/io/Telemetry.cpp b/src/flamegpu/io/Telemetry.cpp
index 5876606b9..e298cb136 100644
--- a/src/flamegpu/io/Telemetry.cpp
+++ b/src/flamegpu/io/Telemetry.cpp
@@ -9,6 +9,8 @@
 #include <cstdio>
 #include <cctype>
 #include <sstream>
+#include <string>
+#include <map>
 
 #include "flamegpu/version.h"
 
diff --git a/src/flamegpu/io/XMLLogger.cu b/src/flamegpu/io/XMLLogger.cu
index 26988e660..ebb7c5a38 100644
--- a/src/flamegpu/io/XMLLogger.cu
+++ b/src/flamegpu/io/XMLLogger.cu
@@ -1,6 +1,8 @@
 #include "flamegpu/io/XMLLogger.h"
 
 #include <sstream>
+#include <cstdio>
+#include <string>
 
 #include "tinyxml2/tinyxml2.h"              // downloaded from https:// github.com/leethomason/tinyxml2, the list of xml parsers : http:// lars.ruoff.free.fr/xmlcpp/
 
diff --git a/src/flamegpu/io/XMLStateReader.cu b/src/flamegpu/io/XMLStateReader.cu
index b93b07ef0..a5d605bdd 100644
--- a/src/flamegpu/io/XMLStateReader.cu
+++ b/src/flamegpu/io/XMLStateReader.cu
@@ -3,6 +3,12 @@
 #include <algorithm>
 #include <numeric>
 #include <tuple>
+#include <cstdio>
+#include <vector>
+#include <functional>
+#include <memory>
+#include <string>
+
 #include "tinyxml2/tinyxml2.h"              // downloaded from https:// github.com/leethomason/tinyxml2, the list of xml parsers : http:// lars.ruoff.free.fr/xmlcpp/
 #include "flamegpu/exception/FLAMEGPUException.h"
 #include "flamegpu/simulation/AgentVector.h"
diff --git a/src/flamegpu/io/XMLStateWriter.cu b/src/flamegpu/io/XMLStateWriter.cu
index 22e7959e3..d17f368d2 100644
--- a/src/flamegpu/io/XMLStateWriter.cu
+++ b/src/flamegpu/io/XMLStateWriter.cu
@@ -2,6 +2,13 @@
 
 #include <numeric>
 #include <sstream>
+#include <string>
+#include <functional>
+#include <algorithm>
+#include <set>
+#include <map>
+#include <memory>
+
 #include "tinyxml2/tinyxml2.h"              // downloaded from https:// github.com/leethomason/tinyxml2, the list of xml parsers : http:// lars.ruoff.free.fr/xmlcpp/
 #include "flamegpu/exception/FLAMEGPUException.h"
 #include "flamegpu/model/AgentDescription.h"
diff --git a/src/flamegpu/model/AgentData.cpp b/src/flamegpu/model/AgentData.cpp
index 02627cd44..008d3c98f 100644
--- a/src/flamegpu/model/AgentData.cpp
+++ b/src/flamegpu/model/AgentData.cpp
@@ -1,5 +1,8 @@
 #include "flamegpu/model/AgentData.h"
 
+#include <string>
+#include <memory>
+
 #include "flamegpu/model/AgentDescription.h"
 #include "flamegpu/model/AgentFunctionDescription.h"
 
diff --git a/src/flamegpu/model/AgentDescription.cpp b/src/flamegpu/model/AgentDescription.cpp
index 942035f13..09323473b 100644
--- a/src/flamegpu/model/AgentDescription.cpp
+++ b/src/flamegpu/model/AgentDescription.cpp
@@ -1,5 +1,9 @@
 #include "flamegpu/model/AgentDescription.h"
 
+#include <utility>
+#include <set>
+#include <string>
+
 #include "flamegpu/model/AgentFunctionDescription.h"
 #include "flamegpu/exception/FLAMEGPUException.h"
 
diff --git a/src/flamegpu/model/AgentFunctionData.cpp b/src/flamegpu/model/AgentFunctionData.cpp
index d2b51629e..e5cb9b084 100644
--- a/src/flamegpu/model/AgentFunctionData.cpp
+++ b/src/flamegpu/model/AgentFunctionData.cpp
@@ -1,5 +1,8 @@
 #include "flamegpu/model/AgentFunctionData.cuh"
 
+#include <string>
+#include <memory>
+
 #include "flamegpu/model/AgentDescription.h"
 #include "flamegpu/model/AgentFunctionDescription.h"
 #include "flamegpu/runtime/detail/curve/curve_rtc.cuh"
diff --git a/src/flamegpu/model/AgentFunctionDescription.cpp b/src/flamegpu/model/AgentFunctionDescription.cpp
index 74bbe8f94..2f0bd202c 100644
--- a/src/flamegpu/model/AgentFunctionDescription.cpp
+++ b/src/flamegpu/model/AgentFunctionDescription.cpp
@@ -5,6 +5,10 @@
 #include <sstream>
 #include <string>
 #include <regex>
+#include <utility>
+#include <vector>
+#include <memory>
+#include <set>
 
 #include "flamegpu/model/AgentFunctionDescription.h"
 #include "flamegpu/detail/cxxname.hpp"
diff --git a/src/flamegpu/model/DependencyGraph.cpp b/src/flamegpu/model/DependencyGraph.cpp
index 81cb38a68..eae915f48 100644
--- a/src/flamegpu/model/DependencyGraph.cpp
+++ b/src/flamegpu/model/DependencyGraph.cpp
@@ -1,5 +1,11 @@
 #include "flamegpu/model/DependencyGraph.h"
 
+#include <vector>
+#include <memory>
+#include <set>
+#include <iostream>
+#include <string>
+
 namespace flamegpu {
 
 DependencyGraph::DependencyGraph(ModelData* _model) : model(_model) {
diff --git a/src/flamegpu/model/DependencyNode.cpp b/src/flamegpu/model/DependencyNode.cpp
index 4ae3f893a..824c097e5 100644
--- a/src/flamegpu/model/DependencyNode.cpp
+++ b/src/flamegpu/model/DependencyNode.cpp
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <string>
+#include <vector>
 
 #include "flamegpu/model/DependencyNode.h"
 
diff --git a/src/flamegpu/model/EnvironmentData.cpp b/src/flamegpu/model/EnvironmentData.cpp
index 2ab12a282..a087a3987 100644
--- a/src/flamegpu/model/EnvironmentData.cpp
+++ b/src/flamegpu/model/EnvironmentData.cpp
@@ -1,4 +1,7 @@
 #include "flamegpu/model/EnvironmentData.h"
+
+#include <memory>
+
 #include "flamegpu/model/EnvironmentDirectedGraphData.cuh"
 
 namespace flamegpu {
diff --git a/src/flamegpu/model/EnvironmentDescription.cpp b/src/flamegpu/model/EnvironmentDescription.cpp
index a01eaa04f..42579b453 100644
--- a/src/flamegpu/model/EnvironmentDescription.cpp
+++ b/src/flamegpu/model/EnvironmentDescription.cpp
@@ -1,3 +1,7 @@
+#include <utility>
+#include <memory>
+#include <string>
+
 #include "flamegpu/model/EnvironmentDescription.h"
 #include "flamegpu/model/EnvironmentDirectedGraphDescription.cuh"
 
diff --git a/src/flamegpu/model/EnvironmentDirectedGraphData.cu b/src/flamegpu/model/EnvironmentDirectedGraphData.cu
index 69b60344f..14b03b9b4 100644
--- a/src/flamegpu/model/EnvironmentDirectedGraphData.cu
+++ b/src/flamegpu/model/EnvironmentDirectedGraphData.cu
@@ -1,5 +1,8 @@
 #include "flamegpu/model/EnvironmentDirectedGraphData.cuh"
 
+#include <string>
+#include <memory>
+
 #include "flamegpu/model/EnvironmentDirectedGraphDescription.cuh"
 #include "flamegpu/defines.h"
 
diff --git a/src/flamegpu/model/EnvironmentDirectedGraphDescription.cu b/src/flamegpu/model/EnvironmentDirectedGraphDescription.cu
index 46efbd5c4..704e1337c 100644
--- a/src/flamegpu/model/EnvironmentDirectedGraphDescription.cu
+++ b/src/flamegpu/model/EnvironmentDirectedGraphDescription.cu
@@ -1,4 +1,8 @@
 #include "flamegpu/model/EnvironmentDirectedGraphDescription.cuh"
+
+#include <utility>
+#include <string>
+
 namespace flamegpu {
 
 CEnvironmentDirectedGraphDescription::CEnvironmentDirectedGraphDescription(std::shared_ptr<EnvironmentDirectedGraphData> data)
diff --git a/src/flamegpu/model/LayerData.cpp b/src/flamegpu/model/LayerData.cpp
index 4e72d2133..f75aa64d4 100644
--- a/src/flamegpu/model/LayerData.cpp
+++ b/src/flamegpu/model/LayerData.cpp
@@ -1,5 +1,8 @@
 #include "flamegpu/model/LayerData.h"
 
+#include <string>
+#include <memory>
+
 #include "flamegpu/model/LayerDescription.h"
 #include "flamegpu/model/SubModelData.h"
 
diff --git a/src/flamegpu/model/LayerDescription.cpp b/src/flamegpu/model/LayerDescription.cpp
index 44b49449f..162e568eb 100644
--- a/src/flamegpu/model/LayerDescription.cpp
+++ b/src/flamegpu/model/LayerDescription.cpp
@@ -1,4 +1,8 @@
 #include "flamegpu/model/LayerDescription.h"
+
+#include <utility>
+#include <string>
+
 #include "flamegpu/model/AgentFunctionDescription.h"
 #include "flamegpu/model/SubModelDescription.h"
 #include "flamegpu/model/SubModelData.h"
diff --git a/src/flamegpu/model/ModelData.cpp b/src/flamegpu/model/ModelData.cpp
index 741c5efa7..63b94e1a1 100644
--- a/src/flamegpu/model/ModelData.cpp
+++ b/src/flamegpu/model/ModelData.cpp
@@ -1,5 +1,7 @@
 #include <iostream>
 #include <algorithm>
+#include <string>
+#include <memory>
 
 #include "flamegpu/model/ModelData.h"
 
diff --git a/src/flamegpu/model/ModelDescription.cpp b/src/flamegpu/model/ModelDescription.cpp
index 60d876acd..4a83b006e 100644
--- a/src/flamegpu/model/ModelDescription.cpp
+++ b/src/flamegpu/model/ModelDescription.cpp
@@ -1,5 +1,8 @@
 #include "flamegpu/model/ModelDescription.h"
 
+#include <string>
+#include <memory>
+
 #include "flamegpu/model/DependencyGraph.h"
 #include "flamegpu/model/AgentDescription.h"
 #include "flamegpu/model/LayerDescription.h"
diff --git a/src/flamegpu/model/SubAgentData.cpp b/src/flamegpu/model/SubAgentData.cpp
index a835132ae..fc4131d89 100644
--- a/src/flamegpu/model/SubAgentData.cpp
+++ b/src/flamegpu/model/SubAgentData.cpp
@@ -1,5 +1,8 @@
 #include "flamegpu/model/SubAgentData.h"
 
+#include <utility>
+#include <memory>
+
 #include "flamegpu/model/SubAgentDescription.h"
 #include "flamegpu/model/AgentData.h"
 #include "flamegpu/model/ModelData.h"
diff --git a/src/flamegpu/model/SubAgentDescription.cpp b/src/flamegpu/model/SubAgentDescription.cpp
index 6991eefde..16aa99b8d 100644
--- a/src/flamegpu/model/SubAgentDescription.cpp
+++ b/src/flamegpu/model/SubAgentDescription.cpp
@@ -1,4 +1,8 @@
 #include "flamegpu/model/SubAgentDescription.h"
+
+#include <utility>
+#include <string>
+
 #include "flamegpu/model/ModelData.h"
 #include "flamegpu/model/SubAgentData.h"
 #include "flamegpu/model/AgentData.h"
diff --git a/src/flamegpu/model/SubEnvironmentData.cpp b/src/flamegpu/model/SubEnvironmentData.cpp
index 9b268dd8b..82859d927 100644
--- a/src/flamegpu/model/SubEnvironmentData.cpp
+++ b/src/flamegpu/model/SubEnvironmentData.cpp
@@ -1,5 +1,8 @@
 #include "flamegpu/model/SubEnvironmentData.h"
 
+#include <utility>
+#include <memory>
+
 #include "flamegpu/model/SubEnvironmentDescription.h"
 #include "flamegpu/model/ModelData.h"
 #include "flamegpu/model/SubModelData.h"
diff --git a/src/flamegpu/model/SubEnvironmentDescription.cpp b/src/flamegpu/model/SubEnvironmentDescription.cpp
index c162bb2c6..f6f1f52e0 100644
--- a/src/flamegpu/model/SubEnvironmentDescription.cpp
+++ b/src/flamegpu/model/SubEnvironmentDescription.cpp
@@ -1,4 +1,8 @@
 #include "flamegpu/model/SubEnvironmentDescription.h"
+
+#include <utility>
+#include <string>
+
 #include "flamegpu/model/ModelData.h"
 #include "flamegpu/model/SubModelData.h"
 #include "flamegpu/model/SubEnvironmentData.h"
diff --git a/src/flamegpu/model/SubModelData.cpp b/src/flamegpu/model/SubModelData.cpp
index 487dcf828..24e79c57d 100644
--- a/src/flamegpu/model/SubModelData.cpp
+++ b/src/flamegpu/model/SubModelData.cpp
@@ -1,5 +1,9 @@
 #include "flamegpu/model/SubModelData.h"
 
+#include <utility>
+#include <string>
+#include <memory>
+
 #include "flamegpu/model/ModelData.h"
 #include "flamegpu/model/AgentData.h"
 #include "flamegpu/model/SubModelDescription.h"
diff --git a/src/flamegpu/model/SubModelDescription.cpp b/src/flamegpu/model/SubModelDescription.cpp
index f36510965..1bb538f69 100644
--- a/src/flamegpu/model/SubModelDescription.cpp
+++ b/src/flamegpu/model/SubModelDescription.cpp
@@ -1,4 +1,9 @@
 #include "flamegpu/model/SubModelDescription.h"
+
+#include <utility>
+#include <string>
+#include <memory>
+
 #include "flamegpu/model/ModelData.h"
 #include "flamegpu/model/AgentData.h"
 #include "flamegpu/model/SubModelData.h"
diff --git a/src/flamegpu/runtime/HostAPI.cu b/src/flamegpu/runtime/HostAPI.cu
index 3ced2eeac..8003bd7e6 100644
--- a/src/flamegpu/runtime/HostAPI.cu
+++ b/src/flamegpu/runtime/HostAPI.cu
@@ -1,6 +1,9 @@
 #include "flamegpu/runtime/HostAPI.h"
 
 #include <map>
+#include <string>
+#include <memory>
+
 #include "flamegpu/runtime/agent/HostAgentAPI.cuh"
 #include "flamegpu/model/ModelDescription.h"
 #include "flamegpu/simulation/Simulation.h"
diff --git a/src/flamegpu/runtime/agent/DeviceAgentVector_impl.cu b/src/flamegpu/runtime/agent/DeviceAgentVector_impl.cu
index 7ad07ad8d..9831b9571 100644
--- a/src/flamegpu/runtime/agent/DeviceAgentVector_impl.cu
+++ b/src/flamegpu/runtime/agent/DeviceAgentVector_impl.cu
@@ -1,3 +1,7 @@
+#include <utility>
+#include <vector>
+#include <string>
+
 #include "flamegpu/runtime/agent/DeviceAgentVector_impl.h"
 #include "flamegpu/simulation/detail/CUDAAgent.h"
 #include "flamegpu/runtime/agent/HostNewAgentAPI.h"
diff --git a/src/flamegpu/runtime/agent/HostAgentAPI.cu b/src/flamegpu/runtime/agent/HostAgentAPI.cu
index 0bc5c6a3e..b8581694d 100644
--- a/src/flamegpu/runtime/agent/HostAgentAPI.cu
+++ b/src/flamegpu/runtime/agent/HostAgentAPI.cu
@@ -1,4 +1,7 @@
 #include "flamegpu/runtime/agent/HostAgentAPI.cuh"
+
+#include <memory>
+
 #include "flamegpu/runtime/agent/DeviceAgentVector_impl.h"
 
 namespace flamegpu {
diff --git a/src/flamegpu/runtime/detail/curve/Curve.cu b/src/flamegpu/runtime/detail/curve/Curve.cu
index 044f312e4..88adbe86f 100644
--- a/src/flamegpu/runtime/detail/curve/Curve.cu
+++ b/src/flamegpu/runtime/detail/curve/Curve.cu
@@ -2,6 +2,7 @@
 
 #include <cuda_runtime.h>
 
+#include <string>
 #include <cstring>
 
 namespace flamegpu {
diff --git a/src/flamegpu/runtime/detail/curve/HostCurve.cu b/src/flamegpu/runtime/detail/curve/HostCurve.cu
index 30ed06825..0f4ac389c 100644
--- a/src/flamegpu/runtime/detail/curve/HostCurve.cu
+++ b/src/flamegpu/runtime/detail/curve/HostCurve.cu
@@ -4,6 +4,7 @@
 #include <cassert>
 #include <map>
 #include <memory>
+#include <string>
 
 #include "flamegpu/runtime/detail/curve/HostCurve.cuh"
 
diff --git a/src/flamegpu/runtime/detail/curve/curve_rtc.cpp b/src/flamegpu/runtime/detail/curve/curve_rtc.cpp
index b299189b0..46bdd495f 100644
--- a/src/flamegpu/runtime/detail/curve/curve_rtc.cpp
+++ b/src/flamegpu/runtime/detail/curve/curve_rtc.cpp
@@ -1,4 +1,6 @@
 #include <sstream>
+#include <set>
+#include <string>
 
 #include "flamegpu/runtime/detail/curve/curve_rtc.cuh"
 #include "flamegpu/exception/FLAMEGPUException.h"
diff --git a/src/flamegpu/runtime/environment/HostEnvironment.cu b/src/flamegpu/runtime/environment/HostEnvironment.cu
index 0cd8dd227..e3f17d430 100644
--- a/src/flamegpu/runtime/environment/HostEnvironment.cu
+++ b/src/flamegpu/runtime/environment/HostEnvironment.cu
@@ -5,6 +5,11 @@
 #include <iterator>
 #include <numeric>
 #include <vector>
+#include <utility>
+#include <memory>
+#include <unordered_map>
+#include <functional>
+#include <string>
 
 #include "flamegpu/io/StateWriter.h"
 #include "flamegpu/io/StateWriterFactory.h"
diff --git a/src/flamegpu/runtime/environment/HostEnvironmentDirectedGraph.cu b/src/flamegpu/runtime/environment/HostEnvironmentDirectedGraph.cu
index 31e74d11f..c9ae54b10 100644
--- a/src/flamegpu/runtime/environment/HostEnvironmentDirectedGraph.cu
+++ b/src/flamegpu/runtime/environment/HostEnvironmentDirectedGraph.cu
@@ -2,6 +2,9 @@
 
 #include <cstring>
 #include <stdexcept>
+#include <utility>
+#include <string>
+#include <memory>
 
 #include "flamegpu/io/JSONGraphReader.h"
 #include "flamegpu/io/JSONGraphWriter.h"
diff --git a/src/flamegpu/runtime/messaging/MessageArray.cu b/src/flamegpu/runtime/messaging/MessageArray.cu
index a2130ae8e..8cab973c8 100644
--- a/src/flamegpu/runtime/messaging/MessageArray.cu
+++ b/src/flamegpu/runtime/messaging/MessageArray.cu
@@ -1,4 +1,9 @@
 #include "flamegpu/runtime/messaging/MessageArray.h"
+
+#include <utility>
+#include <string>
+#include <memory>
+
 #include "flamegpu/model/AgentDescription.h"  // Used by Move-Assign
 #include "flamegpu/simulation/detail/CUDAMessage.h"
 #include "flamegpu/simulation/detail/CUDAScatter.cuh"
diff --git a/src/flamegpu/runtime/messaging/MessageArray2D.cu b/src/flamegpu/runtime/messaging/MessageArray2D.cu
index fed8a3191..21913bcd0 100644
--- a/src/flamegpu/runtime/messaging/MessageArray2D.cu
+++ b/src/flamegpu/runtime/messaging/MessageArray2D.cu
@@ -1,4 +1,9 @@
 #include "flamegpu/runtime/messaging/MessageArray2D.h"
+
+#include <utility>
+#include <string>
+#include <memory>
+
 #include "flamegpu/model/AgentDescription.h"  // Used by Move-Assign
 #include "flamegpu/simulation/detail/CUDAMessage.h"
 #include "flamegpu/simulation/detail/CUDAScatter.cuh"
diff --git a/src/flamegpu/runtime/messaging/MessageArray3D.cu b/src/flamegpu/runtime/messaging/MessageArray3D.cu
index 8c9a227bc..9106cac30 100644
--- a/src/flamegpu/runtime/messaging/MessageArray3D.cu
+++ b/src/flamegpu/runtime/messaging/MessageArray3D.cu
@@ -1,4 +1,9 @@
 #include "flamegpu/runtime/messaging/MessageArray3D.h"
+
+#include <utility>
+#include <string>
+#include <memory>
+
 #include "flamegpu/model/AgentDescription.h"  // Used by Move-Assign
 #include "flamegpu/simulation/detail/CUDAMessage.h"
 #include "flamegpu/simulation/detail/CUDAScatter.cuh"
diff --git a/src/flamegpu/runtime/messaging/MessageBruteForce.cu b/src/flamegpu/runtime/messaging/MessageBruteForce.cu
index 38af3c213..d1c8520d2 100644
--- a/src/flamegpu/runtime/messaging/MessageBruteForce.cu
+++ b/src/flamegpu/runtime/messaging/MessageBruteForce.cu
@@ -1,3 +1,7 @@
+#include <utility>
+#include <string>
+#include <memory>
+
 #include "flamegpu/runtime/messaging/MessageBruteForce/MessageBruteForceHost.h"
 #include "flamegpu/runtime/messaging/MessageBruteForce/MessageBruteForceDevice.cuh"
 #include "flamegpu/model/AgentDescription.h"  // Used by Move-Assign
diff --git a/src/flamegpu/runtime/messaging/MessageBucket.cu b/src/flamegpu/runtime/messaging/MessageBucket.cu
index 930504afc..c31fdfd24 100644
--- a/src/flamegpu/runtime/messaging/MessageBucket.cu
+++ b/src/flamegpu/runtime/messaging/MessageBucket.cu
@@ -1,5 +1,10 @@
 #include "flamegpu/runtime/messaging/MessageBucket.h"
 
+#include <utility>
+#include <string>
+#include <memory>
+#include <limits>
+
 #ifdef _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable : 4706 4834)
diff --git a/src/flamegpu/runtime/messaging/MessageSpatial2D.cu b/src/flamegpu/runtime/messaging/MessageSpatial2D.cu
index 6059b8d90..386015d54 100644
--- a/src/flamegpu/runtime/messaging/MessageSpatial2D.cu
+++ b/src/flamegpu/runtime/messaging/MessageSpatial2D.cu
@@ -1,5 +1,9 @@
 #include "flamegpu/runtime/messaging/MessageSpatial2D.h"
 
+#include <utility>
+#include <string>
+#include <memory>
+
 #ifdef _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable : 4706 4834)
diff --git a/src/flamegpu/runtime/messaging/MessageSpatial3D.cu b/src/flamegpu/runtime/messaging/MessageSpatial3D.cu
index a58524adf..6d8d66213 100644
--- a/src/flamegpu/runtime/messaging/MessageSpatial3D.cu
+++ b/src/flamegpu/runtime/messaging/MessageSpatial3D.cu
@@ -1,3 +1,7 @@
+#include <utility>
+#include <string>
+#include <memory>
+
 #include "flamegpu/runtime/messaging/MessageSpatial3D/MessageSpatial3DHost.h"
 #include "flamegpu/runtime/messaging/MessageSpatial3D/MessageSpatial3DDevice.cuh"
 #include "flamegpu/detail/cuda.cuh"
diff --git a/src/flamegpu/simulation/AgentInstance.cpp b/src/flamegpu/simulation/AgentInstance.cpp
index 676b6a4ea..27c84c269 100644
--- a/src/flamegpu/simulation/AgentInstance.cpp
+++ b/src/flamegpu/simulation/AgentInstance.cpp
@@ -1,5 +1,7 @@
 #include "flamegpu/runtime/agent/AgentInstance.h"
 
+#include <utility>
+
 #include "flamegpu/model/AgentDescription.h"
 #include "flamegpu/model/AgentData.h"
 #include "flamegpu/simulation/AgentVector.h"
diff --git a/src/flamegpu/simulation/AgentLoggingConfig.cu b/src/flamegpu/simulation/AgentLoggingConfig.cu
index 20d8701f5..9e90d213e 100644
--- a/src/flamegpu/simulation/AgentLoggingConfig.cu
+++ b/src/flamegpu/simulation/AgentLoggingConfig.cu
@@ -1,6 +1,9 @@
+#include "flamegpu/simulation/AgentLoggingConfig.h"
+
 #include <utility>
+#include <string>
+#include <memory>
 
-#include "flamegpu/simulation/AgentLoggingConfig.h"
 #include "flamegpu/model/AgentData.h"
 
 namespace flamegpu {
diff --git a/src/flamegpu/simulation/AgentVector.cpp b/src/flamegpu/simulation/AgentVector.cpp
index e429fb808..6b73d3aaa 100644
--- a/src/flamegpu/simulation/AgentVector.cpp
+++ b/src/flamegpu/simulation/AgentVector.cpp
@@ -1,6 +1,10 @@
 #include "flamegpu/simulation/AgentVector.h"
 
 #include <limits>
+#include <utility>
+#include <string>
+#include <memory>
+
 
 #include "flamegpu/model/AgentDescription.h"
 #include "flamegpu/simulation/AgentVector_Agent.h"
diff --git a/src/flamegpu/simulation/AgentVector_Agent.cpp b/src/flamegpu/simulation/AgentVector_Agent.cpp
index 8fe132709..e95e11b44 100644
--- a/src/flamegpu/simulation/AgentVector_Agent.cpp
+++ b/src/flamegpu/simulation/AgentVector_Agent.cpp
@@ -1,5 +1,7 @@
 #include "flamegpu/simulation/AgentVector_Agent.h"
 
+#include <memory>
+
 namespace flamegpu {
 
 AgentVector_CAgent::AgentVector_CAgent(AgentVector* parent, const std::shared_ptr<const AgentData>& agent, const std::weak_ptr<AgentVector::AgentDataMap>& data, flamegpu::size_type pos)
diff --git a/src/flamegpu/simulation/CUDAEnsemble.cu b/src/flamegpu/simulation/CUDAEnsemble.cu
index ae6074a80..ac01f93de 100644
--- a/src/flamegpu/simulation/CUDAEnsemble.cu
+++ b/src/flamegpu/simulation/CUDAEnsemble.cu
@@ -10,6 +10,9 @@
 #include <condition_variable>
 #include <filesystem>
 #include <map>
+#include <cstdio>
+#include <vector>
+#include <string>
 
 #ifdef FLAMEGPU_ENABLE_MPI
 #include "flamegpu/simulation/detail/MPIEnsemble.h"
diff --git a/src/flamegpu/simulation/CUDASimulation.cu b/src/flamegpu/simulation/CUDASimulation.cu
index 480640ac2..c339eb939 100644
--- a/src/flamegpu/simulation/CUDASimulation.cu
+++ b/src/flamegpu/simulation/CUDASimulation.cu
@@ -5,6 +5,11 @@
 #include <string>
 #include <map>
 #include <numeric>
+#include <cstdio>
+#include <vector>
+#include <utility>
+#include <functional>
+#include <memory>
 
 #include "flamegpu/detail/curand.cuh"
 #include "flamegpu/model/AgentFunctionData.cuh"
diff --git a/src/flamegpu/simulation/LogFrame.cu b/src/flamegpu/simulation/LogFrame.cu
index 565b7a5f9..d5d15014c 100644
--- a/src/flamegpu/simulation/LogFrame.cu
+++ b/src/flamegpu/simulation/LogFrame.cu
@@ -1,5 +1,9 @@
 #include "flamegpu/simulation/LogFrame.h"
 
+#include <utility>
+#include <string>
+#include <map>
+
 namespace flamegpu {
 
 LogFrame::LogFrame()
diff --git a/src/flamegpu/simulation/LoggingConfig.cu b/src/flamegpu/simulation/LoggingConfig.cu
index 0b26ff5a5..e1fac3e6e 100644
--- a/src/flamegpu/simulation/LoggingConfig.cu
+++ b/src/flamegpu/simulation/LoggingConfig.cu
@@ -1,5 +1,8 @@
 #include "flamegpu/simulation/LoggingConfig.h"
 
+#include <utility>
+#include <string>
+
 #include "flamegpu/simulation/AgentLoggingConfig.h"
 #include "flamegpu/model/ModelDescription.h"
 #include "flamegpu/model/ModelData.h"
diff --git a/src/flamegpu/simulation/RunPlan.cpp b/src/flamegpu/simulation/RunPlan.cpp
index 38c36354d..941b004d1 100644
--- a/src/flamegpu/simulation/RunPlan.cpp
+++ b/src/flamegpu/simulation/RunPlan.cpp
@@ -1,4 +1,9 @@
 #include "flamegpu/simulation/RunPlan.h"
+
+#include <string>
+#include <memory>
+#include <unordered_map>
+
 #include "flamegpu/simulation/RunPlanVector.h"
 
 #include "flamegpu/model/ModelDescription.h"
diff --git a/src/flamegpu/simulation/RunPlanVector.cpp b/src/flamegpu/simulation/RunPlanVector.cpp
index 20e2b5d5f..13ca68ebf 100644
--- a/src/flamegpu/simulation/RunPlanVector.cpp
+++ b/src/flamegpu/simulation/RunPlanVector.cpp
@@ -1,4 +1,12 @@
 #include "flamegpu/simulation/RunPlanVector.h"
+
+#include <vector>
+#include <string>
+#include <memory>
+#include <unordered_map>
+#include <algorithm>
+
+
 #include "flamegpu/model/ModelDescription.h"
 
 namespace flamegpu {
diff --git a/src/flamegpu/simulation/Simulation.cu b/src/flamegpu/simulation/Simulation.cu
index f15b193b3..cc265fe36 100644
--- a/src/flamegpu/simulation/Simulation.cu
+++ b/src/flamegpu/simulation/Simulation.cu
@@ -3,6 +3,9 @@
 #include <algorithm>
 #include <atomic>
 #include <cinttypes>  // For PRIu64
+#include <cstdio>
+#include <string>
+#include <memory>
 
 #include "flamegpu/version.h"
 #include "flamegpu/model/ModelData.h"
diff --git a/src/flamegpu/simulation/detail/AbstractSimRunner.cu b/src/flamegpu/simulation/detail/AbstractSimRunner.cu
index a859a823d..8f20f467d 100644
--- a/src/flamegpu/simulation/detail/AbstractSimRunner.cu
+++ b/src/flamegpu/simulation/detail/AbstractSimRunner.cu
@@ -1,5 +1,11 @@
 #include "flamegpu/simulation/detail/AbstractSimRunner.h"
 
+#include <utility>
+#include <vector>
+#include <queue>
+#include <memory>
+#include <map>
+
 #ifdef _MSC_VER
 #include <windows.h>
 #else
diff --git a/src/flamegpu/simulation/detail/CUDAAgent.cu b/src/flamegpu/simulation/detail/CUDAAgent.cu
index a4b9a290e..c7bef9f77 100644
--- a/src/flamegpu/simulation/detail/CUDAAgent.cu
+++ b/src/flamegpu/simulation/detail/CUDAAgent.cu
@@ -6,6 +6,11 @@
 #include <fstream>
 #include <string>
 #include <filesystem>
+#include <vector>
+#include <unordered_map>
+#include <utility>
+#include <list>
+#include <memory>
 
 #ifdef _MSC_VER
 #pragma warning(push, 1)
diff --git a/src/flamegpu/simulation/detail/CUDAAgentStateList.cu b/src/flamegpu/simulation/detail/CUDAAgentStateList.cu
index cfedaa485..52f7dee72 100644
--- a/src/flamegpu/simulation/detail/CUDAAgentStateList.cu
+++ b/src/flamegpu/simulation/detail/CUDAAgentStateList.cu
@@ -3,6 +3,12 @@
 #include <cuda_runtime.h>
 #include <device_launch_parameters.h>
 
+#include <string>
+#include <memory>
+#include <vector>
+#include <list>
+#include <set>
+
 #include "flamegpu/simulation/detail/CUDAAgent.h"
 #include "flamegpu/simulation/detail/CUDAErrorChecking.cuh"
 #include "flamegpu/simulation/AgentVector.h"
diff --git a/src/flamegpu/simulation/detail/CUDAEnvironmentDirectedGraphBuffers.cu b/src/flamegpu/simulation/detail/CUDAEnvironmentDirectedGraphBuffers.cu
index f74ef1950..cc307e1b9 100644
--- a/src/flamegpu/simulation/detail/CUDAEnvironmentDirectedGraphBuffers.cu
+++ b/src/flamegpu/simulation/detail/CUDAEnvironmentDirectedGraphBuffers.cu
@@ -1,6 +1,11 @@
 #include "flamegpu/simulation/detail/CUDAEnvironmentDirectedGraphBuffers.cuh"
 
 #include <algorithm>
+#include <utility>
+#include <string>
+#include <memory>
+#include <vector>
+#include <limits>
 
 #include "flamegpu/simulation/detail/CUDAAgent.h"
 #include "flamegpu/simulation/detail/CUDAErrorChecking.cuh"
diff --git a/src/flamegpu/simulation/detail/CUDAFatAgent.cu b/src/flamegpu/simulation/detail/CUDAFatAgent.cu
index 2341c6364..5d3555e9b 100644
--- a/src/flamegpu/simulation/detail/CUDAFatAgent.cu
+++ b/src/flamegpu/simulation/detail/CUDAFatAgent.cu
@@ -1,5 +1,11 @@
 #include "flamegpu/simulation/detail/CUDAFatAgent.h"
 
+#include <unordered_map>
+#include <memory>
+#include <string>
+#include <vector>
+#include <algorithm>
+
 #include "flamegpu/simulation/detail/CUDAScatter.cuh"
 #include "flamegpu/runtime/HostAPI.h"
 #include "flamegpu/util/nvtx.h"
diff --git a/src/flamegpu/simulation/detail/CUDAFatAgentStateList.cu b/src/flamegpu/simulation/detail/CUDAFatAgentStateList.cu
index 6cf2bd64e..b347247b4 100644
--- a/src/flamegpu/simulation/detail/CUDAFatAgentStateList.cu
+++ b/src/flamegpu/simulation/detail/CUDAFatAgentStateList.cu
@@ -1,4 +1,12 @@
 #include "flamegpu/simulation/detail/CUDAFatAgentStateList.h"
+
+#include <utility>
+#include <string>
+#include <memory>
+#include <vector>
+#include <list>
+#include <unordered_map>
+
 #include "flamegpu/simulation/detail/CUDAScatter.cuh"
 #include "flamegpu/detail/cuda.cuh"
 
diff --git a/src/flamegpu/simulation/detail/CUDAMacroEnvironment.cu b/src/flamegpu/simulation/detail/CUDAMacroEnvironment.cu
index 7606eaa26..dd2a604be 100644
--- a/src/flamegpu/simulation/detail/CUDAMacroEnvironment.cu
+++ b/src/flamegpu/simulation/detail/CUDAMacroEnvironment.cu
@@ -1,5 +1,10 @@
 #include "flamegpu/simulation/detail/CUDAMacroEnvironment.h"
 
+#include <string>
+#include <memory>
+#include <map>
+#include <vector>
+
 #include "flamegpu/model/EnvironmentDescription.h"
 #include "flamegpu/simulation/CUDASimulation.h"
 #include "flamegpu/model/AgentFunctionData.cuh"
diff --git a/src/flamegpu/simulation/detail/CUDAMessage.cu b/src/flamegpu/simulation/detail/CUDAMessage.cu
index a3e3edbaf..ec19fe056 100644
--- a/src/flamegpu/simulation/detail/CUDAMessage.cu
+++ b/src/flamegpu/simulation/detail/CUDAMessage.cu
@@ -1,6 +1,10 @@
 #include <cuda_runtime.h>
 #include <device_launch_parameters.h>
 
+#include <string>
+#include <memory>
+#include <algorithm>
+
 #include "flamegpu/simulation/detail/CUDAMessage.h"
 #include "flamegpu/simulation/detail/CUDAAgent.h"
 #include "flamegpu/simulation/detail/CUDAMessageList.h"
diff --git a/src/flamegpu/simulation/detail/CUDAMessageList.cu b/src/flamegpu/simulation/detail/CUDAMessageList.cu
index 367ad022d..154e09cca 100644
--- a/src/flamegpu/simulation/detail/CUDAMessageList.cu
+++ b/src/flamegpu/simulation/detail/CUDAMessageList.cu
@@ -1,8 +1,10 @@
 #include <cuda_runtime.h>
 #include <device_launch_parameters.h>
 
-#include "flamegpu/simulation/detail/CUDAMessageList.h"
+#include <string>
+#include <utility>
 
+#include "flamegpu/simulation/detail/CUDAMessageList.h"
 #include "flamegpu/simulation/detail/CUDAMessage.h"
 #include "flamegpu/simulation/detail/CUDAErrorChecking.cuh"
 #include "flamegpu/runtime/messaging/MessageBruteForce/MessageBruteForceHost.h"
diff --git a/src/flamegpu/simulation/detail/CUDAScatter.cu b/src/flamegpu/simulation/detail/CUDAScatter.cu
index 647ae4a85..0026c5840 100644
--- a/src/flamegpu/simulation/detail/CUDAScatter.cu
+++ b/src/flamegpu/simulation/detail/CUDAScatter.cu
@@ -3,6 +3,12 @@
 #include <cuda_runtime.h>
 #include <vector>
 #include <cassert>
+#include <cstdio>
+#include <list>
+#include <map>
+#include <string>
+#include <algorithm>
+#include <limits>
 
 #include "flamegpu/simulation/detail/CUDAErrorChecking.cuh"
 #include "flamegpu/simulation/detail/CUDAFatAgentStateList.h"
diff --git a/src/flamegpu/simulation/detail/DeviceStrings.cu b/src/flamegpu/simulation/detail/DeviceStrings.cu
index 6abfff612..a493c7d7b 100644
--- a/src/flamegpu/simulation/detail/DeviceStrings.cu
+++ b/src/flamegpu/simulation/detail/DeviceStrings.cu
@@ -1,5 +1,7 @@
 #include "flamegpu/simulation/detail/DeviceStrings.h"
 
+#include <string>
+
 #include "flamegpu/detail/cuda.cuh"
 #include "flamegpu/simulation/detail/CUDAErrorChecking.cuh"
 
diff --git a/src/flamegpu/simulation/detail/EnvironmentManager.cu b/src/flamegpu/simulation/detail/EnvironmentManager.cu
index d4e460e39..6004eee56 100644
--- a/src/flamegpu/simulation/detail/EnvironmentManager.cu
+++ b/src/flamegpu/simulation/detail/EnvironmentManager.cu
@@ -1,6 +1,10 @@
 #include "flamegpu/simulation/detail/EnvironmentManager.cuh"
 
 #include <iostream>
+#include <utility>
+#include <string>
+#include <memory>
+#include <set>
 
 #include "flamegpu/model/EnvironmentData.h"
 #include "flamegpu/model/SubEnvironmentData.h"
diff --git a/src/flamegpu/simulation/detail/MPIEnsemble.cu b/src/flamegpu/simulation/detail/MPIEnsemble.cu
index 941100e60..6f6573464 100644
--- a/src/flamegpu/simulation/detail/MPIEnsemble.cu
+++ b/src/flamegpu/simulation/detail/MPIEnsemble.cu
@@ -1,4 +1,11 @@
 #ifdef FLAMEGPU_ENABLE_MPI
+#include <cstdio>
+#include <string>
+#include <map>
+#include <vector>
+#include <algorithm>
+#include <set>
+
 #include "flamegpu/simulation/detail/MPIEnsemble.h"
 
 #include "flamegpu/detail/compute_capability.cuh"
diff --git a/src/flamegpu/simulation/detail/MPISimRunner.cu b/src/flamegpu/simulation/detail/MPISimRunner.cu
index 164b2988d..319270caa 100644
--- a/src/flamegpu/simulation/detail/MPISimRunner.cu
+++ b/src/flamegpu/simulation/detail/MPISimRunner.cu
@@ -1,6 +1,10 @@
 #include "flamegpu/simulation/detail/MPISimRunner.h"
 
 #include <utility>
+#include <map>
+#include <memory>
+#include <queue>
+#include <vector>
 
 #include "flamegpu/model/ModelData.h"
 #include "flamegpu/simulation/CUDASimulation.h"
diff --git a/src/flamegpu/simulation/detail/SimLogger.cu b/src/flamegpu/simulation/detail/SimLogger.cu
index 0498d633b..4ef067917 100644
--- a/src/flamegpu/simulation/detail/SimLogger.cu
+++ b/src/flamegpu/simulation/detail/SimLogger.cu
@@ -1,6 +1,10 @@
 #include "flamegpu/simulation/detail/SimLogger.h"
 
 #include <filesystem>
+#include <string>
+#include <map>
+#include <queue>
+#include <memory>
 
 #include "flamegpu/io/LoggerFactory.h"
 #include "flamegpu/simulation/RunPlanVector.h"
diff --git a/src/flamegpu/simulation/detail/SimRunner.cu b/src/flamegpu/simulation/detail/SimRunner.cu
index 98f9f0740..021e2fdad 100644
--- a/src/flamegpu/simulation/detail/SimRunner.cu
+++ b/src/flamegpu/simulation/detail/SimRunner.cu
@@ -1,3 +1,9 @@
+#include <cstdio>
+#include <map>
+#include <memory>
+#include <queue>
+#include <vector>
+
 #include "flamegpu/simulation/detail/SimRunner.h"
 
 #include "flamegpu/simulation/RunPlanVector.h"
diff --git a/src/flamegpu/visualiser/AgentStateVis.cpp b/src/flamegpu/visualiser/AgentStateVis.cpp
index b0a999005..7590ba2b9 100644
--- a/src/flamegpu/visualiser/AgentStateVis.cpp
+++ b/src/flamegpu/visualiser/AgentStateVis.cpp
@@ -1,6 +1,8 @@
 // @todo - ifdef visualisation?
 #include "flamegpu/visualiser/AgentStateVis.h"
 
+#include <string>
+
 #include "flamegpu/exception/FLAMEGPUException.h"
 #include "flamegpu/visualiser/AgentVis.h"
 #include "flamegpu/model/AgentData.h"
diff --git a/src/flamegpu/visualiser/AgentVis.cpp b/src/flamegpu/visualiser/AgentVis.cpp
index fc76fe0c9..52303b0ac 100644
--- a/src/flamegpu/visualiser/AgentVis.cpp
+++ b/src/flamegpu/visualiser/AgentVis.cpp
@@ -2,6 +2,10 @@
 
 #include "flamegpu/visualiser/AgentVis.h"
 
+#include <utility>
+#include <string>
+#include <memory>
+
 #include "flamegpu/simulation/detail/CUDAAgent.h"
 #include "flamegpu/model/AgentData.h"
 #include "flamegpu/model/AgentDescription.h"
diff --git a/src/flamegpu/visualiser/EnvironmentGraphVis.cpp b/src/flamegpu/visualiser/EnvironmentGraphVis.cpp
index 5780400a5..55018e6b3 100644
--- a/src/flamegpu/visualiser/EnvironmentGraphVis.cpp
+++ b/src/flamegpu/visualiser/EnvironmentGraphVis.cpp
@@ -1,5 +1,8 @@
 #include "flamegpu/visualiser/EnvironmentGraphVis.h"
 
+#include <utility>
+#include <string>
+#include <memory>
 
 #include "flamegpu/simulation/detail/CUDAEnvironmentDirectedGraphBuffers.cuh"
 #include "flamegpu/visualiser/LineVis.h"
diff --git a/src/flamegpu/visualiser/LineVis.cpp b/src/flamegpu/visualiser/LineVis.cpp
index 94e90d5e7..e8fa0d909 100644
--- a/src/flamegpu/visualiser/LineVis.cpp
+++ b/src/flamegpu/visualiser/LineVis.cpp
@@ -2,6 +2,8 @@
 
 #include "flamegpu/visualiser/LineVis.h"
 
+#include <utility>
+
 namespace flamegpu {
 namespace visualiser {
 
diff --git a/src/flamegpu/visualiser/ModelVis.cpp b/src/flamegpu/visualiser/ModelVis.cpp
index 750e7c706..5b1a5eb0c 100644
--- a/src/flamegpu/visualiser/ModelVis.cpp
+++ b/src/flamegpu/visualiser/ModelVis.cpp
@@ -4,6 +4,9 @@
 
 #include <thread>
 #include <utility>
+#include <string>
+#include <memory>
+#include <unordered_map>
 
 #include "flamegpu/simulation/CUDASimulation.h"
 #include "flamegpu/model/AgentData.h"
diff --git a/src/flamegpu/visualiser/PanelVis.cpp b/src/flamegpu/visualiser/PanelVis.cpp
index ed79095ec..91a28827b 100644
--- a/src/flamegpu/visualiser/PanelVis.cpp
+++ b/src/flamegpu/visualiser/PanelVis.cpp
@@ -1,4 +1,6 @@
 #include <utility>
+#include <string>
+#include <memory>
 
 #include "flamegpu/visualiser/PanelVis.h"
 
diff --git a/src/flamegpu/visualiser/StaticModelVis.cpp b/src/flamegpu/visualiser/StaticModelVis.cpp
index 8ea81ac61..e52fb5609 100644
--- a/src/flamegpu/visualiser/StaticModelVis.cpp
+++ b/src/flamegpu/visualiser/StaticModelVis.cpp
@@ -1,6 +1,8 @@
 // @todo - ifdef visualisation
 #include "flamegpu/visualiser/StaticModelVis.h"
 
+#include <utility>
+
 #include "flamegpu/exception/FLAMEGPUException.h"
 
 namespace flamegpu {
diff --git a/src/flamegpu/visualiser/color/DiscreteColor.cpp b/src/flamegpu/visualiser/color/DiscreteColor.cpp
index 656830f4d..35ededd95 100644
--- a/src/flamegpu/visualiser/color/DiscreteColor.cpp
+++ b/src/flamegpu/visualiser/color/DiscreteColor.cpp
@@ -1,4 +1,8 @@
 #include "flamegpu/visualiser/color/DiscreteColor.h"
+
+#include <string>
+#include <map>
+
 #include "flamegpu/visualiser/color/Palette.h"
 
 namespace flamegpu {
diff --git a/src/flamegpu/visualiser/color/HSVInterpolation.cpp b/src/flamegpu/visualiser/color/HSVInterpolation.cpp
index 50ac86b0a..46ef6c792 100644
--- a/src/flamegpu/visualiser/color/HSVInterpolation.cpp
+++ b/src/flamegpu/visualiser/color/HSVInterpolation.cpp
@@ -2,6 +2,7 @@
 #include "flamegpu/visualiser/color/HSVInterpolation.h"
 
 #include <sstream>
+#include <string>
 
 #include "flamegpu/exception/FLAMEGPUException.h"
 
diff --git a/src/flamegpu/visualiser/color/StaticColor.cpp b/src/flamegpu/visualiser/color/StaticColor.cpp
index ffe7f9416..e3cec83d3 100644
--- a/src/flamegpu/visualiser/color/StaticColor.cpp
+++ b/src/flamegpu/visualiser/color/StaticColor.cpp
@@ -2,6 +2,7 @@
 #include "flamegpu/visualiser/color/StaticColor.h"
 
 #include <sstream>
+#include <string>
 
 #include "flamegpu/exception/FLAMEGPUException.h"
 
diff --git a/src/flamegpu/visualiser/color/ViridisInterpolation.cpp b/src/flamegpu/visualiser/color/ViridisInterpolation.cpp
index 24c2d2eee..8434d1bda 100644
--- a/src/flamegpu/visualiser/color/ViridisInterpolation.cpp
+++ b/src/flamegpu/visualiser/color/ViridisInterpolation.cpp
@@ -1,7 +1,9 @@
 // @todo -  #ifdef FLAMEGPU_VISUALISATION
 #include "flamegpu/visualiser/color/ViridisInterpolation.h"
 
+#include <utility>
 #include <sstream>
+#include <string>
 
 namespace flamegpu {
 namespace visualiser {
diff --git a/tests/helpers/device_initialisation.cu b/tests/helpers/device_initialisation.cu
index 2346fd91a..efbf66341 100644
--- a/tests/helpers/device_initialisation.cu
+++ b/tests/helpers/device_initialisation.cu
@@ -1,6 +1,7 @@
 #include "helpers/device_initialisation.h"
 #include <cuda.h>
 #include <stdio.h>
+#include <cstdio>
 #include "flamegpu/flamegpu.h"
 
 namespace flamegpu {
diff --git a/tests/helpers/host_reductions_common.cu b/tests/helpers/host_reductions_common.cu
index 1c617ab54..f4c3cd4f6 100644
--- a/tests/helpers/host_reductions_common.cu
+++ b/tests/helpers/host_reductions_common.cu
@@ -1,3 +1,6 @@
+#include <utility>
+#include <vector>
+
 #include "helpers/host_reductions_common.h"
 
 namespace flamegpu {
diff --git a/tests/helpers/main.cu b/tests/helpers/main.cu
index 949e85a53..e7fc7bbfe 100644
--- a/tests/helpers/main.cu
+++ b/tests/helpers/main.cu
@@ -1,6 +1,7 @@
 #include <cuda_runtime.h>
 #include <cstdio>
 #include <map>
+#include <string>
 
 #include "flamegpu/simulation/CUDASimulation.h"
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/detail/test_multi_thread_device.cu b/tests/test_cases/detail/test_multi_thread_device.cu
index baf341a14..97a385a75 100644
--- a/tests/test_cases/detail/test_multi_thread_device.cu
+++ b/tests/test_cases/detail/test_multi_thread_device.cu
@@ -1,6 +1,8 @@
 #include <thread>
 #include <vector>
 #include <memory>
+#include <cstdio>
+#include <utility>
 
 #include "flamegpu/flamegpu.h"
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/detail/test_rtc_multi_thread_device.cu b/tests/test_cases/detail/test_rtc_multi_thread_device.cu
index 04de77b52..0b7f01be8 100644
--- a/tests/test_cases/detail/test_rtc_multi_thread_device.cu
+++ b/tests/test_cases/detail/test_rtc_multi_thread_device.cu
@@ -1,6 +1,8 @@
 #include <thread>
 #include <vector>
 #include <memory>
+#include <cstdio>
+#include <utility>
 
 #include "flamegpu/flamegpu.h"
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/exception/test_device_exception.cu b/tests/test_cases/exception/test_device_exception.cu
index 089bf8a19..a76528e6b 100644
--- a/tests/test_cases/exception/test_device_exception.cu
+++ b/tests/test_cases/exception/test_device_exception.cu
@@ -1,3 +1,4 @@
+#include <string>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/test_cases/exception/test_flamegpu_exception.cpp b/tests/test_cases/exception/test_flamegpu_exception.cpp
index 0a11ba18f..49bf12076 100644
--- a/tests/test_cases/exception/test_flamegpu_exception.cpp
+++ b/tests/test_cases/exception/test_flamegpu_exception.cpp
@@ -1,3 +1,4 @@
+#include <string>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/test_cases/exception/test_rtc_device_exception.cu b/tests/test_cases/exception/test_rtc_device_exception.cu
index 78fe487cb..57fd63977 100644
--- a/tests/test_cases/exception/test_rtc_device_exception.cu
+++ b/tests/test_cases/exception/test_rtc_device_exception.cu
@@ -1,3 +1,5 @@
+#include <string>
+
 #include "gtest/gtest.h"
 
 #include "flamegpu/flamegpu.h"
diff --git a/tests/test_cases/io/test_io.cu b/tests/test_cases/io/test_io.cu
index 7461f4e31..2b6239b69 100644
--- a/tests/test_cases/io/test_io.cu
+++ b/tests/test_cases/io/test_io.cu
@@ -1,5 +1,7 @@
 #include <iostream>
 #include <fstream>
+#include <limits>
+#include <string>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/test_cases/io/test_logging.cu b/tests/test_cases/io/test_logging.cu
index 2af5ae606..4c3b94abd 100644
--- a/tests/test_cases/io/test_logging.cu
+++ b/tests/test_cases/io/test_logging.cu
@@ -1,6 +1,7 @@
 #include <chrono>
 #include <thread>
 #include <filesystem>
+#include <string>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/test_cases/model/test_dependency_graph.cu b/tests/test_cases/model/test_dependency_graph.cu
index c3946084f..aa79630c3 100644
--- a/tests/test_cases/model/test_dependency_graph.cu
+++ b/tests/test_cases/model/test_dependency_graph.cu
@@ -1,4 +1,6 @@
 #include <cstdio>
+#include <string>
+#include <iostream>
 
 #include "flamegpu/flamegpu.h"
 
diff --git a/tests/test_cases/model/test_layer.cu b/tests/test_cases/model/test_layer.cu
index 4b48cf6bd..c236eab8d 100644
--- a/tests/test_cases/model/test_layer.cu
+++ b/tests/test_cases/model/test_layer.cu
@@ -1,3 +1,5 @@
+#include <string>
+
 #include "flamegpu/flamegpu.h"
 
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/model/test_model.cu b/tests/test_cases/model/test_model.cu
index de28640a6..9a45480e0 100644
--- a/tests/test_cases/model/test_model.cu
+++ b/tests/test_cases/model/test_model.cu
@@ -1,3 +1,5 @@
+#include <string>
+
 #include "flamegpu/flamegpu.h"
 
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/runtime/agent/detail/test_spatial_agent_sort.cu b/tests/test_cases/runtime/agent/detail/test_spatial_agent_sort.cu
index 8d8ac0497..824994adc 100644
--- a/tests/test_cases/runtime/agent/detail/test_spatial_agent_sort.cu
+++ b/tests/test_cases/runtime/agent/detail/test_spatial_agent_sort.cu
@@ -1,3 +1,5 @@
+#include <vector>
+
 #include "flamegpu/flamegpu.h"
 
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/runtime/agent/host_reduction/test_histogram_even.cu b/tests/test_cases/runtime/agent/host_reduction/test_histogram_even.cu
index bc3b3a8f1..9ae6a20a8 100644
--- a/tests/test_cases/runtime/agent/host_reduction/test_histogram_even.cu
+++ b/tests/test_cases/runtime/agent/host_reduction/test_histogram_even.cu
@@ -1,4 +1,7 @@
+#include <vector>
+
 #include "helpers/host_reductions_common.h"
+
 namespace flamegpu {
 
 
diff --git a/tests/test_cases/runtime/agent/host_reduction/test_min.cu b/tests/test_cases/runtime/agent/host_reduction/test_min.cu
index cdc0dc3ad..03a90f530 100644
--- a/tests/test_cases/runtime/agent/host_reduction/test_min.cu
+++ b/tests/test_cases/runtime/agent/host_reduction/test_min.cu
@@ -1,3 +1,5 @@
+#include <algorithm>
+
 #include "helpers/host_reductions_common.h"
 
 namespace flamegpu {
diff --git a/tests/test_cases/runtime/agent/host_reduction/test_transform_reduce.cu b/tests/test_cases/runtime/agent/host_reduction/test_transform_reduce.cu
index f0ade6c65..43080c081 100644
--- a/tests/test_cases/runtime/agent/host_reduction/test_transform_reduce.cu
+++ b/tests/test_cases/runtime/agent/host_reduction/test_transform_reduce.cu
@@ -1,3 +1,5 @@
+#include <algorithm>
+
 #include "helpers/host_reductions_common.h"
 namespace flamegpu {
 
diff --git a/tests/test_cases/runtime/agent/test_device_agent_creation.cu b/tests/test_cases/runtime/agent/test_device_agent_creation.cu
index 80b78594a..67dd8e34f 100644
--- a/tests/test_cases/runtime/agent/test_device_agent_creation.cu
+++ b/tests/test_cases/runtime/agent/test_device_agent_creation.cu
@@ -9,6 +9,9 @@
 * > With birthing agent conditional state change
 */
 #include <set>
+#include <cstdio>
+#include <utility>
+#include <map>
 
 #include "flamegpu/flamegpu.h"
 
diff --git a/tests/test_cases/runtime/agent/test_device_agent_vector.cu b/tests/test_cases/runtime/agent/test_device_agent_vector.cu
index 0f7ffa91d..0181384c1 100644
--- a/tests/test_cases/runtime/agent/test_device_agent_vector.cu
+++ b/tests/test_cases/runtime/agent/test_device_agent_vector.cu
@@ -1,5 +1,6 @@
 #include <string>
 #include <set>
+#include <vector>
 
 #include "flamegpu/flamegpu.h"
 
diff --git a/tests/test_cases/runtime/messaging/test_bucket.cu b/tests/test_cases/runtime/messaging/test_bucket.cu
index 8070bcdfa..bf0d737e3 100644
--- a/tests/test_cases/runtime/messaging/test_bucket.cu
+++ b/tests/test_cases/runtime/messaging/test_bucket.cu
@@ -4,7 +4,7 @@
 * Tests cover:
 * > validation on MessageBucket::Description
 */
-
+#include <unordered_map>
 
 #include "gtest/gtest.h"
 #include "flamegpu/flamegpu.h"
diff --git a/tests/test_cases/runtime/messaging/test_spatial_2d.cu b/tests/test_cases/runtime/messaging/test_spatial_2d.cu
index cf786184c..0c43f5688 100644
--- a/tests/test_cases/runtime/messaging/test_spatial_2d.cu
+++ b/tests/test_cases/runtime/messaging/test_spatial_2d.cu
@@ -4,6 +4,8 @@
 * Tests cover:
 * > mandatory messaging, send/recieve
 */
+#include <unordered_map>
+
 #include "flamegpu/flamegpu.h"
 
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/runtime/messaging/test_spatial_3d.cu b/tests/test_cases/runtime/messaging/test_spatial_3d.cu
index 64253aedd..d7061fb72 100644
--- a/tests/test_cases/runtime/messaging/test_spatial_3d.cu
+++ b/tests/test_cases/runtime/messaging/test_spatial_3d.cu
@@ -4,6 +4,8 @@
 * Tests cover:
 * > mandatory messaging, send/recieve
 */
+#include <unordered_map>
+
 #include "flamegpu/flamegpu.h"
 
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/runtime/random/test_host_random.cu b/tests/test_cases/runtime/random/test_host_random.cu
index f09e711be..10ac7e78a 100644
--- a/tests/test_cases/runtime/random/test_host_random.cu
+++ b/tests/test_cases/runtime/random/test_host_random.cu
@@ -2,6 +2,7 @@
 #define TESTS_TEST_CASES_RUNTIME_TEST_HOST_RANDOM_H_
 
 #include <array>
+#include <string>
 
 #include "flamegpu/flamegpu.h"
 
diff --git a/tests/test_cases/simulation/detail/test_cuda_subagent.cu b/tests/test_cases/simulation/detail/test_cuda_subagent.cu
index ad92c703a..9b41fc5cb 100644
--- a/tests/test_cases/simulation/detail/test_cuda_subagent.cu
+++ b/tests/test_cases/simulation/detail/test_cuda_subagent.cu
@@ -1,3 +1,6 @@
+#include <limits>
+#include <set>
+
 #include "flamegpu/flamegpu.h"
 
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/simulation/test_RunPlan.cu b/tests/test_cases/simulation/test_RunPlan.cu
index 307de04ef..9c55fd3a0 100644
--- a/tests/test_cases/simulation/test_RunPlan.cu
+++ b/tests/test_cases/simulation/test_RunPlan.cu
@@ -1,3 +1,5 @@
+#include <string>
+
 #include "flamegpu/flamegpu.h"
 
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/simulation/test_RunPlanVector.cu b/tests/test_cases/simulation/test_RunPlanVector.cu
index ca899ec1c..406fcb999 100644
--- a/tests/test_cases/simulation/test_RunPlanVector.cu
+++ b/tests/test_cases/simulation/test_RunPlanVector.cu
@@ -1,3 +1,5 @@
+#include <string>
+
 #include "flamegpu/flamegpu.h"
 
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/simulation/test_agent_instance.cu b/tests/test_cases/simulation/test_agent_instance.cu
index 85b229f61..bef253327 100644
--- a/tests/test_cases/simulation/test_agent_instance.cu
+++ b/tests/test_cases/simulation/test_agent_instance.cu
@@ -1,3 +1,6 @@
+#include <string>
+#include <utility>
+
 #include "flamegpu/flamegpu.h"
 
 #include "gtest/gtest.h"
diff --git a/tests/test_cases/simulation/test_agent_vector.cu b/tests/test_cases/simulation/test_agent_vector.cu
index 2765c3264..91b17ed19 100644
--- a/tests/test_cases/simulation/test_agent_vector.cu
+++ b/tests/test_cases/simulation/test_agent_vector.cu
@@ -1,5 +1,8 @@
 #ifndef TESTS_TEST_CASES_POP_TEST_AGENT_VECTOR_H_
 #define TESTS_TEST_CASES_POP_TEST_AGENT_VECTOR_H_
+
+#include <utility>
+
 #include "flamegpu/flamegpu.h"
 #include "gtest/gtest.h"
 
diff --git a/tests/test_cases/simulation/test_cuda_ensemble.cu b/tests/test_cases/simulation/test_cuda_ensemble.cu
index 5f37a4cfe..5194a31b4 100644
--- a/tests/test_cases/simulation/test_cuda_ensemble.cu
+++ b/tests/test_cases/simulation/test_cuda_ensemble.cu
@@ -1,6 +1,8 @@
 #include <thread>
 #include <chrono>
 #include <filesystem>
+#include <string>
+#include <set>
 
 #include "flamegpu/flamegpu.h"
 
diff --git a/tests/test_cases/simulation/test_cuda_simulation.cu b/tests/test_cases/simulation/test_cuda_simulation.cu
index 137b39eaf..23f720cf8 100644
--- a/tests/test_cases/simulation/test_cuda_simulation.cu
+++ b/tests/test_cases/simulation/test_cuda_simulation.cu
@@ -2,6 +2,8 @@
 #include <filesystem>
 #include <thread>
 #include <set>
+#include <vector>
+#include <string>
 
 #include "flamegpu/flamegpu.h"
 #include "flamegpu/detail/compute_capability.cuh"
diff --git a/tests/test_cases/simulation/test_cuda_simulation_concurrency.cu b/tests/test_cases/simulation/test_cuda_simulation_concurrency.cu
index 255b6966d..6a382cd0b 100644
--- a/tests/test_cases/simulation/test_cuda_simulation_concurrency.cu
+++ b/tests/test_cases/simulation/test_cuda_simulation_concurrency.cu
@@ -1,3 +1,6 @@
+#include <vector>
+#include <string>
+
 #include "flamegpu/flamegpu.h"
 #include "flamegpu/detail/compute_capability.cuh"
 
diff --git a/tests/test_cases/simulation/test_host_functions.cu b/tests/test_cases/simulation/test_host_functions.cu
index f494f5904..18c8e93d2 100644
--- a/tests/test_cases/simulation/test_host_functions.cu
+++ b/tests/test_cases/simulation/test_host_functions.cu
@@ -2,6 +2,7 @@
 #define TESTS_TEST_CASES_SIM_TEST_SIM_VALIDATION_H_
 
 #include <algorithm>
+#include <vector>
 
 #include "flamegpu/flamegpu.h"