diff --git a/src/ObjCommon/Shader/D3D11ShaderAnalyser.h b/src/ObjCommon/Shader/D3D11ShaderAnalyser.h
index 59f9f9aa1..579b73bf8 100644
--- a/src/ObjCommon/Shader/D3D11ShaderAnalyser.h
+++ b/src/ObjCommon/Shader/D3D11ShaderAnalyser.h
@@ -2,6 +2,7 @@
 
 #include <memory>
 #include <string>
+#include <cstdint>
 #include <vector>
 
 namespace d3d11
diff --git a/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp b/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp
index 20ef6458b..745e2daae 100644
--- a/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp
+++ b/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp
@@ -1,4 +1,3 @@
-#pragma once
 
 #include "BSPUtil.h"
 
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp
index 786364bea..5bfcd21a6 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp
+++ b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "BSPLinker.h"
 
 #include "ClipMapLinker.h"
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
index 4951eb83a..237054173 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
+++ b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "ClipMapLinker.h"
 
 #include "../BSPUtil.h"
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.cpp
index a2c29f075..f90d18cf3 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.cpp
+++ b/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.cpp
@@ -1,3 +1,4 @@
+#include <cmath>
 #include "ComWorldLinker.h"
 
 #include <numbers>
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
index ade30d93f..4c1fdb55e 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
+++ b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
@@ -1,3 +1,6 @@
+#include <cmath>
+#include <cstdint>
+#include <cstring>
 #include "GfxWorldLinker.h"
 
 #include "../BSPCalculation.h"
@@ -534,8 +537,8 @@ namespace BSP
 
     struct mnode_t
     {
-        unsigned __int16 cellIndex;
-        unsigned __int16 rightChildOffset;
+        uint16_t cellIndex;
+        uint16_t rightChildOffset;
     };
 
     void GfxWorldLinker::loadGfxCells(GfxWorld* gfxWorld)
diff --git a/src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp b/src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp
index 43cc6e0b5..16655a5a4 100644
--- a/src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp
+++ b/src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp
@@ -33,7 +33,7 @@ namespace
             const auto js = nlohmann::json::parse(*file.m_stream.get());
 
             std::string techSetName = js["name"];
-            techniqueSet->name = _strdup(techSetName.c_str());
+            techniqueSet->name = strdup(techSetName.c_str());
             techniqueSet->worldVertFormat = (unsigned char)js["worldVertFormat"];
 
             for (int i = 0; i < 36; i++)
@@ -50,7 +50,7 @@ namespace
                     techniqueSet->techniques[i] = technique;
 
                     std::string techName = techniqueJs["name"];
-                    technique->name = _strdup(techName.c_str());
+                    technique->name = strdup(techName.c_str());
                     technique->flags = techniqueJs["flags"];
                     technique->passCount = techniqueJs["passCount"];
                     assert(technique->passCount == 1);
@@ -127,7 +127,7 @@ namespace
                             currPass->pixelShader = new MaterialPixelShader;
 
                             std::string pixelName = passJs["pixelShader"]["name"];
-                            currPass->pixelShader->name = _strdup(pixelName.c_str());
+                            currPass->pixelShader->name = strdup(pixelName.c_str());
                             currPass->pixelShader->prog.ps = nullptr;
 
                             const auto psFileName = shader::GetFileNameForPixelShaderAssetName(pixelName);
@@ -151,7 +151,7 @@ namespace
                             currPass->vertexShader = new MaterialVertexShader;
 
                             std::string vertexName = passJs["vertexShader"]["name"];
-                            currPass->vertexShader->name = _strdup(vertexName.c_str());
+                            currPass->vertexShader->name = strdup(vertexName.c_str());
                             currPass->vertexShader->prog.vs = nullptr;
 
                             const auto vsFileName = shader::GetFileNameForVertexShaderAssetName(vertexName);