Resolve a rabbit hole of header dependencies

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index f87d35d047943f443f73fba7940603b05e4bb9f1..3506aa7b799b9dc254cac14ac7ad09c71c4eaec6 100644 (file)
--- 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 9bcd45dd9c77a6b29064268c4ae66c50d7316111..d5868c1f4a705eb46945cbec0cae78badfd4785a 100644 (file)
--- 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 d972d6b089a2dce7568f5bdc647b3e19946632ed..ee01f7ff196433f5c2b2a5397c9bfb0d54851f6b 100644 (file)
--- 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 4e001af734975c785c40bbf3282074dac678b9ca..2d12f986bfe4be8e0b940cc6df9dd7521b66f5cc 100644 (file)
--- 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 8f572a8ec3c83b061dcf3c5bcc9e1c5a1a32c10c..81121cfe89f0891c6ea871192da948f8eb50ca73 100644 (file)
--- 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 60e4f0a657b27562ad17ab302c08e0256f3b34f3..68ea7a87381708eb8b61d43d1834e50563d52227 100644 (file)
--- 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 3be5d6716bff1375ed3214404f4c3c079d0a2dcf..23ec8cf7f849eb34731da399d21a8df45d76915a 100644 (file)
--- 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 e41b689a703b8658a91b36dae10c1c35d177abf0..22cb54abc1d3effee04dd6f993d08e6a614e4504 100644 (file)
--- 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 28d1ecb20bff4d183101942bbf03b54ecc1fbe57..b5fee52d5324277a9130edea8571fc79d0fdad08 100644 (file)
--- 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 130609af34dcd7511029e5bed4ddb70587617e00..3f8d2c28546391e58f42b5cc73bb16759b0c7e82 100644 (file)
--- 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 41176d7535db9f186acfe375e13a74e3ec3ae994..db89ffc443b3478e610cd996b10b6c2335b49443 100644 (file)
--- 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 223dd071a956de88e057a362ab1c3e92c7f93855..a36833a6dbbfa123e657614c0873abc5d270ac6e 100644 (file)
--- 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 5ec837004a08a99a3ed737d8b1dd2e1482f5d79a..79f692590cb6ae2204a8072d2512d6418b7800e6 100644 (file)
--- 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>