diff --git a/source/collada/CommonConvert.cpp b/source/collada/CommonConvert.cpp
index 53239c35a5..3c74279b28 100644
--- a/source/collada/CommonConvert.cpp
+++ b/source/collada/CommonConvert.cpp
@@ -19,18 +19,27 @@
 
 #include "CommonConvert.h"
 
+#include "DLL.h"
 #include "StdSkeletons.h"
 #include "XMLFix.h"
 
-#include "FCollada.h"
-#include "FCDocument/FCDSceneNode.h"
-#include "FCDocument/FCDSkinController.h"
-#include "FUtils/FUDaeSyntax.h"
-#include "FUtils/FUFileManager.h"
-
+#include <FCDocument/FCDAsset.h>
+#include <FCDocument/FCDControllerInstance.h>
+#include <FCDocument/FCDEntity.h>
+#include <FCDocument/FCDEntityInstance.h>
+#include <FCDocument/FCDSceneNode.h>
+#include <FCDocument/FCDSkinController.h>
+#include <FCollada.h>
+#include <FMath/FMVector3.h>
+#include <FUtils/FUString.h>
+#include <FUtils/FUtils.h>
 #include <algorithm>
 #include <cassert>
+#include <cstdarg>
+#include <cstdio>
 #include <libxml/xmlerror.h>
+#include <libxml/xmlmemory.h>
+#include <utility>
 
 void require_(int line, bool value, const char* type, const char* message)
 {
diff --git a/source/collada/CommonConvert.h b/source/collada/CommonConvert.h
index 1c685f86be..ecd3f61359 100644
--- a/source/collada/CommonConvert.h
+++ b/source/collada/CommonConvert.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,15 +18,22 @@
 #ifndef INCLUDED_COMMONCONVERT
 #define INCLUDED_COMMONCONVERT
 
+#include <FCDocument/FCDExtra.h>
+#include <FCDocument/FCDocument.h>
+#include <FMath/FMMatrix44.h>
+#include <FUtils/FUError.h>
+#include <FUtils/Platforms.h>
+#include <cstddef>
 #include <exception>
-#include <string>
+#include <libxml/tree.h>
 #include <memory>
+#include <string>
 #include <vector>
 
+class FCDControllerInstance;
 class FCDEntityInstance;
 class FCDSceneNode;
 class FCDSkinController;
-class FMMatrix44;
 
 class Skeleton;
 
diff --git a/source/collada/DLL.cpp b/source/collada/DLL.cpp
index f789d3b434..01ec28018e 100644
--- a/source/collada/DLL.cpp
+++ b/source/collada/DLL.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,13 +17,19 @@
 
 #include "precompiled.h"
 
+#include "DLL.h"
+
 #include "CommonConvert.h"
 #include "PMDConvert.h"
 #include "PSAConvert.h"
 #include "StdSkeletons.h"
 
-#include <cstdarg>
+#include <FCollada.h>
 #include <cassert>
+#include <cstdarg>
+#include <cstdio>
+#include <cstring>
+#include <string>
 
 void default_logger(void*, int severity, const char* message)
 {
diff --git a/source/collada/Decompose.cpp b/source/collada/Decompose.cpp
index 09e22b585a..79b38fbede 100644
--- a/source/collada/Decompose.cpp
+++ b/source/collada/Decompose.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,9 +23,10 @@
 
 /**** Decompose.c ****/
 /* Ken Shoemake, 1993 */
-#include <math.h>
 #include "Decompose.h"
 
+#include <cmath>
+
 /******* Matrix Preliminaries *******/
 
 /** Fill out 3x3 matrix to 4x4 **/
diff --git a/source/collada/GeomReindex.cpp b/source/collada/GeomReindex.cpp
index b8898e3dae..226dc6dbc9 100644
--- a/source/collada/GeomReindex.cpp
+++ b/source/collada/GeomReindex.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,18 +19,22 @@
 
 #include "GeomReindex.h"
 
-#include "FCollada.h"
-#include "FCDocument/FCDEntity.h"
-#include "FCDocument/FCDGeometryMesh.h"
-#include "FCDocument/FCDGeometryPolygons.h"
-#include "FCDocument/FCDGeometryPolygonsInput.h"
-#include "FCDocument/FCDGeometrySource.h"
-#include "FCDocument/FCDSkinController.h"
-
-#include <cassert>
-#include <vector>
-#include <map>
+#include <FCDocument/FCDGeometryMesh.h>
+#include <FCDocument/FCDGeometryPolygons.h>
+#include <FCDocument/FCDGeometryPolygonsInput.h>
+#include <FCDocument/FCDGeometrySource.h>
+#include <FCDocument/FCDSkinController.h>
+#include <FMath/FMath.h>
+#include <FUtils/FUDaeEnum.h>
+#include <FUtils/Platforms.h>
 #include <algorithm>
+#include <cassert>
+#include <cmath>
+#include <cstring>
+#include <iterator>
+#include <map>
+#include <utility>
+#include <vector>
 
 typedef std::pair<float, float> uv_pair_type;
 
diff --git a/source/collada/Maths.cpp b/source/collada/Maths.cpp
index 3b41a3fc6d..0fa3f48d60 100644
--- a/source/collada/Maths.cpp
+++ b/source/collada/Maths.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,8 +19,10 @@
 
 #include "Maths.h"
 
-#include "FCollada.h"
+#include "DLL.h"
 
+#include <FMath/FMMatrix44.h>
+#include <FMath/FMVector3.h>
 
 void DumpMatrix(const FMMatrix44& m)
 {
diff --git a/source/collada/PMDConvert.cpp b/source/collada/PMDConvert.cpp
index b30c7ea77e..1997a6fe16 100644
--- a/source/collada/PMDConvert.cpp
+++ b/source/collada/PMDConvert.cpp
@@ -18,31 +18,36 @@
 #include "precompiled.h"
 
 #include "PMDConvert.h"
+
 #include "CommonConvert.h"
-
-#include "FCollada.h"
-#include "FCDocument/FCDAsset.h"
-#include "FCDocument/FCDocument.h"
-#include "FCDocument/FCDocumentTools.h"
-#include "FCDocument/FCDController.h"
-#include "FCDocument/FCDControllerInstance.h"
-#include "FCDocument/FCDGeometry.h"
-#include "FCDocument/FCDGeometryMesh.h"
-#include "FCDocument/FCDGeometryPolygons.h"
-#include "FCDocument/FCDGeometryPolygonsInput.h"
-#include "FCDocument/FCDGeometryPolygonsTools.h"
-#include "FCDocument/FCDGeometrySource.h"
-#include "FCDocument/FCDSceneNode.h"
-#include "FCDocument/FCDSkinController.h"
-
+#include "DLL.h"
 #include "StdSkeletons.h"
 #include "Decompose.h"
 #include "Maths.h"
 #include "GeomReindex.h"
 
-#include <cassert>
-#include <vector>
+#include <FCDocument/FCDController.h>
+#include <FCDocument/FCDControllerInstance.h>
+#include <FCDocument/FCDEntity.h>
+#include <FCDocument/FCDEntityInstance.h>
+#include <FCDocument/FCDGeometry.h>
+#include <FCDocument/FCDGeometryMesh.h>
+#include <FCDocument/FCDGeometryPolygons.h>
+#include <FCDocument/FCDGeometryPolygonsInput.h>
+#include <FCDocument/FCDGeometryPolygonsTools.h>
+#include <FCDocument/FCDGeometrySource.h>
+#include <FCDocument/FCDSceneNode.h>
+#include <FCDocument/FCDSkinController.h>
+#include <FMath/FMMatrix44.h>
+#include <FMath/FMVector3.h>
+#include <FUtils/FUDaeEnum.h>
+#include <FUtils/FUString.h>
+#include <FUtils/Platforms.h>
 #include <algorithm>
+#include <cassert>
+#include <cstring>
+#include <utility>
+#include <vector>
 
 const size_t maxInfluences = 4;
 struct VertexBlend
diff --git a/source/collada/PSAConvert.cpp b/source/collada/PSAConvert.cpp
index 8265ef73e8..9a9e3f821b 100644
--- a/source/collada/PSAConvert.cpp
+++ b/source/collada/PSAConvert.cpp
@@ -18,33 +18,35 @@
 #include "precompiled.h"
 
 #include "PSAConvert.h"
+
 #include "CommonConvert.h"
-
-#include "FCollada.h"
-#include "FCDocument/FCDocument.h"
-#include "FCDocument/FCDocumentTools.h"
-#include "FCDocument/FCDAnimated.h"
-#include "FCDocument/FCDAnimationCurve.h"
-#include "FCDocument/FCDAnimationKey.h"
-#include "FCDocument/FCDController.h"
-#include "FCDocument/FCDControllerInstance.h"
-#include "FCDocument/FCDExtra.h"
-#include "FCDocument/FCDGeometry.h"
-#include "FCDocument/FCDGeometryMesh.h"
-#include "FCDocument/FCDGeometryPolygons.h"
-#include "FCDocument/FCDGeometrySource.h"
-#include "FCDocument/FCDSceneNode.h"
-
-#include "StdSkeletons.h"
 #include "Decompose.h"
 #include "Maths.h"
-#include "GeomReindex.h"
+#include "StdSkeletons.h"
+#include "DLL.h"
 
-#include <cassert>
-#include <vector>
-#include <limits>
-#include <iterator>
+#include <FCDocument/FCDAnimated.h>
+#include <FCDocument/FCDAnimationCurve.h>
+#include <FCDocument/FCDAnimationKey.h>
+#include <FCDocument/FCDController.h>
+#include <FCDocument/FCDControllerInstance.h>
+#include <FCDocument/FCDEntityInstance.h>
+#include <FCDocument/FCDExtra.h>
+#include <FCDocument/FCDSceneNode.h>
+#include <FCDocument/FCDSkinController.h>
+#include <FCDocument/FCDTransform.h>
+#include <FCDocument/FCDocument.h>
+#include <FMath/FMMatrix44.h>
+#include <FUtils/FUString.h>
+#include <FUtils/FUStringConversion.h>
+#include <FUtils/Platforms.h>
 #include <algorithm>
+#include <cassert>
+#include <cstring>
+#include <float.h>
+#include <iterator>
+#include <limits>
+#include <vector>
 
 class PSAConvert
 {
diff --git a/source/collada/StdSkeletons.cpp b/source/collada/StdSkeletons.cpp
index 8d1339231a..6190a5ebce 100644
--- a/source/collada/StdSkeletons.cpp
+++ b/source/collada/StdSkeletons.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,16 +17,17 @@
 
 #include "precompiled.h"
 
-#include "libxml/parser.h"
-#include "libxml/xmlerror.h"
-
 #include "StdSkeletons.h"
 
 #include "CommonConvert.h"
 
-#include "FUtils/FUXmlParser.h"
-
+#include <FUtils/FUXmlParser.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlerror.h>
 #include <map>
+#include <utility>
+#include <vector>
 
 namespace
 {
diff --git a/source/collada/StdSkeletons.h b/source/collada/StdSkeletons.h
index f8afba0ba8..11a39b8fb4 100644
--- a/source/collada/StdSkeletons.h
+++ b/source/collada/StdSkeletons.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,6 +18,7 @@
 #ifndef INCLUDED_STDSKELETONS
 #define INCLUDED_STDSKELETONS
 
+#include <cstddef>
 #include <string>
 #include <memory>
 
diff --git a/source/collada/XMLFix.cpp b/source/collada/XMLFix.cpp
index fc5aa6bb38..48b0016dec 100644
--- a/source/collada/XMLFix.cpp
+++ b/source/collada/XMLFix.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,11 +19,12 @@
 
 #include "XMLFix.h"
 
-#include "CommonConvert.h"
-
-#include "FUtils/FUXmlParser.h"
+#include "DLL.h"
 
+#include <cstring>
 #include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlstring.h>
 
 /*
 
diff --git a/source/collada/XMLFix.h b/source/collada/XMLFix.h
index 341f33c919..6145362a1f 100644
--- a/source/collada/XMLFix.h
+++ b/source/collada/XMLFix.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,6 +18,8 @@
 #ifndef XMLFIX_INCLUDED
 #define XMLFIX_INCLUDED
 
+#include <cstddef>
+
 /**
  * Fixes some errors in COLLADA XML files that would otherwise prevent
  * FCollada from loading them successfully.