diff --git a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathNode.cpp b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathNode.cpp
index a0ec8bcb4a4..aaea3aea1bc 100644
--- a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathNode.cpp
+++ b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathNode.cpp
@@ -16,6 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "PreRTS.h"
 #include "GameLogic/Pathfinder/PathNode.h"
 
 PathNode::PathNode() :
diff --git a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindCellInfo.cpp b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindCellInfo.cpp
index c1541f8fcc1..ef89ba02196 100644
--- a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindCellInfo.cpp
+++ b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindCellInfo.cpp
@@ -16,6 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "PreRTS.h"
 #include "GameLogic/Pathfinder/PathfindCellInfo.h"
 
 constexpr const UnsignedInt CELL_INFOS_TO_ALLOCATE = 30000;
diff --git a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindCellList.cpp b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindCellList.cpp
index 4be96d3b39e..1adb4818ba8 100644
--- a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindCellList.cpp
+++ b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindCellList.cpp
@@ -16,6 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "PreRTS.h"
 #include "GameLogic/Pathfinder/PathfindCell.h"
 #include "GameLogic/Pathfinder/PathfindCellList.h"
 
diff --git a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindConstants.cpp b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindConstants.cpp
index b9b95d9b30e..480d22861b6 100644
--- a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindConstants.cpp
+++ b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindConstants.cpp
@@ -16,6 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "PreRTS.h"
 #include "GameLogic/Pathfinder/PathfindConstants.h"
 
 #if RETAIL_COMPATIBLE_PATHFINDING
diff --git a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindZoneManager.cpp b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindZoneManager.cpp
index 82c2e4ef306..4d4541d36b6 100644
--- a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindZoneManager.cpp
+++ b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/PathfindZoneManager.cpp
@@ -16,6 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "PreRTS.h"
 #include "GameLogic/Pathfinder/PathfindCell.h"
 #include "GameLogic/Pathfinder/PathfindConstants.h"
 #include "GameLogic/Pathfinder/PathfindLayer.h"
diff --git a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/ZoneBlock.cpp b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/ZoneBlock.cpp
index 7777bfd96c2..d99e5a75df5 100644
--- a/Core/GameEngine/Source/GameLogic/AI/Pathfinder/ZoneBlock.cpp
+++ b/Core/GameEngine/Source/GameLogic/AI/Pathfinder/ZoneBlock.cpp
@@ -16,6 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "PreRTS.h"
 #include "GameLogic/Pathfinder/PathfindCell.h"
 #include "GameLogic/Pathfinder/PathfindZoneManager.h"
 #include "GameLogic/Pathfinder/ZoneBlock.h"
diff --git a/Core/Libraries/Source/Lib/Include/Lib/ICoord2D.h b/Core/Libraries/Source/Lib/Include/Lib/ICoord2D.h
index 754412a343c..5bccee86780 100644
--- a/Core/Libraries/Source/Lib/Include/Lib/ICoord2D.h
+++ b/Core/Libraries/Source/Lib/Include/Lib/ICoord2D.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "trig.h"
+
 // NOTE: Keep the types simple; avoid constructors and destructors so they can be used within unions
 
 struct ICoord2D