diff --git a/src/Commands/Commands.cpp b/src/Commands/Commands.cpp
index 0e5ad329af..2460c6b971 100644
--- a/src/Commands/Commands.cpp
+++ b/src/Commands/Commands.cpp
@@ -15,7 +15,6 @@
 
 #include <CCINIClass.h>
 
-#include <Utilities/Macro.h>
 #include <Ext/Sidebar/SWSidebar/SWSidebarClass.h>
 #include <Misc/MessageColumn.h>
 
diff --git a/src/Commands/Commands.h b/src/Commands/Commands.h
index ae3c89f503..77206961db 100644
--- a/src/Commands/Commands.h
+++ b/src/Commands/Commands.h
@@ -2,9 +2,7 @@
 
 #include <CommandClass.h>
 #include <StringTable.h>
-#include <MessageListClass.h>
 #include <Phobos.h>
-#include <Utilities/Debug.h>
 
 template <typename T>
 T* MakeCommand()
diff --git a/src/Commands/DamageDisplay.cpp b/src/Commands/DamageDisplay.cpp
index 33ae3548de..6bd1109e68 100644
--- a/src/Commands/DamageDisplay.cpp
+++ b/src/Commands/DamageDisplay.cpp
@@ -1,6 +1,5 @@
 #include "DamageDisplay.h"
 
-#include <MessageListClass.h>
 #include <Utilities/GeneralUtils.h>
 
 const char* DamageDisplayCommandClass::GetName() const
diff --git a/src/Commands/FrameByFrame.cpp b/src/Commands/FrameByFrame.cpp
index e5a1e2c2d5..28da4cfa27 100644
--- a/src/Commands/FrameByFrame.cpp
+++ b/src/Commands/FrameByFrame.cpp
@@ -1,11 +1,8 @@
 #include "FrameByFrame.h"
 
-#include <SessionClass.h>
-#include <TacticalClass.h>
+#include <Utilities/Debug.h>
 #include <Utilities/GeneralUtils.h>
 
-#include <Unsorted.h>
-
 size_t FrameByFrameCommandClass::FrameStepCount = 0;
 bool FrameByFrameCommandClass::FrameStep = false;
 
diff --git a/src/Commands/FrameStep.h b/src/Commands/FrameStep.h
index caf432425c..5639afd624 100644
--- a/src/Commands/FrameStep.h
+++ b/src/Commands/FrameStep.h
@@ -3,6 +3,7 @@
 #include "Commands.h"
 
 #include "FrameByFrame.h"
+#include <Utilities/Debug.h>
 
 template<size_t Frame>
 class FrameStepCommandClass : public CommandClass
diff --git a/src/Commands/NextIdleHarvester.cpp b/src/Commands/NextIdleHarvester.cpp
index 1f78d1a3df..7811e78ae7 100644
--- a/src/Commands/NextIdleHarvester.cpp
+++ b/src/Commands/NextIdleHarvester.cpp
@@ -1,13 +1,7 @@
 #include "NextIdleHarvester.h"
 
-#include <BuildingTypeClass.h>
-#include <MessageListClass.h>
-#include <MapClass.h>
-#include <ObjectClass.h>
 #include <Utilities/GeneralUtils.h>
-#include <Utilities/Debug.h>
 #include <Ext/Techno/Body.h>
-#include <Ext/TechnoType/Body.h>
 
 const char* NextIdleHarvesterCommandClass::GetName() const
 {
diff --git a/src/Commands/ObjectInfo.cpp b/src/Commands/ObjectInfo.cpp
index 98d9768542..47637330ac 100644
--- a/src/Commands/ObjectInfo.cpp
+++ b/src/Commands/ObjectInfo.cpp
@@ -1,17 +1,9 @@
 #include "ObjectInfo.h"
 
 #include <Utilities/GeneralUtils.h>
-#include <BuildingClass.h>
-#include <InfantryClass.h>
-#include <FootClass.h>
-#include <TeamClass.h>
-#include <HouseClass.h>
-#include <ScriptClass.h>
-#include <AITriggerTypeClass.h>
 #include <Helpers/Enumerators.h>
 #include <CRT.h>
 
-#include <Ext/TechnoType/Body.h>
 #include <Ext/Techno/Body.h>
 
 const char* ObjectInfoCommandClass::GetName() const
diff --git a/src/Commands/QuickSave.cpp b/src/Commands/QuickSave.cpp
index 85c6514306..bf56bbe358 100644
--- a/src/Commands/QuickSave.cpp
+++ b/src/Commands/QuickSave.cpp
@@ -1,8 +1,5 @@
 #include "QuickSave.h"
 
-#include <ScenarioClass.h>
-#include <HouseClass.h>
-#include <SessionClass.h>
 #include <EventClass.h>
 #include <Utilities/GeneralUtils.h>
 #include <Utilities/SpawnerHelper.h>
diff --git a/src/Commands/SaveVariablesToFile.cpp b/src/Commands/SaveVariablesToFile.cpp
index 2c216e333f..46f77205cc 100644
--- a/src/Commands/SaveVariablesToFile.cpp
+++ b/src/Commands/SaveVariablesToFile.cpp
@@ -1,7 +1,6 @@
 #include "SaveVariablesToFile.h"
 
 #include <Ext/Scenario/Body.h>
-#include <HouseClass.h>
 
 const char* SaveVariablesToFileCommandClass::GetName() const
 {
diff --git a/src/Commands/ToggleDesignatorRange.cpp b/src/Commands/ToggleDesignatorRange.cpp
index efedf0bd61..7689c33a5b 100644
--- a/src/Commands/ToggleDesignatorRange.cpp
+++ b/src/Commands/ToggleDesignatorRange.cpp
@@ -1,6 +1,5 @@
 #include "ToggleDesignatorRange.h"
 
-#include <MessageListClass.h>
 #include <Utilities/GeneralUtils.h>
 
 const char* ToggleDesignatorRangeCommandClass::GetName() const
diff --git a/src/Commands/ToggleDigitalDisplay.cpp b/src/Commands/ToggleDigitalDisplay.cpp
index 34c9825345..1d6da264a8 100644
--- a/src/Commands/ToggleDigitalDisplay.cpp
+++ b/src/Commands/ToggleDigitalDisplay.cpp
@@ -1,6 +1,5 @@
 #include "ToggleDigitalDisplay.h"
 
-#include <MessageListClass.h>
 #include <Utilities/GeneralUtils.h>
 
 const char* ToggleDigitalDisplayCommandClass::GetName() const
diff --git a/src/Commands/ToggleSWSidebar.cpp b/src/Commands/ToggleSWSidebar.cpp
index 49369828c7..be41653f7d 100644
--- a/src/Commands/ToggleSWSidebar.cpp
+++ b/src/Commands/ToggleSWSidebar.cpp
@@ -1,5 +1,4 @@
 #include "ToggleSWSidebar.h"
-#include <HouseClass.h>
 
 #include <Utilities/GeneralUtils.h>
 #include <Ext/Sidebar/SWSidebar/SWSidebarClass.h>
diff --git a/src/Ext/Aircraft/Body.cpp b/src/Ext/Aircraft/Body.cpp
index 6a4dd860be..bc0d7976fb 100644
--- a/src/Ext/Aircraft/Body.cpp
+++ b/src/Ext/Aircraft/Body.cpp
@@ -1,9 +1,6 @@
 #include "Body.h"
 
-#include <BuildingClass.h>
-
 #include <Ext/BuildingType/Body.h>
-#include <Ext/Techno/Body.h>
 #include <Ext/WeaponType/Body.h>
 
 // TODO: Implement proper extended AircraftClass.
diff --git a/src/Ext/Aircraft/Body.h b/src/Ext/Aircraft/Body.h
index 4fee5f65e6..5fecdfc443 100644
--- a/src/Ext/Aircraft/Body.h
+++ b/src/Ext/Aircraft/Body.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <AircraftClass.h>
+#include <Ext/Techno/Body.h>
 
 // TODO: Implement proper extended AircraftClass.
 
diff --git a/src/Ext/Aircraft/Hooks.cpp b/src/Ext/Aircraft/Hooks.cpp
index 3b24ffa41f..80011023e2 100644
--- a/src/Ext/Aircraft/Hooks.cpp
+++ b/src/Ext/Aircraft/Hooks.cpp
@@ -1,13 +1,10 @@
-#include <AircraftClass.h>
+#include "Body.h"
+
 #include <EventClass.h>
-#include <FlyLocomotionClass.h>
 
-#include <Ext/Aircraft/Body.h>
-#include <Ext/Techno/Body.h>
 #include <Ext/Anim/Body.h>
 #include <Ext/WeaponType/Body.h>
 #include <Ext/BulletType/Body.h>
-#include <Utilities/Macro.h>
 
 #pragma region Mission_Attack
 
diff --git a/src/Ext/Anim/Body.cpp b/src/Ext/Anim/Body.cpp
index f7c74fdb28..2afd1793ce 100644
--- a/src/Ext/Anim/Body.cpp
+++ b/src/Ext/Anim/Body.cpp
@@ -2,8 +2,8 @@
 
 #include <GameOptionsClass.h>
 
-#include <Ext/AnimType/Body.h>
 #include <Ext/House/Body.h>
+#include <Ext/Techno/Body.h>
 #include <Ext/WarheadType/Body.h>
 #include <Misc/SyncLogging.h>
 
diff --git a/src/Ext/Anim/Body.h b/src/Ext/Anim/Body.h
index 72f3726100..6a26255188 100644
--- a/src/Ext/Anim/Body.h
+++ b/src/Ext/Anim/Body.h
@@ -1,11 +1,7 @@
 #pragma once
 #include <AnimClass.h>
 #include <ParticleSystemClass.h>
-
 #include <Ext/AnimType/Body.h>
-#include <Helpers/Macro.h>
-#include <Utilities/Container.h>
-#include <Utilities/TemplateDef.h>
 
 class AnimExt
 {
diff --git a/src/Ext/Anim/Hooks.AnimCreateUnit.cpp b/src/Ext/Anim/Hooks.AnimCreateUnit.cpp
index 9049822e6f..eecc11dc6f 100644
--- a/src/Ext/Anim/Hooks.AnimCreateUnit.cpp
+++ b/src/Ext/Anim/Hooks.AnimCreateUnit.cpp
@@ -3,14 +3,7 @@
 
 #include "Body.h"
 
-#include <BulletClass.h>
-#include <HouseClass.h>
-#include <ScenarioClass.h>
-
-#include <Ext/Bullet/Body.h>
-#include <Ext/TechnoType/Body.h>
 #include <Ext/Techno/Body.h>
-#include <Ext/AnimType/Body.h>
 
 DEFINE_HOOK(0x737F6D, UnitClass_TakeDamage_Destroy, 0x7)
 {
diff --git a/src/Ext/Anim/Hooks.cpp b/src/Ext/Anim/Hooks.cpp
index fc8ad2c1a4..5c1169a2a0 100644
--- a/src/Ext/Anim/Hooks.cpp
+++ b/src/Ext/Anim/Hooks.cpp
@@ -1,14 +1,9 @@
 #include "Body.h"
 
-#include <ScenarioClass.h>
-#include <WarheadTypeClass.h>
-
-#include <Ext/AnimType/Body.h>
+#include <Ext/Techno/Body.h>
 #include <Ext/WarheadType/Body.h>
 #include <Ext/WeaponType/Body.h>
 
-#include <Utilities/Macro.h>
-
 namespace AnimLoggingTemp
 {
 	DWORD UniqueID = 0;
diff --git a/src/Ext/AnimType/Body.cpp b/src/Ext/AnimType/Body.cpp
index 902faebafb..b7cab913bb 100644
--- a/src/Ext/AnimType/Body.cpp
+++ b/src/Ext/AnimType/Body.cpp
@@ -1,11 +1,4 @@
 #include "Body.h"
-#include <Phobos.h>
-#include <Helpers/Macro.h>
-#include <Utilities/TemplateDef.h>
-#include <HouseTypeClass.h>
-#include <HouseClass.h>
-#include <ScenarioClass.h>
-#include <UnitClass.h>
 
 #include <Ext/Anim/Body.h>
 #include <Ext/TechnoType/Body.h>
diff --git a/src/Ext/AnimType/Body.h b/src/Ext/AnimType/Body.h
index 806180910d..cf35037b67 100644
--- a/src/Ext/AnimType/Body.h
+++ b/src/Ext/AnimType/Body.h
@@ -2,11 +2,10 @@
 
 #include <AnimTypeClass.h>
 
-#include <New/Type/Affiliated/CreateUnitTypeClass.h>
 #include <Utilities/Container.h>
-#include <Utilities/Enum.h>
-#include <Utilities/Constructs.h>
-#include <Utilities/Template.h>
+#include <Utilities/TemplateDef.h>
+
+#include <New/Type/Affiliated/CreateUnitTypeClass.h>
 
 enum class AttachedAnimPosition : BYTE
 {
diff --git a/src/Ext/Building/Body.cpp b/src/Ext/Building/Body.cpp
index 14217f98f5..862d8e8217 100644
--- a/src/Ext/Building/Body.cpp
+++ b/src/Ext/Building/Body.cpp
@@ -1,8 +1,7 @@
 #include "Body.h"
 
 #include <BitFont.h>
-
-#include <Utilities/EnumFunctions.h>
+#include <Misc/FlyingStrings.h>
 
 BuildingExt::ExtContainer BuildingExt::ExtMap;
 
diff --git a/src/Ext/Building/Body.h b/src/Ext/Building/Body.h
index 170cc378f3..96491fc805 100644
--- a/src/Ext/Building/Body.h
+++ b/src/Ext/Building/Body.h
@@ -1,17 +1,5 @@
 #pragma once
-#include <BuildingClass.h>
-#include <HouseClass.h>
-#include <TiberiumClass.h>
-#include <FactoryClass.h>
-
-#include <Helpers/Macro.h>
-#include <Utilities/Container.h>
-#include <Utilities/TemplateDef.h>
-
-#include <Misc/FlyingStrings.h>
 #include <Ext/Techno/Body.h>
-#include <Ext/TechnoType/Body.h>
-#include <Ext/Building/Body.h>
 #include <Ext/BuildingType/Body.h>
 
 class BuildingExt
diff --git a/src/Ext/Building/Hooks.Grinding.cpp b/src/Ext/Building/Hooks.Grinding.cpp
index 0d51a2dafa..59eabbe643 100644
--- a/src/Ext/Building/Hooks.Grinding.cpp
+++ b/src/Ext/Building/Hooks.Grinding.cpp
@@ -1,6 +1,5 @@
 #include "Body.h"
 
-#include <InfantryClass.h>
 #include <InputManagerClass.h>
 
 DEFINE_HOOK(0x43C30A, BuildingClass_ReceiveMessage_Grinding, 0x6)
diff --git a/src/Ext/Building/Hooks.Refinery.cpp b/src/Ext/Building/Hooks.Refinery.cpp
index 45ff8b3799..667078e8f7 100644
--- a/src/Ext/Building/Hooks.Refinery.cpp
+++ b/src/Ext/Building/Hooks.Refinery.cpp
@@ -1,5 +1,7 @@
 #include "Body.h"
 
+#include <Misc/FlyingStrings.h>
+
 // The method of calculating the income is subject to each specific situation,
 // which may probably subject to further changes if anyone wants to extend the harvesting logic in the future.
 // I don't want to investigate the details so I check the balance difference directly. --Trsdy
diff --git a/src/Ext/Building/Hooks.Selling.cpp b/src/Ext/Building/Hooks.Selling.cpp
index 15f159bea6..c1e00a71da 100644
--- a/src/Ext/Building/Hooks.Selling.cpp
+++ b/src/Ext/Building/Hooks.Selling.cpp
@@ -1,5 +1,7 @@
 #include "Body.h"
 
+#include <Misc/FlyingStrings.h>
+
 // SellSound and EVA dehardcode
 DEFINE_HOOK(0x4D9F7B, FootClass_Sell, 0x6)
 {
diff --git a/src/Ext/Building/Hooks.cpp b/src/Ext/Building/Hooks.cpp
index 976d9f9236..29deb140e7 100644
--- a/src/Ext/Building/Hooks.cpp
+++ b/src/Ext/Building/Hooks.cpp
@@ -1,15 +1,10 @@
 #include "Body.h"
 
-#include <BulletClass.h>
-#include <UnitClass.h>
-#include <SuperClass.h>
 #include <GameOptionsClass.h>
 #include <Ext/Anim/Body.h>
 #include <Ext/House/Body.h>
 #include <Ext/SWType/Body.h>
 #include <Ext/WarheadType/Body.h>
-#include <TacticalClass.h>
-#include <PlanningTokenClass.h>
 
 #pragma region Update
 
diff --git a/src/Ext/BuildingType/Body.cpp b/src/Ext/BuildingType/Body.cpp
index 919ab6022b..f745331672 100644
--- a/src/Ext/BuildingType/Body.cpp
+++ b/src/Ext/BuildingType/Body.cpp
@@ -1,7 +1,6 @@
 #include "Body.h"
 
 #include <Ext/House/Body.h>
-#include <Utilities/GeneralUtils.h>
 #include <Ext/SWType/Body.h>
 
 BuildingTypeExt::ExtContainer BuildingTypeExt::ExtMap;
diff --git a/src/Ext/BuildingType/Body.h b/src/Ext/BuildingType/Body.h
index a47d7784f2..7b81742a0d 100644
--- a/src/Ext/BuildingType/Body.h
+++ b/src/Ext/BuildingType/Body.h
@@ -1,9 +1,4 @@
 #pragma once
-#include <BuildingTypeClass.h>
-#include <SuperClass.h>
-#include <SuperWeaponTypeClass.h>
-
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 
diff --git a/src/Ext/BuildingType/Hooks.Placing.cpp b/src/Ext/BuildingType/Hooks.Placing.cpp
index a8d08eafb2..581738cb99 100644
--- a/src/Ext/BuildingType/Hooks.Placing.cpp
+++ b/src/Ext/BuildingType/Hooks.Placing.cpp
@@ -1,8 +1,6 @@
 #include "Body.h"
 
-#include <HouseClass.h>
-
-#include "Ext/Rules/Body.h"
+#include <Ext/Rules/Body.h>
 
 // AIConstructionYard Hook #1 -> sub_740810 - Check number of construction yard before deploy.
 DEFINE_HOOK(0x740A11, UnitClass_Mission_Guard_AIAutoDeployMCV, 0x6)
diff --git a/src/Ext/BuildingType/Hooks.Upgrade.cpp b/src/Ext/BuildingType/Hooks.Upgrade.cpp
index d09626aad9..e4dcdc61b3 100644
--- a/src/Ext/BuildingType/Hooks.Upgrade.cpp
+++ b/src/Ext/BuildingType/Hooks.Upgrade.cpp
@@ -1,11 +1,6 @@
-#include <Utilities/Macro.h>
-#include <BuildingClass.h>
-#include <BuildingTypeClass.h>
-#include <HouseClass.h>
-#include <Utilities/EnumFunctions.h>
 #include "Body.h"
-#include <Ext/TechnoType/Body.h>
-#include <FactoryClass.h>
+
+#include <Ext/Building/Body.h>
 #include <Ext/House/Body.h>
 
 bool BuildingTypeExt::CanUpgrade(BuildingClass* pBuilding, BuildingTypeClass* pUpgradeType, HouseClass* pUpgradeOwner)
diff --git a/src/Ext/BuildingType/Hooks.cpp b/src/Ext/BuildingType/Hooks.cpp
index d47fda7159..b082c5ef85 100644
--- a/src/Ext/BuildingType/Hooks.cpp
+++ b/src/Ext/BuildingType/Hooks.cpp
@@ -1,11 +1,7 @@
 #include "Body.h"
 
-#include <TacticalClass.h>
 #include <Ext/Rules/Body.h>
 
-#include <Utilities/Macro.h>
-#include <Utilities/EnumFunctions.h>
-
 DEFINE_HOOK(0x460285, BuildingTypeClass_LoadFromINI_Muzzle, 0x6)
 {
 	enum { Skip = 0x460388, Read = 0x460299 };
diff --git a/src/Ext/Bullet/Body.cpp b/src/Ext/Bullet/Body.cpp
index c5c7a3e989..6571a5b149 100644
--- a/src/Ext/Bullet/Body.cpp
+++ b/src/Ext/Bullet/Body.cpp
@@ -1,16 +1,11 @@
 #include "Body.h"
 
 #include <Ext/Anim/Body.h>
-#include <Ext/Techno/Body.h>
 #include <Ext/RadSite/Body.h>
-#include <Ext/Scenario/Body.h>
 #include <Ext/WeaponType/Body.h>
-#include <Ext/WarheadType/Body.h>
 #include <Ext/Cell/Body.h>
 #include <Ext/EBolt/Body.h>
-#include <Utilities/EnumFunctions.h>
-#include <Utilities/AresFunctions.h>
-#include <Misc/FlyingStrings.h>
+#include <New/Entity/LaserTrailClass.h>
 
 BulletExt::ExtContainer BulletExt::ExtMap;
 
diff --git a/src/Ext/Bullet/Body.h b/src/Ext/Bullet/Body.h
index 5927470f6c..6d2c1b428b 100644
--- a/src/Ext/Bullet/Body.h
+++ b/src/Ext/Bullet/Body.h
@@ -3,11 +3,7 @@
 
 #include <Ext/BulletType/Body.h>
 #include <Ext/TechnoType/Body.h>
-#include <Helpers/Macro.h>
-#include <Utilities/Container.h>
-#include <Utilities/TemplateDef.h>
 #include <New/Entity/LaserTrailClass.h>
-#include "Trajectories/PhobosTrajectory.h"
 
 class BulletExt
 {
diff --git a/src/Ext/Bullet/Hooks.DetonateLogics.cpp b/src/Ext/Bullet/Hooks.DetonateLogics.cpp
index ac07a6e057..c17d6f580d 100644
--- a/src/Ext/Bullet/Hooks.DetonateLogics.cpp
+++ b/src/Ext/Bullet/Hooks.DetonateLogics.cpp
@@ -1,18 +1,11 @@
 #include "Body.h"
-#include <functional>
 
 #include <Ext/Anim/Body.h>
 #include <Ext/CaptureManager/Body.h>
-#include <Ext/WarheadType/Body.h>
 #include <Ext/WeaponType/Body.h>
-#include <Ext/Techno/Body.h>
 #include <Ext/Scenario/Body.h>
 #include <Utilities/Helpers.Alex.h>
 
-#include <VoxelAnimClass.h>
-#include <AircraftClass.h>
-#include <TacticalClass.h>
-
 DEFINE_HOOK(0x4690D4, BulletClass_Logics_NewChecks, 0x6)
 {
 	enum { SkipShaking = 0x469130, GoToExtras = 0x469AA4 };
diff --git a/src/Ext/Bullet/Hooks.Obstacles.cpp b/src/Ext/Bullet/Hooks.Obstacles.cpp
index 3a568e12fa..fcc01d4e3d 100644
--- a/src/Ext/Bullet/Hooks.Obstacles.cpp
+++ b/src/Ext/Bullet/Hooks.Obstacles.cpp
@@ -1,8 +1,6 @@
 #include "Body.h"
 
 #include <Ext/WeaponType/Body.h>
-#include <Ext/TechnoType/Body.h>
-#include <Utilities/Macro.h>
 
 // Ares reimplements the bullet obstacle logic so need to get creative to add any new functionality for that in Phobos.
 // Not named PhobosTrajectoryHelper to avoid confusion with actual custom trajectory logic.
diff --git a/src/Ext/Bullet/Hooks.cpp b/src/Ext/Bullet/Hooks.cpp
index ad67265d4f..df78ad4eb6 100644
--- a/src/Ext/Bullet/Hooks.cpp
+++ b/src/Ext/Bullet/Hooks.cpp
@@ -1,13 +1,7 @@
 #include "Body.h"
 #include <Ext/Anim/Body.h>
 #include <Ext/Techno/Body.h>
-#include <Ext/BulletType/Body.h>
-#include <Ext/Scenario/Body.h>
 #include <Ext/WeaponType/Body.h>
-#include <Utilities/EnumFunctions.h>
-#include <Utilities/Macro.h>
-
-#include <ScenarioClass.h>
 
 // has everything inited except SpawnNextAnim at this point
 DEFINE_HOOK(0x466556, BulletClass_Init, 0x6)
diff --git a/src/Ext/Bullet/Trajectories/BombardTrajectory.cpp b/src/Ext/Bullet/Trajectories/BombardTrajectory.cpp
index 27f979d4f1..7b713c8431 100644
--- a/src/Ext/Bullet/Trajectories/BombardTrajectory.cpp
+++ b/src/Ext/Bullet/Trajectories/BombardTrajectory.cpp
@@ -1,8 +1,5 @@
 #include "BombardTrajectory.h"
-#include "Memory.h"
 
-#include <LineTrail.h>
-#include <AnimClass.h>
 #include <Ext/Anim/Body.h>
 #include <Ext/Bullet/Body.h>
 
diff --git a/src/Ext/Bullet/Trajectories/ParabolaTrajectory.cpp b/src/Ext/Bullet/Trajectories/ParabolaTrajectory.cpp
index 100da59b9b..28b7c17827 100644
--- a/src/Ext/Bullet/Trajectories/ParabolaTrajectory.cpp
+++ b/src/Ext/Bullet/Trajectories/ParabolaTrajectory.cpp
@@ -1,10 +1,6 @@
 #include "ParabolaTrajectory.h"
 
-#include <OverlayTypeClass.h>
-#include <ScenarioClass.h>
-
 #include <Ext/Bullet/Body.h>
-#include <Ext/BulletType/Body.h>
 #include <Ext/WarheadType/Body.h>
 
 std::unique_ptr<PhobosTrajectory> ParabolaTrajectoryType::CreateInstance() const
diff --git a/src/Ext/Bullet/Trajectories/PhobosTrajectory.cpp b/src/Ext/Bullet/Trajectories/PhobosTrajectory.cpp
index 2ec47db210..794de60dbc 100644
--- a/src/Ext/Bullet/Trajectories/PhobosTrajectory.cpp
+++ b/src/Ext/Bullet/Trajectories/PhobosTrajectory.cpp
@@ -1,14 +1,9 @@
-#include <Ext/BulletType/Body.h>
-#include <Ext/Bullet/Body.h>
-#include <Ext/WeaponType/Body.h>
-
-#include <BulletClass.h>
-#include <Helpers/Macro.h>
-
 #include "StraightTrajectory.h"
 #include "BombardTrajectory.h"
 #include "ParabolaTrajectory.h"
 
+#include <Ext/Bullet/Body.h>
+
 TrajectoryTypePointer::TrajectoryTypePointer(TrajectoryFlag flag)
 {
 	switch (flag)
diff --git a/src/Ext/Bullet/Trajectories/PhobosTrajectory.h b/src/Ext/Bullet/Trajectories/PhobosTrajectory.h
index e92617bed9..2ce55bcb5a 100644
--- a/src/Ext/Bullet/Trajectories/PhobosTrajectory.h
+++ b/src/Ext/Bullet/Trajectories/PhobosTrajectory.h
@@ -1,9 +1,6 @@
 #pragma once
 
 #include <Utilities/TemplateDef.h>
-#include <Utilities/Savegame.h>
-
-#include <BulletClass.h>
 
 enum class TrajectoryFlag : int
 {
diff --git a/src/Ext/Bullet/Trajectories/SampleTrajectory.cpp b/src/Ext/Bullet/Trajectories/SampleTrajectory.cpp
index cd3a3e480d..b2ed5778c6 100644
--- a/src/Ext/Bullet/Trajectories/SampleTrajectory.cpp
+++ b/src/Ext/Bullet/Trajectories/SampleTrajectory.cpp
@@ -1,7 +1,5 @@
 #include "SampleTrajectory.h"
 
-#include <Ext/Bullet/Body.h>
-
 // Create
 std::unique_ptr<PhobosTrajectory> SampleTrajectoryType::CreateInstance() const
 {
diff --git a/src/Ext/Bullet/Trajectories/StraightTrajectory.cpp b/src/Ext/Bullet/Trajectories/StraightTrajectory.cpp
index 20e488e05e..7818e0c991 100644
--- a/src/Ext/Bullet/Trajectories/StraightTrajectory.cpp
+++ b/src/Ext/Bullet/Trajectories/StraightTrajectory.cpp
@@ -1,7 +1,5 @@
 #include "StraightTrajectory.h"
 
-#include <OverlayTypeClass.h>
-#include <ScenarioClass.h>
 #include <AircraftTrackerClass.h>
 
 #include <Ext/Bullet/Body.h>
diff --git a/src/Ext/BulletType/Body.h b/src/Ext/BulletType/Body.h
index e85909e894..754cc44766 100644
--- a/src/Ext/BulletType/Body.h
+++ b/src/Ext/BulletType/Body.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <BulletTypeClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 
diff --git a/src/Ext/CaptureManager/Body.h b/src/Ext/CaptureManager/Body.h
index 2d9a782cff..c2984252ca 100644
--- a/src/Ext/CaptureManager/Body.h
+++ b/src/Ext/CaptureManager/Body.h
@@ -1,13 +1,8 @@
 #pragma once
 
-#include <CaptureManagerClass.h>
 #include <AnimTypeClass.h>
-#include <RulesClass.h>
 #include <FootClass.h>
-#include <HouseClass.h>
-#include <AnimClass.h>
-
-#include <Ext/TechnoType/Body.h>
+#include <CaptureManagerClass.h>
 
 class CaptureManagerExt
 {
diff --git a/src/Ext/CaptureManager/Hooks.cpp b/src/Ext/CaptureManager/Hooks.cpp
index ebf35f5e04..8e9b180c7a 100644
--- a/src/Ext/CaptureManager/Hooks.cpp
+++ b/src/Ext/CaptureManager/Hooks.cpp
@@ -1,9 +1,6 @@
 #include "Body.h"
 
-#include <ParticleSystemClass.h>
 #include <Ext/Techno/Body.h>
-#include <Utilities/Macro.h>
-#include <Utilities/EnumFunctions.h>
 
 DEFINE_HOOK(0x471D40, CaptureManagerClass_CaptureUnit, 0x7)
 {
diff --git a/src/Ext/Cell/Body.cpp b/src/Ext/Cell/Body.cpp
index 64612cf6b1..f5c5c3eda8 100644
--- a/src/Ext/Cell/Body.cpp
+++ b/src/Ext/Cell/Body.cpp
@@ -1,9 +1,5 @@
 #include "Body.h"
 
-#include <Helpers/Macro.h>
-
-#include <Utilities/TemplateDef.h>
-
 CellExt::ExtContainer CellExt::ExtMap;
 
 // =============================
diff --git a/src/Ext/Cell/Body.h b/src/Ext/Cell/Body.h
index 49692be63f..5947c207e3 100644
--- a/src/Ext/Cell/Body.h
+++ b/src/Ext/Cell/Body.h
@@ -1,10 +1,8 @@
 #pragma once
 #include <CellClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
-#include <Utilities/Constructs.h>
-#include <Utilities/Template.h>
+#include <Utilities/TemplateDef.h>
 
 class CellExt
 {
diff --git a/src/Ext/EBolt/Body.h b/src/Ext/EBolt/Body.h
index ea48eb941d..51cf0cf0d0 100644
--- a/src/Ext/EBolt/Body.h
+++ b/src/Ext/EBolt/Body.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <EBolt.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 
diff --git a/src/Ext/EBolt/Hooks.cpp b/src/Ext/EBolt/Hooks.cpp
index 1607a990c6..2b7b40b52f 100644
--- a/src/Ext/EBolt/Hooks.cpp
+++ b/src/Ext/EBolt/Hooks.cpp
@@ -1,11 +1,7 @@
 #include "Body.h"
-#include <ParticleSystemClass.h>
 
 #include <Ext/Techno/Body.h>
 #include <Ext/WeaponType/Body.h>
-#include <Utilities/Macro.h>
-#include <Utilities/AresHelper.h>
-#include <Helpers/Macro.h>
 
 namespace BoltTemp
 {
diff --git a/src/Ext/House/Body.cpp b/src/Ext/House/Body.cpp
index b1f8e95ca9..413c7916de 100644
--- a/src/Ext/House/Body.cpp
+++ b/src/Ext/House/Body.cpp
@@ -1,11 +1,8 @@
 #include "Body.h"
 
 #include <Ext/SWType/Body.h>
-#include <Ext/TechnoType/Body.h>
 #include <Ext/Techno/Body.h>
 
-#include <ScenarioClass.h>
-
 //Static init
 
 HouseExt::ExtContainer HouseExt::ExtMap;
diff --git a/src/Ext/House/Body.h b/src/Ext/House/Body.h
index 7042542922..1ee967f6e6 100644
--- a/src/Ext/House/Body.h
+++ b/src/Ext/House/Body.h
@@ -1,14 +1,9 @@
 #pragma once
 #include <HouseClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 
-#include <Ext/Building/Body.h>
-
-#include <map>
-
 class HouseExt
 {
 public:
diff --git a/src/Ext/House/Hooks.AINavalProduction.cpp b/src/Ext/House/Hooks.AINavalProduction.cpp
index e43f2fa7e6..52a5b72bb5 100644
--- a/src/Ext/House/Hooks.AINavalProduction.cpp
+++ b/src/Ext/House/Hooks.AINavalProduction.cpp
@@ -1,7 +1,6 @@
 #include "Body.h"
 
-#include <FactoryClass.h>
-#include <TEventClass.h>
+#include <Ext/Building/Body.h>
 
 // AI Naval queue bugfix hooks
 
diff --git a/src/Ext/House/Hooks.UnitFromFactory.cpp b/src/Ext/House/Hooks.UnitFromFactory.cpp
index e741e8b153..b776706e2e 100644
--- a/src/Ext/House/Hooks.UnitFromFactory.cpp
+++ b/src/Ext/House/Hooks.UnitFromFactory.cpp
@@ -1,10 +1,6 @@
 #include <FactoryClass.h>
 
 #include <Ext/Techno/Body.h>
-#include <Ext/TechnoType/Body.h>
-#include <Utilities/EnumFunctions.h>
-#include <Utilities/GeneralUtils.h>
-#include <Utilities/Macro.h>
 
 DEFINE_HOOK(0x4FB63A, HouseClass_UnitFromFactory_DisablingEVAUnitReady, 0xF)
 {
diff --git a/src/Ext/House/Hooks.cpp b/src/Ext/House/Hooks.cpp
index 2152239bd1..74bd84c565 100644
--- a/src/Ext/House/Hooks.cpp
+++ b/src/Ext/House/Hooks.cpp
@@ -2,9 +2,7 @@
 
 #include <Ext/Aircraft/Body.h>
 #include <Ext/Scenario/Body.h>
-#include "Ext/Techno/Body.h"
-#include "Ext/Building/Body.h"
-#include <unordered_map>
+#include <Ext/Building/Body.h>
 
 DEFINE_HOOK(0x508C30, HouseClass_UpdatePower_UpdateCounter, 0x5)
 {
diff --git a/src/Ext/Infantry/Hooks.Firing.cpp b/src/Ext/Infantry/Hooks.Firing.cpp
index 39d7c442d9..d11e7b3fa1 100644
--- a/src/Ext/Infantry/Hooks.Firing.cpp
+++ b/src/Ext/Infantry/Hooks.Firing.cpp
@@ -1,6 +1,3 @@
-#include <Helpers/Macro.h>
-#include <InfantryClass.h>
-
 #include <Ext/Techno/Body.h>
 #include <Ext/WeaponType/Body.h>
 
diff --git a/src/Ext/Infantry/Hooks.cpp b/src/Ext/Infantry/Hooks.cpp
index a02e32a70e..668855d8c3 100644
--- a/src/Ext/Infantry/Hooks.cpp
+++ b/src/Ext/Infantry/Hooks.cpp
@@ -1,13 +1,8 @@
-#include <Utilities/Macro.h>
-
-#include <InfantryClass.h>
-#include <HouseClass.h>
-#include <InputManagerClass.h>
-#include <WarheadTypeClass.h>
-
 #include <Ext/BuildingType/Body.h>
 #include <Ext/TechnoType/Body.h>
 
+#include <InputManagerClass.h>
+
 DEFINE_HOOK(0x51B2BD, InfantryClass_UpdateTarget_IsControlledByHuman, 0x6)
 {
 	GET(InfantryClass*, pThis, ESI);
diff --git a/src/Ext/OverlayType/Body.cpp b/src/Ext/OverlayType/Body.cpp
index 7916065a88..568f54e84e 100644
--- a/src/Ext/OverlayType/Body.cpp
+++ b/src/Ext/OverlayType/Body.cpp
@@ -1,10 +1,5 @@
 #include "Body.h"
 
-#include <OverlayTypeClass.h>
-#include <TacticalClass.h>
-
-#include <Utilities/GeneralUtils.h>
-
 OverlayTypeExt::ExtContainer OverlayTypeExt::ExtMap;
 
 // =============================
diff --git a/src/Ext/OverlayType/Body.h b/src/Ext/OverlayType/Body.h
index 3c96aaebfa..1acdffce48 100644
--- a/src/Ext/OverlayType/Body.h
+++ b/src/Ext/OverlayType/Body.h
@@ -1,10 +1,8 @@
 #pragma once
 #include <OverlayTypeClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
-#include <Utilities/Macro.h>
 
 class OverlayTypeExt
 {
diff --git a/src/Ext/OverlayType/Hooks.cpp b/src/Ext/OverlayType/Hooks.cpp
index 9839e90975..029ef78bde 100644
--- a/src/Ext/OverlayType/Hooks.cpp
+++ b/src/Ext/OverlayType/Hooks.cpp
@@ -1,7 +1,5 @@
 #include "Body.h"
 
-#include <HouseClass.h>
-
 DEFINE_HOOK(0x47F71D, CellClass_DrawOverlay_ZAdjust, 0x5)
 {
 	GET(const int, zAdjust, EDI);
diff --git a/src/Ext/ParticleSystemType/Body.h b/src/Ext/ParticleSystemType/Body.h
index 9bdfd467e9..b613a3c5bf 100644
--- a/src/Ext/ParticleSystemType/Body.h
+++ b/src/Ext/ParticleSystemType/Body.h
@@ -1,11 +1,8 @@
 #pragma once
 #include <ParticleSystemTypeClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
-#include <Utilities/Macro.h>
-#include <Utilities/GeneralUtils.h>
 
 class ParticleSystemTypeExt
 {
diff --git a/src/Ext/ParticleType/Body.h b/src/Ext/ParticleType/Body.h
index 91f24b4298..fe2c2d283f 100644
--- a/src/Ext/ParticleType/Body.h
+++ b/src/Ext/ParticleType/Body.h
@@ -2,10 +2,8 @@
 
 #include <ParticleTypeClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
-#include <Utilities/Macro.h>
 
 class ParticleTypeExt
 {
diff --git a/src/Ext/ParticleType/Hooks.cpp b/src/Ext/ParticleType/Hooks.cpp
index 030a483ef6..8877735b13 100644
--- a/src/Ext/ParticleType/Hooks.cpp
+++ b/src/Ext/ParticleType/Hooks.cpp
@@ -1,7 +1,5 @@
 #include "Body.h"
 
-#include <ParticleClass.h>
-
 DEFINE_HOOK(0x62BE30, ParticleClass_Gas_AI_DriftSpeed, 0x5)
 {
 	enum { ContinueAI = 0x62BE60 };
diff --git a/src/Ext/RadSite/Body.cpp b/src/Ext/RadSite/Body.cpp
index 1cb80538ea..2841b62646 100644
--- a/src/Ext/RadSite/Body.cpp
+++ b/src/Ext/RadSite/Body.cpp
@@ -1,9 +1,9 @@
 #include "Body.h"
-#include <LightSourceClass.h>
 #include <Notifications.h>
 
 #include <New/Type/RadTypeClass.h>
 #include <Ext/WarheadType/Body.h>
+#include <Ext/WeaponType/Body.h>
 #include <Ext/Cell/Body.h>
 
 RadSiteExt::ExtContainer RadSiteExt::ExtMap;
diff --git a/src/Ext/RadSite/Body.h b/src/Ext/RadSite/Body.h
index 4d929e90c5..44f8d7525f 100644
--- a/src/Ext/RadSite/Body.h
+++ b/src/Ext/RadSite/Body.h
@@ -2,7 +2,6 @@
 
 #include <RadSiteClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 
diff --git a/src/Ext/RadSite/Hooks.cpp b/src/Ext/RadSite/Hooks.cpp
index ba9d61f821..40cdc98cb9 100644
--- a/src/Ext/RadSite/Hooks.cpp
+++ b/src/Ext/RadSite/Hooks.cpp
@@ -1,19 +1,10 @@
 #include "Body.h"
 
-#include <BulletClass.h>
-#include <HouseClass.h>
-#include <InfantryClass.h>
-#include <WarheadTypeClass.h>
-#include <ScenarioClass.h>
-
-#include <Ext/BuildingType/Body.h>
 #include <Ext/Bullet/Body.h>
 #include <Ext/Rules/Body.h>
-#include <Ext/Techno/Body.h>
+#include <Ext/WeaponType/Body.h>
 #include <Ext/WarheadType/Body.h>
 #include <Ext/Cell/Body.h>
-
-#include <Utilities/Macro.h>
 /*
 	Custom Radiations
 	Worked out from old uncommented Ares RadSite Hook , adding some more hook
diff --git a/src/Ext/Rules/Body.cpp b/src/Ext/Rules/Body.cpp
index 6b9da866f3..4f6d81f3eb 100644
--- a/src/Ext/Rules/Body.cpp
+++ b/src/Ext/Rules/Body.cpp
@@ -1,12 +1,6 @@
 #include "Body.h"
-#include <Ext/Side/Body.h>
-#include <Utilities/TemplateDef.h>
-#include <FPSCounter.h>
-#include <GameOptionsClass.h>
 
-#include <Ext/BulletType/Body.h>
 #include <Ext/TechnoType/Body.h>
-#include <Ext/Scenario/Body.h>
 #include <New/Type/RadTypeClass.h>
 #include <New/Type/ShieldTypeClass.h>
 #include <New/Type/LaserTrailTypeClass.h>
@@ -15,7 +9,6 @@
 #include <New/Type/BannerTypeClass.h>
 #include <New/Type/InsigniaTypeClass.h>
 #include <New/Type/SelectBoxTypeClass.h>
-#include <Utilities/Patch.h>
 
 std::unique_ptr<RulesExt::ExtData> RulesExt::Data = nullptr;
 
diff --git a/src/Ext/Rules/Body.h b/src/Ext/Rules/Body.h
index c3a004edb2..703e8f472a 100644
--- a/src/Ext/Rules/Body.h
+++ b/src/Ext/Rules/Body.h
@@ -1,14 +1,8 @@
 #pragma once
 
-#include <CCINIClass.h>
 #include <RulesClass.h>
 #include <Utilities/Container.h>
-#include <Utilities/Constructs.h>
-#include <Utilities/Template.h>
-#include <Utilities/Enum.h>
 #include <Utilities/TemplateDef.h>
-#include <Utilities/Debug.h>
-#include <Utilities/Anchor.h>
 
 class AnimTypeClass;
 class MouseCursor;
diff --git a/src/Ext/Rules/Hooks.Image.cpp b/src/Ext/Rules/Hooks.Image.cpp
index 6212a9bfca..e78a55b176 100644
--- a/src/Ext/Rules/Hooks.Image.cpp
+++ b/src/Ext/Rules/Hooks.Image.cpp
@@ -1,14 +1,4 @@
-#include <Phobos.h>
-
-#include <Helpers/Macro.h>
-#include <Utilities/Debug.h>
-#include <Utilities/Helpers.Alex.h>
-
-#include <CCINIClass.h>
-#include <RulesClass.h>
-#include <InfantryTypeClass.h>
-#include <UnitTypeClass.h>
-#include <AircraftTypeClass.h>
+#include "Body.h"
 
 static void ReplaceImageInfantry(InfantryTypeClass* pType)
 {
diff --git a/src/Ext/SWType/Body.cpp b/src/Ext/SWType/Body.cpp
index f230746dc7..16a5993da9 100644
--- a/src/Ext/SWType/Body.cpp
+++ b/src/Ext/SWType/Body.cpp
@@ -2,8 +2,6 @@
 
 #include "NewSWType/NewSWType.h"
 
-#include <StringTable.h>
-
 SWTypeExt::ExtContainer SWTypeExt::ExtMap;
 
 void SWTypeExt::ExtData::Initialize()
diff --git a/src/Ext/SWType/Body.h b/src/Ext/SWType/Body.h
index e4af1c3879..02d98681e8 100644
--- a/src/Ext/SWType/Body.h
+++ b/src/Ext/SWType/Body.h
@@ -1,13 +1,7 @@
 #pragma once
-#include <WarheadTypeClass.h>
-#include <WeaponTypeClass.h>
-#include <SuperWeaponTypeClass.h>
-
-#include <Helpers/Macro.h>
+#include <Ext/Building/Body.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
-
-#include <Ext/Building/Body.h>
 #include <New/Type/Affiliated/TypeConvertGroup.h>
 
 class SWTypeExt
diff --git a/src/Ext/SWType/FireSuperWeapon.cpp b/src/Ext/SWType/FireSuperWeapon.cpp
index 1d5e2e4a20..2e318a3058 100644
--- a/src/Ext/SWType/FireSuperWeapon.cpp
+++ b/src/Ext/SWType/FireSuperWeapon.cpp
@@ -1,17 +1,8 @@
 #include "Body.h"
 
-#include <SuperClass.h>
-#include <BuildingClass.h>
-#include <HouseClass.h>
-#include <ScenarioClass.h>
-#include <MessageListClass.h>
-
-#include <Utilities/EnumFunctions.h>
-#include <Utilities/GeneralUtils.h>
-
-#include "Ext/House/Body.h"
-#include "Ext/WarheadType/Body.h"
-#include "Ext/WeaponType/Body.h"
+#include <Ext/House/Body.h>
+#include <Ext/WarheadType/Body.h>
+#include <Ext/WeaponType/Body.h>
 #include <Ext/Scenario/Body.h>
 
 // ============= New SuperWeapon Effects================
diff --git a/src/Ext/SWType/Hooks.cpp b/src/Ext/SWType/Hooks.cpp
index 023073853e..d25a14592e 100644
--- a/src/Ext/SWType/Hooks.cpp
+++ b/src/Ext/SWType/Hooks.cpp
@@ -1,9 +1,5 @@
 #include "Body.h"
 
-#include <SuperClass.h>
-
-#include <Ext/House/Body.h>
-
 //this hook just for phobos NewSWType
 DEFINE_HOOK(0x6CC390, SuperClass_Launch, 0x6)
 {
diff --git a/src/Ext/SWType/NewSWType/NewSWType.h b/src/Ext/SWType/NewSWType/NewSWType.h
index e44204bf74..84709aa8ce 100644
--- a/src/Ext/SWType/NewSWType/NewSWType.h
+++ b/src/Ext/SWType/NewSWType/NewSWType.h
@@ -1,7 +1,5 @@
 #pragma once
 #include <Ext/SWType/Body.h>
-#include <SuperClass.h>
-#include <HouseClass.h>
 
 class NewSWType
 {
diff --git a/src/Ext/Scenario/Body.cpp b/src/Ext/Scenario/Body.cpp
index a2135dfa35..d35cdd3ab3 100644
--- a/src/Ext/Scenario/Body.cpp
+++ b/src/Ext/Scenario/Body.cpp
@@ -1,6 +1,5 @@
 #include "Body.h"
 
-#include <SessionClass.h>
 #include <VeinholeMonsterClass.h>
 
 std::unique_ptr<ScenarioExt::ExtData> ScenarioExt::Data = nullptr;
diff --git a/src/Ext/Scenario/Body.h b/src/Ext/Scenario/Body.h
index 534c6c0022..bb15c90df1 100644
--- a/src/Ext/Scenario/Body.h
+++ b/src/Ext/Scenario/Body.h
@@ -1,16 +1,12 @@
 #pragma once
 
 #include <ScenarioClass.h>
-#include <MessageListClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 
 #include <Ext/Techno/Body.h>
 
-#include <map>
-
 struct ExtendedVariable
 {
 	char Name[0x100];
diff --git a/src/Ext/Scenario/Hooks.Variables.cpp b/src/Ext/Scenario/Hooks.Variables.cpp
index 7b2e20e46c..3fa43e9825 100644
--- a/src/Ext/Scenario/Hooks.Variables.cpp
+++ b/src/Ext/Scenario/Hooks.Variables.cpp
@@ -1,9 +1,5 @@
-#include <Helpers/Macro.h>
-
 #include "Body.h"
 
-#include <TagClass.h>
-
 DEFINE_HOOK(0x689910, ScenarioClass_SetLocalToByID, 0x5)
 {
 	GET_STACK(const int, nIndex, 0x4);
diff --git a/src/Ext/Scenario/Hooks.Waypoints.cpp b/src/Ext/Scenario/Hooks.Waypoints.cpp
index 61a2231a31..4c6d2145be 100644
--- a/src/Ext/Scenario/Hooks.Waypoints.cpp
+++ b/src/Ext/Scenario/Hooks.Waypoints.cpp
@@ -1,9 +1,5 @@
-#include <Helpers/Macro.h>
-
 #include "Body.h"
 
-#include <MapClass.h>
-
 DEFINE_HOOK(0x68BCC0, ScenarioClass_Get_Waypoint_Location, 0xB)
 {
 	GET_STACK(CellStruct*, pCell, 0x4);
diff --git a/src/Ext/Scenario/Hooks.cpp b/src/Ext/Scenario/Hooks.cpp
index ab96369e04..4b370ff968 100644
--- a/src/Ext/Scenario/Hooks.cpp
+++ b/src/Ext/Scenario/Hooks.cpp
@@ -1,6 +1,4 @@
-#include <Ext/Scenario/Body.h>
-#include <Helpers/Macro.h>
-#include <Utilities/Debug.h>
+#include "Body.h"
 
 DEFINE_HOOK(0x6870D7, ReadScenario_MissionINI, 0x5)
 {
diff --git a/src/Ext/Script/Body.cpp b/src/Ext/Script/Body.cpp
index e44973f5c1..c34d624dfd 100644
--- a/src/Ext/Script/Body.cpp
+++ b/src/Ext/Script/Body.cpp
@@ -1,7 +1,5 @@
 #include "Body.h"
 
-#include <Ext/House/Body.h>
-#include <Ext/Techno/Body.h>
 #include <Ext/Scenario/Body.h>
 
 ScriptExt::ExtContainer ScriptExt::ExtMap;
diff --git a/src/Ext/Script/Body.h b/src/Ext/Script/Body.h
index eaff1ae0b4..2241031d54 100644
--- a/src/Ext/Script/Body.h
+++ b/src/Ext/Script/Body.h
@@ -2,21 +2,9 @@
 
 #include <ScriptClass.h>
 #include <ScriptTypeClass.h>
-#include <TeamClass.h>
-#include <AITriggerTypeClass.h>
-
-#include <HouseClass.h>
-#include <AircraftClass.h>
-#include <MapClass.h>
-#include <BulletClass.h>
-#include <Helpers/Enumerators.h>
-#include <WarheadTypeClass.h>
-#include <SpawnManagerClass.h>
-
-#include <Ext/House/Body.h>
 #include <Ext/Team/Body.h>
+#include <Ext/House/Body.h>
 #include <Utilities/Container.h>
-#include <Phobos.h>
 
 enum class PhobosScripts : unsigned int
 {
diff --git a/src/Ext/Script/Hooks.cpp b/src/Ext/Script/Hooks.cpp
index 312952fbea..880757c914 100644
--- a/src/Ext/Script/Hooks.cpp
+++ b/src/Ext/Script/Hooks.cpp
@@ -1,10 +1,5 @@
 #include "Body.h"
 
-#include <MapClass.h>
-
-#include <Ext/House/Body.h>
-#include <Helpers/Macro.h>
-
 DEFINE_HOOK(0x6E9443, TeamClass_AI, 0x8)
 {
 	GET(TeamClass*, pTeam, ESI);
diff --git a/src/Ext/Script/Mission.Attack.cpp b/src/Ext/Script/Mission.Attack.cpp
index 9bc61e27f7..49855cbd65 100644
--- a/src/Ext/Script/Mission.Attack.cpp
+++ b/src/Ext/Script/Mission.Attack.cpp
@@ -2,7 +2,6 @@
 
 #include <Ext/Building/Body.h>
 #include <Ext/BulletType/Body.h>
-#include <Ext/Techno/Body.h>
 #include <Ext/WeaponType/Body.h>
 
 // Contains ScriptExt::Mission_Attack and its helper functions.
diff --git a/src/Ext/Side/Body.cpp b/src/Ext/Side/Body.cpp
index e59f347000..b0eabbd0ff 100644
--- a/src/Ext/Side/Body.cpp
+++ b/src/Ext/Side/Body.cpp
@@ -1,7 +1,5 @@
 #include "Body.h"
 
-#include <ThemeClass.h>
-
 SideExt::ExtContainer SideExt::ExtMap;
 
 void SideExt::ExtData::Initialize()
diff --git a/src/Ext/Side/Body.h b/src/Ext/Side/Body.h
index bc0d72a748..27a868cfa0 100644
--- a/src/Ext/Side/Body.h
+++ b/src/Ext/Side/Body.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <SideClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 
diff --git a/src/Ext/Side/Hooks.SidebarGDIPositions.cpp b/src/Ext/Side/Hooks.SidebarGDIPositions.cpp
index 5b46ce2ce2..c8e65ad0c8 100644
--- a/src/Ext/Side/Hooks.SidebarGDIPositions.cpp
+++ b/src/Ext/Side/Hooks.SidebarGDIPositions.cpp
@@ -1,4 +1,3 @@
-#include <ScenarioClass.h>
 #include "Body.h"
 
 bool isNODSidebar = false;
diff --git a/src/Ext/Side/Hooks.cpp b/src/Ext/Side/Hooks.cpp
index ede854f79f..c49735a83b 100644
--- a/src/Ext/Side/Hooks.cpp
+++ b/src/Ext/Side/Hooks.cpp
@@ -1,5 +1,4 @@
 #include "Body.h"
-#include <HouseClass.h>
 #include <ThemeClass.h>
 
 // Ingame music switch when defeated
diff --git a/src/Ext/Sidebar/Body.cpp b/src/Ext/Sidebar/Body.cpp
index 4d4c83cec3..57ee601f0a 100644
--- a/src/Ext/Sidebar/Body.cpp
+++ b/src/Ext/Sidebar/Body.cpp
@@ -2,8 +2,6 @@
 #include "SWSidebar/SWSidebarClass.h"
 
 #include <EventClass.h>
-#include <HouseClass.h>
-#include <SuperClass.h>
 
 std::unique_ptr<SidebarExt::ExtData> SidebarExt::Data = nullptr;
 
diff --git a/src/Ext/Sidebar/Body.h b/src/Ext/Sidebar/Body.h
index c5df31106f..86644822b5 100644
--- a/src/Ext/Sidebar/Body.h
+++ b/src/Ext/Sidebar/Body.h
@@ -2,12 +2,9 @@
 
 #include <SidebarClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 
-#include <map>
-
 class SidebarExt
 {
 public:
diff --git a/src/Ext/Sidebar/Hooks.cpp b/src/Ext/Sidebar/Hooks.cpp
index 3d5546a7b0..cf19a93322 100644
--- a/src/Ext/Sidebar/Hooks.cpp
+++ b/src/Ext/Sidebar/Hooks.cpp
@@ -1,10 +1,6 @@
 #include "Body.h"
 #include "SWSidebar/SWSidebarClass.h"
 
-#include <HouseClass.h>
-#include <FactoryClass.h>
-#include <FileSystem.h>
-
 #include <Ext/Side/Body.h>
 #include <Misc/MessageColumn.h>
 
diff --git a/src/Ext/Sidebar/SWSidebar/SWButtonClass.cpp b/src/Ext/Sidebar/SWSidebar/SWButtonClass.cpp
index 5794f9f18a..143844cccd 100644
--- a/src/Ext/Sidebar/SWSidebar/SWButtonClass.cpp
+++ b/src/Ext/Sidebar/SWSidebar/SWButtonClass.cpp
@@ -2,10 +2,7 @@
 #include "SWSidebarClass.h"
 #include <EventClass.h>
 #include <CCToolTip.h>
-#include <CommandClass.h>
-#include <UI.h>
 
-#include <Ext/SWType/Body.h>
 #include <Utilities/AresFunctions.h>
 
 SWButtonClass::SWButtonClass(int superIdx, int x, int y, int width, int height)
diff --git a/src/Ext/Sidebar/SWSidebar/SWButtonClass.h b/src/Ext/Sidebar/SWSidebar/SWButtonClass.h
index ec4561a076..5703f9f464 100644
--- a/src/Ext/Sidebar/SWSidebar/SWButtonClass.h
+++ b/src/Ext/Sidebar/SWSidebar/SWButtonClass.h
@@ -1,6 +1,8 @@
 #pragma once
 #include <GadgetClass.h>
 
+#include <Ext/SWType/Body.h>
+
 class SWButtonClass : public GadgetClass
 {
 public:
diff --git a/src/Ext/Sidebar/SWSidebar/SWColumnClass.cpp b/src/Ext/Sidebar/SWSidebar/SWColumnClass.cpp
index 1bc283351e..8bfff873f5 100644
--- a/src/Ext/Sidebar/SWSidebar/SWColumnClass.cpp
+++ b/src/Ext/Sidebar/SWSidebar/SWColumnClass.cpp
@@ -1,9 +1,6 @@
 #include "SWColumnClass.h"
 #include "SWSidebarClass.h"
 
-#include <Ext/SWType/Body.h>
-#include <Ext/Side/Body.h>
-
 SWColumnClass::SWColumnClass(int maxButtons, int x, int y, int width, int height)
 	: GadgetClass(x, y, width, height, static_cast<GadgetFlag>(0), false)
 	, MaxButtons(maxButtons)
diff --git a/src/Ext/Sidebar/SWSidebar/SWColumnClass.h b/src/Ext/Sidebar/SWSidebar/SWColumnClass.h
index 3ffed8f1fc..5ca8dd36b4 100644
--- a/src/Ext/Sidebar/SWSidebar/SWColumnClass.h
+++ b/src/Ext/Sidebar/SWSidebar/SWColumnClass.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "SWButtonClass.h"
-#include <GadgetClass.h>
+#include <Ext/Side/Body.h>
+#include <Ext/Scenario/Body.h>
 
 #include <vector>
 
diff --git a/src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp b/src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp
index 8046451d08..5d4eec40f8 100644
--- a/src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp
+++ b/src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp
@@ -1,9 +1,6 @@
 #include "SWSidebarClass.h"
-#include <CommandClass.h>
 
 #include <Ext/House/Body.h>
-#include <Ext/Side/Body.h>
-#include <Ext/SWType/Body.h>
 
 SWSidebarClass SWSidebarClass::Instance;
 CommandClass* SWSidebarClass::Commands[10];
diff --git a/src/Ext/Sidebar/SWSidebar/SWSidebarClass.h b/src/Ext/Sidebar/SWSidebar/SWSidebarClass.h
index 5cfaf415a9..82b78fe797 100644
--- a/src/Ext/Sidebar/SWSidebar/SWSidebarClass.h
+++ b/src/Ext/Sidebar/SWSidebar/SWSidebarClass.h
@@ -1,8 +1,6 @@
 #pragma once
-#include "SWButtonClass.h"
 #include "SWColumnClass.h"
 #include "ToggleSWButtonClass.h"
-#include <Ext/Scenario/Body.h>
 #include <CommandClass.h>
 
 class SWSidebarClass
diff --git a/src/Ext/Sidebar/SWSidebar/ToggleSWButtonClass.cpp b/src/Ext/Sidebar/SWSidebar/ToggleSWButtonClass.cpp
index b8df65eb87..7daa55e539 100644
--- a/src/Ext/Sidebar/SWSidebar/ToggleSWButtonClass.cpp
+++ b/src/Ext/Sidebar/SWSidebar/ToggleSWButtonClass.cpp
@@ -1,7 +1,6 @@
 #include "ToggleSWButtonClass.h"
 #include "SWSidebarClass.h"
 #include <GameOptionsClass.h>
-#include <ScenarioClass.h>
 
 #include <Ext/Side/Body.h>
 
diff --git a/src/Ext/TAction/Body.cpp b/src/Ext/TAction/Body.cpp
index 9284bebb66..8d50ec2945 100644
--- a/src/Ext/TAction/Body.cpp
+++ b/src/Ext/TAction/Body.cpp
@@ -2,16 +2,10 @@
 
 #include <MessageListClass.h>
 
+#include <Ext/House/Body.h>
 #include <Ext/Scenario/Body.h>
-#include <Ext/SWType/Body.h>
-
 #include <New/Entity/BannerClass.h>
-
-#include <New/Type/BannerTypeClass.h>
-
-#include <Utilities/SavegameDef.h>
 #include <Utilities/SpawnerHelper.h>
-#include <Ext/House/Body.h>
 
 //Static init
 TActionExt::ExtContainer TActionExt::ExtMap;
diff --git a/src/Ext/TAction/Body.h b/src/Ext/TAction/Body.h
index 72bf78126f..ef3c7240b3 100644
--- a/src/Ext/TAction/Body.h
+++ b/src/Ext/TAction/Body.h
@@ -1,9 +1,7 @@
 #pragma once
 
 #include <Utilities/Container.h>
-#include <Utilities/Template.h>
-
-#include <Helpers/Template.h>
+#include <Utilities/TemplateDef.h>
 
 #include <TActionClass.h>
 
diff --git a/src/Ext/TAction/Hooks.cpp b/src/Ext/TAction/Hooks.cpp
index d8ed3ad2e7..5e4580f160 100644
--- a/src/Ext/TAction/Hooks.cpp
+++ b/src/Ext/TAction/Hooks.cpp
@@ -3,18 +3,6 @@
 #include <Ext/Anim/Body.h>
 #include <Ext/Rules/Body.h>
 
-#include <Helpers/Macro.h>
-
-#include <HouseClass.h>
-#include <BuildingClass.h>
-#include <OverlayTypeClass.h>
-#include <LightSourceClass.h>
-#include <RadSiteClass.h>
-#include <VocClass.h>
-#include <ScenarioClass.h>
-
-#include <Utilities/Macro.h>
-
 DEFINE_HOOK(0x6DD8B0, TActionClass_Execute, 0x6)
 {
 	GET(TActionClass*, pThis, ECX);
diff --git a/src/Ext/TEvent/Body.cpp b/src/Ext/TEvent/Body.cpp
index 20071e9f67..f1b15bfbfe 100644
--- a/src/Ext/TEvent/Body.cpp
+++ b/src/Ext/TEvent/Body.cpp
@@ -1,13 +1,7 @@
 #include "Body.h"
 
-#include <Utilities/SavegameDef.h>
-#include <New/Entity/ShieldClass.h>
 #include <Ext/Scenario/Body.h>
-#include <BuildingClass.h>
-#include <InfantryClass.h>
-#include <UnitClass.h>
-#include <AircraftClass.h>
-#include <HouseClass.h>
+#include <New/Entity/ShieldClass.h>
 
 //Static init
 TEventExt::ExtContainer TEventExt::ExtMap;
diff --git a/src/Ext/TEvent/Body.h b/src/Ext/TEvent/Body.h
index 553494e697..478dfa3c55 100644
--- a/src/Ext/TEvent/Body.h
+++ b/src/Ext/TEvent/Body.h
@@ -1,10 +1,7 @@
 #pragma once
 
 #include <Utilities/Container.h>
-#include <Utilities/Template.h>
-#include <Helpers/Template.h>
-
-#include <optional>
+#include <Utilities/TemplateDef.h>
 
 #include <TEventClass.h>
 
diff --git a/src/Ext/TEvent/Hooks.cpp b/src/Ext/TEvent/Hooks.cpp
index eef6aeb8aa..c98bb7e2c7 100644
--- a/src/Ext/TEvent/Hooks.cpp
+++ b/src/Ext/TEvent/Hooks.cpp
@@ -1,15 +1,11 @@
 #include "Body.h"
 
-#include <Helpers\Macro.h>
-
 #include <HouseClass.h>
 #include <BuildingClass.h>
 #include <InfantryClass.h>
 #include <OverlayTypeClass.h>
 #include <VocClass.h>
 
-#include <Utilities/Macro.h>
-
 DEFINE_HOOK(0x71E940, TEventClass_Execute, 0x5)
 {
 	GET(TEventClass*, pThis, ECX);
diff --git a/src/Ext/Team/Body.h b/src/Ext/Team/Body.h
index 71a531d4b8..373b559c5a 100644
--- a/src/Ext/Team/Body.h
+++ b/src/Ext/Team/Body.h
@@ -1,11 +1,8 @@
 #pragma once
 #include <TeamClass.h>
 
-#include <Helpers/Enumerators.h>
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
-#include <Phobos.h>
 
 class TeamExt
 {
diff --git a/src/Ext/Techno/Body.Internal.cpp b/src/Ext/Techno/Body.Internal.cpp
index bbc744a6b2..7251d5ae27 100644
--- a/src/Ext/Techno/Body.Internal.cpp
+++ b/src/Ext/Techno/Body.Internal.cpp
@@ -1,9 +1,5 @@
 #include "Body.h"
 
-#include <AirstrikeClass.h>
-
-#include <Utilities/EnumFunctions.h>
-
 // Unsorted methods
 
 void TechnoExt::ExtData::InitializeLaserTrails()
diff --git a/src/Ext/Techno/Body.Update.cpp b/src/Ext/Techno/Body.Update.cpp
index 1be8e43495..daf4e5f161 100644
--- a/src/Ext/Techno/Body.Update.cpp
+++ b/src/Ext/Techno/Body.Update.cpp
@@ -1,22 +1,15 @@
 // methods used in TechnoClass_AI hooks or anything similar
 #include "Body.h"
 
-#include <SessionClass.h>
-#include <SpawnManagerClass.h>
-#include <ParticleSystemClass.h>
-#include <Conversions.h>
-#include <SlaveManagerClass.h>
-#include <AirstrikeClass.h>
 #include <Kamikaze.h>
 #include <JumpjetLocomotionClass.h>
-#include <FlyLocomotionClass.h>
 
 #include <Ext/Anim/Body.h>
 #include <Ext/Bullet/Body.h>
 #include <Ext/House/Body.h>
 #include <Ext/WeaponType/Body.h>
 #include <Ext/Scenario/Body.h>
-#include <Utilities/EnumFunctions.h>
+#include <Misc/FlyingStrings.h>
 #include <Utilities/AresFunctions.h>
 #include <New/Type/Affiliated/TypeConvertGroup.h>
 
diff --git a/src/Ext/Techno/Body.Visuals.cpp b/src/Ext/Techno/Body.Visuals.cpp
index b14c4b8337..c7b23eea07 100644
--- a/src/Ext/Techno/Body.Visuals.cpp
+++ b/src/Ext/Techno/Body.Visuals.cpp
@@ -1,14 +1,8 @@
 #include "Body.h"
 
-#include <SessionClass.h>
-#include <TacticalClass.h>
-#include <SpawnManagerClass.h>
-#include <FactoryClass.h>
-#include <SuperClass.h>
 #include <Ext/Anim/Body.h>
 #include <Ext/SWType/Body.h>
 #include <Ext/House/Body.h>
-#include <Utilities/EnumFunctions.h>
 
 void TechnoExt::DrawSelfHealPips(TechnoClass* pThis, Point2D* pLocation, RectangleStruct* pBounds)
 {
diff --git a/src/Ext/Techno/Body.cpp b/src/Ext/Techno/Body.cpp
index 8ddfcf20f1..45212b55c9 100644
--- a/src/Ext/Techno/Body.cpp
+++ b/src/Ext/Techno/Body.cpp
@@ -1,8 +1,5 @@
 #include "Body.h"
 
-#include <AircraftClass.h>
-#include <HouseClass.h>
-#include <ScenarioClass.h>
 #include <JumpjetLocomotionClass.h>
 
 #include <Ext/Anim/Body.h>
diff --git a/src/Ext/Techno/Body.h b/src/Ext/Techno/Body.h
index 89ed549edf..392bc23444 100644
--- a/src/Ext/Techno/Body.h
+++ b/src/Ext/Techno/Body.h
@@ -1,11 +1,8 @@
 #pragma once
-#include <InfantryClass.h>
-#include <AnimClass.h>
 
-#include <Helpers/Macro.h>
+#include <Ext/TechnoType/Body.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
-#include <Utilities/Macro.h>
 #include <New/Entity/ShieldClass.h>
 #include <New/Entity/LaserTrailClass.h>
 #include <New/Entity/AttachEffectClass.h>
diff --git a/src/Ext/Techno/Hooks.Airstrike.cpp b/src/Ext/Techno/Hooks.Airstrike.cpp
index d56887555c..38795d54c8 100644
--- a/src/Ext/Techno/Hooks.Airstrike.cpp
+++ b/src/Ext/Techno/Hooks.Airstrike.cpp
@@ -1,6 +1,4 @@
 #include "Body.h"
-#include <AirstrikeClass.h>
-#include <AircraftClass.h>
 
 #include <Ext/WarheadType/Body.h>
 
diff --git a/src/Ext/Techno/Hooks.Firing.cpp b/src/Ext/Techno/Hooks.Firing.cpp
index c8cf1733e2..c6f386e90f 100644
--- a/src/Ext/Techno/Hooks.Firing.cpp
+++ b/src/Ext/Techno/Hooks.Firing.cpp
@@ -1,15 +1,10 @@
 #include "Body.h"
 
-#include <OverlayTypeClass.h>
-#include <ScenarioClass.h>
-#include <TerrainClass.h>
-
 #include <Ext/Anim/Body.h>
 #include <Ext/Building/Body.h>
 #include <Ext/Bullet/Body.h>
 #include <Ext/WarheadType/Body.h>
 #include <Ext/WeaponType/Body.h>
-#include <Utilities/EnumFunctions.h>
 
 #pragma region TechnoClass_SelectWeapon
 
diff --git a/src/Ext/Techno/Hooks.Misc.cpp b/src/Ext/Techno/Hooks.Misc.cpp
index 6e15973360..6ae2637716 100644
--- a/src/Ext/Techno/Hooks.Misc.cpp
+++ b/src/Ext/Techno/Hooks.Misc.cpp
@@ -1,7 +1,6 @@
 #include "Body.h"
 
 #include <EventClass.h>
-#include <SpawnManagerClass.h>
 #include <TunnelLocomotionClass.h>
 #include <JumpjetLocomotionClass.h>
 
diff --git a/src/Ext/Techno/Hooks.Pips.cpp b/src/Ext/Techno/Hooks.Pips.cpp
index b15f9f64bd..075299f870 100644
--- a/src/Ext/Techno/Hooks.Pips.cpp
+++ b/src/Ext/Techno/Hooks.Pips.cpp
@@ -1,7 +1,3 @@
-#include <AircraftTypeClass.h>
-#include <SpawnManagerClass.h>
-#include <TiberiumClass.h>
-#include <TacticalClass.h>
 #include "Body.h"
 
 DEFINE_HOOK_AGAIN(0x6D9134, TacticalClass_RenderLayers_DrawBefore, 0x5)// BuildingClass
diff --git a/src/Ext/Techno/Hooks.ReceiveDamage.cpp b/src/Ext/Techno/Hooks.ReceiveDamage.cpp
index 9e57d97361..f23c509e53 100644
--- a/src/Ext/Techno/Hooks.ReceiveDamage.cpp
+++ b/src/Ext/Techno/Hooks.ReceiveDamage.cpp
@@ -1,12 +1,9 @@
 #include "Body.h"
 
-#include <TacticalClass.h>
-#include <RadarEventClass.h>
-
+#include <Ext/House/Body.h>
+#include <Ext/TEvent/Body.h>
 #include <Ext/WarheadType/Body.h>
 #include <Ext/WeaponType/Body.h>
-#include <Ext/TEvent/Body.h>
-#include <Ext/House/Body.h>
 
 namespace ReceiveDamageTemp
 {
diff --git a/src/Ext/Techno/Hooks.Tint.cpp b/src/Ext/Techno/Hooks.Tint.cpp
index 4aa401265a..32cd0ecaa5 100644
--- a/src/Ext/Techno/Hooks.Tint.cpp
+++ b/src/Ext/Techno/Hooks.Tint.cpp
@@ -1,7 +1,4 @@
-#include <AircraftClass.h>
-#include <InfantryClass.h>
 #include <JumpjetLocomotionClass.h>
-#include <SuperClass.h>
 
 #include "Body.h"
 
diff --git a/src/Ext/Techno/Hooks.Transport.cpp b/src/Ext/Techno/Hooks.Transport.cpp
index c9001516da..8416ebf863 100644
--- a/src/Ext/Techno/Hooks.Transport.cpp
+++ b/src/Ext/Techno/Hooks.Transport.cpp
@@ -1,7 +1,6 @@
 #include "Body.h"
 
 #include <Ext/Scenario/Body.h>
-
 #include <Utilities/AresHelper.h>
 #include <Utilities/AresFunctions.h>
 
diff --git a/src/Ext/Techno/Hooks.WeaponEffects.cpp b/src/Ext/Techno/Hooks.WeaponEffects.cpp
index 3ba82f6232..6f5ead2daa 100644
--- a/src/Ext/Techno/Hooks.WeaponEffects.cpp
+++ b/src/Ext/Techno/Hooks.WeaponEffects.cpp
@@ -1,14 +1,7 @@
-#include <BuildingClass.h>
-#include <CellClass.h>
-#include <MapClass.h>
-#include <ParticleSystemClass.h>
-#include <FootClass.h>
-#include <WaveClass.h>
+#include "Body.h"
 
 #include <Ext/ParticleSystemType/Body.h>
-#include <Ext/Techno/Body.h>
 #include <Ext/WeaponType/Body.h>
-#include <Utilities/Macro.h>
 
 // Contains hooks that fix weapon graphical effects like lasers, railguns, electric bolts, beams and waves not interacting
 // correctly with obstacles between firer and target, as well as railgun / railgun particles being cut off by elevation.
diff --git a/src/Ext/Techno/Hooks.WeaponRange.cpp b/src/Ext/Techno/Hooks.WeaponRange.cpp
index 0e0aeeab25..ad70078f7a 100644
--- a/src/Ext/Techno/Hooks.WeaponRange.cpp
+++ b/src/Ext/Techno/Hooks.WeaponRange.cpp
@@ -1,7 +1,5 @@
 #include "Body.h"
 
-#include <AircraftClass.h>
-
 #include <Ext/WeaponType/Body.h>
 
 // Reimplements the game function with few changes / optimizations
diff --git a/src/Ext/Techno/Hooks.cpp b/src/Ext/Techno/Hooks.cpp
index 25f7a90674..979d53d0e9 100644
--- a/src/Ext/Techno/Hooks.cpp
+++ b/src/Ext/Techno/Hooks.cpp
@@ -1,20 +1,13 @@
 #include "Body.h"
 
-#include <AircraftClass.h>
-#include <ScenarioClass.h>
 #include <TunnelLocomotionClass.h>
 #include <JumpjetLocomotionClass.h>
-#include <AlphaShapeClass.h>
-#include <TacticalClass.h>
 
 #include <Ext/Anim/Body.h>
 #include <Ext/BuildingType/Body.h>
 #include <Ext/House/Body.h>
 #include <Ext/Scenario/Body.h>
 #include <Ext/WarheadType/Body.h>
-#include <Ext/WeaponType/Body.h>
-#include <Ext/TechnoType/Body.h>
-#include <Utilities/EnumFunctions.h>
 #include <Utilities/Helpers.Alex.h>
 #include <Utilities/AresHelper.h>
 #include <Utilities/AresFunctions.h>
diff --git a/src/Ext/Techno/WeaponHelpers.cpp b/src/Ext/Techno/WeaponHelpers.cpp
index 4d99b86c8e..e472d5e680 100644
--- a/src/Ext/Techno/WeaponHelpers.cpp
+++ b/src/Ext/Techno/WeaponHelpers.cpp
@@ -1,10 +1,7 @@
 #include "Body.h"
 
-#include <OverlayTypeClass.h>
-
 #include <Ext/WeaponType/Body.h>
 #include <Ext/WarheadType/Body.h>
-#include <Utilities/EnumFunctions.h>
 
 // Compares two weapons and returns index of which one is eligible to fire against current target (0 = first, 1 = second), or -1 if neither works.
 int TechnoExt::PickWeaponIndex(TechnoClass* pThis, TechnoClass* pTargetTechno, AbstractClass* pTarget, int weaponIndexOne, int weaponIndexTwo, bool allowFallback, bool allowAAFallback)
diff --git a/src/Ext/TechnoType/Body.cpp b/src/Ext/TechnoType/Body.cpp
index 3caaa4f57a..6fecec798a 100644
--- a/src/Ext/TechnoType/Body.cpp
+++ b/src/Ext/TechnoType/Body.cpp
@@ -1,11 +1,6 @@
 #include "Body.h"
 
-#include <AircraftTrackerClass.h>
-#include <AnimClass.h>
-#include <FlyLocomotionClass.h>
 #include <JumpjetLocomotionClass.h>
-#include <TechnoTypeClass.h>
-#include <StringTable.h>
 
 #include <Ext/Anim/Body.h>
 #include <Ext/BuildingType/Body.h>
@@ -13,7 +8,6 @@
 #include <Ext/Techno/Body.h>
 #include <New/Type/InsigniaTypeClass.h>
 
-#include <Utilities/GeneralUtils.h>
 #include <Utilities/AresHelper.h>
 
 TechnoTypeExt::ExtContainer TechnoTypeExt::ExtMap;
diff --git a/src/Ext/TechnoType/Body.h b/src/Ext/TechnoType/Body.h
index 8bc0d57d8c..9ea7ede822 100644
--- a/src/Ext/TechnoType/Body.h
+++ b/src/Ext/TechnoType/Body.h
@@ -1,17 +1,14 @@
 #pragma once
-#include <TechnoTypeClass.h>
-
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 
+#include <New/Type/AttachEffectTypeClass.h>
 #include <New/Type/ShieldTypeClass.h>
 #include <New/Type/LaserTrailTypeClass.h>
-#include <New/Type/AttachEffectTypeClass.h>
-#include <New/Type/Affiliated/InterceptorTypeClass.h>
-#include <New/Type/Affiliated/PassengerDeletionTypeClass.h>
 #include <New/Type/DigitalDisplayTypeClass.h>
 #include <New/Type/SelectBoxTypeClass.h>
+#include <New/Type/Affiliated/InterceptorTypeClass.h>
+#include <New/Type/Affiliated/PassengerDeletionTypeClass.h>
 #include <New/Type/Affiliated/DroppodTypeClass.h>
 #include <New/Type/Affiliated/TiberiumEaterTypeClass.h>
 #include <New/Type/Affiliated/CreateUnitTypeClass.h>
diff --git a/src/Ext/TechnoType/Hooks.MatrixOp.cpp b/src/Ext/TechnoType/Hooks.MatrixOp.cpp
index fa9eb373ca..7e313acdb7 100644
--- a/src/Ext/TechnoType/Hooks.MatrixOp.cpp
+++ b/src/Ext/TechnoType/Hooks.MatrixOp.cpp
@@ -1,19 +1,10 @@
-#include <AircraftClass.h>
-#include <BounceClass.h>
-#include <FlyLocomotionClass.h>
+#include "Body.h"
+
 #include <JumpjetLocomotionClass.h>
-#include <RocketLocomotionClass.h>
-#include <SpawnManagerClass.h>
-#include <TacticalClass.h>
 #include <TunnelLocomotionClass.h>
-#include <UnitClass.h>
 #include <Utilities/AresHelper.h>
-#include <Utilities/Macro.h>
 #include <Ext/Techno/Body.h>
 
-#include "Body.h"
-
-
 DEFINE_REFERENCE(double, Pixel_Per_Lepton, 0xB1D008)
 
 #pragma region FLH_Turrets
diff --git a/src/Ext/TechnoType/Hooks.MultiWeapon.cpp b/src/Ext/TechnoType/Hooks.MultiWeapon.cpp
index ceb5139206..c7d01b6110 100644
--- a/src/Ext/TechnoType/Hooks.MultiWeapon.cpp
+++ b/src/Ext/TechnoType/Hooks.MultiWeapon.cpp
@@ -1,5 +1,4 @@
 #include "Body.h"
-#include <Randomizer.h>
 
 #include <Ext/Techno/Body.h>
 
diff --git a/src/Ext/TechnoType/Hooks.Teleport.cpp b/src/Ext/TechnoType/Hooks.Teleport.cpp
index facab36868..4fd755e699 100644
--- a/src/Ext/TechnoType/Hooks.Teleport.cpp
+++ b/src/Ext/TechnoType/Hooks.Teleport.cpp
@@ -1,11 +1,8 @@
 #include "Body.h"
-#include <LocomotionClass.h>
-#include <TeleportLocomotionClass.h>
 
 #include <Ext/Anim/Body.h>
 #include <Ext/Techno/Body.h>
 #include <Ext/WeaponType/Body.h>
-#include <TacticalClass.h>
 
 #define GET_LOCO(reg_Loco) \
 	GET(ILocomotion *, Loco, reg_Loco); \
diff --git a/src/Ext/TechnoType/Hooks.cpp b/src/Ext/TechnoType/Hooks.cpp
index d873c710ac..b20dbd625e 100644
--- a/src/Ext/TechnoType/Hooks.cpp
+++ b/src/Ext/TechnoType/Hooks.cpp
@@ -1,7 +1,6 @@
 #include "Body.h"
 #include <Ext/House/Body.h>
 #include <Ext/AnimType/Body.h>
-#include <Ext/WarheadType/Body.h>
 
 DEFINE_HOOK(0x73D223, UnitClass_DrawIt_OreGath, 0x6)
 {
diff --git a/src/Ext/TerrainType/Body.cpp b/src/Ext/TerrainType/Body.cpp
index b8d72c7f93..648e3bb436 100644
--- a/src/Ext/TerrainType/Body.cpp
+++ b/src/Ext/TerrainType/Body.cpp
@@ -1,12 +1,6 @@
 #include "Body.h"
 
-#include <AnimClass.h>
-#include <TacticalClass.h>
-#include <TerrainClass.h>
-#include <TerrainTypeClass.h>
-
 #include <Ext/Anim/Body.h>
-#include <Utilities/GeneralUtils.h>
 
 TerrainTypeExt::ExtContainer TerrainTypeExt::ExtMap;
 
diff --git a/src/Ext/TerrainType/Body.h b/src/Ext/TerrainType/Body.h
index 4bb586ca98..36b3cf63ec 100644
--- a/src/Ext/TerrainType/Body.h
+++ b/src/Ext/TerrainType/Body.h
@@ -1,10 +1,8 @@
 #pragma once
 #include <TerrainTypeClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
-#include <Utilities/Macro.h>
 
 class TerrainTypeExt
 {
diff --git a/src/Ext/TerrainType/Hooks.Passable.cpp b/src/Ext/TerrainType/Hooks.Passable.cpp
index 59110fa683..c2d251877a 100644
--- a/src/Ext/TerrainType/Hooks.Passable.cpp
+++ b/src/Ext/TerrainType/Hooks.Passable.cpp
@@ -1,11 +1,5 @@
 #include "Body.h"
 
-#include <HouseClass.h>
-#include <OverlayClass.h>
-#include <TerrainClass.h>
-
-#include <Utilities/GeneralUtils.h>
-
 constexpr bool IS_CELL_OCCUPIED(CellClass* pCell)
 {
 	return pCell->OccupationFlags & 0x20 || pCell->OccupationFlags & 0x40 || pCell->OccupationFlags & 0x80 || pCell->GetInfantry(false);
diff --git a/src/Ext/TerrainType/Hooks.cpp b/src/Ext/TerrainType/Hooks.cpp
index c99e766b7f..7f89a92ab2 100644
--- a/src/Ext/TerrainType/Hooks.cpp
+++ b/src/Ext/TerrainType/Hooks.cpp
@@ -1,14 +1,6 @@
 #include "Body.h"
 
-#include <HouseClass.h>
-#include <ScenarioClass.h>
-#include <SpecificStructures.h>
-#include <TacticalClass.h>
-#include <TiberiumClass.h>
-#include <TerrainClass.h>
-
 #include <Ext/Rules/Body.h>
-#include <Utilities/GeneralUtils.h>
 
 namespace TerrainTypeTemp
 {
diff --git a/src/Ext/Tiberium/Body.h b/src/Ext/Tiberium/Body.h
index 7f2750df05..ccb1406061 100644
--- a/src/Ext/Tiberium/Body.h
+++ b/src/Ext/Tiberium/Body.h
@@ -1,11 +1,8 @@
 #pragma once
 #include <TiberiumClass.h>
 
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
-#include <Utilities/Macro.h>
-#include <Utilities/GeneralUtils.h>
 
 class TiberiumExt
 {
diff --git a/src/Ext/Tiberium/Hooks.cpp b/src/Ext/Tiberium/Hooks.cpp
index bda639d57f..35a67a64b9 100644
--- a/src/Ext/Tiberium/Hooks.cpp
+++ b/src/Ext/Tiberium/Hooks.cpp
@@ -1,10 +1,7 @@
 #include "Body.h"
 
-#include <CellClass.h>
 #include <OverlayClass.h>
 
-#include <Utilities/GeneralUtils.h>
-
 DEFINE_HOOK(0x47C210, CellClass_CellColor_TiberiumRadarColor, 0x6)
 {
 	enum { ReturnFromFunction = 0x47C23F };
diff --git a/src/Ext/Trigger/Hooks.cpp b/src/Ext/Trigger/Hooks.cpp
index 33e85a4683..67f8c3ec3f 100644
--- a/src/Ext/Trigger/Hooks.cpp
+++ b/src/Ext/Trigger/Hooks.cpp
@@ -1,7 +1,3 @@
-#include <TriggerClass.h>
-
-#include <Helpers/Macro.h>
-
 #include <Ext/TEvent/Body.h>
 
 DEFINE_HOOK(0x727064, TriggerTypeClass_HasLocalSetOrClearedEvent, 0x5)
diff --git a/src/Ext/Unit/Hooks.Crushing.cpp b/src/Ext/Unit/Hooks.Crushing.cpp
index acd03863d4..0ebf775979 100644
--- a/src/Ext/Unit/Hooks.Crushing.cpp
+++ b/src/Ext/Unit/Hooks.Crushing.cpp
@@ -1,11 +1,7 @@
 #include <DriveLocomotionClass.h>
 #include <ShipLocomotionClass.h>
-#include <UnitClass.h>
 
 #include <Ext/Techno/Body.h>
-#include <Ext/TechnoType/Body.h>
-#include <Utilities/Macro.h>
-#include <Utilities/TemplateDef.h>
 
 DEFINE_HOOK(0x73B05B, UnitClass_PerCellProcess_TiltWhenCrushes, 0x6)
 {
diff --git a/src/Ext/Unit/Hooks.DeployFire.cpp b/src/Ext/Unit/Hooks.DeployFire.cpp
index f1933c8e74..4ced7ae8ae 100644
--- a/src/Ext/Unit/Hooks.DeployFire.cpp
+++ b/src/Ext/Unit/Hooks.DeployFire.cpp
@@ -1,7 +1,4 @@
-#include <ScenarioClass.h>
-
 #include <Ext/Techno/Body.h>
-#include <Utilities/Macro.h>
 
 DEFINE_HOOK(0x4C77E4, EventClass_Execute_DeployCommand, 0x6)
 {
diff --git a/src/Ext/Unit/Hooks.DeploysInto.cpp b/src/Ext/Unit/Hooks.DeploysInto.cpp
index 72c65faa8e..98815fdf2f 100644
--- a/src/Ext/Unit/Hooks.DeploysInto.cpp
+++ b/src/Ext/Unit/Hooks.DeploysInto.cpp
@@ -1,9 +1,7 @@
-#include <TerrainClass.h>
 #include <IsometricTileTypeClass.h>
 
 #include <Ext/TerrainType/Body.h>
 #include <Ext/CaptureManager/Body.h>
-#include <Ext/WarheadType/Body.h>
 #include <Ext/Building/Body.h>
 
 #pragma region AllowDeployControlledMCV
diff --git a/src/Ext/Unit/Hooks.DisallowMoving.cpp b/src/Ext/Unit/Hooks.DisallowMoving.cpp
index 837bab0df4..42f629e90b 100644
--- a/src/Ext/Unit/Hooks.DisallowMoving.cpp
+++ b/src/Ext/Unit/Hooks.DisallowMoving.cpp
@@ -1,9 +1,6 @@
 // Issue #5 Permanently stationary units
 // Author: Starkku
 
-#include "UnitClass.h"
-
-#include <Utilities/GeneralUtils.h>
 #include <Ext/Techno/Body.h>
 
 DEFINE_HOOK(0x740A93, UnitClass_Mission_Move_DisallowMoving, 0x6)
diff --git a/src/Ext/Unit/Hooks.DrawIt.cpp b/src/Ext/Unit/Hooks.DrawIt.cpp
index b2c44ed79e..a8fda02b47 100644
--- a/src/Ext/Unit/Hooks.DrawIt.cpp
+++ b/src/Ext/Unit/Hooks.DrawIt.cpp
@@ -1,6 +1,3 @@
-#include <Helpers/Macro.h>
-#include <UnitClass.h>
-
 #include <Ext/TechnoType/Body.h>
 
 DEFINE_HOOK(0x73C7AC, UnitClass_DrawAsSHP_DrawTurret_TintFix, 0x6)
diff --git a/src/Ext/Unit/Hooks.Jumpjet.cpp b/src/Ext/Unit/Hooks.Jumpjet.cpp
index affc5b46b2..069eae18d5 100644
--- a/src/Ext/Unit/Hooks.Jumpjet.cpp
+++ b/src/Ext/Unit/Hooks.Jumpjet.cpp
@@ -1,8 +1,5 @@
 #include <JumpjetLocomotionClass.h>
-#include <UnitClass.h>
-#include <BuildingClass.h>
 
-#include <Utilities/Macro.h>
 #include <Ext/Techno/Body.h>
 #include <Ext/WeaponType/Body.h>
 
diff --git a/src/Ext/Unit/Hooks.SimpleDeployer.cpp b/src/Ext/Unit/Hooks.SimpleDeployer.cpp
index 209add1ce1..f1539546ac 100644
--- a/src/Ext/Unit/Hooks.SimpleDeployer.cpp
+++ b/src/Ext/Unit/Hooks.SimpleDeployer.cpp
@@ -1,11 +1,9 @@
 #include <GameOptionsClass.h>
 #include <JumpjetLocomotionClass.h>
-#include <UnitClass.h>
 
 #include <Ext/Anim/Body.h>
 #include <Ext/Techno/Body.h>
 #include <Utilities/AresFunctions.h>
-#include <Utilities/Macro.h>
 
 static __forceinline bool HasDeployingAnim(TechnoTypeClass* pType)
 {
diff --git a/src/Ext/Unit/Hooks.Sinking.cpp b/src/Ext/Unit/Hooks.Sinking.cpp
index 26da765154..023fa66466 100644
--- a/src/Ext/Unit/Hooks.Sinking.cpp
+++ b/src/Ext/Unit/Hooks.Sinking.cpp
@@ -1,10 +1,4 @@
-#include <AircraftClass.h>
-
-#include <ScenarioClass.h>
-#include <TunnelLocomotionClass.h>
-#include <UnitClass.h>
-
-#include <Ext/TechnoType/Body.h>
+#include <Ext/Techno/Body.h>
 
 DEFINE_HOOK(0x7364DC, UnitClass_Update_SinkSpeed, 0x7)
 {
@@ -35,8 +29,7 @@ DEFINE_HOOK(0x629C67, ParasiteClass_UpdateSquid_SinkableBySquid, 0x9)
 	GET(ParasiteClass*, pThis, ESI);
 	GET(FootClass*, pVictim, EDI);
 
-	const auto pVictimType = pVictim->GetTechnoType();
-	const auto pVictimTypeExt = TechnoTypeExt::ExtMap.Find(pVictimType);
+	const auto pVictimTypeExt = TechnoExt::ExtMap.Find(pVictim)->TypeExtData;
 	const auto pOwner = pThis->Owner;
 
 	if (pVictimTypeExt->Sinkable_SquidGrab || pVictim->WhatAmI() != AbstractType::Unit)
@@ -47,7 +40,7 @@ DEFINE_HOOK(0x629C67, ParasiteClass_UpdateSquid_SinkableBySquid, 0x9)
 	}
 	else
 	{
-		auto damage = pVictimType->Strength;
+		auto damage = pVictimTypeExt->OwnerObject()->Strength;
 		pVictim->ReceiveDamage(&damage, 0, RulesClass::Instance->C4Warhead, pOwner, true, false, pOwner->Owner);
 	}
 
diff --git a/src/Ext/VoxelAnim/Body.cpp b/src/Ext/VoxelAnim/Body.cpp
index a50cf9e4eb..26d5ce5c78 100644
--- a/src/Ext/VoxelAnim/Body.cpp
+++ b/src/Ext/VoxelAnim/Body.cpp
@@ -1,7 +1,4 @@
 #include "Body.h"
-#include <Ext/VoxelAnimType/Body.h>
-#include <New/Entity/LaserTrailClass.h>
-#include <Utilities/Macro.h>
 
 VoxelAnimExt::ExtContainer VoxelAnimExt::ExtMap;
 
diff --git a/src/Ext/VoxelAnim/Body.h b/src/Ext/VoxelAnim/Body.h
index 985025ab5b..d467e9f58a 100644
--- a/src/Ext/VoxelAnim/Body.h
+++ b/src/Ext/VoxelAnim/Body.h
@@ -2,14 +2,7 @@
 
 #include <VoxelAnimClass.h>
 
-#include <Utilities/Container.h>
-#include <Utilities/Constructs.h>
-#include <Utilities/Template.h>
-#include <Utilities/TemplateDef.h>
-#include <Utilities/Debug.h>
-
-#include <Helpers/Macro.h>
-
+#include <Ext/VoxelAnimType/Body.h>
 #include <New/Entity/LaserTrailClass.h>
 
 class VoxelAnimExt
diff --git a/src/Ext/VoxelAnim/Hooks.cpp b/src/Ext/VoxelAnim/Hooks.cpp
index da6ae397e7..498680292a 100644
--- a/src/Ext/VoxelAnim/Hooks.cpp
+++ b/src/Ext/VoxelAnim/Hooks.cpp
@@ -1,11 +1,6 @@
 #include "Body.h"
 
-#include <ScenarioClass.h>
-
 #include <Ext/Anim/Body.h>
-#include <Ext/AnimType/Body.h>
-#include <Ext/VoxelAnimType/Body.h>
-#include <Ext/WarheadType/Body.h>
 
 DEFINE_HOOK(0x74A70E, VoxelAnimClass_AI_Additional, 0xC)
 {
diff --git a/src/Ext/VoxelAnimType/Body.cpp b/src/Ext/VoxelAnimType/Body.cpp
index b2baed23f7..07e880b6db 100644
--- a/src/Ext/VoxelAnimType/Body.cpp
+++ b/src/Ext/VoxelAnimType/Body.cpp
@@ -1,6 +1,5 @@
 #include "Body.h"
 
-
 VoxelAnimTypeExt::ExtContainer VoxelAnimTypeExt::ExtMap;
 
 void VoxelAnimTypeExt::ExtData::Initialize() { }
diff --git a/src/Ext/VoxelAnimType/Body.h b/src/Ext/VoxelAnimType/Body.h
index 3ae8246e99..406ca818ca 100644
--- a/src/Ext/VoxelAnimType/Body.h
+++ b/src/Ext/VoxelAnimType/Body.h
@@ -2,11 +2,7 @@
 #include <VoxelAnimTypeClass.h>
 
 #include <Utilities/Container.h>
-#include <Utilities/Constructs.h>
-#include <Utilities/Template.h>
 #include <Utilities/TemplateDef.h>
-#include <Utilities/Debug.h>
-#include <Helpers/Macro.h>
 
 #include <New/Type/LaserTrailTypeClass.h>
 
diff --git a/src/Ext/WarheadType/Body.cpp b/src/Ext/WarheadType/Body.cpp
index b0dc81fb02..1fa40d7d94 100644
--- a/src/Ext/WarheadType/Body.cpp
+++ b/src/Ext/WarheadType/Body.cpp
@@ -1,11 +1,6 @@
 #include "Body.h"
 
-#include <BulletClass.h>
-#include <HouseClass.h>
-
-#include <Ext/BulletType/Body.h>
 #include <Ext/Techno/Body.h>
-#include <Utilities/EnumFunctions.h>
 
 WarheadTypeExt::ExtContainer WarheadTypeExt::ExtMap;
 
diff --git a/src/Ext/WarheadType/Body.h b/src/Ext/WarheadType/Body.h
index b61bb4a20c..9a3e273cb2 100644
--- a/src/Ext/WarheadType/Body.h
+++ b/src/Ext/WarheadType/Body.h
@@ -1,12 +1,9 @@
 #pragma once
-#include <WarheadTypeClass.h>
-#include <SuperWeaponTypeClass.h>
-#include <Helpers/Macro.h>
+#include <Ext/Bullet/Body.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 #include <New/Type/ShieldTypeClass.h>
-#include <Ext/Bullet/Body.h>
-#include <Ext/Techno/Body.h>
+#include <New/Type/AttachEffectTypeClass.h>
 #include <New/Type/Affiliated/TypeConvertGroup.h>
 
 class WarheadTypeExt
diff --git a/src/Ext/WarheadType/Detonate.cpp b/src/Ext/WarheadType/Detonate.cpp
index d64548ebd1..7e1f2dd285 100644
--- a/src/Ext/WarheadType/Detonate.cpp
+++ b/src/Ext/WarheadType/Detonate.cpp
@@ -1,21 +1,9 @@
 #include "Body.h"
 
-#include <InfantryClass.h>
-#include <BulletClass.h>
-#include <HouseClass.h>
-#include <ScenarioClass.h>
-#include <AnimTypeClass.h>
-#include <AnimClass.h>
-#include <BitFont.h>
-#include <SuperClass.h>
-
 #include <Ext/Anim/Body.h>
-#include <Ext/Bullet/Body.h>
-#include <Ext/BulletType/Body.h>
 #include <Ext/SWType/Body.h>
 #include <Misc/FlyingStrings.h>
 #include <Utilities/Helpers.Alex.h>
-#include <Utilities/EnumFunctions.h>
 #include <Utilities/AresFunctions.h>
 
 #pragma region CreateGap Calls
diff --git a/src/Ext/WarheadType/Hooks.cpp b/src/Ext/WarheadType/Hooks.cpp
index ad2c724a6c..32c7507380 100644
--- a/src/Ext/WarheadType/Hooks.cpp
+++ b/src/Ext/WarheadType/Hooks.cpp
@@ -1,14 +1,7 @@
 #include "Body.h"
 
-#include <BulletClass.h>
-#include <ScenarioClass.h>
-#include <HouseClass.h>
-
-#include <Ext/Bullet/Body.h>
 #include <Ext/Techno/Body.h>
-#include <Ext/WeaponType/Body.h>
 #include <Ext/Scenario/Body.h>
-#include <Utilities/EnumFunctions.h>
 
 #pragma region Detonation
 
diff --git a/src/Ext/WeaponType/Body.cpp b/src/Ext/WeaponType/Body.cpp
index 354e766ebb..030d183962 100644
--- a/src/Ext/WeaponType/Body.cpp
+++ b/src/Ext/WeaponType/Body.cpp
@@ -1,7 +1,6 @@
 #include "Body.h"
 #include <Ext/Bullet/Body.h>
 #include <Ext/Techno/Body.h>
-#include <SpawnManagerClass.h>
 
 WeaponTypeExt::ExtContainer WeaponTypeExt::ExtMap;
 
diff --git a/src/Ext/WeaponType/Body.h b/src/Ext/WeaponType/Body.h
index 03d6fe37e0..c1de7e4969 100644
--- a/src/Ext/WeaponType/Body.h
+++ b/src/Ext/WeaponType/Body.h
@@ -1,10 +1,4 @@
 #pragma once
-#include <BulletClass.h>
-#include <WeaponTypeClass.h>
-#include <DiskLaserClass.h>
-#include <EBolt.h>
-#include <ParticleSystemTypeClass.h>
-#include <Helpers/Macro.h>
 #include <Utilities/Container.h>
 #include <Utilities/TemplateDef.h>
 
diff --git a/src/Misc/FlyingStrings.cpp b/src/Misc/FlyingStrings.cpp
index 331c393b6f..dcca47123c 100644
--- a/src/Misc/FlyingStrings.cpp
+++ b/src/Misc/FlyingStrings.cpp
@@ -3,9 +3,6 @@
 #include <MapClass.h>
 #include <Phobos.CRT.h>
 #include <TacticalClass.h>
-#include <ColorScheme.h>
-#include <Drawing.h>
-#include <ScenarioClass.h>
 #include <BitFont.h>
 #include <Utilities/EnumFunctions.h>
 
diff --git a/src/Misc/FlyingStrings.h b/src/Misc/FlyingStrings.h
index 79c932d41f..88956f9a24 100644
--- a/src/Misc/FlyingStrings.h
+++ b/src/Misc/FlyingStrings.h
@@ -6,7 +6,6 @@ By AlexB and Joshy
 
 #pragma once
 #include <vector>
-#include <ColorScheme.h>
 #include <HouseClass.h>
 #include <Utilities/Enum.h>
 
diff --git a/src/Misc/Hooks.AlphaImage.cpp b/src/Misc/Hooks.AlphaImage.cpp
index 8569b68113..dca1d0dcfc 100644
--- a/src/Misc/Hooks.AlphaImage.cpp
+++ b/src/Misc/Hooks.AlphaImage.cpp
@@ -1,6 +1,3 @@
-#include <AlphaShapeClass.h>
-#include <TacticalClass.h>
-
 #include <Ext/Building/Body.h>
 #include <Utilities/AresFunctions.h>
 
diff --git a/src/Misc/Hooks.Ares.cpp b/src/Misc/Hooks.Ares.cpp
index 34a35407e3..b7b6827bd7 100644
--- a/src/Misc/Hooks.Ares.cpp
+++ b/src/Misc/Hooks.Ares.cpp
@@ -1,13 +1,8 @@
-#include <BuildingClass.h>
-#include <FootClass.h>
-
-#include <Utilities/Macro.h>
 #include <Utilities/AresHelper.h>
 #include <Utilities/Helpers.Alex.h>
 
 #include <Ext/Building/Body.h>
 #include <Ext/Sidebar/Body.h>
-#include <Ext/Techno/Body.h>
 #include <Ext/EBolt/Body.h>
 
 #include <New/Entity/Ares/RadarJammerClass.h>
diff --git a/src/Misc/Hooks.BugFixes.cpp b/src/Misc/Hooks.BugFixes.cpp
index ca8ac8733a..ddcd52635f 100644
--- a/src/Misc/Hooks.BugFixes.cpp
+++ b/src/Misc/Hooks.BugFixes.cpp
@@ -1,40 +1,14 @@
-#include <AircraftClass.h>
 #include <AircraftTrackerClass.h>
-#include <AnimClass.h>
-#include <BuildingClass.h>
-#include <TechnoClass.h>
-#include <InfantryClass.h>
-#include <FootClass.h>
-#include <UnitClass.h>
-#include <OverlayTypeClass.h>
-#include <ScenarioClass.h>
-#include <SpawnManagerClass.h>
-#include <VoxelAnimClass.h>
-#include <BulletClass.h>
-#include <HouseClass.h>
-#include <FlyLocomotionClass.h>
 #include <JumpjetLocomotionClass.h>
-#include <TeleportLocomotionClass.h>
-#include <BombClass.h>
-#include <ParticleSystemClass.h>
-#include <WarheadTypeClass.h>
-#include <HashTable.h>
 #include <TunnelLocomotionClass.h>
-#include <TacticalClass.h>
 
-#include <Ext/Rules/Body.h>
 #include <Ext/BuildingType/Body.h>
 #include <Ext/Techno/Body.h>
 #include <Ext/Anim/Body.h>
-#include <Ext/AnimType/Body.h>
 #include <Ext/SWType/Body.h>
 #include <Ext/WarheadType/Body.h>
 #include <Ext/Cell/Body.h>
 
-#include <Utilities/Macro.h>
-#include <Utilities/Debug.h>
-#include <Utilities/TemplateDef.h>
-
 /*
 	Allow usage of TileSet of 255 and above without making NE-SW broken bridges unrepairable
 
diff --git a/src/Misc/Hooks.Crates.cpp b/src/Misc/Hooks.Crates.cpp
index f57fdc4e39..4c546a9850 100644
--- a/src/Misc/Hooks.Crates.cpp
+++ b/src/Misc/Hooks.Crates.cpp
@@ -1,11 +1,5 @@
-#include <HouseClass.h>
-#include <ScenarioClass.h>
-
-#include <Ext/Rules/Body.h>
 #include <Ext/TechnoType/Body.h>
 
-#include <Utilities/Macro.h>
-
 DEFINE_HOOK(0x56BD8B, MapClass_PlaceRandomCrate_Sampling, 0x5)
 {
 	enum { SpawnCrate = 0x56BE7B, SkipSpawn = 0x56BE91 };
diff --git a/src/Misc/Hooks.Gamespeed.cpp b/src/Misc/Hooks.Gamespeed.cpp
index 47a5013f74..9a64c6afc8 100644
--- a/src/Misc/Hooks.Gamespeed.cpp
+++ b/src/Misc/Hooks.Gamespeed.cpp
@@ -1,8 +1,7 @@
 #include <Phobos.h>
-#include <Utilities/Macro.h>
+#include <Helpers/Macro.h>
 #include <SessionClass.h>
 #include <GameOptionsClass.h>
-#include <Unsorted.h>
 
 namespace GameSpeedTemp
 {
diff --git a/src/Misc/Hooks.INIInheritance.cpp b/src/Misc/Hooks.INIInheritance.cpp
index 4c99dfd9e8..86bfa6d202 100644
--- a/src/Misc/Hooks.INIInheritance.cpp
+++ b/src/Misc/Hooks.INIInheritance.cpp
@@ -1,15 +1,9 @@
-#include <Utilities/Debug.h>
-#include <Utilities/Macro.h>
-#include <Helpers/Macro.h>
-#include <CCINIClass.h>
 #include <Utilities/TemplateDef.h>
 
 #include <CRC.h>
-#include <CRT.h>
 
 #include <vector>
 #include <set>
-#include <string>
 #include <unordered_map>
 
 namespace INIInheritance
diff --git a/src/Misc/Hooks.LaserDraw.cpp b/src/Misc/Hooks.LaserDraw.cpp
index 0716a97063..aa9d88cfaf 100644
--- a/src/Misc/Hooks.LaserDraw.cpp
+++ b/src/Misc/Hooks.LaserDraw.cpp
@@ -1,9 +1,4 @@
 #include <Helpers/Macro.h>
-
-#include <LaserDrawClass.h>
-#include <GeneralStructures.h>
-#include <Utilities/Debug.h>
-#include <Utilities/Macro.h>
 #include <Utilities/GeneralUtils.h>
 
 namespace LaserDrawTemp
diff --git a/src/Misc/Hooks.LightEffects.cpp b/src/Misc/Hooks.LightEffects.cpp
index 8d66e43367..0527925c1f 100644
--- a/src/Misc/Hooks.LightEffects.cpp
+++ b/src/Misc/Hooks.LightEffects.cpp
@@ -1,7 +1,6 @@
 #include <GameOptionsClass.h>
 
 #include <Ext/WarheadType/Body.h>
-#include <Helpers/Macro.h>
 
 namespace LightEffectsTemp
 {
diff --git a/src/Misc/Hooks.Overlay.cpp b/src/Misc/Hooks.Overlay.cpp
index 187949142f..1a0659fcee 100644
--- a/src/Misc/Hooks.Overlay.cpp
+++ b/src/Misc/Hooks.Overlay.cpp
@@ -1,8 +1,5 @@
 #include <Helpers/Macro.h>
 #include <CCINIClass.h>
-#include <ScenarioClass.h>
-#include <OverlayClass.h>
-#include <OverlayTypeClass.h>
 #include <Straws.h>
 #include <Pipes.h>
 
diff --git a/src/Misc/Hooks.PCX.cpp b/src/Misc/Hooks.PCX.cpp
index bb8324aca5..e9c5b7b934 100644
--- a/src/Misc/Hooks.PCX.cpp
+++ b/src/Misc/Hooks.PCX.cpp
@@ -1,8 +1,4 @@
-#include <Helpers/Macro.h>
-#include <PCX.h>
-#include <FileFormats/SHP.h>
 #include <Ext/Rules/Body.h>
-#include <LoadProgressManager.h>
 
 DEFINE_HOOK(0x6B9D9C, RGB_PCX_Loader, 0x7)
 {
diff --git a/src/Misc/Hooks.Timers.cpp b/src/Misc/Hooks.Timers.cpp
index 44b173a8c5..df650e5b11 100644
--- a/src/Misc/Hooks.Timers.cpp
+++ b/src/Misc/Hooks.Timers.cpp
@@ -1,11 +1,7 @@
-#include <ColorScheme.h>
 #include <GameOptionsClass.h>
 #include <FPSCounter.h>
-#include <SessionClass.h>
-#include <Phobos.h>
 
 #include <Ext/Rules/Body.h>
-#include <Utilities/Macro.h>
 
 namespace TimerValueTemp
 {
diff --git a/src/Misc/Hooks.UI.cpp b/src/Misc/Hooks.UI.cpp
index cf9699a3aa..241dff8c92 100644
--- a/src/Misc/Hooks.UI.cpp
+++ b/src/Misc/Hooks.UI.cpp
@@ -1,13 +1,8 @@
-#include <Phobos.h>
-
-#include <Helpers/Macro.h>
 #include <PreviewClass.h>
-#include <Surface.h>
 #include <ThemeClass.h>
 
 #include <Ext/House/Body.h>
 #include <Ext/Side/Body.h>
-#include <Ext/Rules/Body.h>
 #include <Ext/Scenario/Body.h>
 #include <Ext/TechnoType/Body.h>
 #include <Ext/SWType/Body.h>
@@ -15,7 +10,6 @@
 #include <Misc/FlyingStrings.h>
 
 #include <New/Entity/BannerClass.h>
-#include <New/Type/BannerTypeClass.h>
 
 #include <Utilities/Debug.h>
 
diff --git a/src/Misc/Hooks.VeinholeMonster.cpp b/src/Misc/Hooks.VeinholeMonster.cpp
index 36f71e1133..908e38c522 100644
--- a/src/Misc/Hooks.VeinholeMonster.cpp
+++ b/src/Misc/Hooks.VeinholeMonster.cpp
@@ -1,13 +1,7 @@
 #include <Ext/Anim/Body.h>
 
-#include <GameOptionsClass.h>
-#include <IonBlastClass.h>
-#include <OverlayTypeClass.h>
-#include <ScenarioClass.h>
-#include <UnitClass.h>
 #include <VeinholeMonsterClass.h>
 
-
 ///
 /// Veinhole Monster
 ///
diff --git a/src/Misc/MessageColumn.cpp b/src/Misc/MessageColumn.cpp
index 010c2291d1..9e2c587351 100644
--- a/src/Misc/MessageColumn.cpp
+++ b/src/Misc/MessageColumn.cpp
@@ -1,8 +1,6 @@
 #include "MessageColumn.h"
 
 #include <BitFont.h>
-#include <MessageListClass.h>
-#include <MouseClass.h>
 #include <WWMouseClass.h>
 
 #include <Ext/Side/Body.h>
diff --git a/src/Misc/MessageColumn.h b/src/Misc/MessageColumn.h
index 152b8f7667..593c9ede5b 100644
--- a/src/Misc/MessageColumn.h
+++ b/src/Misc/MessageColumn.h
@@ -4,8 +4,6 @@
 
 #include <Ext/Scenario/Body.h>
 
-#include <string>
-
 // --------------------------------------------------
 
 class MessageToggleClass : public GadgetClass
diff --git a/src/Misc/PhobosToolTip.cpp b/src/Misc/PhobosToolTip.cpp
index 5ae67f4f71..aa30b9692c 100644
--- a/src/Misc/PhobosToolTip.cpp
+++ b/src/Misc/PhobosToolTip.cpp
@@ -1,18 +1,8 @@
-#include <Helpers/Macro.h>
-
 #include "PhobosToolTip.h"
 
-#include <AircraftClass.h>
-#include <BuildingClass.h>
-#include <UnitClass.h>
-#include <InfantryClass.h>
-
 #include <GameOptionsClass.h>
 #include <CCToolTip.h>
-#include <BitFont.h>
-#include <BitText.h>
 #include <FPSCounter.h>
-#include <Phobos.h>
 
 #include <Ext/Side/Body.h>
 #include <Ext/Surface/Body.h>
diff --git a/src/Misc/PhobosToolTip.h b/src/Misc/PhobosToolTip.h
index 1d054751a2..31c1a92852 100644
--- a/src/Misc/PhobosToolTip.h
+++ b/src/Misc/PhobosToolTip.h
@@ -1,16 +1,8 @@
 #pragma once
 
-#include <SidebarClass.h>
-#include <SuperWeaponTypeClass.h>
-#include <TechnoTypeClass.h>
-
-#include <Phobos.h>
-
 #include <Ext/TechnoType/Body.h>
 #include <Ext/SWType/Body.h>
 
-#include <string>
-
 struct StripClass;
 
 class PhobosToolTip
diff --git a/src/Misc/Selection.cpp b/src/Misc/Selection.cpp
index b788ba5ee2..d2b938e4db 100644
--- a/src/Misc/Selection.cpp
+++ b/src/Misc/Selection.cpp
@@ -1,12 +1,5 @@
-#include "Phobos.h"
-#include "Utilities/Macro.h"
 #include <Utilities/AresHelper.h>
-#include "Ext/Techno/Body.h"
-#include "Ext/TechnoType/Body.h"
-
-#include <TacticalClass.h>
-#include <HouseClass.h>
-#include <Unsorted.h>
+#include <Ext/Techno/Body.h>
 
 class ExtSelection
 {
diff --git a/src/Misc/SyncLogging.cpp b/src/Misc/SyncLogging.cpp
index 5f2fab8f78..ac22f05000 100644
--- a/src/Misc/SyncLogging.cpp
+++ b/src/Misc/SyncLogging.cpp
@@ -1,12 +1,7 @@
-#include <Misc/SyncLogging.h>
-
-#include <AircraftClass.h>
-#include <InfantryClass.h>
-#include <HouseClass.h>
-#include <Unsorted.h>
+#include "SyncLogging.h"
 
+#include <Helpers/Macro.h>
 #include <Utilities/Debug.h>
-#include <Utilities/Macro.h>
 #include <Utilities/GeneralUtils.h>
 #include <Utilities/AresHelper.h>
 
diff --git a/src/Misc/TextInput.cpp b/src/Misc/TextInput.cpp
index f27feab829..250be9ad0f 100644
--- a/src/Misc/TextInput.cpp
+++ b/src/Misc/TextInput.cpp
@@ -1,4 +1,4 @@
-#include <Utilities\Macro.h>
+#include <Helpers/Macro.h>
 
 // Allow message entry in Skirmish
 // DEFINE_JUMP(LJMP, 0x55E484, 0x55E48D);
diff --git a/src/New/Entity/Ares/RadarJammerClass.cpp b/src/New/Entity/Ares/RadarJammerClass.cpp
index cbb6db1081..01e006316e 100644
--- a/src/New/Entity/Ares/RadarJammerClass.cpp
+++ b/src/New/Entity/Ares/RadarJammerClass.cpp
@@ -1,8 +1,6 @@
 #include "RadarJammerClass.h"
 
 #include <Ext/Techno/Body.h>
-#include <Ext/TechnoType/Body.h>
-#include <Utilities/EnumFunctions.h>
 
 void RadarJammerClass::Update()
 {
diff --git a/src/New/Entity/Ares/RadarJammerClass.h b/src/New/Entity/Ares/RadarJammerClass.h
index bd6239b95f..12b73449c4 100644
--- a/src/New/Entity/Ares/RadarJammerClass.h
+++ b/src/New/Entity/Ares/RadarJammerClass.h
@@ -1,9 +1,6 @@
 #pragma once
-#include <GeneralStructures.h>
-#include <TechnoClass.h>
 
 #include <Utilities/TemplateDef.h>
-#include <Utilities/AresFunctions.h>
 
 class RadarJammerClass
 {
diff --git a/src/New/Entity/AttachEffectClass.cpp b/src/New/Entity/AttachEffectClass.cpp
index 62717dfa8b..5a0adbdca3 100644
--- a/src/New/Entity/AttachEffectClass.cpp
+++ b/src/New/Entity/AttachEffectClass.cpp
@@ -1,14 +1,8 @@
 #include "AttachEffectClass.h"
-#include "Memory.h"
 
-#include <AnimClass.h>
-#include <BuildingClass.h>
-
-#include <Ext/TEvent/Body.h>
 #include <Ext/Anim/Body.h>
 #include <Ext/Techno/Body.h>
 #include <Ext/WeaponType/Body.h>
-#include <Utilities/EnumFunctions.h>
 
 std::vector<AttachEffectClass*> AttachEffectClass::Array;
 
diff --git a/src/New/Entity/BannerClass.cpp b/src/New/Entity/BannerClass.cpp
index 7ecb6a2235..a1cf6d5b3e 100644
--- a/src/New/Entity/BannerClass.cpp
+++ b/src/New/Entity/BannerClass.cpp
@@ -2,10 +2,6 @@
 
 #include <Ext/Scenario/Body.h>
 
-#include <New/Type/BannerTypeClass.h>
-
-#include <Utilities/SavegameDef.h>
-
 std::vector<std::unique_ptr<BannerClass>> BannerClass::Array;
 
 BannerClass::BannerClass
diff --git a/src/New/Entity/BannerClass.h b/src/New/Entity/BannerClass.h
index 146800e9b1..3d588cb7e9 100644
--- a/src/New/Entity/BannerClass.h
+++ b/src/New/Entity/BannerClass.h
@@ -1,10 +1,6 @@
 #pragma once
 
-#include <vector>
-
-#include <GeneralStructures.h>
-
-#include <Utilities/Savegame.h>
+#include <New/Type/BannerTypeClass.h>
 
 class BannerTypeClass;
 
diff --git a/src/New/Entity/LaserTrailClass.cpp b/src/New/Entity/LaserTrailClass.cpp
index 0a76d93794..a136b88568 100644
--- a/src/New/Entity/LaserTrailClass.cpp
+++ b/src/New/Entity/LaserTrailClass.cpp
@@ -1,6 +1,5 @@
 #include "LaserTrailClass.h"
 
-#include <Utilities/TemplateDef.h>
 #include <Ext/EBolt/Body.h>
 
 // Draws LaserTrail if the conditions are suitable.
diff --git a/src/New/Entity/LaserTrailClass.h b/src/New/Entity/LaserTrailClass.h
index 3902c5ff85..58a31fd767 100644
--- a/src/New/Entity/LaserTrailClass.h
+++ b/src/New/Entity/LaserTrailClass.h
@@ -1,11 +1,7 @@
 #pragma once
 
-#include <GeneralStructures.h>
-#include <HouseClass.h>
-
 #include <New/Type/LaserTrailTypeClass.h>
 
-
 class LaserTrailClass
 {
 public:
diff --git a/src/New/Entity/ShieldClass.cpp b/src/New/Entity/ShieldClass.cpp
index 1d747b6f3f..3e5e6d56df 100644
--- a/src/New/Entity/ShieldClass.cpp
+++ b/src/New/Entity/ShieldClass.cpp
@@ -1,17 +1,9 @@
 #include "ShieldClass.h"
 
 #include <Ext/Anim/Body.h>
-#include <Ext/Rules/Body.h>
 #include <Ext/Techno/Body.h>
-#include <Ext/TechnoType/Body.h>
 #include <Ext/WarheadType/Body.h>
 
-#include <Utilities/GeneralUtils.h>
-#include <AnimClass.h>
-#include <HouseClass.h>
-#include <RadarEventClass.h>
-#include <TacticalClass.h>
-
 std::vector<ShieldClass*> ShieldClass::Array;
 
 ShieldClass::ShieldClass()
diff --git a/src/New/Entity/ShieldClass.h b/src/New/Entity/ShieldClass.h
index 62789d970a..2a2491c96f 100644
--- a/src/New/Entity/ShieldClass.h
+++ b/src/New/Entity/ShieldClass.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <GeneralStructures.h>
-#include <SpecificStructures.h>
-#include <Ext/TechnoType/Body.h>
+#include <New/Type/ShieldTypeClass.h>
+
+#include "SpecificStructures.h"
 
 class TechnoClass;
 class WarheadTypeClass;
diff --git a/src/New/Type/Affiliated/CreateUnitTypeClass.cpp b/src/New/Type/Affiliated/CreateUnitTypeClass.cpp
index 647247ffd6..49ef868ab8 100644
--- a/src/New/Type/Affiliated/CreateUnitTypeClass.cpp
+++ b/src/New/Type/Affiliated/CreateUnitTypeClass.cpp
@@ -1,7 +1,5 @@
 #include "CreateUnitTypeClass.h"
 
-#include <Ext/Techno/Body.h>
-
 void CreateUnitTypeClass::LoadFromINI(CCINIClass* pINI, const char* pSection)
 {
 	INI_EX exINI(pINI);
diff --git a/src/New/Type/Affiliated/CreateUnitTypeClass.h b/src/New/Type/Affiliated/CreateUnitTypeClass.h
index 643905adbd..3dbe467e4e 100644
--- a/src/New/Type/Affiliated/CreateUnitTypeClass.h
+++ b/src/New/Type/Affiliated/CreateUnitTypeClass.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <Utilities/Template.h>
-#include <Utilities/Enum.h>
+#include <Utilities/TemplateDef.h>
 
 class CreateUnitTypeClass
 {
diff --git a/src/New/Type/Affiliated/DroppodTypeClass.h b/src/New/Type/Affiliated/DroppodTypeClass.h
index 644d6ab623..044a43c69f 100644
--- a/src/New/Type/Affiliated/DroppodTypeClass.h
+++ b/src/New/Type/Affiliated/DroppodTypeClass.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Utilities/Template.h>
+#include <Utilities/TemplateDef.h>
 
 class DroppodTypeClass
 {
diff --git a/src/New/Type/Affiliated/InterceptorTypeClass.cpp b/src/New/Type/Affiliated/InterceptorTypeClass.cpp
index e22731fc9c..babeaa6557 100644
--- a/src/New/Type/Affiliated/InterceptorTypeClass.cpp
+++ b/src/New/Type/Affiliated/InterceptorTypeClass.cpp
@@ -1,8 +1,5 @@
 #include "InterceptorTypeClass.h"
 
-#include <Utilities/SavegameDef.h>
-#include <Utilities/TemplateDef.h>
-
 InterceptorTypeClass::InterceptorTypeClass(TechnoTypeClass* OwnedBy)
 	: OwnerType { OwnedBy }
 	, TargetingDelay { 1 }
diff --git a/src/New/Type/Affiliated/InterceptorTypeClass.h b/src/New/Type/Affiliated/InterceptorTypeClass.h
index 2e09f56a26..69b7ac5d32 100644
--- a/src/New/Type/Affiliated/InterceptorTypeClass.h
+++ b/src/New/Type/Affiliated/InterceptorTypeClass.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include <Utilities/Constructs.h>
-#include <Utilities/Enum.h>
-#include <Utilities/Template.h>
+#include <Utilities/TemplateDef.h>
 
 class InterceptorTypeClass
 {
diff --git a/src/New/Type/Affiliated/PassengerDeletionTypeClass.cpp b/src/New/Type/Affiliated/PassengerDeletionTypeClass.cpp
index 00b5c5de53..8426b1e616 100644
--- a/src/New/Type/Affiliated/PassengerDeletionTypeClass.cpp
+++ b/src/New/Type/Affiliated/PassengerDeletionTypeClass.cpp
@@ -1,8 +1,5 @@
 #include "PassengerDeletionTypeClass.h"
 
-#include <Utilities/SavegameDef.h>
-#include <Utilities/TemplateDef.h>
-
 std::pair<bool, bool> PassengerDeletionTypeClass::CanParse(INI_EX exINI, const char* pSection)
 {
 	Nullable<int> rate;
diff --git a/src/New/Type/Affiliated/PassengerDeletionTypeClass.h b/src/New/Type/Affiliated/PassengerDeletionTypeClass.h
index 32a29cd89a..15b2feff47 100644
--- a/src/New/Type/Affiliated/PassengerDeletionTypeClass.h
+++ b/src/New/Type/Affiliated/PassengerDeletionTypeClass.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include <Utilities/Constructs.h>
-#include <Utilities/Enum.h>
-#include <Utilities/Template.h>
+#include <Utilities/TemplateDef.h>
 
 class PassengerDeletionTypeClass
 {
diff --git a/src/New/Type/Affiliated/TiberiumEaterTypeClass.cpp b/src/New/Type/Affiliated/TiberiumEaterTypeClass.cpp
index 9b988fff42..82cdb3ea87 100644
--- a/src/New/Type/Affiliated/TiberiumEaterTypeClass.cpp
+++ b/src/New/Type/Affiliated/TiberiumEaterTypeClass.cpp
@@ -1,8 +1,5 @@
 #include "TiberiumEaterTypeClass.h"
 
-#include <Utilities/SavegameDef.h>
-#include <Utilities/TemplateDef.h>
-
 void TiberiumEaterTypeClass::LoadFromINI(CCINIClass* pINI, const char* pSection)
 {
 	INI_EX exINI(pINI);
diff --git a/src/New/Type/Affiliated/TiberiumEaterTypeClass.h b/src/New/Type/Affiliated/TiberiumEaterTypeClass.h
index 6762eee9d9..e148d02c35 100644
--- a/src/New/Type/Affiliated/TiberiumEaterTypeClass.h
+++ b/src/New/Type/Affiliated/TiberiumEaterTypeClass.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include <Utilities/Constructs.h>
-#include <Utilities/Enum.h>
-#include <Utilities/Template.h>
+#include <Utilities/TemplateDef.h>
 
 class TiberiumEaterTypeClass
 {
diff --git a/src/New/Type/Affiliated/TypeConvertGroup.h b/src/New/Type/Affiliated/TypeConvertGroup.h
index bb2d9ad3e2..79fd7c0cdd 100644
--- a/src/New/Type/Affiliated/TypeConvertGroup.h
+++ b/src/New/Type/Affiliated/TypeConvertGroup.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Utilities/EnumFunctions.h>
+#include <Utilities/TemplateDef.h>
 
 class TypeConvertGroup
 {
diff --git a/src/New/Type/AttachEffectTypeClass.cpp b/src/New/Type/AttachEffectTypeClass.cpp
index 0b8191e409..56012f8dd1 100644
--- a/src/New/Type/AttachEffectTypeClass.cpp
+++ b/src/New/Type/AttachEffectTypeClass.cpp
@@ -1,5 +1,7 @@
 #include "AttachEffectTypeClass.h"
 
+#include <Ext/TEvent/Body.h>
+
 // Used to match groups names to AttachEffectTypeClass instances. Do not iterate due to undetermined order being prone to desyncs.
 std::unordered_map<std::string, std::set<AttachEffectTypeClass*>> AttachEffectTypeClass::GroupsMap;
 
diff --git a/src/New/Type/AttachEffectTypeClass.h b/src/New/Type/AttachEffectTypeClass.h
index b3d76711d3..45d1d069ed 100644
--- a/src/New/Type/AttachEffectTypeClass.h
+++ b/src/New/Type/AttachEffectTypeClass.h
@@ -3,7 +3,6 @@
 #include <set>
 #include <unordered_map>
 
-#include <Ext/TEvent/Body.h>
 #include <Utilities/Enumerable.h>
 #include <Utilities/TemplateDef.h>
 #include "LaserTrailTypeClass.h"
diff --git a/src/New/Type/BannerTypeClass.cpp b/src/New/Type/BannerTypeClass.cpp
index b0725016a3..2950b344d2 100644
--- a/src/New/Type/BannerTypeClass.cpp
+++ b/src/New/Type/BannerTypeClass.cpp
@@ -1,8 +1,5 @@
 #include "BannerTypeClass.h"
 
-#include <Utilities/GeneralUtils.h>
-#include <Utilities/TemplateDef.h>
-
 template<>
 const char* Enumerable<BannerTypeClass>::GetMainSection()
 {
diff --git a/src/New/Type/BannerTypeClass.h b/src/New/Type/BannerTypeClass.h
index 54be6d3efd..8aeb921668 100644
--- a/src/New/Type/BannerTypeClass.h
+++ b/src/New/Type/BannerTypeClass.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <Utilities/Enum.h>
 #include <Utilities/Enumerable.h>
-#include <Utilities/Template.h>
+#include <Utilities/TemplateDef.h>
 
 class BannerTypeClass final : public Enumerable<BannerTypeClass>
 {
diff --git a/src/New/Type/DigitalDisplayTypeClass.cpp b/src/New/Type/DigitalDisplayTypeClass.cpp
index 8fd33c3a67..e8057e252a 100644
--- a/src/New/Type/DigitalDisplayTypeClass.cpp
+++ b/src/New/Type/DigitalDisplayTypeClass.cpp
@@ -1,12 +1,6 @@
 #include "DigitalDisplayTypeClass.h"
 
-#include <TacticalClass.h>
-#include <SpawnManagerClass.h>
-
-#include <Ext/Techno/Body.h>
-
 #include <Utilities/ShapeTextPrinter.h>
-#include <Utilities/EnumFunctions.h>
 
 template<>
 const char* Enumerable<DigitalDisplayTypeClass>::GetMainSection()
diff --git a/src/New/Type/DigitalDisplayTypeClass.h b/src/New/Type/DigitalDisplayTypeClass.h
index 528b5ddb1f..6b544682b3 100644
--- a/src/New/Type/DigitalDisplayTypeClass.h
+++ b/src/New/Type/DigitalDisplayTypeClass.h
@@ -1,7 +1,5 @@
 #pragma once
 #include <Utilities/Enumerable.h>
-#include <Utilities/Template.h>
-#include <Utilities/GeneralUtils.h>
 #include <Utilities/TemplateDef.h>
 #include <Utilities/Anchor.h>
 
diff --git a/src/New/Type/LaserTrailTypeClass.cpp b/src/New/Type/LaserTrailTypeClass.cpp
index e1b00aa999..64d93d7bfd 100644
--- a/src/New/Type/LaserTrailTypeClass.cpp
+++ b/src/New/Type/LaserTrailTypeClass.cpp
@@ -1,8 +1,5 @@
 #include "LaserTrailTypeClass.h"
 
-#include <Utilities/TemplateDef.h>
-#include <HouseClass.h>
-
 template<>
 const char* Enumerable<LaserTrailTypeClass>::GetMainSection()
 {
diff --git a/src/New/Type/LaserTrailTypeClass.h b/src/New/Type/LaserTrailTypeClass.h
index 8ce4979a17..a247048cd8 100644
--- a/src/New/Type/LaserTrailTypeClass.h
+++ b/src/New/Type/LaserTrailTypeClass.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Utilities/Enumerable.h>
-#include <Utilities/Template.h>
+#include <Utilities/TemplateDef.h>
 
 class LaserTrailTypeClass final : public Enumerable<LaserTrailTypeClass>
 {
diff --git a/src/New/Type/RadTypeClass.cpp b/src/New/Type/RadTypeClass.cpp
index 3126b28f1b..e3dca1bce6 100644
--- a/src/New/Type/RadTypeClass.cpp
+++ b/src/New/Type/RadTypeClass.cpp
@@ -1,6 +1,5 @@
 #include "RadTypeClass.h"
 
-#include <Utilities/TemplateDef.h>
 #include <WarheadTypeClass.h>
 
 template<>
diff --git a/src/New/Type/RadTypeClass.h b/src/New/Type/RadTypeClass.h
index 38efb2a4ff..7fb5336849 100644
--- a/src/New/Type/RadTypeClass.h
+++ b/src/New/Type/RadTypeClass.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include <Utilities/Enumerable.h>
-#include <Utilities/Template.h>
-#include <Utilities/GeneralUtils.h>
+#include <Utilities/TemplateDef.h>
 #include <Ext/Rules/Body.h>
 
 class WarheadTypeClass;
diff --git a/src/New/Type/SelectBoxTypeClass.h b/src/New/Type/SelectBoxTypeClass.h
index 1f0707e700..ef81a3f08e 100644
--- a/src/New/Type/SelectBoxTypeClass.h
+++ b/src/New/Type/SelectBoxTypeClass.h
@@ -2,7 +2,6 @@
 
 #include <Utilities/Enumerable.h>
 #include <Utilities/TemplateDef.h>
-#include <Utilities/Enum.h>
 
 class SelectBoxTypeClass final : public Enumerable<SelectBoxTypeClass>
 {
diff --git a/src/New/Type/ShieldTypeClass.h b/src/New/Type/ShieldTypeClass.h
index acd602d87e..da4574ef35 100644
--- a/src/New/Type/ShieldTypeClass.h
+++ b/src/New/Type/ShieldTypeClass.h
@@ -1,10 +1,8 @@
 #pragma once
 
 #include <Utilities/Enumerable.h>
-#include <Utilities/Template.h>
-#include <Utilities/GeneralUtils.h>
-#include <Ext/Rules/Body.h>
 #include <Utilities/TemplateDef.h>
+#include <Ext/Rules/Body.h>
 
 class ShieldTypeClass final : public Enumerable<ShieldTypeClass>
 {
diff --git a/src/Utilities/Anchor.cpp b/src/Utilities/Anchor.cpp
index 5a076745ee..860e721f6a 100644
--- a/src/Utilities/Anchor.cpp
+++ b/src/Utilities/Anchor.cpp
@@ -1,7 +1,5 @@
 #include "Anchor.h"
 
-#include <GeneralDefinitions.h>
-
 double Anchor::GetRelativeOffsetHorizontal() const
 {
 	// Enum goes from 0 to 2 from left to right. Cast it and divide it
diff --git a/src/Utilities/Anchor.h b/src/Utilities/Anchor.h
index 2b16facff0..6bd2fc9308 100644
--- a/src/Utilities/Anchor.h
+++ b/src/Utilities/Anchor.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <Utilities/Enum.h>
 #include <Utilities/TemplateDef.h>
 
 #include <YRPPCore.h>
diff --git a/src/Utilities/AresHelper.h b/src/Utilities/AresHelper.h
index 07837b8765..52e45a2d2f 100644
--- a/src/Utilities/AresHelper.h
+++ b/src/Utilities/AresHelper.h
@@ -1,6 +1,4 @@
 #pragma once
-#include <vector>
-#include <string>
 #include <unordered_map>
 #include <Windows.h>
 
diff --git a/src/Utilities/Constructs.h b/src/Utilities/Constructs.h
index 0ddd844b04..f87acf0763 100644
--- a/src/Utilities/Constructs.h
+++ b/src/Utilities/Constructs.h
@@ -51,8 +51,6 @@
 
 class PhobosStreamReader;
 class PhobosStreamWriter;
-#include "Enum.h"
-
 class ConvertClass;
 
 template <typename T>
diff --git a/src/Utilities/GeneralUtils.cpp b/src/Utilities/GeneralUtils.cpp
index 906e9c5e4f..a3b0f9711b 100644
--- a/src/Utilities/GeneralUtils.cpp
+++ b/src/Utilities/GeneralUtils.cpp
@@ -1,13 +1,12 @@
+#include "Constructs.h"
 #include "GeneralUtils.h"
 #include "Debug.h"
 #include <Theater.h>
-#include <ScenarioClass.h>
 #include <BitFont.h>
 
 #include <Ext/Rules/Body.h>
 #include <Ext/Techno/Body.h>
 #include <Misc/FlyingStrings.h>
-#include <Utilities/Constructs.h>
 #include "AresHelper.h"
 
 bool GeneralUtils::IsValidString(const char* str)
diff --git a/src/Utilities/SavegameDef.h b/src/Utilities/SavegameDef.h
index 5d9c419eff..44a3bfe8e4 100644
--- a/src/Utilities/SavegameDef.h
+++ b/src/Utilities/SavegameDef.h
@@ -3,6 +3,8 @@
 // include this file whenever something is to be saved.
 
 #include "Savegame.h"
+#include "Constructs.h"
+
 #include <optional>
 #include <vector>
 #include <map>
@@ -14,7 +16,6 @@
 #include <FileFormats/SHP.h>
 #include <RulesClass.h>
 #include <SidebarClass.h>
-#include <Utilities/Constructs.h>
 
 #include "Swizzle.h"
 #include "Debug.h"
diff --git a/src/Utilities/SpawnerHelper.cpp b/src/Utilities/SpawnerHelper.cpp
index e84808c8a8..09db194f66 100644
--- a/src/Utilities/SpawnerHelper.cpp
+++ b/src/Utilities/SpawnerHelper.cpp
@@ -1,6 +1,5 @@
 #include "SpawnerHelper.h"
 
-#include <Utilities/Debug.h>
 #include <Utilities/Macro.h>
 
 bool SpawnerHelper::IsSaveGameEventHooked()
diff --git a/src/Utilities/TemplateDef.h b/src/Utilities/TemplateDef.h
index 2b8a6022da..089a27499b 100644
--- a/src/Utilities/TemplateDef.h
+++ b/src/Utilities/TemplateDef.h
@@ -37,17 +37,21 @@
 #include "Template.h"
 
 #include "INIParser.h"
-#include "Enum.h"
-#include "Constructs.h"
+#include "EnumFunctions.h"
 #include "SavegameDef.h"
+#include "Macro.h"
 
 #include <InfantryTypeClass.h>
 #include <AircraftTypeClass.h>
 #include <UnitTypeClass.h>
 #include <BuildingTypeClass.h>
 #include <WarheadTypeClass.h>
+#include <WeaponTypeClass.h>
 #include <SuperWeaponTypeClass.h>
-#include <FootClass.h>
+#include <InfantryClass.h>
+#include <AircraftClass.h>
+#include <UnitClass.h>
+#include <BuildingClass.h>
 #include <Powerups.h>
 #include <VocClass.h>
 #include <VoxClass.h>