From 62308e453f03857e57edc80a8cd57e94992e6ec1 Mon Sep 17 00:00:00 2001
From: Mario <mario.mario@y7mail.com>
Date: Sat, 17 Oct 2020 07:45:04 +1000
Subject: [PATCH] Resolve a rabbit hole of header dependencies

---
 qcsrc/server/cheats.qc               |  1 +
 qcsrc/server/client.qc               |  9 +++++++++
 qcsrc/server/clientkill.qc           |  2 ++
 qcsrc/server/command/common.qc       |  2 ++
 qcsrc/server/command/getreplies.qc   |  3 +++
 qcsrc/server/damage.qh               | 27 +--------------------------
 qcsrc/server/hook.qh                 |  2 +-
 qcsrc/server/items/items.qc          |  1 +
 qcsrc/server/player.qc               |  2 ++
 qcsrc/server/weapons/common.qc       |  3 ++-
 qcsrc/server/weapons/throwing.qc     |  1 +
 qcsrc/server/weapons/tracing.qc      |  1 +
 qcsrc/server/weapons/weaponsystem.qc |  2 ++
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index f87d35d04..3506aa7b7 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -17,6 +17,7 @@
 #include <common/weapons/_all.qh>
 #include <lib/csqcmodel/sv_model.qh>
 #include <lib/warpzone/anglestransform.qh>
+#include <lib/warpzone/common.qh>
 #include <lib/warpzone/util_server.qh>
 #include <server/clientkill.qh>
 #include <server/damage.qh>
diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 9bcd45dd9..d5868c1f4 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1,5 +1,7 @@
 #include "client.qh"
 
+#include <common/csqcmodel_settings.qh>
+#include <common/deathtypes/all.qh>
 #include <common/effects/all.qh>
 #include <common/effects/qc/globalsound.qh>
 #include <common/ent_cs.qh>
@@ -23,14 +25,19 @@
 #include <common/mutators/mutator/waypoints/all.qh>
 #include <common/net_linked.qh>
 #include <common/net_notice.qh>
+#include <common/notifications/all.qh>
 #include <common/physics/player.qh>
+#include <common/playerstats.qh>
 #include <common/state.qh>
 #include <common/stats.qh>
 #include <common/vehicles/all.qh>
 #include <common/vehicles/sv_vehicles.qh>
+#include <common/viewloc.qh>
 #include <common/weapons/_all.qh>
 #include <common/weapons/weapon/vortex.qh>
 #include <common/wepent.qh>
+#include <lib/csqcmodel/sv_model.qh>
+#include <lib/warpzone/common.qh>
 #include <lib/warpzone/server.qh>
 #include <server/anticheat.qh>
 #include <server/antilag.qh>
@@ -56,9 +63,11 @@
 #include <server/portals.qh>
 #include <server/race.qh>
 #include <server/resources.qh>
+#include <server/scores.qh>
 #include <server/scores_rules.qh>
 #include <server/spawnpoints.qh>
 #include <server/teamplay.qh>
+#include <server/weapons/accuracy.qh>
 #include <server/weapons/common.qh>
 #include <server/weapons/hitplot.qh>
 #include <server/weapons/selection.qh>
diff --git a/qcsrc/server/clientkill.qc b/qcsrc/server/clientkill.qc
index d972d6b08..ee01f7ff1 100644
--- a/qcsrc/server/clientkill.qc
+++ b/qcsrc/server/clientkill.qc
@@ -1,5 +1,7 @@
 #include "clientkill.qh"
 
+#include <common/csqcmodel_settings.qh>
+#include <common/deathtypes/all.qh>
 #include <common/mapobjects/triggers.qh>
 #include <common/notifications/all.qh>
 #include <common/stats.qh>
diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index 4e001af73..2d12f986b 100644
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -1,9 +1,11 @@
 #include "common.qh"
 
 #include <common/command/_mod.qh>
+#include <common/deathtypes/all.qh>
 #include <common/monsters/_mod.qh>
 #include <common/notifications/all.qh>
 #include <common/stats.qh>
+#include <common/vehicles/all.qh>
 #include <common/weapons/_all.qh>
 #include <lib/warpzone/common.qh>
 #include <server/chat.qh>
diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc
index 8f572a8ec..81121cfe8 100644
--- a/qcsrc/server/command/getreplies.qc
+++ b/qcsrc/server/command/getreplies.qc
@@ -5,6 +5,8 @@
 #include <common/gamemodes/_mod.qh>
 #include <common/monsters/_mod.qh>
 #include <common/net_linked.qh>
+#include <common/notifications/all.qh>
+#include <common/playerstats.qh>
 #include <common/stats.qh>
 #include <common/util.qh>
 #include <common/weapons/_all.qh>
@@ -14,6 +16,7 @@
 #include <server/main.qh>
 #include <server/mutators/_mod.qh>
 #include <server/race.qh>
+#include <server/weapons/selection.qh>
 #include <server/world.qh>
 
 // =========================================================
diff --git a/qcsrc/server/damage.qh b/qcsrc/server/damage.qh
index 60e4f0a65..68ea7a873 100644
--- a/qcsrc/server/damage.qh
+++ b/qcsrc/server/damage.qh
@@ -1,31 +1,6 @@
 #pragma once
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include <common/weapons/_all.qh>
-    #include <common/stats.qh>
-    #include <server/items/items.qh>
-    #include <lib/warpzone/common.qh>
-    #include <common/constants.qh>
-    #include <common/teams.qh>
-    #include <common/util.qh>
-    #include <common/weapons/_all.qh>
-    #include "weapons/accuracy.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/selection.qh"
-    #include "autocvars.qh"
-    #include <common/notifications/all.qh>
-    #include <common/deathtypes/all.qh>
-    #include <server/mutators/_mod.qh>
-    #include <common/turrets/sv_turrets.qh>
-    #include <common/vehicles/all.qh>
-    #include <lib/csqcmodel/sv_model.qh>
-    #include <common/playerstats.qh>
-    #include "hook.qh"
-    #include "scores.qh"
-    #include "spawnpoints.qh"
-#endif
+#include <common/weapons/_all.qh>
 
 .void(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) event_damage;
 
diff --git a/qcsrc/server/hook.qh b/qcsrc/server/hook.qh
index 3be5d6716..23ec8cf7f 100644
--- a/qcsrc/server/hook.qh
+++ b/qcsrc/server/hook.qh
@@ -1,7 +1,7 @@
 #pragma once
 
 // Wazat's grappling hook
-.entity		hook;
+.entity hook;
 void GrapplingHookThink(entity this);
 void RemoveGrapplingHooks(entity pl);
 void RemoveHook(entity this);
diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc
index e41b689a7..22cb54abc 100644
--- a/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@ -12,6 +12,7 @@
 #include <common/util.qh>
 #include <common/weapons/_all.qh>
 #include <common/wepent.qh>
+#include <lib/warpzone/common.qh>
 #include <lib/warpzone/util_server.qh>
 #include <server/bot/api.qh>
 #include <server/command/vote.qh>
diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 28d1ecb20..b5fee52d5 100644
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -27,10 +27,12 @@
 #include <server/command/vote.qh>
 #include <server/damage.qh>
 #include <server/handicap.qh>
+#include <server/hook.qh>
 #include <server/main.qh>
 #include <server/mutators/_mod.qh>
 #include <server/portals.qh>
 #include <server/teamplay.qh>
+#include <server/weapons/accuracy.qh>
 #include <server/weapons/common.qh>
 #include <server/weapons/throwing.qh>
 #include <server/weapons/weaponstats.qh>
diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc
index 130609af3..3f8d2c285 100644
--- a/qcsrc/server/weapons/common.qc
+++ b/qcsrc/server/weapons/common.qc
@@ -9,12 +9,13 @@
 #include <common/stats.qh>
 #include <common/util.qh>
 #include <common/weapons/_all.qh>
-#include <common/weapons/_all.qh>
 #include <common/wepent.qh>
 #include <server/command/common.qh>
 #include <server/damage.qh>
+#include <server/hook.qh>
 #include <server/items/items.qh>
 #include <server/mutators/_mod.qh>
+#include <server/weapons/csqcprojectile.qh>
 
 bool W_DualWielding(entity player)
 {
diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index 41176d753..db89ffc44 100644
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -13,6 +13,7 @@
 #include <server/items/spawning.qh>
 #include <server/mutators/_mod.qh>
 #include <server/resources.qh>
+#include <server/weapons/selection.qh>
 #include <server/weapons/weaponsystem.qh>
 #include <server/world.qh>
 
diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index 223dd071a..a36833a6d 100644
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -1,6 +1,7 @@
 #include "tracing.qh"
 
 #include <common/constants.qh>
+#include <common/deathtypes/all.qh>
 #include <common/effects/all.qh>
 #include <common/net_linked.qh>
 #include <common/state.qh>
diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 5ec837004..79f692590 100644
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -9,6 +9,7 @@
 #include <common/notifications/all.qh>
 #include <common/state.qh>
 #include <common/util.qh>
+#include <common/vehicles/all.qh>
 #include <common/weapons/_all.qh>
 #include <common/wepent.qh>
 #include <lib/csqcmodel/sv_model.qh>
@@ -17,6 +18,7 @@
 #include <server/command/common.qh>
 #include <server/damage.qh>
 #include <server/items/items.qh>
+#include <server/hook.qh>
 #include <server/mutators/_mod.qh>
 #include <server/resources.qh>
 #include <server/round_handler.qh>
-- 
2.39.2