From: Mario <mario.mario@y7mail.com>
Date: Fri, 16 Oct 2020 12:12:54 +0000 (+1000)
Subject: Sort most common includes alphabetically
X-Git-Tag: xonotic-v0.8.5~731
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=1a366da10ff6cc0740b9c7754cc0d8c0fac356a4

Sort most common includes alphabetically
---

diff --git a/qcsrc/common/animdecide.qc b/qcsrc/common/animdecide.qc
index 136e4d4366..f759ef4447 100644
--- a/qcsrc/common/animdecide.qc
+++ b/qcsrc/common/animdecide.qc
@@ -1,11 +1,13 @@
 #include "animdecide.qh"
 
-#include <common/monsters/_mod.qh>
-
-#if defined(SVQC)
-    #include "util.qh"
-    #include <common/weapons/_all.qh>
-    #include <common/stats.qh>
+#if defined(CSQC)
+	#include <common/monsters/_mod.qh>
+#elif defined(MENUQC)
+#elif defined(SVQC)
+	#include <common/monsters/_mod.qh>
+	#include <common/stats.qh>
+	#include <common/util.qh>
+	#include <common/weapons/_all.qh>
 #endif
 
 bool monsters_animoverride(entity this)
diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc
index 8bac6f35ee..65e1917fab 100644
--- a/qcsrc/common/campaign_file.qc
+++ b/qcsrc/common/campaign_file.qc
@@ -1,9 +1,10 @@
 #include "campaign_file.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "util.qh"
-    #include "campaign_common.qh"
+	#include <common/util.qh>
+	#include <common/campaign_common.qh>
 #endif
 
 // CampaignFileLoad(offset, n)
diff --git a/qcsrc/common/campaign_setup.qc b/qcsrc/common/campaign_setup.qc
index 258d47f452..8be208980a 100644
--- a/qcsrc/common/campaign_setup.qc
+++ b/qcsrc/common/campaign_setup.qc
@@ -1,9 +1,10 @@
 #include "campaign_setup.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "campaign_common.qh"
-    #include "mapinfo.qh"
+	#include <common/campaign_common.qh>
+	#include <common/mapinfo.qh>
 #endif
 
 void CampaignSetup(int n)
diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index 7ef5cb64e5..e354a9a591 100644
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -1,24 +1,24 @@
 #include "generic.qh"
-#include "_mod.qh"
-#include "reg.qh"
 
-#include "markup.qh"
-#include "rpn.qh"
-
-#include "../mapinfo.qh"
-
-#ifdef GAMEQC
-	#include "../notifications/all.qh"
-#endif
-
-#ifdef CSQC
+#if defined(CSQC)
 	#include <client/command/cl_cmd.qh>
-#endif
-
-#ifdef SVQC
-	#include <server/command/_mod.qh>
+	#include <common/command/_mod.qh>
+	#include <common/command/markup.qh>
+	#include <common/command/reg.qh>
+	#include <common/command/rpn.qh>
+	#include <common/mapinfo.qh>
+	#include <common/notifications/all.qh>
+#elif defined(MENUQC)
+#elif defined(SVQC)
+	#include <common/command/_mod.qh>
+	#include <common/command/markup.qh>
+	#include <common/command/reg.qh>
+	#include <common/command/rpn.qh>
+	#include <common/mapinfo.qh>
+	#include <common/notifications/all.qh>
 	#include <common/turrets/config.qh>
 	#include <common/weapons/config.qh>
+	#include <server/command/_mod.qh>
 #endif
 
 // =========================================================
diff --git a/qcsrc/common/command/markup.qc b/qcsrc/common/command/markup.qc
index 1618f6e08f..bd1b79cbfb 100644
--- a/qcsrc/common/command/markup.qc
+++ b/qcsrc/common/command/markup.qc
@@ -1,5 +1,6 @@
 #include "markup.qh"
-#include "command.qh"
+
+#include <common/command/command.qh>
 
 // =========================================================
 //  Markup chat characters command code, reworked by Samual
diff --git a/qcsrc/common/command/rpn.qc b/qcsrc/common/command/rpn.qc
index 6d2ffe43bc..467768269c 100644
--- a/qcsrc/common/command/rpn.qc
+++ b/qcsrc/common/command/rpn.qc
@@ -1,5 +1,6 @@
 #include "rpn.qh"
-#include "command.qh"
+
+#include <common/command/command.qh>
 
 
 // ========================================
diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 4ef6b2f793..95e4af4194 100644
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -1,8 +1,13 @@
 #include "ent_cs.qh"
-#include <common/gamemodes/_mod.qh>
-#include <common/resources.qh>
-#ifdef SVQC
-#include <server/resources.qh>
+
+#if defined(CSQC)
+	#include <common/gamemodes/_mod.qh>
+	#include <common/resources.qh>
+#elif defined(MENUQC)
+#elif defined(SVQC)
+	#include <common/gamemodes/_mod.qh>
+	#include <common/resources.qh>
+	#include <server/resources.qh>
 #endif
 
 REGISTRY(EntCSProps, BITS(16) - 1)
diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index b8071fab64..1b3fa8faf7 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1,11 +1,11 @@
 #include "mapinfo.qh"
 #if defined(CSQC)
-    #include "util.qh"
-    #include <common/weapons/_all.qh>
+	#include <common/util.qh>
+	#include <common/weapons/_all.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "util.qh"
-    #include <common/monsters/_mod.qh>
+	#include <common/util.qh>
+	#include <common/monsters/_mod.qh>
 #endif
 
 #ifdef MENUQC
diff --git a/qcsrc/common/mapobjects/models.qc b/qcsrc/common/mapobjects/models.qc
index 9ba1dcdf66..4d4ccc8dd2 100644
--- a/qcsrc/common/mapobjects/models.qc
+++ b/qcsrc/common/mapobjects/models.qc
@@ -1,14 +1,13 @@
 #include "models.qh"
 
 #ifdef SVQC
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <common/net_linked.qh>
-#include "subs.qh"
-#include "triggers.qh"
-#include "bgmscript.qh"
-
 #include <common/constants.qh>
+#include <common/mapobjects/bgmscript.qh>
+#include <common/mapobjects/subs.qh>
+#include <common/mapobjects/triggers.qh>
+#include <common/net_linked.qh>
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
 #include <lib/csqcmodel/sv_model.qh>
 
 void g_model_setcolormaptoactivator(entity this, entity actor, entity trigger)
diff --git a/qcsrc/common/mapobjects/platforms.qc b/qcsrc/common/mapobjects/platforms.qc
index aae20894d3..afd349673c 100644
--- a/qcsrc/common/mapobjects/platforms.qc
+++ b/qcsrc/common/mapobjects/platforms.qc
@@ -1,4 +1,5 @@
 #include "platforms.qh"
+
 void generic_plat_blocked(entity this, entity blocker)
 {
 #ifdef SVQC
diff --git a/qcsrc/common/mapobjects/subs.qc b/qcsrc/common/mapobjects/subs.qc
index 4195abfc68..847deca6e0 100644
--- a/qcsrc/common/mapobjects/subs.qc
+++ b/qcsrc/common/mapobjects/subs.qc
@@ -1,4 +1,5 @@
 #include "subs.qh"
+
 void SUB_NullThink(entity this) { }
 
 void SUB_CalcMoveDone(entity this);
diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc
index 1b0c9a3da3..7c0ea12253 100644
--- a/qcsrc/common/mapobjects/teleporters.qc
+++ b/qcsrc/common/mapobjects/teleporters.qc
@@ -3,21 +3,21 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include <lib/warpzone/common.qh>
-    #include <lib/warpzone/util_server.qh>
-    #include <lib/warpzone/server.qh>
-    #include "../constants.qh"
-	#include "../mapobjects/subs.qh"
-    #include "../util.qh"
-    #include <server/weapons/csqcprojectile.qh>
-    #include <server/autocvars.qh>
-    #include <common/weapons/_all.qh>
-    #include <common/stats.qh>
-    #include "../deathtypes/all.qh"
-    #include "../turrets/sv_turrets.qh"
-    #include "../vehicles/all.qh"
-    #include <common/gamemodes/_mod.qh>
-    #include <server/anticheat.qh>
+	#include <common/constants.qh>
+	#include <common/deathtypes/all.qh>
+	#include <common/gamemodes/_mod.qh>
+	#include <common/mapobjects/subs.qh>
+	#include <common/stats.qh>
+	#include <common/turrets/sv_turrets.qh>
+	#include <common/util.qh>
+	#include <common/vehicles/all.qh>
+	#include <common/weapons/_all.qh>
+	#include <lib/warpzone/common.qh>
+	#include <lib/warpzone/server.qh>
+	#include <lib/warpzone/util_server.qh>
+	#include <server/anticheat.qh>
+	#include <server/autocvars.qh>
+	#include <server/weapons/csqcprojectile.qh>
 #endif
 
 #ifdef SVQC
diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc
index 14dac4e88e..2fdc52fcbf 100644
--- a/qcsrc/common/minigames/cl_minigames_hud.qc
+++ b/qcsrc/common/minigames/cl_minigames_hud.qc
@@ -2,15 +2,13 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
+#include <client/hud/hud_config.qh>
+#include <client/mapvoting.qh>
 #include <common/ent_cs.qh>
-
-#include "minigames.qh"
+#include <common/minigames/minigames.qh>
 
 .vector colormod;
 
-#include <client/hud/hud_config.qh>
-#include <client/mapvoting.qh>
-
 void HUD_MinigameBoard_Export(int fh)
 {
 	// allow saving cvars that aesthetically change the panel into hud skin files
diff --git a/qcsrc/common/minigames/sv_minigames.qc b/qcsrc/common/minigames/sv_minigames.qc
index 2e793d10a9..21f81055a4 100644
--- a/qcsrc/common/minigames/sv_minigames.qc
+++ b/qcsrc/common/minigames/sv_minigames.qc
@@ -1,6 +1,6 @@
 #include "sv_minigames.qh"
-#include "minigames.qh"
 
+#include <common/minigames/minigames.qh>
 #include <server/gamelog.qh>
 
 void player_clear_minigame(entity player)
diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 2e109e9069..7ddc7b10ca 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1,31 +1,31 @@
 #include "sv_monsters.qh"
 
+#include <common/constants.qh>
+#include <common/deathtypes/all.qh>
+#include <common/items/_mod.qh>
+#include <common/mapobjects/teleporters.qh>
+#include <common/mapobjects/triggers.qh>
+#include <common/monsters/all.qh>
+#include <common/physics/movelib.qh>
+#include <common/stats.qh>
+#include <common/teams.qh>
+#include <common/turrets/sv_turrets.qh>
+#include <common/turrets/util.qh>
+#include <common/util.qh>
+#include <common/vehicles/all.qh>
+#include <common/weapons/_all.qh>
+#include <common/weapons/_mod.qh>
+#include <lib/csqcmodel/sv_model.qh>
 #include <lib/warpzone/common.qh>
-#include "../constants.qh"
-#include "../teams.qh"
-#include "../util.qh"
-#include "all.qh"
-#include "../physics/movelib.qh"
-#include "../weapons/_mod.qh"
 #include <server/autocvars.qh>
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/damage.qh>
-#include "../deathtypes/all.qh"
-#include <server/items/items.qh>
-#include <server/mutators/_mod.qh>
-#include <server/steerlib.qh>
-#include "../turrets/sv_turrets.qh"
-#include "../turrets/util.qh"
-#include "../vehicles/all.qh"
 #include <server/campaign.qh>
 #include <server/cheats.qh>
 #include <server/command/_mod.qh>
-#include <common/items/_mod.qh>
-#include <common/mapobjects/teleporters.qh>
-#include "../mapobjects/triggers.qh"
-#include <lib/csqcmodel/sv_model.qh>
+#include <server/damage.qh>
+#include <server/items/items.qh>
+#include <server/mutators/_mod.qh>
 #include <server/round_handler.qh>
+#include <server/steerlib.qh>
 #include <server/weapons/_mod.qh>
 
 void monsters_setstatus(entity this)
diff --git a/qcsrc/common/monsters/sv_spawn.qc b/qcsrc/common/monsters/sv_spawn.qc
index 4cdfb24e40..54fc4154e2 100644
--- a/qcsrc/common/monsters/sv_spawn.qc
+++ b/qcsrc/common/monsters/sv_spawn.qc
@@ -1,15 +1,17 @@
 #include "sv_spawn.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../util.qh"
-    #include "all.qh"
-    #include "sv_monsters.qh"
-    #include <server/autocvars.qh>
-    #include <common/weapons/_all.qh>
-    #include <common/stats.qh>
-    #include <server/weapons/common.qh>
+	#include <common/monsters/all.qh>
+	#include <common/monsters/sv_monsters.qh>
+	#include <common/stats.qh>
+	#include <common/util.qh>
+	#include <common/weapons/_all.qh>
+	#include <server/autocvars.qh>
+	#include <server/weapons/common.qh>
 #endif
+
 entity spawnmonster (entity e, string monster, Monster monster_id, entity spawnedby, entity own, vector orig, bool respwn, bool removeifinvalid, int moveflag)
 {
 	e.spawnflags = MONSTERFLAG_SPAWNED;
diff --git a/qcsrc/common/monsters/sv_spawner.qc b/qcsrc/common/monsters/sv_spawner.qc
index 98222f6ac9..a430951da5 100644
--- a/qcsrc/common/monsters/sv_spawner.qc
+++ b/qcsrc/common/monsters/sv_spawner.qc
@@ -1,6 +1,7 @@
-#include "sv_monsters.qh"
 #include "sv_spawner.qh"
-#include "sv_spawn.qh"
+
+#include <common/monsters/sv_monsters.qh>
+#include <common/monsters/sv_spawn.qh>
 
 void spawner_use(entity this, entity actor, entity trigger)
 {
diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc
index e2c1e185af..372d963d7a 100644
--- a/qcsrc/common/notifications/all.qc
+++ b/qcsrc/common/notifications/all.qc
@@ -1,4 +1,5 @@
 #include "all.qh"
+
 #if defined(CSQC)
 	#include <client/announcer.qh>
 #elif defined(MENUQC)
@@ -8,8 +9,8 @@
 	#include <common/teams.qh>
 	#include <server/autocvars.qh>
 	#include <server/command/getreplies.qh>
-	#include <server/world.qh>
 	#include <server/mutators/_mod.qh>
+	#include <server/world.qh>
 #endif
 
 // ================================================
diff --git a/qcsrc/common/physics/movetypes/follow.qc b/qcsrc/common/physics/movetypes/follow.qc
index 3009069052..ba33be9861 100644
--- a/qcsrc/common/physics/movetypes/follow.qc
+++ b/qcsrc/common/physics/movetypes/follow.qc
@@ -1,4 +1,5 @@
 #include "follow.qh"
+
 void _Movetype_Physics_Follow(entity this) // SV_Physics_Follow
 {
 	entity e = this.aiment;
diff --git a/qcsrc/common/physics/movetypes/push.qc b/qcsrc/common/physics/movetypes/push.qc
index 66ff42a69f..1b654b59c7 100644
--- a/qcsrc/common/physics/movetypes/push.qc
+++ b/qcsrc/common/physics/movetypes/push.qc
@@ -1,4 +1,5 @@
 #include "push.qh"
+
 void _Movetype_PushMove(entity this, float dt) // SV_PushMove
 {
 	if(this.velocity == '0 0 0' && this.avelocity == '0 0 0')
diff --git a/qcsrc/common/physics/movetypes/step.qc b/qcsrc/common/physics/movetypes/step.qc
index 30ebe6afad..d689810767 100644
--- a/qcsrc/common/physics/movetypes/step.qc
+++ b/qcsrc/common/physics/movetypes/step.qc
@@ -1,4 +1,5 @@
 #include "step.qh"
+
 void _Movetype_Physics_Step(entity this, float dt) // SV_Physics_Step
 {
 	if(IS_ONGROUND(this))
diff --git a/qcsrc/common/physics/movetypes/walk.qc b/qcsrc/common/physics/movetypes/walk.qc
index cd33ebc826..d74837927b 100644
--- a/qcsrc/common/physics/movetypes/walk.qc
+++ b/qcsrc/common/physics/movetypes/walk.qc
@@ -1,4 +1,5 @@
 #include "walk.qh"
+
 void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 {
 	// if frametime is 0 (due to client sending the same timestamp twice), don't move
diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 7afc039e15..69dcf56b0f 100644
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -1,12 +1,12 @@
 #include "player.qh"
-#include "../mapobjects/_mod.qh"
-#include "../viewloc.qh"
 
-#ifdef SVQC
+#include <common/mapobjects/_mod.qh>
+#include <common/viewloc.qh>
 
-#include <server/client.qh>
+#ifdef SVQC
 #include <common/mapobjects/defs.qh>
-#include "../mapobjects/trigger/viewloc.qh"
+#include <common/mapobjects/trigger/viewloc.qh>
+#include <server/client.qh>
 
 // client side physics
 bool Physics_Valid(string thecvar)
diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc
index cbf7f9eef4..4a7f352035 100644
--- a/qcsrc/common/playerstats.qc
+++ b/qcsrc/common/playerstats.qc
@@ -1,17 +1,18 @@
 #include "playerstats.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "constants.qh"
-    #include "util.qh"
-    #include <common/weapons/_all.qh>
-    #include <server/client.qh>
-    #include "../server/anticheat.qh"
-    #include <common/stats.qh>
-    #include <server/intermission.qh>
-    #include "../server/scores.qh"
+	#include <common/constants.qh>
+	#include <common/stats.qh>
+	#include <common/util.qh>
+	#include <common/weapons/_all.qh>
+	#include <server/anticheat.qh>
+	#include <server/client.qh>
+	#include <server/intermission.qh>
+	#include <server/scores.qh>
+	#include <server/weapons/accuracy.qh>
 	#include <server/world.qh>
-    #include "../server/weapons/accuracy.qh"
 #endif
 
 #ifdef SVQC
diff --git a/qcsrc/common/sounds/all.qc b/qcsrc/common/sounds/all.qc
index fdbf411801..c6418674ce 100644
--- a/qcsrc/common/sounds/all.qc
+++ b/qcsrc/common/sounds/all.qc
@@ -1,6 +1,6 @@
 #include "all.qh"
-#ifdef SVQC
 
+#ifdef SVQC
 #include <server/utils.qh>
 
 bool autocvar_bot_sound_monopoly;
diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc
index fca9f7f237..84812fc460 100644
--- a/qcsrc/common/turrets/cl_turrets.qc
+++ b/qcsrc/common/turrets/cl_turrets.qc
@@ -1,4 +1,5 @@
 #include "cl_turrets.qh"
+
 void turret_remove(entity this)
 {
 	delete(this.tur_head);
diff --git a/qcsrc/common/turrets/config.qc b/qcsrc/common/turrets/config.qc
index 8ecd190e32..14c51be661 100644
--- a/qcsrc/common/turrets/config.qc
+++ b/qcsrc/common/turrets/config.qc
@@ -1,9 +1,10 @@
 #include "config.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
+	#include <common/turrets/all.qh>
 	#include <common/util.qh>
-	#include "all.qh"
 #endif
 
 // ==========================
diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc
index 98490610a2..1900def331 100644
--- a/qcsrc/common/turrets/sv_turrets.qc
+++ b/qcsrc/common/turrets/sv_turrets.qc
@@ -1,12 +1,13 @@
 #include "sv_turrets.qh"
+
 #ifdef SVQC
+#include <common/mapobjects/defs.qh>
 #include <server/autocvars.qh>
 #include <server/bot/api.qh>
 #include <server/damage.qh>
 #include <server/weapons/common.qh>
 #include <server/weapons/weaponsystem.qh>
 #include <server/world.qh>
-#include <common/mapobjects/defs.qh>
 
 // Generic aiming
 vector turret_aim_generic(entity this)
diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 35eff3f9ce..ee0eb10585 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -1,22 +1,22 @@
 #include "util.qh"
 
 #if defined(CSQC)
-    #include "constants.qh"
 	#include <client/mutators/_mod.qh>
-    #include "mapinfo.qh"
-    #include "notifications/all.qh"
-	#include "scores.qh"
-    #include <common/deathtypes/all.qh>
+	#include <common/constants.qh>
+	#include <common/deathtypes/all.qh>
 	#include <common/gamemodes/_mod.qh>
+	#include <common/mapinfo.qh>
+	#include <common/notifications/all.qh>
+	#include <common/scores.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "constants.qh"
-	#include <server/mutators/_mod.qh>
-    #include "notifications/all.qh"
-    #include <common/deathtypes/all.qh>
+	#include <common/constants.qh>
+	#include <common/deathtypes/all.qh>
 	#include <common/gamemodes/_mod.qh>
-	#include "scores.qh"
-    #include "mapinfo.qh"
+	#include <common/mapinfo.qh>
+	#include <common/notifications/all.qh>
+	#include <common/scores.qh>
+	#include <server/mutators/_mod.qh>
 #endif
 
 #ifdef SVQC
diff --git a/qcsrc/common/vehicles/cl_vehicles.qc b/qcsrc/common/vehicles/cl_vehicles.qc
index 667c1f75a3..86e718bbba 100644
--- a/qcsrc/common/vehicles/cl_vehicles.qc
+++ b/qcsrc/common/vehicles/cl_vehicles.qc
@@ -1,4 +1,5 @@
 #include "cl_vehicles.qh"
+
 const string vCROSS_BURST = "gfx/vehicles/crosshair_burst.tga";
 const string vCROSS_DROP  = "gfx/vehicles/crosshair_drop.tga";
 const string vCROSS_GUIDE = "gfx/vehicles/crosshair_guide.tga";
diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc
index dbfeb1240f..5bc834a00b 100644
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -1,14 +1,14 @@
 #include "sv_vehicles.qh"
 
-#include <server/bot/api.qh>
-#include <server/damage.qh>
-#include <server/world.qh>
-#include <server/items/items.qh>
 #include <common/items/_mod.qh>
 #include <common/mapobjects/defs.qh>
 #include <common/mapobjects/teleporters.qh>
 #include <common/mapobjects/triggers.qh>
+#include <server/bot/api.qh>
+#include <server/damage.qh>
+#include <server/items/items.qh>
 #include <server/weapons/common.qh>
+#include <server/world.qh>
 
 bool SendAuxiliaryXhair(entity this, entity to, int sf)
 {
diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc
index 423eefd194..606d11505a 100644
--- a/qcsrc/common/vehicles/vehicle/racer.qc
+++ b/qcsrc/common/vehicles/vehicle/racer.qc
@@ -2,13 +2,12 @@
 
 #if defined(SVQC)
 	#include <common/gamemodes/gamemode/ctf/sv_ctf.qh>
+	#include <common/mapobjects/trigger/impulse.qh>
 #endif
 
 #ifdef GAMEQC
 
 #ifdef SVQC
-#include <common/mapobjects/trigger/impulse.qh>
-
 bool autocvar_g_vehicle_racer = true;
 
 float autocvar_g_vehicle_racer_thinkrate = 0.05; // TODO: any higher causes it to sink in liquids
diff --git a/qcsrc/common/viewloc.qc b/qcsrc/common/viewloc.qc
index 58cf42161c..92e739542e 100644
--- a/qcsrc/common/viewloc.qc
+++ b/qcsrc/common/viewloc.qc
@@ -1,12 +1,12 @@
 #include "viewloc.qh"
-#include "util.qh"
 
 #if defined(CSQC)
-    #include "constants.qh"
+	#include <common/util.qh>
+	#include <common/constants.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include <common/weapons/_all.qh>
 	#include <common/stats.qh>
+	#include <common/weapons/_all.qh>
 #endif
 
 // client movement
diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 7c089ba70c..b0e3b58a0e 100644
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -3,54 +3,52 @@
 #define WEAPONS_ALL_C
 
 #if defined(CSQC)
-	#include "../constants.qh"
-	#include "../stats.qh"
-	#include <lib/warpzone/anglestransform.qh>
-	#include <lib/warpzone/common.qh>
-	#include <lib/warpzone/client.qh>
-	#include "../util.qh"
 	#include <client/autocvars.qh>
-	#include "../deathtypes/all.qh"
-	#include <lib/csqcmodel/interpolate.qh>
-	#include "../physics/movetypes/movetypes.qh"
 	#include <client/main.qh>
+	#include <common/constants.qh>
+	#include <common/deathtypes/all.qh>
+	#include <common/physics/movetypes/movetypes.qh>
+	#include <common/stats.qh>
+	#include <common/util.qh>
+	#include <common/weapons/calculations.qc>
+	#include <common/weapons/weapon/_mod.inc>
 	#include <lib/csqcmodel/cl_model.qh>
+	#include <lib/csqcmodel/interpolate.qh>
+	#include <lib/warpzone/anglestransform.qh>
+	#include <lib/warpzone/client.qh>
+	#include <lib/warpzone/common.qh>
 #elif defined(MENUQC)
+	#include <common/weapons/weapon/_mod.inc>
 #elif defined(SVQC)
+	#include <common/constants.qh>
+	#include <common/deathtypes/all.qh>
 	#include <common/items/_mod.qh>
+	#include <common/mapinfo.qh>
+	#include <common/monsters/_mod.qh>
+	#include <common/notifications/all.qh>
+	#include <common/stats.qh>
+	#include <common/teams.qh>
+	#include <common/util.qh>
+	#include <common/weapons/calculations.qc>
+	#include <common/weapons/config.qc>
+	#include <common/weapons/config.qh>
+	#include <common/weapons/weapon/_mod.inc>
+	#include <lib/csqcmodel/sv_model.qh>
 	#include <lib/warpzone/anglestransform.qh>
 	#include <lib/warpzone/common.qh>
-	#include <lib/warpzone/util_server.qh>
 	#include <lib/warpzone/server.qh>
-	#include "../constants.qh"
-	#include "../stats.qh"
-	#include "../teams.qh"
-	#include <common/util.qh>
-	#include "../monsters/_mod.qh"
-	#include "config.qh"
-	#include <server/weapons/common.qh>
-	#include <server/weapons/csqcprojectile.qh>
-	#include <server/weapons/tracing.qh>
-	#include <server/items/spawning.qh>
+	#include <lib/warpzone/util_server.qh>
 	#include <server/autocvars.qh>
-	#include "../notifications/all.qh"
-	#include "../deathtypes/all.qh"
-	#include <server/mutators/_mod.qh>
-	#include "../mapinfo.qh"
 	#include <server/command/_mod.qh>
-	#include <lib/csqcmodel/sv_model.qh>
+	#include <server/hook.qh>
+	#include <server/items/spawning.qh>
+	#include <server/mutators/_mod.qh>
 	#include <server/portals.qh>
-#include <server/hook.qh>
-#endif
-#ifdef GAMEQC
-	#include "calculations.qc"
-#endif
-#ifdef SVQC
-	#include "config.qc"
+	#include <server/weapons/common.qh>
+	#include <server/weapons/csqcprojectile.qh>
+	#include <server/weapons/tracing.qh>
 #endif
 
-#include "weapon/_mod.inc"
-
 
 // WEAPON PLUGIN SYSTEM
 
diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc
index ab0fa0c17f..596540dd39 100644
--- a/qcsrc/common/weapons/config.qc
+++ b/qcsrc/common/weapons/config.qc
@@ -1,9 +1,10 @@
 #include "config.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
 	#include <common/util.qh>
-	#include "all.qh"
+	#include <common/weapons/all.qh>
 #endif
 
 // ==========================
diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index f5888c50a0..d190576541 100644
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -1,8 +1,8 @@
 #include "arc.qh"
 
 #ifdef SVQC
-#include <common/gamemodes/gamemode/onslaught/sv_onslaught.qh>
 #include <common/gamemodes/gamemode/onslaught/sv_generator.qh>
+#include <common/gamemodes/gamemode/onslaught/sv_onslaught.qh>
 
 bool W_Arc_Beam_Send(entity this, entity to, int sf)
 {