From: Mario <mario.mario@y7mail.com>
Date: Fri, 16 Oct 2020 11:45:50 +0000 (+1000)
Subject: Apply a standard alphabetical sort order to the server side includes and use constant... 
X-Git-Tag: xonotic-v0.8.5~732
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3cbcea63497633f206816900e4f7e32b833751f0;p=xonotic%2Fxonotic-data.pk3dir.git

Apply a standard alphabetical sort order to the server side includes and use constant paths
---

diff --git a/qcsrc/server/anticheat.qc b/qcsrc/server/anticheat.qc
index 536a3b623..7567563e9 100644
--- a/qcsrc/server/anticheat.qc
+++ b/qcsrc/server/anticheat.qc
@@ -1,17 +1,16 @@
 #include "anticheat.qh"
 
-#include "antilag.qh"
-#include "autocvars.qh"
-#include <common/weapons/_all.qh>
+#include <common/playerstats.qh>
+#include <common/state.qh>
 #include <common/stats.qh>
+#include <common/weapons/_all.qh>
+#include <server/antilag.qh>
+#include <server/autocvars.qh>
 #include <server/client.qh>
+#include <server/command/common.qh>
 #include <server/gamelog.qh>
 #include <server/main.qh>
 
-#include "command/common.qh"
-#include <common/playerstats.qh>
-#include <common/state.qh>
-
 .float anticheat_jointime;
 
 .float anticheat_fixangle_endtime;
diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc
index d116bc109..c3229adfd 100644
--- a/qcsrc/server/antilag.qc
+++ b/qcsrc/server/antilag.qc
@@ -1,16 +1,13 @@
 #include "antilag.qh"
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include <common/weapons/_all.qh>
-    #include <common/stats.qh>
-    #include <server/weapons/common.qh>
-    #include <common/state.qh>
-    #include <common/monsters/sv_monsters.qh>
-    #include <common/vehicles/all.qh>
-	#include <lib/warpzone/common.qh>
-    #include "antilag.qh"
-#endif
+
+#include <common/monsters/sv_monsters.qh>
+#include <common/state.qh>
+#include <common/stats.qh>
+#include <common/vehicles/all.qh>
+#include <common/weapons/_all.qh>
+#include <lib/warpzone/common.qh>
+#include <server/antilag.qh>
+#include <server/weapons/common.qh>
 
 const int ANTILAG_MAX_ORIGINS = 64;
 .vector antilag_origins[ANTILAG_MAX_ORIGINS];
diff --git a/qcsrc/server/bot/default/aim.qc b/qcsrc/server/bot/default/aim.qc
index fc6755fb0..6b1488bac 100644
--- a/qcsrc/server/bot/default/aim.qc
+++ b/qcsrc/server/bot/default/aim.qc
@@ -1,18 +1,13 @@
 #include "aim.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-
-#include "cvars.qh"
-
-#include "bot.qh"
-
 #include <common/physics/player.qh>
 #include <common/state.qh>
-
-#include "../../weapons/weaponsystem.qh"
-
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
+#include <server/bot/default/bot.qh>
+#include <server/bot/default/cvars.qh>
 #include <server/mutators/_mod.qh>
+#include <server/weapons/weaponsystem.qh>
 
 // traces multiple trajectories to find one that will impact the target
 // 'end' vector is the place it aims for,
diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc
index c42a053f4..f6e991770 100644
--- a/qcsrc/server/bot/default/bot.qc
+++ b/qcsrc/server/bot/default/bot.qc
@@ -1,46 +1,35 @@
 #include "bot.qh"
 
-#include "cvars.qh"
-
-#include "aim.qh"
-#include "navigation.qh"
-#include "scripting.qh"
-#include "waypoints.qh"
-
-#include "havocbot/havocbot.qh"
-#include "havocbot/scripting.qh"
-
-#include "../../teamplay.qh"
-
-#include "../../antilag.qh"
-#include "../../autocvars.qh"
-#include "../../campaign.qh"
-#include "../../client.qh"
-#include <common/stats.qh>
-#include <server/world.qh>
-#include <server/damage.qh>
-#include "../../race.qh"
-#include <server/items/items.qh>
-
-#include <server/mutators/_mod.qh>
-
-#include "../../weapons/accuracy.qh"
-
-#include <common/physics/player.qh>
 #include <common/constants.qh>
-#include <common/net_linked.qh>
 #include <common/mapinfo.qh>
+#include <common/net_linked.qh>
+#include <common/physics/player.qh>
+#include <common/stats.qh>
 #include <common/teams.qh>
 #include <common/util.qh>
-
-#include <server/scores_rules.qh>
-
 #include <common/weapons/_all.qh>
-
 #include <lib/csqcmodel/sv_model.qh>
-
 #include <lib/warpzone/common.qh>
 #include <lib/warpzone/util_server.qh>
+#include <server/antilag.qh>
+#include <server/autocvars.qh>
+#include <server/bot/default/aim.qh>
+#include <server/bot/default/cvars.qh>
+#include <server/bot/default/havocbot/havocbot.qh>
+#include <server/bot/default/havocbot/scripting.qh>
+#include <server/bot/default/navigation.qh>
+#include <server/bot/default/scripting.qh>
+#include <server/bot/default/waypoints.qh>
+#include <server/campaign.qh>
+#include <server/client.qh>
+#include <server/damage.qh>
+#include <server/items/items.qh>
+#include <server/mutators/_mod.qh>
+#include <server/race.qh>
+#include <server/scores_rules.qh>
+#include <server/teamplay.qh>
+#include <server/weapons/accuracy.qh>
+#include <server/world.qh>
 
 STATIC_INIT(bot) { bot_calculate_stepheightvec(); }
 
diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc
index c5a955749..64d3c9153 100644
--- a/qcsrc/server/bot/default/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/default/havocbot/havocbot.qc
@@ -1,39 +1,34 @@
 #include "havocbot.qh"
 
-#include "roles.qh"
-
-#include <server/bot/api.qh>
-#include <server/client.qh>
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/damage.qh>
-#include <server/items/items.qh>
-#include <server/mutators/_mod.qh>
-#include <server/weapons/selection.qh>
-#include <server/weapons/weaponsystem.qh>
-#include <server/world.qh>
-#include "../cvars.qh"
-
-#include "../aim.qh"
-#include "../bot.qh"
-#include "../navigation.qh"
-#include "../scripting.qh"
-#include "../waypoints.qh"
-
 #include <common/constants.qh>
 #include <common/impulses/all.qh>
-#include <common/net_linked.qh>
-#include <common/physics/player.qh>
-#include <common/state.qh>
 #include <common/items/_mod.qh>
-#include <common/wepent.qh>
-
 #include <common/mapobjects/func/ladder.qh>
 #include <common/mapobjects/teleporters.qh>
 #include <common/mapobjects/trigger/hurt.qh>
 #include <common/mapobjects/trigger/jumppads.qh>
-
+#include <common/net_linked.qh>
+#include <common/physics/player.qh>
+#include <common/state.qh>
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
+#include <common/wepent.qh>
 #include <lib/warpzone/common.qh>
+#include <server/bot/api.qh>
+#include <server/bot/default/aim.qh>
+#include <server/bot/default/bot.qh>
+#include <server/bot/default/cvars.qh>
+#include <server/bot/default/havocbot/roles.qh>
+#include <server/bot/default/navigation.qh>
+#include <server/bot/default/scripting.qh>
+#include <server/bot/default/waypoints.qh>
+#include <server/client.qh>
+#include <server/damage.qh>
+#include <server/items/items.qh>
+#include <server/mutators/_mod.qh>
+#include <server/weapons/selection.qh>
+#include <server/weapons/weaponsystem.qh>
+#include <server/world.qh>
 
 void havocbot_ai(entity this)
 {
diff --git a/qcsrc/server/bot/default/havocbot/roles.qc b/qcsrc/server/bot/default/havocbot/roles.qc
index dbc55a90c..94c1cf442 100644
--- a/qcsrc/server/bot/default/havocbot/roles.qc
+++ b/qcsrc/server/bot/default/havocbot/roles.qc
@@ -1,17 +1,15 @@
 #include "roles.qh"
 
-#include <common/weapons/_all.qh>
 #include <common/stats.qh>
+#include <common/weapons/_all.qh>
+#include <server/bot/default/bot.qh>
+#include <server/bot/default/cvars.qh>
+#include <server/bot/default/havocbot/havocbot.qh>
+#include <server/bot/default/navigation.qh>
 #include <server/items/items.qh>
 #include <server/items/spawning.qh>
 #include <server/mutators/_mod.qh>
 #include <server/resources.qh>
-#include "havocbot.qh"
-
-#include "../cvars.qh"
-
-#include "../bot.qh"
-#include "../navigation.qh"
 
 void havocbot_goalrating_waypoints(entity this, float ratingscale, vector org, float sradius)
 {
diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index 8a48efb0e..3068aa77c 100644
--- a/qcsrc/server/bot/default/navigation.qc
+++ b/qcsrc/server/bot/default/navigation.qc
@@ -1,22 +1,18 @@
 #include "navigation.qh"
 
-#include <server/bot/api.qh>
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include "cvars.qh"
-
-#include "bot.qh"
-#include "waypoints.qh"
-
-#include <server/items/items.qh>
-
-#include <common/items/_mod.qh>
-
 #include <common/constants.qh>
-#include <common/net_linked.qh>
+#include <common/items/_mod.qh>
 #include <common/mapobjects/func/ladder.qh>
 #include <common/mapobjects/trigger/hurt.qh>
 #include <common/mapobjects/trigger/jumppads.qh>
+#include <common/net_linked.qh>
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
+#include <server/bot/api.qh>
+#include <server/bot/default/bot.qh>
+#include <server/bot/default/cvars.qh>
+#include <server/bot/default/waypoints.qh>
+#include <server/items/items.qh>
 
 .float speed;
 
diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc
index bad63baa8..a20f98fda 100644
--- a/qcsrc/server/bot/default/scripting.qc
+++ b/qcsrc/server/bot/default/scripting.qc
@@ -1,17 +1,15 @@
 #include "scripting.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/weapons/selection.qh>
-#include <server/weapons/weaponsystem.qh>
-#include "cvars.qh"
-
-#include <common/state.qh>
 #include <common/gamemodes/gamemode/ctf/sv_ctf.qh>
 #include <common/physics/player.qh>
+#include <common/state.qh>
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
 #include <common/wepent.qh>
-
-#include "bot.qh"
+#include <server/bot/default/bot.qh>
+#include <server/bot/default/cvars.qh>
+#include <server/weapons/selection.qh>
+#include <server/weapons/weaponsystem.qh>
 
 .int state;
 
diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc
index 65da3b94c..12bf39fa0 100644
--- a/qcsrc/server/bot/default/waypoints.qc
+++ b/qcsrc/server/bot/default/waypoints.qc
@@ -1,28 +1,23 @@
 #include "waypoints.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/items/items.qh>
-#include <server/spawnpoints.qh>
-#include <server/weapons/tracing.qh>
-#include "cvars.qh"
-
-#include "bot.qh"
-#include "navigation.qh"
-
-#include <common/state.qh>
-
-#include "../../antilag.qh"
-
 #include <common/constants.qh>
 #include <common/debug.qh>
 #include <common/gamemodes/_mod.qh>
 #include <common/mapobjects/trigger/jumppads.qh>
 #include <common/net_linked.qh>
 #include <common/physics/player.qh>
-
+#include <common/state.qh>
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
 #include <lib/warpzone/common.qh>
 #include <lib/warpzone/util_server.qh>
+#include <server/antilag.qh>
+#include <server/bot/default/bot.qh>
+#include <server/bot/default/cvars.qh>
+#include <server/bot/default/navigation.qh>
+#include <server/items/items.qh>
+#include <server/spawnpoints.qh>
+#include <server/weapons/tracing.qh>
 
 .entity spawnpointmodel;
 void waypoint_unreachable(entity pl)
diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index 2ac3c58d1..a368938c2 100644
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -1,14 +1,12 @@
 #include "campaign.qh"
 
+#include <common/campaign_common.qh>
 #include <common/mapinfo.qh>
-#include <common/weapons/_all.qh>
 #include <common/stats.qh>
-
-#include "cheats.qh"
+#include <common/weapons/_all.qh>
+#include <server/cheats.qh>
 #include <server/intermission.qh>
-#include "world.qh"
-
-#include <common/campaign_common.qh>
+#include <server/world.qh>
 
 // campaign cvars:
 //   _campaign_index: index of CURRENT map
diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 75d0e2caf..f87d35d04 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -1,43 +1,31 @@
 #include "cheats.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <common/effects/all.qh>
-#include <server/resources.qh>
-#include <server/main.qh>
-#include <server/world.qh>
-
-#include "damage.qh"
-#include "clientkill.qh"
-#include "player.qh"
-#include "race.qh"
-#include <common/mapobjects/teleporters.qh>
-
-#include <server/mutators/_mod.qh>
-
 #include "weapons/tracing.qh"
-
 #include <common/constants.qh>
 #include <common/deathtypes/all.qh>
-#include <common/util.qh>
-
-#include <common/physics/player.qh>
-
-#include <common/monsters/_mod.qh>
-
+#include <common/effects/all.qh>
 #include <common/items/_mod.qh>
-
-#include <common/weapons/_all.qh>
-
+#include <common/mapobjects/func/breakable.qh>
 #include <common/mapobjects/subs.qh>
+#include <common/mapobjects/teleporters.qh>
 #include <common/mapobjects/triggers.qh>
-
-#include <common/mapobjects/func/breakable.qh>
-
+#include <common/monsters/_mod.qh>
+#include <common/physics/player.qh>
+#include <common/stats.qh>
+#include <common/util.qh>
+#include <common/weapons/_all.qh>
+#include <common/weapons/_all.qh>
 #include <lib/csqcmodel/sv_model.qh>
-
 #include <lib/warpzone/anglestransform.qh>
 #include <lib/warpzone/util_server.qh>
+#include <server/clientkill.qh>
+#include <server/damage.qh>
+#include <server/main.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
+#include <server/race.qh>
+#include <server/resources.qh>
+#include <server/world.qh>
 
 #ifdef NOCHEATS
 
diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index f06f64084..9bcd45dd9 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1,88 +1,69 @@
 #include "client.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/chat.qh>
 #include <common/effects/all.qh>
-#include "anticheat.qh"
-#include "impulse.qh"
-#include "player.qh"
-#include "ipban.qh"
-#include "portals.qh"
-#include "teamplay.qh"
-#include "spawnpoints.qh"
-#include "resources.qh"
-#include "damage.qh"
-#include "handicap.qh"
-#include "hook.qh"
-#include <server/intermission.qh>
-#include "command/common.qh"
-#include "command/vote.qh"
-#include "clientkill.qh"
-#include "cheats.qh"
-#include "world.qh"
-#include <server/gamelog.qh>
-#include "race.qh"
-#include <server/main.qh>
-#include <server/mutators/_mod.qh>
-#include "antilag.qh"
-#include "campaign.qh"
-#include "command/common.qh"
-#include "scores_rules.qh"
-#include "weapons/common.qh"
-
-#include "bot/api.qh"
-
-#include <common/ent_cs.qh>
-#include <common/wepent.qh>
-#include <common/state.qh>
-
-#include "compat/quake3.qh"
-
 #include <common/effects/qc/globalsound.qh>
-
+#include <common/ent_cs.qh>
+#include <common/gamemodes/_mod.qh>
+#include <common/gamemodes/gamemode/nexball/sv_nexball.qh>
+#include <common/items/_mod.qh>
+#include <common/items/inventory.qh>
 #include <common/mapobjects/func/conveyor.qh>
 #include <common/mapobjects/func/ladder.qh>
-#include <common/mapobjects/teleporters.qh>
+#include <common/mapobjects/subs.qh>
 #include <common/mapobjects/target/spawnpoint.qh>
+#include <common/mapobjects/teleporters.qh>
 #include <common/mapobjects/trigger/counter.qh>
+#include <common/mapobjects/trigger/secret.qh>
 #include <common/mapobjects/trigger/swamp.qh>
-
-#include <common/vehicles/all.qh>
-
-#include "weapons/hitplot.qh"
-#include "weapons/selection.qh"
-#include "weapons/weaponsystem.qh"
-
-#include <common/net_notice.qh>
-#include <common/net_linked.qh>
-#include <common/physics/player.qh>
-
-#include <common/vehicles/sv_vehicles.qh>
-
-#include <common/items/_mod.qh>
-
-#include <common/gamemodes/gamemode/nexball/sv_nexball.qh>
-
-#include <common/mutators/mutator/waypoints/all.qh>
-#include <common/mutators/mutator/instagib/sv_instagib.qh>
-#include <common/gamemodes/_mod.qh>
-
-#include <common/mapobjects/subs.qh>
 #include <common/mapobjects/triggers.qh>
-#include <common/mapobjects/trigger/secret.qh>
-
 #include <common/minigames/sv_minigames.qh>
-
-#include <common/items/inventory.qh>
-
 #include <common/monsters/sv_monsters.qh>
-
-#include <lib/warpzone/server.qh>
-
+#include <common/mutators/mutator/instagib/sv_instagib.qh>
 #include <common/mutators/mutator/overkill/oknex.qh>
-
+#include <common/mutators/mutator/waypoints/all.qh>
+#include <common/net_linked.qh>
+#include <common/net_notice.qh>
+#include <common/physics/player.qh>
+#include <common/state.qh>
+#include <common/stats.qh>
+#include <common/vehicles/all.qh>
+#include <common/vehicles/sv_vehicles.qh>
+#include <common/weapons/_all.qh>
 #include <common/weapons/weapon/vortex.qh>
+#include <common/wepent.qh>
+#include <lib/warpzone/server.qh>
+#include <server/anticheat.qh>
+#include <server/antilag.qh>
+#include <server/bot/api.qh>
+#include <server/campaign.qh>
+#include <server/chat.qh>
+#include <server/cheats.qh>
+#include <server/clientkill.qh>
+#include <server/command/common.qh>
+#include <server/command/common.qh>
+#include <server/command/vote.qh>
+#include <server/compat/quake3.qh>
+#include <server/damage.qh>
+#include <server/gamelog.qh>
+#include <server/handicap.qh>
+#include <server/hook.qh>
+#include <server/impulse.qh>
+#include <server/intermission.qh>
+#include <server/ipban.qh>
+#include <server/main.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
+#include <server/portals.qh>
+#include <server/race.qh>
+#include <server/resources.qh>
+#include <server/scores_rules.qh>
+#include <server/spawnpoints.qh>
+#include <server/teamplay.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/hitplot.qh>
+#include <server/weapons/selection.qh>
+#include <server/weapons/weaponsystem.qh>
+#include <server/world.qh>
 
 STATIC_METHOD(Client, Add, void(Client this, int _team))
 {
diff --git a/qcsrc/server/clientkill.qc b/qcsrc/server/clientkill.qc
index 96adde60f..d972d6b08 100644
--- a/qcsrc/server/clientkill.qc
+++ b/qcsrc/server/clientkill.qc
@@ -1,18 +1,16 @@
 #include "clientkill.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/client.qh>
-#include <server/player.qh>
-#include <server/mutators/_mod.qh>
-
-#include "damage.qh"
-#include "teamplay.qh"
-
-#include <common/vehicles/sv_vehicles.qh>
 #include <common/mapobjects/triggers.qh>
 #include <common/notifications/all.qh>
 #include <common/stats.qh>
+#include <common/stats.qh>
+#include <common/vehicles/sv_vehicles.qh>
+#include <common/weapons/_all.qh>
+#include <server/client.qh>
+#include <server/damage.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
+#include <server/teamplay.qh>
 
 void ClientKill_Now_TeamChange(entity this)
 {
diff --git a/qcsrc/server/command/banning.qc b/qcsrc/server/command/banning.qc
index 1822f1a81..99a7756e1 100644
--- a/qcsrc/server/command/banning.qc
+++ b/qcsrc/server/command/banning.qc
@@ -1,17 +1,14 @@
 #include "banning.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <common/state.qh>
 #include <common/command/_mod.qh>
-#include "banning.qh"
-
-#include "common.qh"
-
-#include "../player.qh"
-#include "../ipban.qh"
-
+#include <common/state.qh>
+#include <common/stats.qh>
 #include <common/util.qh>
+#include <common/weapons/_all.qh>
+#include <server/command/banning.qh>
+#include <server/command/common.qh>
+#include <server/ipban.qh>
+#include <server/player.qh>
 
 // =====================================================
 //  Banning and kicking command code, written by Samual
diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index ce5557064..106da7720 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -1,50 +1,38 @@
 #include "cmd.qh"
 
-#include <server/chat.qh>
-#include <server/world.qh>
-
 #include <common/command/_mod.qh>
-
-#include "common.qh"
-#include "getreplies.qh"
-#include "vote.qh"
-
-#include "../bot/api.qh"
-
-#include "../campaign.qh"
-#include "../cheats.qh"
-#include "../client.qh"
-#include "../clientkill.qh"
-#include "../player.qh"
-#include "../ipban.qh"
-#include "../mapvoting.qh"
-#include "../scores.qh"
-#include "../teamplay.qh"
-
-#include <server/mutators/_mod.qh>
-#include <common/gamemodes/_mod.qh>
-
-#ifdef SVQC
-	#include <common/vehicles/all.qh>
-#endif
-
 #include <common/constants.qh>
 #include <common/deathtypes/all.qh>
 #include <common/effects/all.qh>
+#include <common/gamemodes/_mod.qh>
 #include <common/mapinfo.qh>
-#include <common/notifications/all.qh>
-#include <common/physics/player.qh>
-#include <common/teams.qh>
-#include <common/util.qh>
 #include <common/mapobjects/triggers.qh>
-
 #include <common/minigames/sv_minigames.qh>
-
 #include <common/monsters/_mod.qh>
-#include <common/monsters/sv_spawn.qh>
 #include <common/monsters/sv_monsters.qh>
-
+#include <common/monsters/sv_spawn.qh>
+#include <common/notifications/all.qh>
+#include <common/physics/player.qh>
+#include <common/teams.qh>
+#include <common/util.qh>
+#include <common/vehicles/all.qh>
 #include <lib/warpzone/common.qh>
+#include <server/bot/api.qh>
+#include <server/campaign.qh>
+#include <server/chat.qh>
+#include <server/cheats.qh>
+#include <server/client.qh>
+#include <server/clientkill.qh>
+#include <server/command/common.qh>
+#include <server/command/getreplies.qh>
+#include <server/command/vote.qh>
+#include <server/ipban.qh>
+#include <server/mapvoting.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
+#include <server/scores.qh>
+#include <server/teamplay.qh>
+#include <server/world.qh>
 
 // =========================================================
 //  Server side networked commands code, reworked by Samual
diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index 710c3889f..4e001af73 100644
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -1,20 +1,17 @@
 #include "common.qh"
 
-#include <server/chat.qh>
-#include <server/client.qh>
-#include <server/mutators/_mod.qh>
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/world.qh>
-
 #include <common/command/_mod.qh>
-#include "common.qh"
-
-#include "../scores.qh"
-
 #include <common/monsters/_mod.qh>
 #include <common/notifications/all.qh>
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
 #include <lib/warpzone/common.qh>
+#include <server/chat.qh>
+#include <server/client.qh>
+#include <server/command/common.qh>
+#include <server/mutators/_mod.qh>
+#include <server/scores.qh>
+#include <server/world.qh>
 
 
 // ====================================================
diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc
index 17fcc2d35..8f572a8ec 100644
--- a/qcsrc/server/command/getreplies.qc
+++ b/qcsrc/server/command/getreplies.qc
@@ -1,24 +1,20 @@
 #include "getreplies.qh"
 
+#include <common/command/_mod.qh>
+#include <common/constants.qh>
+#include <common/gamemodes/_mod.qh>
+#include <common/monsters/_mod.qh>
+#include <common/net_linked.qh>
+#include <common/stats.qh>
+#include <common/util.qh>
 #include <common/weapons/_all.qh>
 #include <common/wepent.qh>
-#include <common/stats.qh>
+#include <server/command/getreplies.qh>
 #include <server/intermission.qh>
 #include <server/main.qh>
 #include <server/mutators/_mod.qh>
-#include <server/world.qh>
-
-#include <common/command/_mod.qh>
-#include "getreplies.qh"
-
 #include <server/race.qh>
-
-#include <common/constants.qh>
-#include <common/gamemodes/_mod.qh>
-#include <common/net_linked.qh>
-#include <common/util.qh>
-
-#include <common/monsters/_mod.qh>
+#include <server/world.qh>
 
 // =========================================================
 //  Reply messages for common commands, re-worked by Samual
diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc
index 4d3992239..583916b3d 100644
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -3,14 +3,10 @@
 
 #include <common/command/_mod.qh>
 #include <common/mapobjects/triggers.qh>
-
-#include "../world.qh"
-
-#include <server/intermission.qh>
-
 #include <common/util.qh>
-
 #include <lib/csqcmodel/sv_model.qh>
+#include <server/intermission.qh>
+#include <server/world.qh>
 
 // ===============================================
 //	Generates radar map images for use in the HUD
diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 86755c7e3..9dcec7804 100644
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -1,36 +1,30 @@
 #include "sv_cmd.qh"
-#include "_mod.qh"
 
+#include <common/constants.qh>
 #include <common/effects/all.qh>
-
-#include "banning.qh"
-#include "cmd.qh"
-#include "common.qh"
-#include "getreplies.qh"
-#include "radarmap.qh"
-
-#include "../anticheat.qh"
-#include "../campaign.qh"
-#include "../client.qh"
-#include "../player.qh"
-#include "../world.qh"
-#include "../ipban.qh"
-#include "../teamplay.qh"
-#include <server/intermission.qh>
-
-#include "../bot/api.qh"
-
-#include <server/mutators/_mod.qh>
 #include <common/gamemodes/_mod.qh>
-
-#include <common/constants.qh>
-#include <common/net_linked.qh>
 #include <common/mapinfo.qh>
+#include <common/monsters/sv_monsters.qh>
+#include <common/net_linked.qh>
 #include <common/notifications/all.qh>
 #include <common/teams.qh>
 #include <common/util.qh>
-
-#include <common/monsters/sv_monsters.qh>
+#include <server/anticheat.qh>
+#include <server/bot/api.qh>
+#include <server/campaign.qh>
+#include <server/client.qh>
+#include <server/command/_mod.qh>
+#include <server/command/banning.qh>
+#include <server/command/cmd.qh>
+#include <server/command/common.qh>
+#include <server/command/getreplies.qh>
+#include <server/command/radarmap.qh>
+#include <server/intermission.qh>
+#include <server/ipban.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
+#include <server/teamplay.qh>
+#include <server/world.qh>
 
 //  used by GameCommand_make_mapinfo()
 void make_mapinfo_Think(entity this)
diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 16b636c85..67f683cdf 100644
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -1,32 +1,27 @@
 #include "vote.qh"
 
-#include <server/client.qh>
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/gamelog.qh>
-
 #include <common/command/_mod.qh>
-#include "vote.qh"
-
-#include "common.qh"
-
-#include "../damage.qh"
-#include <server/intermission.qh>
-#include <server/world.qh>
-#include "../teamplay.qh"
-#include "../race.qh"
-#include "../round_handler.qh"
-#include "../scores.qh"
-
-#include <server/mutators/_mod.qh>
-#include <common/gamemodes/_mod.qh>
-
 #include <common/constants.qh>
-#include <common/net_linked.qh>
+#include <common/gamemodes/_mod.qh>
 #include <common/mapinfo.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>
+#include <server/client.qh>
+#include <server/command/common.qh>
+#include <server/command/vote.qh>
+#include <server/damage.qh>
+#include <server/gamelog.qh>
+#include <server/intermission.qh>
+#include <server/mutators/_mod.qh>
+#include <server/race.qh>
+#include <server/round_handler.qh>
+#include <server/scores.qh>
+#include <server/teamplay.qh>
+#include <server/world.qh>
 
 // =============================================
 //  Server side voting code, reworked by Samual
diff --git a/qcsrc/server/compat/halflife.qc b/qcsrc/server/compat/halflife.qc
index 74e50137f..32c46156c 100644
--- a/qcsrc/server/compat/halflife.qc
+++ b/qcsrc/server/compat/halflife.qc
@@ -1,4 +1,5 @@
 #include "halflife.qh"
+
 .float  roomtype;
 .float  radius;
 .float  pitch;
diff --git a/qcsrc/server/compat/quake.qc b/qcsrc/server/compat/quake.qc
index 23ae923b0..a49b85f18 100644
--- a/qcsrc/server/compat/quake.qc
+++ b/qcsrc/server/compat/quake.qc
@@ -1,8 +1,8 @@
 #include "quake.qh"
 
-#include <common/weapons/_all.qh>
 #include <common/stats.qh>
 #include <common/weapons/_all.qh>
+#include <common/weapons/_all.qh>
 
 //***********************
 //QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons
diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index bda38dcf2..ea951ddce 100644
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -1,19 +1,19 @@
 #include "quake3.qh"
 
-#include <server/client.qh>
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/items/items.qh>
-#include <server/items/spawning.qh>
-#include <server/resources.qh>
-#include <server/world.qh>
 #include <common/gamemodes/_mod.qh>
 #include <common/gamemodes/gamemode/ctf/sv_ctf.qh>
-#include <common/mapobjects/triggers.qh>
 #include <common/mapobjects/trigger/counter.qh>
+#include <common/mapobjects/triggers.qh>
 #include <common/mutators/mutator/buffs/buffs.qh>
 #include <common/notifications/all.qh>
+#include <common/stats.qh>
 #include <common/weapons/_all.qh>
+#include <common/weapons/_all.qh>
+#include <server/client.qh>
+#include <server/items/items.qh>
+#include <server/items/spawning.qh>
+#include <server/resources.qh>
+#include <server/world.qh>
 
 //***********************
 //QUAKE 3 ENTITIES - So people can play quake3 maps with the xonotic weapons
diff --git a/qcsrc/server/compat/wop.qc b/qcsrc/server/compat/wop.qc
index 784303010..8a559332d 100644
--- a/qcsrc/server/compat/wop.qc
+++ b/qcsrc/server/compat/wop.qc
@@ -1,9 +1,9 @@
 #include "wop.qh"
 
-#include <common/weapons/_all.qh>
 #include <common/stats.qh>
-#include <server/items/spawning.qh>
 #include <common/weapons/_all.qh>
+#include <common/weapons/_all.qh>
+#include <server/items/spawning.qh>
 
 spawnfunc(item_haste);
 spawnfunc(item_invis);
diff --git a/qcsrc/server/damage.qc b/qcsrc/server/damage.qc
index c253c0915..fd2e9f2a6 100644
--- a/qcsrc/server/damage.qc
+++ b/qcsrc/server/damage.qc
@@ -1,42 +1,42 @@
 #include "damage.qh"
 
-#include <common/effects/all.qh>
-#include "bot/api.qh"
-#include "hook.qh"
-#include <server/client.qh>
-#include <server/gamelog.qh>
-#include <server/items/items.qh>
-#include <server/mutators/_mod.qh>
-#include <server/main.qh>
-#include <server/world.qh>
-#include "teamplay.qh"
-#include "scores.qh"
-#include "spawnpoints.qh"
-#include <common/state.qh>
-#include <common/physics/player.qh>
-#include "resources.qh"
-#include <common/vehicles/all.qh>
-#include <common/items/_mod.qh>
-#include <common/mutators/mutator/waypoints/waypointsprites.qh>
-#include <common/mutators/mutator/instagib/sv_instagib.qh>
-#include <common/mutators/mutator/buffs/buffs.qh>
-#include "weapons/accuracy.qh"
-#include "weapons/csqcprojectile.qh"
-#include "weapons/selection.qh"
 #include <common/constants.qh>
 #include <common/deathtypes/all.qh>
+#include <common/effects/all.qh>
+#include <common/gamemodes/_mod.qh>
+#include <common/gamemodes/rules.qh>
+#include <common/items/_mod.qh>
 #include <common/mapobjects/defs.qh>
 #include <common/mapobjects/triggers.qh>
+#include <common/mutators/mutator/buffs/buffs.qh>
+#include <common/mutators/mutator/instagib/sv_instagib.qh>
+#include <common/mutators/mutator/waypoints/waypointsprites.qh>
 #include <common/notifications/all.qh>
 #include <common/physics/movetypes/movetypes.qh>
+#include <common/physics/player.qh>
 #include <common/playerstats.qh>
+#include <common/state.qh>
 #include <common/teams.qh>
 #include <common/util.qh>
-#include <common/gamemodes/_mod.qh>
-#include <common/gamemodes/rules.qh>
+#include <common/vehicles/all.qh>
 #include <common/weapons/_all.qh>
 #include <lib/csqcmodel/sv_model.qh>
 #include <lib/warpzone/common.qh>
+#include <server/bot/api.qh>
+#include <server/client.qh>
+#include <server/gamelog.qh>
+#include <server/hook.qh>
+#include <server/items/items.qh>
+#include <server/main.qh>
+#include <server/mutators/_mod.qh>
+#include <server/resources.qh>
+#include <server/scores.qh>
+#include <server/spawnpoints.qh>
+#include <server/teamplay.qh>
+#include <server/weapons/accuracy.qh>
+#include <server/weapons/csqcprojectile.qh>
+#include <server/weapons/selection.qh>
+#include <server/world.qh>
 
 void UpdateFrags(entity player, int f)
 {
diff --git a/qcsrc/server/handicap.qc b/qcsrc/server/handicap.qc
index ccb585f01..6d03725f8 100644
--- a/qcsrc/server/handicap.qc
+++ b/qcsrc/server/handicap.qc
@@ -6,7 +6,7 @@
 /// \copyright GNU GPLv2 or any later version.
 
 #include <common/state.qh>
-#include "client.qh"
+#include <server/client.qh>
 
 .float m_handicap; ///< Holds the handicap value.
 
diff --git a/qcsrc/server/hook.qc b/qcsrc/server/hook.qc
index 4fa2385cf..51e580370 100644
--- a/qcsrc/server/hook.qc
+++ b/qcsrc/server/hook.qc
@@ -1,30 +1,30 @@
 #include "hook.qh"
 
-#include <server/bot/api.qh>
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/damage.qh>
-#include <server/mutators/_mod.qh>
-#include <server/world.qh>
+#include <common/constants.qh>
 #include <common/effects/all.qh>
-#include "weapons/common.qh"
-#include "weapons/csqcprojectile.qh"
-#include "weapons/weaponsystem.qh"
-#include "weapons/selection.qh"
-#include "weapons/tracing.qh"
-#include "player.qh"
-#include "command/common.qh"
-#include "command/vote.qh"
-#include "round_handler.qh"
-#include <common/state.qh>
+#include <common/net_linked.qh>
 #include <common/physics/player.qh>
-#include <common/vehicles/all.qh>
-#include <common/constants.qh>
+#include <common/state.qh>
+#include <common/stats.qh>
 #include <common/util.qh>
-#include <common/net_linked.qh>
+#include <common/vehicles/all.qh>
+#include <common/weapons/_all.qh>
 #include <common/weapons/_all.qh>
 #include <lib/warpzone/common.qh>
 #include <lib/warpzone/server.qh>
+#include <server/bot/api.qh>
+#include <server/command/common.qh>
+#include <server/command/vote.qh>
+#include <server/damage.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
+#include <server/round_handler.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/csqcprojectile.qh>
+#include <server/weapons/selection.qh>
+#include <server/weapons/tracing.qh>
+#include <server/weapons/weaponsystem.qh>
+#include <server/world.qh>
 
 /*============================================
 
diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc
index f42510179..e9ebaec87 100644
--- a/qcsrc/server/impulse.qc
+++ b/qcsrc/server/impulse.qc
@@ -1,27 +1,22 @@
 #include "impulse.qh"
-#include "round_handler.qh"
-
-#include "weapons/throwing.qh"
-#include "command/common.qh"
-#include "cheats.qh"
-#include "client.qh"
-#include "clientkill.qh"
-#include "damage.qh"
-#include <server/mutators/_mod.qh>
-#include "weapons/selection.qh"
-#include "weapons/tracing.qh"
-#include "weapons/weaponsystem.qh"
 
 #include <common/gamemodes/_mod.qh>
-
-#include <common/state.qh>
-
 #include <common/minigames/sv_minigames.qh>
-
-#include <common/weapons/_all.qh>
-#include <common/vehicles/sv_vehicles.qh>
-
 #include <common/mutators/mutator/waypoints/waypointsprites.qh>
+#include <common/state.qh>
+#include <common/vehicles/sv_vehicles.qh>
+#include <common/weapons/_all.qh>
+#include <server/cheats.qh>
+#include <server/client.qh>
+#include <server/clientkill.qh>
+#include <server/command/common.qh>
+#include <server/damage.qh>
+#include <server/mutators/_mod.qh>
+#include <server/round_handler.qh>
+#include <server/weapons/selection.qh>
+#include <server/weapons/throwing.qh>
+#include <server/weapons/tracing.qh>
+#include <server/weapons/weaponsystem.qh>
 
 .entity vehicle;
 
diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc
index bd3aa75c2..d8e055daf 100644
--- a/qcsrc/server/ipban.qc
+++ b/qcsrc/server/ipban.qc
@@ -1,12 +1,12 @@
 #include "ipban.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include "autocvars.qh"
-#include <server/main.qh>
-#include "command/banning.qh"
 #include <common/constants.qh>
+#include <common/stats.qh>
 #include <common/util.qh>
+#include <common/weapons/_all.qh>
+#include <server/autocvars.qh>
+#include <server/command/banning.qh>
+#include <server/main.qh>
 
 /*
  * Protocol of online ban list:
diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc
index 41c7eca4e..e41b689a7 100644
--- a/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@ -1,38 +1,27 @@
 #include "items.qh"
 
+#include <common/constants.qh>
+#include <common/deathtypes/all.qh>
 #include <common/items/_mod.qh>
-
+#include <common/mapobjects/subs.qh>
+#include <common/mapobjects/triggers.qh>
+#include <common/monsters/_mod.qh>
+#include <common/mutators/mutator/buffs/buffs.qh>
+#include <common/mutators/mutator/buffs/sv_buffs.qh>
+#include <common/notifications/all.qh>
+#include <common/util.qh>
+#include <common/weapons/_all.qh>
+#include <common/wepent.qh>
+#include <lib/warpzone/util_server.qh>
 #include <server/bot/api.qh>
-
 #include <server/command/vote.qh>
-
 #include <server/damage.qh>
-
 #include <server/mutators/_mod.qh>
-
 #include <server/teamplay.qh>
-#include <server/world.qh>
-
 #include <server/weapons/common.qh>
 #include <server/weapons/selection.qh>
 #include <server/weapons/weaponsystem.qh>
-
-#include <common/constants.qh>
-#include <common/deathtypes/all.qh>
-#include <common/notifications/all.qh>
-#include <common/mapobjects/subs.qh>
-#include <common/mapobjects/triggers.qh>
-#include <common/util.qh>
-
-#include <common/monsters/_mod.qh>
-
-#include <common/wepent.qh>
-#include <common/weapons/_all.qh>
-
-#include <common/mutators/mutator/buffs/buffs.qh>
-#include <common/mutators/mutator/buffs/sv_buffs.qh>
-
-#include <lib/warpzone/util_server.qh>
+#include <server/world.qh>
 
 bool ItemSend(entity this, entity to, int sf)
 {
diff --git a/qcsrc/server/items/spawning.qc b/qcsrc/server/items/spawning.qc
index d2f1530c6..fc8338f38 100644
--- a/qcsrc/server/items/spawning.qc
+++ b/qcsrc/server/items/spawning.qc
@@ -5,11 +5,11 @@
 /// creation of game items.
 /// \copyright GNU GPLv2 or any later version.
 
+#include <common/mapobjects/subs.qh>
+#include <common/weapons/all.qh>
 #include <server/items/items.qh>
 #include <server/mutators/_mod.qh>
 #include <server/weapons/spawning.qh>
-#include <common/weapons/all.qh>
-#include <common/mapobjects/subs.qh>
 
 .bool m_isloot; ///< Holds whether item is loot.
 /// \brief Holds whether strength, shield or superweapon timers expire while
diff --git a/qcsrc/server/main.qc b/qcsrc/server/main.qc
index cd84923ae..13574bf0e 100644
--- a/qcsrc/server/main.qc
+++ b/qcsrc/server/main.qc
@@ -1,37 +1,30 @@
 #include "main.qh"
 
-#include "anticheat.qh"
-#include "hook.qh"
-#include "damage.qh"
-#include "world.qh"
-#include "spawnpoints.qh"
-#include <server/ipban.qh>
-#include <server/gamelog.qh>
-
-#include "bot/api.qh"
-
-#include "command/common.qh"
-
-#include <server/mutators/_mod.qh>
-#include "weapons/csqcprojectile.qh"
-#include <server/weapons/common.qh>
-#include <server/compat/quake3.qh>
-
-#include <common/constants.qh>
 #include <common/command/generic.qh>
+#include <common/constants.qh>
 #include <common/deathtypes/all.qh>
 #include <common/debug.qh>
 #include <common/mapinfo.qh>
+#include <common/monsters/sv_monsters.qh>
 #include <common/util.qh>
-
 #include <common/vehicles/all.qh>
-#include <common/monsters/sv_monsters.qh>
 #include <common/weapons/_all.qh>
-
 #include <lib/csqcmodel/sv_model.qh>
-
 #include <lib/warpzone/common.qh>
 #include <lib/warpzone/server.qh>
+#include <server/anticheat.qh>
+#include <server/bot/api.qh>
+#include <server/command/common.qh>
+#include <server/compat/quake3.qh>
+#include <server/damage.qh>
+#include <server/gamelog.qh>
+#include <server/hook.qh>
+#include <server/ipban.qh>
+#include <server/mutators/_mod.qh>
+#include <server/spawnpoints.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/csqcprojectile.qh>
+#include <server/world.qh>
 
 void CreatureFrame_hotliquids(entity this)
 {
diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index bb76bde5a..42df54c75 100644
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -1,20 +1,19 @@
 #include "mapvoting.qh"
 
-#include <server/client.qh>
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/gamelog.qh>
-#include <server/intermission.qh>
-#include "world.qh"
-#include "command/cmd.qh"
-#include "command/getreplies.qh"
 #include <common/constants.qh>
-#include <common/net_linked.qh>
 #include <common/mapinfo.qh>
+#include <common/net_linked.qh>
 #include <common/playerstats.qh>
 #include <common/state.qh>
+#include <common/stats.qh>
 #include <common/util.qh>
-
+#include <common/weapons/_all.qh>
+#include <server/client.qh>
+#include <server/command/cmd.qh>
+#include <server/command/getreplies.qh>
+#include <server/gamelog.qh>
+#include <server/intermission.qh>
+#include <server/world.qh>
 
 // definitions
 
diff --git a/qcsrc/server/mutators/loader.qc b/qcsrc/server/mutators/loader.qc
index 0830fb686..8913e7f24 100644
--- a/qcsrc/server/mutators/loader.qc
+++ b/qcsrc/server/mutators/loader.qc
@@ -1,9 +1,9 @@
 #include "loader.qh"
 
-#include <common/mutators/base.qh>
 #include <common/mapinfo.qh>
-#include <common/weapons/_all.qh>
+#include <common/mutators/base.qh>
 #include <common/stats.qh>
+#include <common/weapons/_all.qh>
 
 STATIC_INIT_LATE(Gametype) {
     Gametype g = MapInfo_CurrentGametype();
diff --git a/qcsrc/server/pathlib/expandnode.qc b/qcsrc/server/pathlib/expandnode.qc
index e3ab64748..404e257a6 100644
--- a/qcsrc/server/pathlib/expandnode.qc
+++ b/qcsrc/server/pathlib/expandnode.qc
@@ -1,6 +1,7 @@
 #include "expandnode.qh"
-#include "pathlib.qh"
-#include "utility.qh"
+
+#include <server/pathlib/pathlib.qh>
+#include <server/pathlib/utility.qh>
 
 /*
 vector plib_points2[8];
diff --git a/qcsrc/server/pathlib/main.qc b/qcsrc/server/pathlib/main.qc
index 16090e31b..4a5c2c175 100644
--- a/qcsrc/server/pathlib/main.qc
+++ b/qcsrc/server/pathlib/main.qc
@@ -1,11 +1,11 @@
 #include "main.qh"
 
-#include <common/weapons/_all.qh>
 #include <common/stats.qh>
-#include "pathlib.qh"
-#include "utility.qh"
 #include <common/turrets/util.qh>
-#include "../command/common.qh"
+#include <common/weapons/_all.qh>
+#include <server/command/common.qh>
+#include <server/pathlib/pathlib.qh>
+#include <server/pathlib/utility.qh>
 
 void pathlib_deletepath(entity start)
 {
diff --git a/qcsrc/server/pathlib/movenode.qc b/qcsrc/server/pathlib/movenode.qc
index 65e4923ea..260fd711f 100644
--- a/qcsrc/server/pathlib/movenode.qc
+++ b/qcsrc/server/pathlib/movenode.qc
@@ -1,10 +1,10 @@
 #include "movenode.qh"
 
 #include <common/mapobjects/triggers.qh>
-#include <common/weapons/_all.qh>
 #include <common/stats.qh>
-#include "pathlib.qh"
-#include "utility.qh"
+#include <common/weapons/_all.qh>
+#include <server/pathlib/pathlib.qh>
+#include <server/pathlib/utility.qh>
 
 .vector	pos1, pos2;
 
diff --git a/qcsrc/server/pathlib/path_waypoint.qc b/qcsrc/server/pathlib/path_waypoint.qc
index 0f1c4e85a..27249d8a1 100644
--- a/qcsrc/server/pathlib/path_waypoint.qc
+++ b/qcsrc/server/pathlib/path_waypoint.qc
@@ -1,8 +1,8 @@
 #include "path_waypoint.qh"
-#include "../bot/api.qh"
 
-#include "pathlib.qh"
-#include "main.qh"
+#include <server/bot/api.qh>
+#include <server/pathlib/main.qh>
+#include <server/pathlib/pathlib.qh>
 
 var float pathlib_wpp_open(entity wp, entity child, float cost);
 
diff --git a/qcsrc/server/pathlib/utility.qc b/qcsrc/server/pathlib/utility.qc
index 799cd4358..73d109e60 100644
--- a/qcsrc/server/pathlib/utility.qc
+++ b/qcsrc/server/pathlib/utility.qc
@@ -1,8 +1,8 @@
 #include "utility.qh"
 
-#include <common/weapons/_all.qh>
 #include <common/stats.qh>
-#include "pathlib.qh"
+#include <common/weapons/_all.qh>
+#include <server/pathlib/pathlib.qh>
 
 bool location_isok(vector point, bool waterok, bool air_isok)
 {
diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index ed824bd04..28d1ecb20 100644
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -1,46 +1,41 @@
 #include "player.qh"
 
-#include <common/effects/all.qh>
-#include "bot/api.qh"
-#include "cheats.qh"
-#include "client.qh"
-#include "clientkill.qh"
-#include "damage.qh"
-#include <server/mutators/_mod.qh>
-#include "world.qh"
-#include "handicap.qh"
-#include "portals.qh"
-#include "teamplay.qh"
-#include <server/main.qh>
-#include "weapons/common.qh"
-#include "weapons/throwing.qh"
-#include "command/common.qh"
-#include "command/vote.qh"
-#include <common/state.qh>
 #include <common/anim.qh>
 #include <common/animdecide.qh>
+#include <common/animdecide.qh>
 #include <common/csqcmodel_settings.qh>
-#include <common/gamemodes/sv_rules.qh>
 #include <common/deathtypes/all.qh>
+#include <common/effects/all.qh>
+#include <common/effects/qc/_mod.qh>
+#include <common/gamemodes/_mod.qh>
+#include <common/gamemodes/sv_rules.qh>
+#include <common/mapobjects/_mod.qh>
 #include <common/mapobjects/subs.qh>
 #include <common/mapobjects/teleporters.qh>
-#include <common/playerstats.qh>
-#include <lib/csqcmodel/sv_model.qh>
-
 #include <common/minigames/sv_minigames.qh>
-
-#include <common/gamemodes/_mod.qh>
-
-#include <common/physics/player.qh>
-#include <common/effects/qc/_mod.qh>
 #include <common/mutators/mutator/waypoints/waypointsprites.qh>
-#include <common/mapobjects/_mod.qh>
+#include <common/physics/player.qh>
+#include <common/playerstats.qh>
+#include <common/state.qh>
 #include <common/wepent.qh>
-
-#include "weapons/weaponstats.qh"
+#include <lib/csqcmodel/sv_model.qh>
+#include <server/bot/api.qh>
+#include <server/cheats.qh>
+#include <server/client.qh>
+#include <server/clientkill.qh>
+#include <server/command/common.qh>
+#include <server/command/vote.qh>
+#include <server/damage.qh>
+#include <server/handicap.qh>
+#include <server/main.qh>
+#include <server/mutators/_mod.qh>
+#include <server/portals.qh>
+#include <server/teamplay.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/throwing.qh>
+#include <server/weapons/weaponstats.qh>
 #include <server/weapons/weaponsystem.qh>
-
-#include <common/animdecide.qh>
+#include <server/world.qh>
 
 void Drop_Special_Items(entity player)
 {
diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 2c5839175..2cf8db682 100644
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -1,27 +1,27 @@
 #include "portals.qh"
 
-#include <common/effects/all.qh>
-#include "hook.qh"
-#include "mutators/_mod.qh"
-#include <server/client.qh>
-#include <server/weapons/common.qh>
 #include <common/constants.qh>
 #include <common/deathtypes/all.qh>
-#include <common/notifications/all.qh>
+#include <common/effects/all.qh>
+#include <common/mapobjects/subs.qh>
 #include <common/mapobjects/teleporters.qh>
 #include <common/mapobjects/triggers.qh>
-#include <common/mapobjects/subs.qh>
+#include <common/notifications/all.qh>
 #include <common/util.qh>
+#include <common/vehicles/sv_vehicles.qh>
+#include <common/vehicles/vehicle.qh>
 #include <common/weapons/_all.qh>
+#include <common/weapons/weapon/porto.qh>
 #include <lib/csqcmodel/sv_model.qh>
 #include <lib/warpzone/anglestransform.qh>
-#include <lib/warpzone/util_server.qh>
 #include <lib/warpzone/common.qh>
-#include <common/vehicles/vehicle.qh>
-#include <common/vehicles/sv_vehicles.qh>
-#include <common/weapons/weapon/porto.qh>
-#include <server/player.qh>
+#include <lib/warpzone/util_server.qh>
+#include <server/client.qh>
 #include <server/damage.qh>
+#include <server/hook.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
+#include <server/weapons/common.qh>
 
 #define PORTALS_ARE_NOT_SOLID
 
diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index f7769e6eb..f66ca7c8d 100644
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -1,34 +1,34 @@
 #include "race.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/damage.qh>
-#include <server/gamelog.qh>
-#include <server/intermission.qh>
-#include <server/main.qh>
-#include <server/mutators/_mod.qh>
-#include <server/world.qh>
-#include <server/weapons/common.qh>
-#include "client.qh"
-#include "cheats.qh"
-#include "portals.qh"
-#include "scores.qh"
-#include "spawnpoints.qh"
-#include "bot/api.qh"
-#include "command/getreplies.qh"
 #include <common/deathtypes/all.qh>
-#include <common/notifications/all.qh>
 #include <common/gamemodes/_mod.qh>
 #include <common/gamemodes/rules.qh>
+#include <common/mapobjects/subs.qh>
+#include <common/mapobjects/triggers.qh>
+#include <common/mutators/mutator/waypoints/waypointsprites.qh>
 #include <common/net_linked.qh>
+#include <common/notifications/all.qh>
 #include <common/state.qh>
+#include <common/stats.qh>
+#include <common/vehicles/sv_vehicles.qh>
+#include <common/weapons/_all.qh>
 #include <common/weapons/weapon/porto.qh>
-#include <common/mapobjects/subs.qh>
-#include <common/mapobjects/triggers.qh>
-#include <lib/warpzone/util_server.qh>
 #include <lib/warpzone/common.qh>
-#include <common/vehicles/sv_vehicles.qh>
-#include <common/mutators/mutator/waypoints/waypointsprites.qh>
+#include <lib/warpzone/util_server.qh>
+#include <server/bot/api.qh>
+#include <server/cheats.qh>
+#include <server/client.qh>
+#include <server/command/getreplies.qh>
+#include <server/damage.qh>
+#include <server/gamelog.qh>
+#include <server/intermission.qh>
+#include <server/main.qh>
+#include <server/mutators/_mod.qh>
+#include <server/portals.qh>
+#include <server/scores.qh>
+#include <server/spawnpoints.qh>
+#include <server/weapons/common.qh>
+#include <server/world.qh>
 
 string uid2name(string myuid)
 {
diff --git a/qcsrc/server/resources.qc b/qcsrc/server/resources.qc
index ef3dea1bf..cc301130e 100644
--- a/qcsrc/server/resources.qc
+++ b/qcsrc/server/resources.qc
@@ -5,7 +5,7 @@
 /// \author Lyberta
 /// \copyright GNU GPLv2 or any later version.
 
-#include "autocvars.qh"
+#include <server/autocvars.qh>
 #include <server/mutators/_mod.qh>
 #include <server/world.qh>
 
diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index bc0b23b8f..369e75708 100644
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,10 +1,10 @@
 #include "round_handler.qh"
 
-#include <server/world.qh>
-#include "campaign.qh"
-#include "command/vote.qh"
 #include <common/mapobjects/triggers.qh>
 #include <common/util.qh>
+#include <server/campaign.qh>
+#include <server/command/vote.qh>
+#include <server/world.qh>
 
 void round_handler_Think(entity this)
 {
diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 10ffc9c7e..eefd06fe3 100644
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -1,20 +1,20 @@
 #include "scores.qh"
 
-#include "command/common.qh"
-#include <common/weapons/_all.qh>
-#include "client.qh"
-#include <server/intermission.qh>
-#include <server/world.qh>
-#include <server/mutators/_mod.qh>
-#include <server/round_handler.qh>
-#include <common/net_linked.qh>
-#include <common/playerstats.qh>
-#include <common/teams.qh>
 #include <common/mapinfo.qh>
 #include <common/mutators/base.qh>
+#include <common/net_linked.qh>
+#include <common/playerstats.qh>
 #include <common/scores.qh>
 #include <common/state.qh>
 #include <common/stats.qh>
+#include <common/teams.qh>
+#include <common/weapons/_all.qh>
+#include <server/client.qh>
+#include <server/command/common.qh>
+#include <server/intermission.qh>
+#include <server/mutators/_mod.qh>
+#include <server/round_handler.qh>
+#include <server/world.qh>
 
 .entity scorekeeper;
 entity teamscorekeepers[16];
diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index 1ad2640ad..c7c9c3e8d 100644
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -1,11 +1,11 @@
 #include "scores_rules.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include "client.qh"
-#include "scores.qh"
 #include <common/gamemodes/rules.qh>
-#include "teamplay.qh"
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
+#include <server/client.qh>
+#include <server/scores.qh>
+#include <server/teamplay.qh>
 
 int ScoreRules_teams;
 
diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 61969ae35..3f5bd580a 100644
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -1,23 +1,23 @@
 #include "spawnpoints.qh"
 
-#include <server/mutators/_mod.qh>
-#include <server/world.qh>
-#include "race.qh"
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
 #include <common/constants.qh>
-#include <common/net_linked.qh>
-#include <common/teams.qh>
 #include <common/gamemodes/_mod.qh>
 #include <common/mapobjects/subs.qh>
 #include <common/mapobjects/target/spawnpoint.qh>
 #include <common/mapobjects/triggers.qh>
+#include <common/net_linked.qh>
+#include <common/stats.qh>
+#include <common/teams.qh>
 #include <common/util.qh>
+#include <common/weapons/_all.qh>
 #include <lib/warpzone/common.qh>
 #include <lib/warpzone/util_server.qh>
+#include <server/command/vote.qh>
 #include <server/intermission.qh>
+#include <server/mutators/_mod.qh>
+#include <server/race.qh>
 #include <server/utils.qh>
-#include <server/command/vote.qh>
+#include <server/world.qh>
 
 bool SpawnPoint_Send(entity this, entity to, int sf)
 {
diff --git a/qcsrc/server/steerlib.qc b/qcsrc/server/steerlib.qc
index 310835c5c..d0cb5a351 100644
--- a/qcsrc/server/steerlib.qc
+++ b/qcsrc/server/steerlib.qc
@@ -1,9 +1,6 @@
 #include "steerlib.qh"
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "pathlib/utility.qh"
-#endif
+
+#include <server/pathlib/utility.qh>
 
 /**
     Uniform pull towards a point
diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 118900398..2e293bac8 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -1,21 +1,17 @@
 #include "teamplay.qh"
 
-#include "client.qh"
-#include <server/gamelog.qh>
-#include <server/damage.qh>
-#include "race.qh"
-#include "scores.qh"
-#include "scores_rules.qh"
-
-#include "bot/api.qh"
-
-#include "command/vote.qh"
-
-#include <server/mutators/_mod.qh>
-
 #include <common/deathtypes/all.qh>
 #include <common/gamemodes/_mod.qh>
 #include <common/teams.qh>
+#include <server/bot/api.qh>
+#include <server/client.qh>
+#include <server/command/vote.qh>
+#include <server/damage.qh>
+#include <server/gamelog.qh>
+#include <server/mutators/_mod.qh>
+#include <server/race.qh>
+#include <server/scores.qh>
+#include <server/scores_rules.qh>
 
 /// \brief Describes a state of team balance entity.
 enum
diff --git a/qcsrc/server/tests.qh b/qcsrc/server/tests.qh
index de9b3579f..2dbcee7ad 100644
--- a/qcsrc/server/tests.qh
+++ b/qcsrc/server/tests.qh
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "autocvars.qh"
-#include "client.qh"
-#include "command/_mod.qh"
-#include "weapons/common.qh"
-#include "weapons/selection.qh"
 #include <common/items/item.qh>
 #include <common/mapobjects/defs.qh>
 #include <common/physics/player.qh>
-#include <common/weapons/_all.qh>
 #include <common/vehicles/all.qh>
+#include <common/weapons/_all.qh>
+#include <server/autocvars.qh>
+#include <server/client.qh>
+#include <server/command/_mod.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/selection.qh>
diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc
index e8f59f53e..7b5220e03 100644
--- a/qcsrc/server/weapons/accuracy.qc
+++ b/qcsrc/server/weapons/accuracy.qc
@@ -1,14 +1,14 @@
 #include "accuracy.qh"
 
-#include <server/client.qh>
-#include <server/mutators/_mod.qh>
-#include <server/damage.qh>
 #include <common/constants.qh>
 #include <common/net_linked.qh>
-#include <server/player.qh>
 #include <common/teams.qh>
 #include <common/util.qh>
 #include <common/weapons/_all.qh>
+#include <server/client.qh>
+#include <server/damage.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
 #include <server/world.qh>
 
 int accuracy_byte(float n, float d)
diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc
index 2539b7d3b..130609af3 100644
--- a/qcsrc/server/weapons/common.qc
+++ b/qcsrc/server/weapons/common.qc
@@ -1,20 +1,20 @@
 #include "common.qh"
 
-#include <server/command/common.qh>
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/damage.qh>
-#include <server/items/items.qh>
-#include <server/mutators/_mod.qh>
 #include <common/constants.qh>
-#include <common/net_linked.qh>
 #include <common/deathtypes/all.qh>
+#include <common/items/_mod.qh>
+#include <common/net_linked.qh>
 #include <common/notifications/all.qh>
 #include <common/state.qh>
+#include <common/stats.qh>
 #include <common/util.qh>
 #include <common/weapons/_all.qh>
+#include <common/weapons/_all.qh>
 #include <common/wepent.qh>
-#include <common/items/_mod.qh>
+#include <server/command/common.qh>
+#include <server/damage.qh>
+#include <server/items/items.qh>
+#include <server/mutators/_mod.qh>
 
 bool W_DualWielding(entity player)
 {
diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc
index 27a376ec7..2cd09d7fe 100644
--- a/qcsrc/server/weapons/csqcprojectile.qc
+++ b/qcsrc/server/weapons/csqcprojectile.qc
@@ -1,14 +1,12 @@
 #include "csqcprojectile.qh"
 
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/items/items.qh>
-
-#include "../command/common.qh"
-
 #include <common/constants.qh>
 #include <common/net_linked.qh>
+#include <common/stats.qh>
 #include <common/weapons/_all.qh>
+#include <common/weapons/_all.qh>
+#include <server/command/common.qh>
+#include <server/items/items.qh>
 
 .float csqcprojectile_type;
 
diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc
index 45642f298..c42d88b97 100644
--- a/qcsrc/server/weapons/hitplot.qc
+++ b/qcsrc/server/weapons/hitplot.qc
@@ -1,13 +1,13 @@
 #include "hitplot.qh"
 
-#include <server/client.qh>
-#include <common/weapons/_all.qh>
+#include <common/state.qh>
 #include <common/stats.qh>
-#include <server/world.qh>
-#include "../antilag.qh"
 #include <common/weapons/_all.qh>
-#include <common/state.qh>
+#include <common/weapons/_all.qh>
 #include <common/wepent.qh>
+#include <server/antilag.qh>
+#include <server/client.qh>
+#include <server/world.qh>
 
 vector W_HitPlotUnnormalizedUntransform(vector screenforward, vector screenright, vector screenup, vector v)
 {
diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc
index 4a55dab29..5dd3073e9 100644
--- a/qcsrc/server/weapons/selection.qc
+++ b/qcsrc/server/weapons/selection.qc
@@ -1,18 +1,18 @@
 #include "selection.qh"
 
-#include "weaponsystem.qh"
-#include <server/items/items.qh>
-#include <server/items/spawning.qh>
 #include <common/constants.qh>
-#include <common/net_linked.qh>
-#include <common/util.qh>
 #include <common/items/item.qh>
-#include <common/weapons/_all.qh>
-#include <common/replicate.qh>
-#include <common/state.qh>
 #include <common/mapobjects/triggers.qh>
 #include <common/mutators/mutator/waypoints/waypointsprites.qh>
+#include <common/net_linked.qh>
+#include <common/replicate.qh>
+#include <common/state.qh>
+#include <common/util.qh>
+#include <common/weapons/_all.qh>
 #include <common/wepent.qh>
+#include <server/items/items.qh>
+#include <server/items/spawning.qh>
+#include <server/weapons/weaponsystem.qh>
 
 // switch between weapons
 void Send_WeaponComplain(entity e, float wpn, float type)
diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index f555a6ea7..954bcc46c 100644
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -1,12 +1,12 @@
 #include "spawning.qh"
 
-#include "weaponsystem.qh"
-#include "../resources.qh"
-#include <server/mutators/_mod.qh>
+#include <common/weapons/_all.qh>
 #include <server/items/items.qh>
 #include <server/items/spawning.qh>
+#include <server/mutators/_mod.qh>
+#include <server/resources.qh>
+#include <server/weapons/weaponsystem.qh>
 #include <server/world.qh>
-#include <common/weapons/_all.qh>
 
 .bool m_isreplaced; ///< Holds whether the weapon has been replaced.
 
diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index 1a92f3991..41176d753 100644
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -1,20 +1,20 @@
 #include "throwing.qh"
 
-#include "weaponsystem.qh"
-#include "../resources.qh"
-#include <server/items/spawning.qh>
-#include <server/mutators/_mod.qh>
-#include <server/items/items.qh>
-#include "../damage.qh"
-#include <server/world.qh>
 #include <common/items/item.qh>
 #include <common/mapinfo.qh>
-#include <common/notifications/all.qh>
 #include <common/mapobjects/subs.qh>
+#include <common/notifications/all.qh>
+#include <common/state.qh>
 #include <common/util.qh>
 #include <common/weapons/_all.qh>
-#include <common/state.qh>
 #include <common/wepent.qh>
+#include <server/damage.qh>
+#include <server/items/items.qh>
+#include <server/items/spawning.qh>
+#include <server/mutators/_mod.qh>
+#include <server/resources.qh>
+#include <server/weapons/weaponsystem.qh>
+#include <server/world.qh>
 
 void thrown_wep_think(entity this)
 {
diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index b82095a69..223dd071a 100644
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -1,26 +1,21 @@
 #include "tracing.qh"
 
-#include <common/effects/all.qh>
-
-#include "accuracy.qh"
-#include "common.qh"
-#include "hitplot.qh"
-#include "weaponsystem.qh"
-
-#include "../damage.qh"
-#include <server/main.qh>
-#include <server/mutators/_mod.qh>
-#include <server/antilag.qh>
-
 #include <common/constants.qh>
+#include <common/effects/all.qh>
 #include <common/net_linked.qh>
+#include <common/state.qh>
 #include <common/util.qh>
-
 #include <common/weapons/_all.qh>
 #include <common/wepent.qh>
-#include <common/state.qh>
-
 #include <lib/warpzone/common.qh>
+#include <server/antilag.qh>
+#include <server/damage.qh>
+#include <server/main.qh>
+#include <server/mutators/_mod.qh>
+#include <server/weapons/accuracy.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/hitplot.qh>
+#include <server/weapons/weaponsystem.qh>
 
 // this function calculates w_shotorg and w_shotdir based on the weapon model
 // offset, trueaim and antilag, and won't put w_shotorg inside a wall.
diff --git a/qcsrc/server/weapons/weaponstats.qc b/qcsrc/server/weapons/weaponstats.qc
index f774cb056..47805fea6 100644
--- a/qcsrc/server/weapons/weaponstats.qc
+++ b/qcsrc/server/weapons/weaponstats.qc
@@ -1,11 +1,10 @@
 #include "weaponstats.qh"
 
-#include <server/intermission.qh>
-#include <common/weapons/_all.qh>
 #include <common/stats.qh>
-#include "../world.qh"
-
 #include <common/weapons/_all.qh>
+#include <common/weapons/_all.qh>
+#include <server/intermission.qh>
+#include <server/world.qh>
 
 void WeaponStats_Init()
 {
diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 487154fe3..5ec837004 100644
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -1,28 +1,27 @@
 #include "weaponsystem.qh"
 
-#include "selection.qh"
-
-#include "../command/common.qh"
-#include <server/client.qh>
-#include <server/damage.qh>
-#include <server/world.qh>
-#include <server/items/items.qh>
-#include <server/mutators/_mod.qh>
-#include "../round_handler.qh"
-#include <server/cheats.qh>
-#include <server/resources.qh>
 #include <common/animdecide.qh>
 #include <common/constants.qh>
 #include <common/items/_mod.qh>
-#include <common/net_linked.qh>
 #include <common/mapobjects/platforms.qh>
 #include <common/monsters/_mod.qh>
+#include <common/net_linked.qh>
 #include <common/notifications/all.qh>
+#include <common/state.qh>
 #include <common/util.qh>
 #include <common/weapons/_all.qh>
-#include <common/state.qh>
-#include <lib/csqcmodel/sv_model.qh>
 #include <common/wepent.qh>
+#include <lib/csqcmodel/sv_model.qh>
+#include <server/cheats.qh>
+#include <server/client.qh>
+#include <server/command/common.qh>
+#include <server/damage.qh>
+#include <server/items/items.qh>
+#include <server/mutators/_mod.qh>
+#include <server/resources.qh>
+#include <server/round_handler.qh>
+#include <server/weapons/selection.qh>
+#include <server/world.qh>
 
 .int state;
 
diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index de5e63e6b..01b2763c2 100644
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -1,52 +1,52 @@
 #include "world.qh"
 
-#include "anticheat.qh"
-#include "antilag.qh"
-#include "bot/api.qh"
-#include "campaign.qh"
-#include "cheats.qh"
-#include "client.qh"
-#include "command/common.qh"
-#include "command/getreplies.qh"
-#include "command/sv_cmd.qh"
-#include "command/vote.qh"
-#include "hook.qh"
-#include <server/gamelog.qh>
-#include <server/damage.qh>
-#include "ipban.qh"
-#include <server/intermission.qh>
-#include <server/main.qh>
-#include "mapvoting.qh"
-#include <server/mutators/_mod.qh>
-#include "race.qh"
-#include "scores.qh"
-#include "scores_rules.qh"
-#include "spawnpoints.qh"
-#include "teamplay.qh"
-#include "weapons/weaponstats.qh"
-#include <server/weapons/common.qh>
 #include <common/constants.qh>
-#include <common/net_linked.qh>
 #include <common/deathtypes/all.qh>
 #include <common/gamemodes/_mod.qh>
 #include <common/gamemodes/sv_rules.qh>
+#include <common/items/_mod.qh>
 #include <common/mapinfo.qh>
+#include <common/mapobjects/target/music.qh>
+#include <common/mapobjects/trigger/hurt.qh>
+#include <common/mapobjects/trigger/secret.qh>
+#include <common/mapobjects/triggers.qh>
 #include <common/monsters/_mod.qh>
 #include <common/monsters/sv_monsters.qh>
-#include <common/vehicles/all.qh>
+#include <common/net_linked.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/teams.qh>
-#include <common/mapobjects/triggers.qh>
-#include <common/mapobjects/trigger/hurt.qh>
-#include <common/mapobjects/trigger/secret.qh>
-#include <common/mapobjects/target/music.qh>
 #include <common/util.qh>
-#include <common/items/_mod.qh>
+#include <common/vehicles/all.qh>
 #include <common/weapons/_all.qh>
-#include <common/state.qh>
+#include <server/anticheat.qh>
+#include <server/antilag.qh>
+#include <server/bot/api.qh>
+#include <server/campaign.qh>
+#include <server/cheats.qh>
+#include <server/client.qh>
+#include <server/command/common.qh>
+#include <server/command/getreplies.qh>
+#include <server/command/sv_cmd.qh>
+#include <server/command/vote.qh>
+#include <server/damage.qh>
+#include <server/gamelog.qh>
+#include <server/hook.qh>
+#include <server/intermission.qh>
+#include <server/ipban.qh>
+#include <server/main.qh>
+#include <server/mapvoting.qh>
+#include <server/mutators/_mod.qh>
+#include <server/race.qh>
+#include <server/scores.qh>
+#include <server/scores_rules.qh>
+#include <server/spawnpoints.qh>
+#include <server/teamplay.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/weaponstats.qh>
 
 const float LATENCY_THINKRATE = 10;
 .float latency_sum;