Phobos-developers · Coronia · Dec 22, 2025 · Dec 22, 2025 · Dec 22, 2025 · Dec 22, 2025
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 };