From 8e12088e8a6a698f155e4f79a1b07a5656355ce6 Mon Sep 17 00:00:00 2001
From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 18 Apr 2016 23:24:54 +1000
Subject: [PATCH] Work around CMake #12619

---
 CMakeLists.txt                                |   2 +-
 qcsrc/client/_mod.inc                         |  24 +-
 qcsrc/client/_mod.qh                          |  13 +
 qcsrc/client/commands/_mod.inc                |   4 +-
 qcsrc/client/commands/_mod.qh                 |   3 +
 qcsrc/client/hud/_mod.inc                     |   4 +-
 qcsrc/client/hud/_mod.qh                      |   3 +
 qcsrc/client/hud/panel/_mod.inc               |  38 +--
 qcsrc/client/hud/panel/_mod.qh                |  20 ++
 qcsrc/client/mutators/_mod.qh                 |   1 +
 qcsrc/client/progs.inc                        |   2 +-
 qcsrc/client/weapons/_mod.inc                 |   2 +-
 qcsrc/client/weapons/_mod.qh                  |   2 +
 qcsrc/common/_mod.inc                         |  24 +-
 qcsrc/common/_mod.qh                          |  13 +
 qcsrc/common/command/_mod.inc                 |   8 +-
 qcsrc/common/command/_mod.qh                  |   5 +
 qcsrc/common/deathtypes/_mod.inc              |   2 +-
 qcsrc/common/deathtypes/_mod.qh               |   2 +
 qcsrc/common/effects/_mod.inc                 |   4 +-
 qcsrc/common/effects/_mod.qh                  |   3 +
 qcsrc/common/effects/qc/_mod.inc              |  14 +-
 qcsrc/common/effects/qc/_mod.qh               |   8 +
 qcsrc/common/gamemodes/_mod.inc               |   2 +-
 qcsrc/common/gamemodes/_mod.qh                |   2 +
 qcsrc/common/gamemodes/gamemode/_mod.qh       |   1 +
 .../gamemodes/gamemode/nexball/_mod.inc       |   4 +-
 .../common/gamemodes/gamemode/nexball/_mod.qh |   3 +
 .../gamemodes/gamemode/onslaught/_mod.inc     |  10 +-
 .../gamemodes/gamemode/onslaught/_mod.qh      |   6 +
 qcsrc/common/impulses/_mod.inc                |   2 +-
 qcsrc/common/impulses/_mod.qh                 |   2 +
 qcsrc/common/items/_mod.inc                   |   2 +-
 qcsrc/common/items/_mod.qh                    |   2 +
 qcsrc/common/items/item/_mod.inc              |  12 +-
 qcsrc/common/items/item/_mod.qh               |   7 +
 qcsrc/common/minigames/_mod.inc               |  12 +-
 qcsrc/common/minigames/_mod.qh                |   3 +
 qcsrc/common/minigames/minigame/_mod.inc      |  16 +-
 qcsrc/common/minigames/minigame/_mod.qh       |   9 +
 qcsrc/common/models/_mod.qh                   |   1 +
 qcsrc/common/monsters/_mod.inc                |   6 +-
 qcsrc/common/monsters/_mod.qh                 |   4 +
 qcsrc/common/monsters/monster/_mod.inc        |  10 +-
 qcsrc/common/monsters/monster/_mod.qh         |   6 +
 qcsrc/common/mutators/_mod.inc                |   2 +-
 qcsrc/common/mutators/_mod.qh                 |   2 +
 qcsrc/common/mutators/mutator/_mod.inc        |   2 +-
 qcsrc/common/mutators/mutator/_mod.qh         |   2 +
 .../mutators/mutator/bloodloss/_mod.inc       |   2 +-
 .../common/mutators/mutator/bloodloss/_mod.qh |   2 +
 .../mutators/mutator/breakablehook/_mod.inc   |   2 +-
 .../mutators/mutator/breakablehook/_mod.qh    |   2 +
 qcsrc/common/mutators/mutator/buffs/_mod.inc  |   4 +-
 qcsrc/common/mutators/mutator/buffs/_mod.qh   |   3 +
 .../common/mutators/mutator/bugrigs/_mod.inc  |   2 +-
 qcsrc/common/mutators/mutator/bugrigs/_mod.qh |   2 +
 .../mutators/mutator/campcheck/_mod.inc       |   2 +-
 .../common/mutators/mutator/campcheck/_mod.qh |   2 +
 .../common/mutators/mutator/cloaked/_mod.inc  |   2 +-
 qcsrc/common/mutators/mutator/cloaked/_mod.qh |   2 +
 .../mutators/mutator/damagetext/_mod.inc      |   2 +-
 .../mutators/mutator/damagetext/_mod.qh       |   2 +
 .../common/mutators/mutator/dodging/_mod.inc  |   2 +-
 qcsrc/common/mutators/mutator/dodging/_mod.qh |   2 +
 .../mutators/mutator/doublejump/_mod.inc      |   2 +-
 .../mutators/mutator/doublejump/_mod.qh       |   2 +
 qcsrc/common/mutators/mutator/hook/_mod.inc   |   2 +-
 qcsrc/common/mutators/mutator/hook/_mod.qh    |   2 +
 .../common/mutators/mutator/instagib/_mod.inc |   4 +-
 .../common/mutators/mutator/instagib/_mod.qh  |   3 +
 .../mutators/mutator/invincibleproj/_mod.inc  |   2 +-
 .../mutators/mutator/invincibleproj/_mod.qh   |   2 +
 .../mutators/mutator/melee_only/_mod.inc      |   2 +-
 .../mutators/mutator/melee_only/_mod.qh       |   2 +
 qcsrc/common/mutators/mutator/midair/_mod.inc |   2 +-
 qcsrc/common/mutators/mutator/midair/_mod.qh  |   2 +
 .../mutators/mutator/multijump/_mod.inc       |   2 +-
 .../common/mutators/mutator/multijump/_mod.qh |   2 +
 qcsrc/common/mutators/mutator/nades/_mod.inc  |   4 +-
 qcsrc/common/mutators/mutator/nades/_mod.qh   |   3 +
 .../common/mutators/mutator/new_toys/_mod.inc |   2 +-
 .../common/mutators/mutator/new_toys/_mod.qh  |   2 +
 qcsrc/common/mutators/mutator/nix/_mod.inc    |   2 +-
 qcsrc/common/mutators/mutator/nix/_mod.qh     |   2 +
 .../common/mutators/mutator/overkill/_mod.inc |   6 +-
 .../common/mutators/mutator/overkill/_mod.qh  |   4 +
 .../mutators/mutator/physical_items/_mod.inc  |   2 +-
 .../mutators/mutator/physical_items/_mod.qh   |   2 +
 qcsrc/common/mutators/mutator/pinata/_mod.inc |   2 +-
 qcsrc/common/mutators/mutator/pinata/_mod.qh  |   2 +
 .../mutators/mutator/random_gravity/_mod.inc  |   2 +-
 .../mutators/mutator/random_gravity/_mod.qh   |   2 +
 .../mutators/mutator/rocketflying/_mod.inc    |   2 +-
 .../mutators/mutator/rocketflying/_mod.qh     |   2 +
 .../mutators/mutator/rocketminsta/_mod.inc    |   2 +-
 .../mutators/mutator/rocketminsta/_mod.qh     |   2 +
 .../mutators/mutator/running_guns/_mod.inc    |   2 +-
 .../mutators/mutator/running_guns/_mod.qh     |   2 +
 .../common/mutators/mutator/sandbox/_mod.inc  |   2 +-
 qcsrc/common/mutators/mutator/sandbox/_mod.qh |   2 +
 .../mutator/spawn_near_teammate/_mod.inc      |   2 +-
 .../mutator/spawn_near_teammate/_mod.qh       |   2 +
 .../mutators/mutator/superspec/_mod.inc       |   2 +-
 .../common/mutators/mutator/superspec/_mod.qh |   2 +
 .../mutators/mutator/touchexplode/_mod.inc    |   2 +-
 .../mutators/mutator/touchexplode/_mod.qh     |   2 +
 .../common/mutators/mutator/vampire/_mod.inc  |   2 +-
 qcsrc/common/mutators/mutator/vampire/_mod.qh |   2 +
 .../mutators/mutator/vampirehook/_mod.inc     |   2 +-
 .../mutators/mutator/vampirehook/_mod.qh      |   2 +
 .../mutators/mutator/waypoints/_mod.inc       |   2 +-
 .../common/mutators/mutator/waypoints/_mod.qh |   2 +
 .../mutator/weaponarena_random/_mod.inc       |   2 +-
 .../mutator/weaponarena_random/_mod.qh        |   2 +
 qcsrc/common/notifications/_mod.inc           |   2 +-
 qcsrc/common/notifications/_mod.qh            |   2 +
 qcsrc/common/physics/_mod.inc                 |   4 +-
 qcsrc/common/physics/_mod.qh                  |   3 +
 qcsrc/common/physics/movetypes/_mod.inc       |  12 +-
 qcsrc/common/physics/movetypes/_mod.qh        |   7 +
 qcsrc/common/sounds/_mod.inc                  |   2 +-
 qcsrc/common/sounds/_mod.qh                   |   2 +
 qcsrc/common/triggers/_mod.inc                |  10 +-
 qcsrc/common/triggers/_mod.qh                 |   6 +
 qcsrc/common/triggers/func/_mod.inc           |  36 +--
 qcsrc/common/triggers/func/_mod.qh            |  19 ++
 qcsrc/common/triggers/misc/_mod.inc           |  10 +-
 qcsrc/common/triggers/misc/_mod.qh            |   6 +
 qcsrc/common/triggers/target/_mod.inc         |  14 +-
 qcsrc/common/triggers/target/_mod.qh          |   8 +
 qcsrc/common/triggers/trigger/_mod.inc        |  48 ++--
 qcsrc/common/triggers/trigger/_mod.qh         |  25 ++
 qcsrc/common/turrets/_mod.inc                 |  14 +-
 qcsrc/common/turrets/_mod.qh                  |   8 +
 qcsrc/common/turrets/turret/_mod.inc          |  44 ++--
 qcsrc/common/turrets/turret/_mod.qh           |  23 ++
 qcsrc/common/vehicles/_mod.inc                |   6 +-
 qcsrc/common/vehicles/_mod.qh                 |   4 +
 qcsrc/common/vehicles/vehicle/_mod.inc        |  16 +-
 qcsrc/common/vehicles/vehicle/_mod.qh         |   9 +
 qcsrc/common/weapons/_mod.inc                 |   6 +-
 qcsrc/common/weapons/_mod.qh                  |   4 +
 qcsrc/common/weapons/weapon/_mod.inc          |  40 +--
 qcsrc/common/weapons/weapon/_mod.qh           |  21 ++
 qcsrc/lib/_mod.inc                            |  14 +-
 qcsrc/lib/_mod.qh                             |   8 +
 qcsrc/lib/csqcmodel/_mod.inc                  |   8 +-
 qcsrc/lib/csqcmodel/_mod.qh                   |   5 +
 qcsrc/lib/matrix/_mod.inc                     |   4 +-
 qcsrc/lib/matrix/_mod.qh                      |   3 +
 qcsrc/lib/warpzone/_mod.inc                   |  12 +-
 qcsrc/lib/warpzone/_mod.qh                    |   7 +
 qcsrc/menu/_mod.inc                           |   8 +-
 qcsrc/menu/_mod.qh                            |   5 +
 qcsrc/menu/anim/_mod.inc                      |   8 +-
 qcsrc/menu/anim/_mod.qh                       |   5 +
 qcsrc/menu/command/_mod.inc                   |   4 +-
 qcsrc/menu/command/_mod.qh                    |   3 +
 qcsrc/menu/item/_mod.inc                      |  32 +--
 qcsrc/menu/item/_mod.qh                       |  17 ++
 qcsrc/menu/mutators/_mod.qh                   |   1 +
 qcsrc/menu/progs.inc                          |   2 +-
 qcsrc/menu/xonotic/_mod.inc                   | 230 +++++++++---------
 qcsrc/menu/xonotic/_mod.qh                    | 116 +++++++++
 qcsrc/server/_mod.inc                         |  64 ++---
 qcsrc/server/_mod.qh                          |  33 +++
 qcsrc/server/bot/_mod.inc                     |  10 +-
 qcsrc/server/bot/_mod.qh                      |   6 +
 qcsrc/server/bot/havocbot/_mod.inc            |   4 +-
 qcsrc/server/bot/havocbot/_mod.qh             |   3 +
 qcsrc/server/command/_mod.inc                 |  18 +-
 qcsrc/server/command/_mod.qh                  |   8 +
 qcsrc/server/mutators/_mod.inc                |   2 +-
 qcsrc/server/mutators/_mod.qh                 |   2 +
 qcsrc/server/mutators/mutator/_mod.inc        |  26 +-
 qcsrc/server/mutators/mutator/_mod.qh         |  14 ++
 qcsrc/server/pathlib/_mod.inc                 |  14 +-
 qcsrc/server/pathlib/_mod.qh                  |   8 +
 qcsrc/server/progs.inc                        |   2 +-
 qcsrc/server/weapons/_mod.inc                 |  20 +-
 qcsrc/server/weapons/_mod.qh                  |  11 +
 qcsrc/tools/genmod.sh                         |  19 +-
 183 files changed, 1130 insertions(+), 515 deletions(-)
 create mode 100644 qcsrc/client/_mod.qh
 create mode 100644 qcsrc/client/commands/_mod.qh
 create mode 100644 qcsrc/client/hud/_mod.qh
 create mode 100644 qcsrc/client/hud/panel/_mod.qh
 create mode 100644 qcsrc/client/mutators/_mod.qh
 create mode 100644 qcsrc/client/weapons/_mod.qh
 create mode 100644 qcsrc/common/_mod.qh
 create mode 100644 qcsrc/common/command/_mod.qh
 create mode 100644 qcsrc/common/deathtypes/_mod.qh
 create mode 100644 qcsrc/common/effects/_mod.qh
 create mode 100644 qcsrc/common/effects/qc/_mod.qh
 create mode 100644 qcsrc/common/gamemodes/_mod.qh
 create mode 100644 qcsrc/common/gamemodes/gamemode/_mod.qh
 create mode 100644 qcsrc/common/gamemodes/gamemode/nexball/_mod.qh
 create mode 100644 qcsrc/common/gamemodes/gamemode/onslaught/_mod.qh
 create mode 100644 qcsrc/common/impulses/_mod.qh
 create mode 100644 qcsrc/common/items/_mod.qh
 create mode 100644 qcsrc/common/items/item/_mod.qh
 create mode 100644 qcsrc/common/minigames/_mod.qh
 create mode 100644 qcsrc/common/minigames/minigame/_mod.qh
 create mode 100644 qcsrc/common/models/_mod.qh
 create mode 100644 qcsrc/common/monsters/_mod.qh
 create mode 100644 qcsrc/common/monsters/monster/_mod.qh
 create mode 100644 qcsrc/common/mutators/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/bloodloss/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/breakablehook/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/buffs/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/bugrigs/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/campcheck/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/cloaked/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/damagetext/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/dodging/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/doublejump/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/hook/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/instagib/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/invincibleproj/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/melee_only/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/midair/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/multijump/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/nades/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/new_toys/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/nix/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/overkill/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/physical_items/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/pinata/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/random_gravity/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/rocketflying/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/rocketminsta/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/running_guns/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/sandbox/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/superspec/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/touchexplode/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/vampire/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/vampirehook/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/waypoints/_mod.qh
 create mode 100644 qcsrc/common/mutators/mutator/weaponarena_random/_mod.qh
 create mode 100644 qcsrc/common/notifications/_mod.qh
 create mode 100644 qcsrc/common/physics/_mod.qh
 create mode 100644 qcsrc/common/physics/movetypes/_mod.qh
 create mode 100644 qcsrc/common/sounds/_mod.qh
 create mode 100644 qcsrc/common/triggers/_mod.qh
 create mode 100644 qcsrc/common/triggers/func/_mod.qh
 create mode 100644 qcsrc/common/triggers/misc/_mod.qh
 create mode 100644 qcsrc/common/triggers/target/_mod.qh
 create mode 100644 qcsrc/common/triggers/trigger/_mod.qh
 create mode 100644 qcsrc/common/turrets/_mod.qh
 create mode 100644 qcsrc/common/turrets/turret/_mod.qh
 create mode 100644 qcsrc/common/vehicles/_mod.qh
 create mode 100644 qcsrc/common/vehicles/vehicle/_mod.qh
 create mode 100644 qcsrc/common/weapons/_mod.qh
 create mode 100644 qcsrc/common/weapons/weapon/_mod.qh
 create mode 100644 qcsrc/lib/_mod.qh
 create mode 100644 qcsrc/lib/csqcmodel/_mod.qh
 create mode 100644 qcsrc/lib/matrix/_mod.qh
 create mode 100644 qcsrc/lib/warpzone/_mod.qh
 create mode 100644 qcsrc/menu/_mod.qh
 create mode 100644 qcsrc/menu/anim/_mod.qh
 create mode 100644 qcsrc/menu/command/_mod.qh
 create mode 100644 qcsrc/menu/item/_mod.qh
 create mode 100644 qcsrc/menu/mutators/_mod.qh
 create mode 100644 qcsrc/menu/xonotic/_mod.qh
 create mode 100644 qcsrc/server/_mod.qh
 create mode 100644 qcsrc/server/bot/_mod.qh
 create mode 100644 qcsrc/server/bot/havocbot/_mod.qh
 create mode 100644 qcsrc/server/command/_mod.qh
 create mode 100644 qcsrc/server/mutators/_mod.qh
 create mode 100644 qcsrc/server/mutators/mutator/_mod.qh
 create mode 100644 qcsrc/server/pathlib/_mod.qh
 create mode 100644 qcsrc/server/weapons/_mod.qh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c235c9775..c2b856435 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ add_definitions(-DNDEBUG=1)
 
 find_package(Git REQUIRED)
 execute_process(
-        COMMAND ${GIT_EXECUTABLE} describe --tags --dirty=*
+        COMMAND ${GIT_EXECUTABLE} describe --tags --dirty=~
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_DESC
         OUTPUT_STRIP_TRAILING_WHITESPACE
diff --git a/qcsrc/client/_mod.inc b/qcsrc/client/_mod.inc
index acb697787..186be9740 100644
--- a/qcsrc/client/_mod.inc
+++ b/qcsrc/client/_mod.inc
@@ -1,13 +1,13 @@
 // generated file; do not modify
-#include "announcer.qc"
-#include "bgmscript.qc"
-#include "csqcmodel_hooks.qc"
-#include "main.qc"
-#include "mapvoting.qc"
-#include "miscfunctions.qc"
-#include "player_skeleton.qc"
-#include "scoreboard.qc"
-#include "shownames.qc"
-#include "teamradar.qc"
-#include "view.qc"
-#include "wall.qc"
+#include <client/announcer.qc>
+#include <client/bgmscript.qc>
+#include <client/csqcmodel_hooks.qc>
+#include <client/main.qc>
+#include <client/mapvoting.qc>
+#include <client/miscfunctions.qc>
+#include <client/player_skeleton.qc>
+#include <client/scoreboard.qc>
+#include <client/shownames.qc>
+#include <client/teamradar.qc>
+#include <client/view.qc>
+#include <client/wall.qc>
diff --git a/qcsrc/client/_mod.qh b/qcsrc/client/_mod.qh
new file mode 100644
index 000000000..1c66ff781
--- /dev/null
+++ b/qcsrc/client/_mod.qh
@@ -0,0 +1,13 @@
+// generated file; do not modify
+#include <client/announcer.qh>
+#include <client/bgmscript.qh>
+#include <client/csqcmodel_hooks.qh>
+#include <client/main.qh>
+#include <client/mapvoting.qh>
+#include <client/miscfunctions.qh>
+#include <client/player_skeleton.qh>
+#include <client/scoreboard.qh>
+#include <client/shownames.qh>
+#include <client/teamradar.qh>
+#include <client/view.qh>
+#include <client/wall.qh>
diff --git a/qcsrc/client/commands/_mod.inc b/qcsrc/client/commands/_mod.inc
index d9220c61d..235f1297f 100644
--- a/qcsrc/client/commands/_mod.inc
+++ b/qcsrc/client/commands/_mod.inc
@@ -1,3 +1,3 @@
 // generated file; do not modify
-#include "all.qc"
-#include "cl_cmd.qc"
+#include <client/commands/all.qc>
+#include <client/commands/cl_cmd.qc>
diff --git a/qcsrc/client/commands/_mod.qh b/qcsrc/client/commands/_mod.qh
new file mode 100644
index 000000000..03df56398
--- /dev/null
+++ b/qcsrc/client/commands/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <client/commands/all.qh>
+#include <client/commands/cl_cmd.qh>
diff --git a/qcsrc/client/hud/_mod.inc b/qcsrc/client/hud/_mod.inc
index 73066c3d4..b90f61b8c 100644
--- a/qcsrc/client/hud/_mod.inc
+++ b/qcsrc/client/hud/_mod.inc
@@ -1,3 +1,3 @@
 // generated file; do not modify
-#include "hud.qc"
-#include "hud_config.qc"
+#include <client/hud/hud.qc>
+#include <client/hud/hud_config.qc>
diff --git a/qcsrc/client/hud/_mod.qh b/qcsrc/client/hud/_mod.qh
new file mode 100644
index 000000000..ee9ac8f76
--- /dev/null
+++ b/qcsrc/client/hud/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <client/hud/hud.qh>
+#include <client/hud/hud_config.qh>
diff --git a/qcsrc/client/hud/panel/_mod.inc b/qcsrc/client/hud/panel/_mod.inc
index 2995164b9..5681474b8 100644
--- a/qcsrc/client/hud/panel/_mod.inc
+++ b/qcsrc/client/hud/panel/_mod.inc
@@ -1,20 +1,20 @@
 // generated file; do not modify
-#include "ammo.qc"
-#include "centerprint.qc"
-#include "chat.qc"
-#include "engineinfo.qc"
-#include "healtharmor.qc"
-#include "infomessages.qc"
-#include "minigame.qc"
-#include "modicons.qc"
-#include "notify.qc"
-#include "physics.qc"
-#include "powerups.qc"
-#include "pressedkeys.qc"
-#include "quickmenu.qc"
-#include "racetimer.qc"
-#include "radar.qc"
-#include "score.qc"
-#include "timer.qc"
-#include "vote.qc"
-#include "weapons.qc"
+#include <client/hud/panel/ammo.qc>
+#include <client/hud/panel/centerprint.qc>
+#include <client/hud/panel/chat.qc>
+#include <client/hud/panel/engineinfo.qc>
+#include <client/hud/panel/healtharmor.qc>
+#include <client/hud/panel/infomessages.qc>
+#include <client/hud/panel/minigame.qc>
+#include <client/hud/panel/modicons.qc>
+#include <client/hud/panel/notify.qc>
+#include <client/hud/panel/physics.qc>
+#include <client/hud/panel/powerups.qc>
+#include <client/hud/panel/pressedkeys.qc>
+#include <client/hud/panel/quickmenu.qc>
+#include <client/hud/panel/racetimer.qc>
+#include <client/hud/panel/radar.qc>
+#include <client/hud/panel/score.qc>
+#include <client/hud/panel/timer.qc>
+#include <client/hud/panel/vote.qc>
+#include <client/hud/panel/weapons.qc>
diff --git a/qcsrc/client/hud/panel/_mod.qh b/qcsrc/client/hud/panel/_mod.qh
new file mode 100644
index 000000000..930a3fe02
--- /dev/null
+++ b/qcsrc/client/hud/panel/_mod.qh
@@ -0,0 +1,20 @@
+// generated file; do not modify
+#include <client/hud/panel/ammo.qh>
+#include <client/hud/panel/centerprint.qh>
+#include <client/hud/panel/chat.qh>
+#include <client/hud/panel/engineinfo.qh>
+#include <client/hud/panel/healtharmor.qh>
+#include <client/hud/panel/infomessages.qh>
+#include <client/hud/panel/minigame.qh>
+#include <client/hud/panel/modicons.qh>
+#include <client/hud/panel/notify.qh>
+#include <client/hud/panel/physics.qh>
+#include <client/hud/panel/powerups.qh>
+#include <client/hud/panel/pressedkeys.qh>
+#include <client/hud/panel/quickmenu.qh>
+#include <client/hud/panel/racetimer.qh>
+#include <client/hud/panel/radar.qh>
+#include <client/hud/panel/score.qh>
+#include <client/hud/panel/timer.qh>
+#include <client/hud/panel/vote.qh>
+#include <client/hud/panel/weapons.qh>
diff --git a/qcsrc/client/mutators/_mod.qh b/qcsrc/client/mutators/_mod.qh
new file mode 100644
index 000000000..98fb4815c
--- /dev/null
+++ b/qcsrc/client/mutators/_mod.qh
@@ -0,0 +1 @@
+// generated file; do not modify
diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc
index 8817a2c71..a736d3262 100644
--- a/qcsrc/client/progs.inc
+++ b/qcsrc/client/progs.inc
@@ -1,7 +1,7 @@
 #include <lib/_all.inc>
 #include "_all.qh"
 
-#include "_mod.inc"
+#include "../client/_mod.inc"
 #include "commands/_mod.inc"
 #include "hud/_mod.inc"
 #include "mutators/_mod.inc"
diff --git a/qcsrc/client/weapons/_mod.inc b/qcsrc/client/weapons/_mod.inc
index 005158a27..5fb71ce1e 100644
--- a/qcsrc/client/weapons/_mod.inc
+++ b/qcsrc/client/weapons/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "projectile.qc"
+#include <client/weapons/projectile.qc>
diff --git a/qcsrc/client/weapons/_mod.qh b/qcsrc/client/weapons/_mod.qh
new file mode 100644
index 000000000..f72a914c6
--- /dev/null
+++ b/qcsrc/client/weapons/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <client/weapons/projectile.qh>
diff --git a/qcsrc/common/_mod.inc b/qcsrc/common/_mod.inc
index 0503213ce..90edfa618 100644
--- a/qcsrc/common/_mod.inc
+++ b/qcsrc/common/_mod.inc
@@ -1,13 +1,13 @@
 // generated file; do not modify
-#include "anim.qc"
-#include "animdecide.qc"
-#include "campaign_file.qc"
-#include "campaign_setup.qc"
-#include "ent_cs.qc"
-#include "mapinfo.qc"
-#include "net_notice.qc"
-#include "playerstats.qc"
-#include "state.qc"
-#include "t_items.qc"
-#include "util.qc"
-#include "viewloc.qc"
+#include <common/anim.qc>
+#include <common/animdecide.qc>
+#include <common/campaign_file.qc>
+#include <common/campaign_setup.qc>
+#include <common/ent_cs.qc>
+#include <common/mapinfo.qc>
+#include <common/net_notice.qc>
+#include <common/playerstats.qc>
+#include <common/state.qc>
+#include <common/t_items.qc>
+#include <common/util.qc>
+#include <common/viewloc.qc>
diff --git a/qcsrc/common/_mod.qh b/qcsrc/common/_mod.qh
new file mode 100644
index 000000000..e32b270e0
--- /dev/null
+++ b/qcsrc/common/_mod.qh
@@ -0,0 +1,13 @@
+// generated file; do not modify
+#include <common/anim.qh>
+#include <common/animdecide.qh>
+#include <common/campaign_file.qh>
+#include <common/campaign_setup.qh>
+#include <common/ent_cs.qh>
+#include <common/mapinfo.qh>
+#include <common/net_notice.qh>
+#include <common/playerstats.qh>
+#include <common/state.qh>
+#include <common/t_items.qh>
+#include <common/util.qh>
+#include <common/viewloc.qh>
diff --git a/qcsrc/common/command/_mod.inc b/qcsrc/common/command/_mod.inc
index 57ff3f778..d2d24f03d 100644
--- a/qcsrc/common/command/_mod.inc
+++ b/qcsrc/common/command/_mod.inc
@@ -1,5 +1,5 @@
 // generated file; do not modify
-#include "all.qc"
-#include "generic.qc"
-#include "markup.qc"
-#include "rpn.qc"
+#include <common/command/all.qc>
+#include <common/command/generic.qc>
+#include <common/command/markup.qc>
+#include <common/command/rpn.qc>
diff --git a/qcsrc/common/command/_mod.qh b/qcsrc/common/command/_mod.qh
new file mode 100644
index 000000000..440bdcb13
--- /dev/null
+++ b/qcsrc/common/command/_mod.qh
@@ -0,0 +1,5 @@
+// generated file; do not modify
+#include <common/command/all.qh>
+#include <common/command/generic.qh>
+#include <common/command/markup.qh>
+#include <common/command/rpn.qh>
diff --git a/qcsrc/common/deathtypes/_mod.inc b/qcsrc/common/deathtypes/_mod.inc
index 254d13d7e..71f1dcb0f 100644
--- a/qcsrc/common/deathtypes/_mod.inc
+++ b/qcsrc/common/deathtypes/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "all.qc"
+#include <common/deathtypes/all.qc>
diff --git a/qcsrc/common/deathtypes/_mod.qh b/qcsrc/common/deathtypes/_mod.qh
new file mode 100644
index 000000000..cca282a1e
--- /dev/null
+++ b/qcsrc/common/deathtypes/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/deathtypes/all.qh>
diff --git a/qcsrc/common/effects/_mod.inc b/qcsrc/common/effects/_mod.inc
index 25e906275..6975259c1 100644
--- a/qcsrc/common/effects/_mod.inc
+++ b/qcsrc/common/effects/_mod.inc
@@ -1,3 +1,3 @@
 // generated file; do not modify
-#include "all.qc"
-#include "effectinfo.qc"
+#include <common/effects/all.qc>
+#include <common/effects/effectinfo.qc>
diff --git a/qcsrc/common/effects/_mod.qh b/qcsrc/common/effects/_mod.qh
new file mode 100644
index 000000000..3f5ed8219
--- /dev/null
+++ b/qcsrc/common/effects/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <common/effects/all.qh>
+#include <common/effects/effectinfo.qh>
diff --git a/qcsrc/common/effects/qc/_mod.inc b/qcsrc/common/effects/qc/_mod.inc
index fc5a14fa0..befcce83d 100644
--- a/qcsrc/common/effects/qc/_mod.inc
+++ b/qcsrc/common/effects/qc/_mod.inc
@@ -1,8 +1,8 @@
 // generated file; do not modify
-#include "all.qc"
-#include "casings.qc"
-#include "damageeffects.qc"
-#include "gibs.qc"
-#include "globalsound.qc"
-#include "lightningarc.qc"
-#include "modeleffects.qc"
+#include <common/effects/qc/all.qc>
+#include <common/effects/qc/casings.qc>
+#include <common/effects/qc/damageeffects.qc>
+#include <common/effects/qc/gibs.qc>
+#include <common/effects/qc/globalsound.qc>
+#include <common/effects/qc/lightningarc.qc>
+#include <common/effects/qc/modeleffects.qc>
diff --git a/qcsrc/common/effects/qc/_mod.qh b/qcsrc/common/effects/qc/_mod.qh
new file mode 100644
index 000000000..91298f312
--- /dev/null
+++ b/qcsrc/common/effects/qc/_mod.qh
@@ -0,0 +1,8 @@
+// generated file; do not modify
+#include <common/effects/qc/all.qh>
+#include <common/effects/qc/casings.qh>
+#include <common/effects/qc/damageeffects.qh>
+#include <common/effects/qc/gibs.qh>
+#include <common/effects/qc/globalsound.qh>
+#include <common/effects/qc/lightningarc.qh>
+#include <common/effects/qc/modeleffects.qh>
diff --git a/qcsrc/common/gamemodes/_mod.inc b/qcsrc/common/gamemodes/_mod.inc
index 254d13d7e..0b779498b 100644
--- a/qcsrc/common/gamemodes/_mod.inc
+++ b/qcsrc/common/gamemodes/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "all.qc"
+#include <common/gamemodes/all.qc>
diff --git a/qcsrc/common/gamemodes/_mod.qh b/qcsrc/common/gamemodes/_mod.qh
new file mode 100644
index 000000000..a7b7a54af
--- /dev/null
+++ b/qcsrc/common/gamemodes/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/gamemodes/all.qh>
diff --git a/qcsrc/common/gamemodes/gamemode/_mod.qh b/qcsrc/common/gamemodes/gamemode/_mod.qh
new file mode 100644
index 000000000..98fb4815c
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/_mod.qh
@@ -0,0 +1 @@
+// generated file; do not modify
diff --git a/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc b/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc
index 3e72142ab..f48ef7450 100644
--- a/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc
@@ -1,3 +1,3 @@
 // generated file; do not modify
-#include "nexball.qc"
-#include "weapon.qc"
+#include <common/gamemodes/gamemode/nexball/nexball.qc>
+#include <common/gamemodes/gamemode/nexball/weapon.qc>
diff --git a/qcsrc/common/gamemodes/gamemode/nexball/_mod.qh b/qcsrc/common/gamemodes/gamemode/nexball/_mod.qh
new file mode 100644
index 000000000..4ac2347c5
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/nexball/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <common/gamemodes/gamemode/nexball/nexball.qh>
+#include <common/gamemodes/gamemode/nexball/weapon.qh>
diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/_mod.inc b/qcsrc/common/gamemodes/gamemode/onslaught/_mod.inc
index d1aac78ed..334eb561e 100644
--- a/qcsrc/common/gamemodes/gamemode/onslaught/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/_mod.inc
@@ -1,6 +1,6 @@
 // generated file; do not modify
-#include "cl_controlpoint.qc"
-#include "cl_generator.qc"
-#include "onslaught.qc"
-#include "sv_controlpoint.qc"
-#include "sv_generator.qc"
+#include <common/gamemodes/gamemode/onslaught/cl_controlpoint.qc>
+#include <common/gamemodes/gamemode/onslaught/cl_generator.qc>
+#include <common/gamemodes/gamemode/onslaught/onslaught.qc>
+#include <common/gamemodes/gamemode/onslaught/sv_controlpoint.qc>
+#include <common/gamemodes/gamemode/onslaught/sv_generator.qc>
diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/_mod.qh b/qcsrc/common/gamemodes/gamemode/onslaught/_mod.qh
new file mode 100644
index 000000000..e89549558
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/_mod.qh
@@ -0,0 +1,6 @@
+// generated file; do not modify
+#include <common/gamemodes/gamemode/onslaught/cl_controlpoint.qh>
+#include <common/gamemodes/gamemode/onslaught/cl_generator.qh>
+#include <common/gamemodes/gamemode/onslaught/onslaught.qh>
+#include <common/gamemodes/gamemode/onslaught/sv_controlpoint.qh>
+#include <common/gamemodes/gamemode/onslaught/sv_generator.qh>
diff --git a/qcsrc/common/impulses/_mod.inc b/qcsrc/common/impulses/_mod.inc
index 254d13d7e..330c0374e 100644
--- a/qcsrc/common/impulses/_mod.inc
+++ b/qcsrc/common/impulses/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "all.qc"
+#include <common/impulses/all.qc>
diff --git a/qcsrc/common/impulses/_mod.qh b/qcsrc/common/impulses/_mod.qh
new file mode 100644
index 000000000..9f8a7b336
--- /dev/null
+++ b/qcsrc/common/impulses/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/impulses/all.qh>
diff --git a/qcsrc/common/items/_mod.inc b/qcsrc/common/items/_mod.inc
index 254d13d7e..3b5dd9550 100644
--- a/qcsrc/common/items/_mod.inc
+++ b/qcsrc/common/items/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "all.qc"
+#include <common/items/all.qc>
diff --git a/qcsrc/common/items/_mod.qh b/qcsrc/common/items/_mod.qh
new file mode 100644
index 000000000..158814c55
--- /dev/null
+++ b/qcsrc/common/items/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/items/all.qh>
diff --git a/qcsrc/common/items/item/_mod.inc b/qcsrc/common/items/item/_mod.inc
index 453cead66..254011643 100644
--- a/qcsrc/common/items/item/_mod.inc
+++ b/qcsrc/common/items/item/_mod.inc
@@ -1,7 +1,7 @@
 // generated file; do not modify
-#include "ammo.qc"
-#include "armor.qc"
-#include "health.qc"
-#include "jetpack.qc"
-#include "pickup.qc"
-#include "powerup.qc"
+#include <common/items/item/ammo.qc>
+#include <common/items/item/armor.qc>
+#include <common/items/item/health.qc>
+#include <common/items/item/jetpack.qc>
+#include <common/items/item/pickup.qc>
+#include <common/items/item/powerup.qc>
diff --git a/qcsrc/common/items/item/_mod.qh b/qcsrc/common/items/item/_mod.qh
new file mode 100644
index 000000000..4539e0f35
--- /dev/null
+++ b/qcsrc/common/items/item/_mod.qh
@@ -0,0 +1,7 @@
+// generated file; do not modify
+#include <common/items/item/ammo.qh>
+#include <common/items/item/armor.qh>
+#include <common/items/item/health.qh>
+#include <common/items/item/jetpack.qh>
+#include <common/items/item/pickup.qh>
+#include <common/items/item/powerup.qh>
diff --git a/qcsrc/common/minigames/_mod.inc b/qcsrc/common/minigames/_mod.inc
index 47690d32b..43ad69de5 100644
--- a/qcsrc/common/minigames/_mod.inc
+++ b/qcsrc/common/minigames/_mod.inc
@@ -1,5 +1,9 @@
 // generated file; do not modify
-#include "cl_minigames.qc"
-#include "cl_minigames_hud.qc"
-#include "minigames.qc"
-#include "sv_minigames.qc"
+#include <common/minigames/cl_minigames_hud.qc>
+#include <common/minigames/minigames.qc>
+#ifdef CSQC
+    #include <common/minigames/cl_minigames.qc>
+#endif
+#ifdef SVQC
+    #include <common/minigames/sv_minigames.qc>
+#endif
diff --git a/qcsrc/common/minigames/_mod.qh b/qcsrc/common/minigames/_mod.qh
new file mode 100644
index 000000000..36f5de2f1
--- /dev/null
+++ b/qcsrc/common/minigames/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <common/minigames/cl_minigames_hud.qh>
+#include <common/minigames/minigames.qh>
diff --git a/qcsrc/common/minigames/minigame/_mod.inc b/qcsrc/common/minigames/minigame/_mod.inc
index f53fc0b65..0ccb46c9f 100644
--- a/qcsrc/common/minigames/minigame/_mod.inc
+++ b/qcsrc/common/minigames/minigame/_mod.inc
@@ -1,9 +1,9 @@
 // generated file; do not modify
-#include "bd.qc"
-#include "c4.qc"
-#include "nmm.qc"
-#include "pong.qc"
-#include "pp.qc"
-#include "ps.qc"
-#include "snake.qc"
-#include "ttt.qc"
+#include <common/minigames/minigame/bd.qc>
+#include <common/minigames/minigame/c4.qc>
+#include <common/minigames/minigame/nmm.qc>
+#include <common/minigames/minigame/pong.qc>
+#include <common/minigames/minigame/pp.qc>
+#include <common/minigames/minigame/ps.qc>
+#include <common/minigames/minigame/snake.qc>
+#include <common/minigames/minigame/ttt.qc>
diff --git a/qcsrc/common/minigames/minigame/_mod.qh b/qcsrc/common/minigames/minigame/_mod.qh
new file mode 100644
index 000000000..5098420f0
--- /dev/null
+++ b/qcsrc/common/minigames/minigame/_mod.qh
@@ -0,0 +1,9 @@
+// generated file; do not modify
+#include <common/minigames/minigame/bd.qh>
+#include <common/minigames/minigame/c4.qh>
+#include <common/minigames/minigame/nmm.qh>
+#include <common/minigames/minigame/pong.qh>
+#include <common/minigames/minigame/pp.qh>
+#include <common/minigames/minigame/ps.qh>
+#include <common/minigames/minigame/snake.qh>
+#include <common/minigames/minigame/ttt.qh>
diff --git a/qcsrc/common/models/_mod.qh b/qcsrc/common/models/_mod.qh
new file mode 100644
index 000000000..98fb4815c
--- /dev/null
+++ b/qcsrc/common/models/_mod.qh
@@ -0,0 +1 @@
+// generated file; do not modify
diff --git a/qcsrc/common/monsters/_mod.inc b/qcsrc/common/monsters/_mod.inc
index 8dff76f69..f9d80b3f4 100644
--- a/qcsrc/common/monsters/_mod.inc
+++ b/qcsrc/common/monsters/_mod.inc
@@ -1,4 +1,4 @@
 // generated file; do not modify
-#include "all.qc"
-#include "spawn.qc"
-#include "sv_monsters.qc"
+#include <common/monsters/all.qc>
+#include <common/monsters/spawn.qc>
+#include <common/monsters/sv_monsters.qc>
diff --git a/qcsrc/common/monsters/_mod.qh b/qcsrc/common/monsters/_mod.qh
new file mode 100644
index 000000000..48427f94f
--- /dev/null
+++ b/qcsrc/common/monsters/_mod.qh
@@ -0,0 +1,4 @@
+// generated file; do not modify
+#include <common/monsters/all.qh>
+#include <common/monsters/spawn.qh>
+#include <common/monsters/sv_monsters.qh>
diff --git a/qcsrc/common/monsters/monster/_mod.inc b/qcsrc/common/monsters/monster/_mod.inc
index 6b8a307db..23e649ab8 100644
--- a/qcsrc/common/monsters/monster/_mod.inc
+++ b/qcsrc/common/monsters/monster/_mod.inc
@@ -1,6 +1,6 @@
 // generated file; do not modify
-#include "mage.qc"
-#include "shambler.qc"
-#include "spider.qc"
-#include "wyvern.qc"
-#include "zombie.qc"
+#include <common/monsters/monster/mage.qc>
+#include <common/monsters/monster/shambler.qc>
+#include <common/monsters/monster/spider.qc>
+#include <common/monsters/monster/wyvern.qc>
+#include <common/monsters/monster/zombie.qc>
diff --git a/qcsrc/common/monsters/monster/_mod.qh b/qcsrc/common/monsters/monster/_mod.qh
new file mode 100644
index 000000000..a1c048d0f
--- /dev/null
+++ b/qcsrc/common/monsters/monster/_mod.qh
@@ -0,0 +1,6 @@
+// generated file; do not modify
+#include <common/monsters/monster/mage.qh>
+#include <common/monsters/monster/shambler.qh>
+#include <common/monsters/monster/spider.qh>
+#include <common/monsters/monster/wyvern.qh>
+#include <common/monsters/monster/zombie.qh>
diff --git a/qcsrc/common/mutators/_mod.inc b/qcsrc/common/mutators/_mod.inc
index 254d13d7e..8220b2d19 100644
--- a/qcsrc/common/mutators/_mod.inc
+++ b/qcsrc/common/mutators/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "all.qc"
+#include <common/mutators/all.qc>
diff --git a/qcsrc/common/mutators/_mod.qh b/qcsrc/common/mutators/_mod.qh
new file mode 100644
index 000000000..5d6ac5628
--- /dev/null
+++ b/qcsrc/common/mutators/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/all.qh>
diff --git a/qcsrc/common/mutators/mutator/_mod.inc b/qcsrc/common/mutators/mutator/_mod.inc
index 14e0e3d65..30d67e34b 100644
--- a/qcsrc/common/mutators/mutator/_mod.inc
+++ b/qcsrc/common/mutators/mutator/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "itemstime.qc"
+#include <common/mutators/mutator/itemstime.qc>
diff --git a/qcsrc/common/mutators/mutator/_mod.qh b/qcsrc/common/mutators/mutator/_mod.qh
new file mode 100644
index 000000000..ac056ac68
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/itemstime.qh>
diff --git a/qcsrc/common/mutators/mutator/bloodloss/_mod.inc b/qcsrc/common/mutators/mutator/bloodloss/_mod.inc
index 791cd0337..16e6308ac 100644
--- a/qcsrc/common/mutators/mutator/bloodloss/_mod.inc
+++ b/qcsrc/common/mutators/mutator/bloodloss/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "bloodloss.qc"
+#include <common/mutators/mutator/bloodloss/bloodloss.qc>
diff --git a/qcsrc/common/mutators/mutator/bloodloss/_mod.qh b/qcsrc/common/mutators/mutator/bloodloss/_mod.qh
new file mode 100644
index 000000000..b1d45e279
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/bloodloss/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/bloodloss/bloodloss.qh>
diff --git a/qcsrc/common/mutators/mutator/breakablehook/_mod.inc b/qcsrc/common/mutators/mutator/breakablehook/_mod.inc
index ff8da6266..bdbbae46c 100644
--- a/qcsrc/common/mutators/mutator/breakablehook/_mod.inc
+++ b/qcsrc/common/mutators/mutator/breakablehook/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "breakablehook.qc"
+#include <common/mutators/mutator/breakablehook/breakablehook.qc>
diff --git a/qcsrc/common/mutators/mutator/breakablehook/_mod.qh b/qcsrc/common/mutators/mutator/breakablehook/_mod.qh
new file mode 100644
index 000000000..8a41908af
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/breakablehook/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/breakablehook/breakablehook.qh>
diff --git a/qcsrc/common/mutators/mutator/buffs/_mod.inc b/qcsrc/common/mutators/mutator/buffs/_mod.inc
index df0201d1f..c06263a92 100644
--- a/qcsrc/common/mutators/mutator/buffs/_mod.inc
+++ b/qcsrc/common/mutators/mutator/buffs/_mod.inc
@@ -1,3 +1,3 @@
 // generated file; do not modify
-#include "all.qc"
-#include "buffs.qc"
+#include <common/mutators/mutator/buffs/all.qc>
+#include <common/mutators/mutator/buffs/buffs.qc>
diff --git a/qcsrc/common/mutators/mutator/buffs/_mod.qh b/qcsrc/common/mutators/mutator/buffs/_mod.qh
new file mode 100644
index 000000000..2133c7250
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/buffs/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <common/mutators/mutator/buffs/all.qh>
+#include <common/mutators/mutator/buffs/buffs.qh>
diff --git a/qcsrc/common/mutators/mutator/bugrigs/_mod.inc b/qcsrc/common/mutators/mutator/bugrigs/_mod.inc
index cd18f3318..f898b93f8 100644
--- a/qcsrc/common/mutators/mutator/bugrigs/_mod.inc
+++ b/qcsrc/common/mutators/mutator/bugrigs/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "bugrigs.qc"
+#include <common/mutators/mutator/bugrigs/bugrigs.qc>
diff --git a/qcsrc/common/mutators/mutator/bugrigs/_mod.qh b/qcsrc/common/mutators/mutator/bugrigs/_mod.qh
new file mode 100644
index 000000000..dd8bcbdc7
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/bugrigs/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/bugrigs/bugrigs.qh>
diff --git a/qcsrc/common/mutators/mutator/campcheck/_mod.inc b/qcsrc/common/mutators/mutator/campcheck/_mod.inc
index 2f61e4597..3ddb376fc 100644
--- a/qcsrc/common/mutators/mutator/campcheck/_mod.inc
+++ b/qcsrc/common/mutators/mutator/campcheck/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "campcheck.qc"
+#include <common/mutators/mutator/campcheck/campcheck.qc>
diff --git a/qcsrc/common/mutators/mutator/campcheck/_mod.qh b/qcsrc/common/mutators/mutator/campcheck/_mod.qh
new file mode 100644
index 000000000..81345f1cf
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/campcheck/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/campcheck/campcheck.qh>
diff --git a/qcsrc/common/mutators/mutator/cloaked/_mod.inc b/qcsrc/common/mutators/mutator/cloaked/_mod.inc
index 4423f2bdb..721369522 100644
--- a/qcsrc/common/mutators/mutator/cloaked/_mod.inc
+++ b/qcsrc/common/mutators/mutator/cloaked/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "cloaked.qc"
+#include <common/mutators/mutator/cloaked/cloaked.qc>
diff --git a/qcsrc/common/mutators/mutator/cloaked/_mod.qh b/qcsrc/common/mutators/mutator/cloaked/_mod.qh
new file mode 100644
index 000000000..5606b9aaf
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/cloaked/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/cloaked/cloaked.qh>
diff --git a/qcsrc/common/mutators/mutator/damagetext/_mod.inc b/qcsrc/common/mutators/mutator/damagetext/_mod.inc
index ff5376725..b5dfbc32a 100644
--- a/qcsrc/common/mutators/mutator/damagetext/_mod.inc
+++ b/qcsrc/common/mutators/mutator/damagetext/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "damagetext.qc"
+#include <common/mutators/mutator/damagetext/damagetext.qc>
diff --git a/qcsrc/common/mutators/mutator/damagetext/_mod.qh b/qcsrc/common/mutators/mutator/damagetext/_mod.qh
new file mode 100644
index 000000000..2775109a2
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/damagetext/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/damagetext/damagetext.qh>
diff --git a/qcsrc/common/mutators/mutator/dodging/_mod.inc b/qcsrc/common/mutators/mutator/dodging/_mod.inc
index 92244a517..4902d5fc1 100644
--- a/qcsrc/common/mutators/mutator/dodging/_mod.inc
+++ b/qcsrc/common/mutators/mutator/dodging/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "dodging.qc"
+#include <common/mutators/mutator/dodging/dodging.qc>
diff --git a/qcsrc/common/mutators/mutator/dodging/_mod.qh b/qcsrc/common/mutators/mutator/dodging/_mod.qh
new file mode 100644
index 000000000..b2b65f02f
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/dodging/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/dodging/dodging.qh>
diff --git a/qcsrc/common/mutators/mutator/doublejump/_mod.inc b/qcsrc/common/mutators/mutator/doublejump/_mod.inc
index 8c1f53154..8f4813807 100644
--- a/qcsrc/common/mutators/mutator/doublejump/_mod.inc
+++ b/qcsrc/common/mutators/mutator/doublejump/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "doublejump.qc"
+#include <common/mutators/mutator/doublejump/doublejump.qc>
diff --git a/qcsrc/common/mutators/mutator/doublejump/_mod.qh b/qcsrc/common/mutators/mutator/doublejump/_mod.qh
new file mode 100644
index 000000000..e55b1435b
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/doublejump/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/doublejump/doublejump.qh>
diff --git a/qcsrc/common/mutators/mutator/hook/_mod.inc b/qcsrc/common/mutators/mutator/hook/_mod.inc
index 9eff27e68..ec6da662e 100644
--- a/qcsrc/common/mutators/mutator/hook/_mod.inc
+++ b/qcsrc/common/mutators/mutator/hook/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "hook.qc"
+#include <common/mutators/mutator/hook/hook.qc>
diff --git a/qcsrc/common/mutators/mutator/hook/_mod.qh b/qcsrc/common/mutators/mutator/hook/_mod.qh
new file mode 100644
index 000000000..50c0c1372
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/hook/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/hook/hook.qh>
diff --git a/qcsrc/common/mutators/mutator/instagib/_mod.inc b/qcsrc/common/mutators/mutator/instagib/_mod.inc
index e5e439369..dad005fe4 100644
--- a/qcsrc/common/mutators/mutator/instagib/_mod.inc
+++ b/qcsrc/common/mutators/mutator/instagib/_mod.inc
@@ -1,3 +1,3 @@
 // generated file; do not modify
-#include "instagib.qc"
-#include "items.qc"
+#include <common/mutators/mutator/instagib/instagib.qc>
+#include <common/mutators/mutator/instagib/items.qc>
diff --git a/qcsrc/common/mutators/mutator/instagib/_mod.qh b/qcsrc/common/mutators/mutator/instagib/_mod.qh
new file mode 100644
index 000000000..2e88f427e
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/instagib/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <common/mutators/mutator/instagib/instagib.qh>
+#include <common/mutators/mutator/instagib/items.qh>
diff --git a/qcsrc/common/mutators/mutator/invincibleproj/_mod.inc b/qcsrc/common/mutators/mutator/invincibleproj/_mod.inc
index 2783d099a..68d313e95 100644
--- a/qcsrc/common/mutators/mutator/invincibleproj/_mod.inc
+++ b/qcsrc/common/mutators/mutator/invincibleproj/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "invincibleproj.qc"
+#include <common/mutators/mutator/invincibleproj/invincibleproj.qc>
diff --git a/qcsrc/common/mutators/mutator/invincibleproj/_mod.qh b/qcsrc/common/mutators/mutator/invincibleproj/_mod.qh
new file mode 100644
index 000000000..dc3f32f10
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/invincibleproj/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/invincibleproj/invincibleproj.qh>
diff --git a/qcsrc/common/mutators/mutator/melee_only/_mod.inc b/qcsrc/common/mutators/mutator/melee_only/_mod.inc
index d2132e680..db31be3fd 100644
--- a/qcsrc/common/mutators/mutator/melee_only/_mod.inc
+++ b/qcsrc/common/mutators/mutator/melee_only/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "melee_only.qc"
+#include <common/mutators/mutator/melee_only/melee_only.qc>
diff --git a/qcsrc/common/mutators/mutator/melee_only/_mod.qh b/qcsrc/common/mutators/mutator/melee_only/_mod.qh
new file mode 100644
index 000000000..2228d64f1
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/melee_only/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/melee_only/melee_only.qh>
diff --git a/qcsrc/common/mutators/mutator/midair/_mod.inc b/qcsrc/common/mutators/mutator/midair/_mod.inc
index aae84aafc..8fcc96ea2 100644
--- a/qcsrc/common/mutators/mutator/midair/_mod.inc
+++ b/qcsrc/common/mutators/mutator/midair/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "midair.qc"
+#include <common/mutators/mutator/midair/midair.qc>
diff --git a/qcsrc/common/mutators/mutator/midair/_mod.qh b/qcsrc/common/mutators/mutator/midair/_mod.qh
new file mode 100644
index 000000000..48272b870
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/midair/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/midair/midair.qh>
diff --git a/qcsrc/common/mutators/mutator/multijump/_mod.inc b/qcsrc/common/mutators/mutator/multijump/_mod.inc
index a58cf852b..eb3fab007 100644
--- a/qcsrc/common/mutators/mutator/multijump/_mod.inc
+++ b/qcsrc/common/mutators/mutator/multijump/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "multijump.qc"
+#include <common/mutators/mutator/multijump/multijump.qc>
diff --git a/qcsrc/common/mutators/mutator/multijump/_mod.qh b/qcsrc/common/mutators/mutator/multijump/_mod.qh
new file mode 100644
index 000000000..29df9afa3
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/multijump/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/multijump/multijump.qh>
diff --git a/qcsrc/common/mutators/mutator/nades/_mod.inc b/qcsrc/common/mutators/mutator/nades/_mod.inc
index 905554580..28739d2e1 100644
--- a/qcsrc/common/mutators/mutator/nades/_mod.inc
+++ b/qcsrc/common/mutators/mutator/nades/_mod.inc
@@ -1,3 +1,3 @@
 // generated file; do not modify
-#include "nades.qc"
-#include "net.qc"
+#include <common/mutators/mutator/nades/nades.qc>
+#include <common/mutators/mutator/nades/net.qc>
diff --git a/qcsrc/common/mutators/mutator/nades/_mod.qh b/qcsrc/common/mutators/mutator/nades/_mod.qh
new file mode 100644
index 000000000..0ca855a13
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/nades/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <common/mutators/mutator/nades/nades.qh>
+#include <common/mutators/mutator/nades/net.qh>
diff --git a/qcsrc/common/mutators/mutator/new_toys/_mod.inc b/qcsrc/common/mutators/mutator/new_toys/_mod.inc
index 97665f5c4..90e9811ea 100644
--- a/qcsrc/common/mutators/mutator/new_toys/_mod.inc
+++ b/qcsrc/common/mutators/mutator/new_toys/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "new_toys.qc"
+#include <common/mutators/mutator/new_toys/new_toys.qc>
diff --git a/qcsrc/common/mutators/mutator/new_toys/_mod.qh b/qcsrc/common/mutators/mutator/new_toys/_mod.qh
new file mode 100644
index 000000000..ec3b8105f
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/new_toys/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/new_toys/new_toys.qh>
diff --git a/qcsrc/common/mutators/mutator/nix/_mod.inc b/qcsrc/common/mutators/mutator/nix/_mod.inc
index b98eab4fd..a669175da 100644
--- a/qcsrc/common/mutators/mutator/nix/_mod.inc
+++ b/qcsrc/common/mutators/mutator/nix/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "nix.qc"
+#include <common/mutators/mutator/nix/nix.qc>
diff --git a/qcsrc/common/mutators/mutator/nix/_mod.qh b/qcsrc/common/mutators/mutator/nix/_mod.qh
new file mode 100644
index 000000000..6c012fe65
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/nix/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/nix/nix.qh>
diff --git a/qcsrc/common/mutators/mutator/overkill/_mod.inc b/qcsrc/common/mutators/mutator/overkill/_mod.inc
index 19c25a063..5b42a4dd1 100644
--- a/qcsrc/common/mutators/mutator/overkill/_mod.inc
+++ b/qcsrc/common/mutators/mutator/overkill/_mod.inc
@@ -1,4 +1,4 @@
 // generated file; do not modify
-#include "hmg.qc"
-#include "overkill.qc"
-#include "rpc.qc"
+#include <common/mutators/mutator/overkill/hmg.qc>
+#include <common/mutators/mutator/overkill/overkill.qc>
+#include <common/mutators/mutator/overkill/rpc.qc>
diff --git a/qcsrc/common/mutators/mutator/overkill/_mod.qh b/qcsrc/common/mutators/mutator/overkill/_mod.qh
new file mode 100644
index 000000000..7a4669444
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/overkill/_mod.qh
@@ -0,0 +1,4 @@
+// generated file; do not modify
+#include <common/mutators/mutator/overkill/hmg.qh>
+#include <common/mutators/mutator/overkill/overkill.qh>
+#include <common/mutators/mutator/overkill/rpc.qh>
diff --git a/qcsrc/common/mutators/mutator/physical_items/_mod.inc b/qcsrc/common/mutators/mutator/physical_items/_mod.inc
index 8174e8541..4d4ef59f8 100644
--- a/qcsrc/common/mutators/mutator/physical_items/_mod.inc
+++ b/qcsrc/common/mutators/mutator/physical_items/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "physical_items.qc"
+#include <common/mutators/mutator/physical_items/physical_items.qc>
diff --git a/qcsrc/common/mutators/mutator/physical_items/_mod.qh b/qcsrc/common/mutators/mutator/physical_items/_mod.qh
new file mode 100644
index 000000000..a347cec04
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/physical_items/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/physical_items/physical_items.qh>
diff --git a/qcsrc/common/mutators/mutator/pinata/_mod.inc b/qcsrc/common/mutators/mutator/pinata/_mod.inc
index a4017bd97..a0bd94d00 100644
--- a/qcsrc/common/mutators/mutator/pinata/_mod.inc
+++ b/qcsrc/common/mutators/mutator/pinata/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "pinata.qc"
+#include <common/mutators/mutator/pinata/pinata.qc>
diff --git a/qcsrc/common/mutators/mutator/pinata/_mod.qh b/qcsrc/common/mutators/mutator/pinata/_mod.qh
new file mode 100644
index 000000000..1602640e0
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/pinata/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/pinata/pinata.qh>
diff --git a/qcsrc/common/mutators/mutator/random_gravity/_mod.inc b/qcsrc/common/mutators/mutator/random_gravity/_mod.inc
index e07c8af79..feeaec8d6 100644
--- a/qcsrc/common/mutators/mutator/random_gravity/_mod.inc
+++ b/qcsrc/common/mutators/mutator/random_gravity/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "random_gravity.qc"
+#include <common/mutators/mutator/random_gravity/random_gravity.qc>
diff --git a/qcsrc/common/mutators/mutator/random_gravity/_mod.qh b/qcsrc/common/mutators/mutator/random_gravity/_mod.qh
new file mode 100644
index 000000000..99a11ed63
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/random_gravity/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/random_gravity/random_gravity.qh>
diff --git a/qcsrc/common/mutators/mutator/rocketflying/_mod.inc b/qcsrc/common/mutators/mutator/rocketflying/_mod.inc
index 92ef3cc0d..0841ae680 100644
--- a/qcsrc/common/mutators/mutator/rocketflying/_mod.inc
+++ b/qcsrc/common/mutators/mutator/rocketflying/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "rocketflying.qc"
+#include <common/mutators/mutator/rocketflying/rocketflying.qc>
diff --git a/qcsrc/common/mutators/mutator/rocketflying/_mod.qh b/qcsrc/common/mutators/mutator/rocketflying/_mod.qh
new file mode 100644
index 000000000..75ca141bf
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/rocketflying/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/rocketflying/rocketflying.qh>
diff --git a/qcsrc/common/mutators/mutator/rocketminsta/_mod.inc b/qcsrc/common/mutators/mutator/rocketminsta/_mod.inc
index e50a4ba8d..bc579ec51 100644
--- a/qcsrc/common/mutators/mutator/rocketminsta/_mod.inc
+++ b/qcsrc/common/mutators/mutator/rocketminsta/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "rocketminsta.qc"
+#include <common/mutators/mutator/rocketminsta/rocketminsta.qc>
diff --git a/qcsrc/common/mutators/mutator/rocketminsta/_mod.qh b/qcsrc/common/mutators/mutator/rocketminsta/_mod.qh
new file mode 100644
index 000000000..29a367d3c
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/rocketminsta/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/rocketminsta/rocketminsta.qh>
diff --git a/qcsrc/common/mutators/mutator/running_guns/_mod.inc b/qcsrc/common/mutators/mutator/running_guns/_mod.inc
index 2550d2d66..f88b36a53 100644
--- a/qcsrc/common/mutators/mutator/running_guns/_mod.inc
+++ b/qcsrc/common/mutators/mutator/running_guns/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "running_guns.qc"
+#include <common/mutators/mutator/running_guns/running_guns.qc>
diff --git a/qcsrc/common/mutators/mutator/running_guns/_mod.qh b/qcsrc/common/mutators/mutator/running_guns/_mod.qh
new file mode 100644
index 000000000..559be4c98
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/running_guns/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/running_guns/running_guns.qh>
diff --git a/qcsrc/common/mutators/mutator/sandbox/_mod.inc b/qcsrc/common/mutators/mutator/sandbox/_mod.inc
index c1e80d487..8e54c1f95 100644
--- a/qcsrc/common/mutators/mutator/sandbox/_mod.inc
+++ b/qcsrc/common/mutators/mutator/sandbox/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "sandbox.qc"
+#include <common/mutators/mutator/sandbox/sandbox.qc>
diff --git a/qcsrc/common/mutators/mutator/sandbox/_mod.qh b/qcsrc/common/mutators/mutator/sandbox/_mod.qh
new file mode 100644
index 000000000..81e250c7f
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/sandbox/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/sandbox/sandbox.qh>
diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.inc b/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.inc
index 612f5a0d0..b7d3af7f4 100644
--- a/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.inc
+++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "spawn_near_teammate.qc"
+#include <common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc>
diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.qh b/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.qh
new file mode 100644
index 000000000..5f53e95c8
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh>
diff --git a/qcsrc/common/mutators/mutator/superspec/_mod.inc b/qcsrc/common/mutators/mutator/superspec/_mod.inc
index bb63a1861..d5005242f 100644
--- a/qcsrc/common/mutators/mutator/superspec/_mod.inc
+++ b/qcsrc/common/mutators/mutator/superspec/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "superspec.qc"
+#include <common/mutators/mutator/superspec/superspec.qc>
diff --git a/qcsrc/common/mutators/mutator/superspec/_mod.qh b/qcsrc/common/mutators/mutator/superspec/_mod.qh
new file mode 100644
index 000000000..b544ffc61
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/superspec/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/superspec/superspec.qh>
diff --git a/qcsrc/common/mutators/mutator/touchexplode/_mod.inc b/qcsrc/common/mutators/mutator/touchexplode/_mod.inc
index 06bb8d30a..42dad3926 100644
--- a/qcsrc/common/mutators/mutator/touchexplode/_mod.inc
+++ b/qcsrc/common/mutators/mutator/touchexplode/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "touchexplode.qc"
+#include <common/mutators/mutator/touchexplode/touchexplode.qc>
diff --git a/qcsrc/common/mutators/mutator/touchexplode/_mod.qh b/qcsrc/common/mutators/mutator/touchexplode/_mod.qh
new file mode 100644
index 000000000..ec71f52d7
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/touchexplode/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/touchexplode/touchexplode.qh>
diff --git a/qcsrc/common/mutators/mutator/vampire/_mod.inc b/qcsrc/common/mutators/mutator/vampire/_mod.inc
index c0164ea8f..856ed84c4 100644
--- a/qcsrc/common/mutators/mutator/vampire/_mod.inc
+++ b/qcsrc/common/mutators/mutator/vampire/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "vampire.qc"
+#include <common/mutators/mutator/vampire/vampire.qc>
diff --git a/qcsrc/common/mutators/mutator/vampire/_mod.qh b/qcsrc/common/mutators/mutator/vampire/_mod.qh
new file mode 100644
index 000000000..551184c77
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/vampire/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/vampire/vampire.qh>
diff --git a/qcsrc/common/mutators/mutator/vampirehook/_mod.inc b/qcsrc/common/mutators/mutator/vampirehook/_mod.inc
index 4f2e935c0..868a4ef3f 100644
--- a/qcsrc/common/mutators/mutator/vampirehook/_mod.inc
+++ b/qcsrc/common/mutators/mutator/vampirehook/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "vampirehook.qc"
+#include <common/mutators/mutator/vampirehook/vampirehook.qc>
diff --git a/qcsrc/common/mutators/mutator/vampirehook/_mod.qh b/qcsrc/common/mutators/mutator/vampirehook/_mod.qh
new file mode 100644
index 000000000..5d57816c9
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/vampirehook/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/vampirehook/vampirehook.qh>
diff --git a/qcsrc/common/mutators/mutator/waypoints/_mod.inc b/qcsrc/common/mutators/mutator/waypoints/_mod.inc
index a5ebe76e3..7547fb577 100644
--- a/qcsrc/common/mutators/mutator/waypoints/_mod.inc
+++ b/qcsrc/common/mutators/mutator/waypoints/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "waypointsprites.qc"
+#include <common/mutators/mutator/waypoints/waypointsprites.qc>
diff --git a/qcsrc/common/mutators/mutator/waypoints/_mod.qh b/qcsrc/common/mutators/mutator/waypoints/_mod.qh
new file mode 100644
index 000000000..4036f101e
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/waypoints/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/waypoints/waypointsprites.qh>
diff --git a/qcsrc/common/mutators/mutator/weaponarena_random/_mod.inc b/qcsrc/common/mutators/mutator/weaponarena_random/_mod.inc
index c110d3fed..742510b88 100644
--- a/qcsrc/common/mutators/mutator/weaponarena_random/_mod.inc
+++ b/qcsrc/common/mutators/mutator/weaponarena_random/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "weaponarena_random.qc"
+#include <common/mutators/mutator/weaponarena_random/weaponarena_random.qc>
diff --git a/qcsrc/common/mutators/mutator/weaponarena_random/_mod.qh b/qcsrc/common/mutators/mutator/weaponarena_random/_mod.qh
new file mode 100644
index 000000000..68d6a24c4
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/weaponarena_random/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/mutators/mutator/weaponarena_random/weaponarena_random.qh>
diff --git a/qcsrc/common/notifications/_mod.inc b/qcsrc/common/notifications/_mod.inc
index 254d13d7e..33566850f 100644
--- a/qcsrc/common/notifications/_mod.inc
+++ b/qcsrc/common/notifications/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "all.qc"
+#include <common/notifications/all.qc>
diff --git a/qcsrc/common/notifications/_mod.qh b/qcsrc/common/notifications/_mod.qh
new file mode 100644
index 000000000..726be67a4
--- /dev/null
+++ b/qcsrc/common/notifications/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/notifications/all.qh>
diff --git a/qcsrc/common/physics/_mod.inc b/qcsrc/common/physics/_mod.inc
index fb423ecf5..3a61cd4e9 100644
--- a/qcsrc/common/physics/_mod.inc
+++ b/qcsrc/common/physics/_mod.inc
@@ -1,3 +1,3 @@
 // generated file; do not modify
-#include "movelib.qc"
-#include "player.qc"
+#include <common/physics/movelib.qc>
+#include <common/physics/player.qc>
diff --git a/qcsrc/common/physics/_mod.qh b/qcsrc/common/physics/_mod.qh
new file mode 100644
index 000000000..39dacad8e
--- /dev/null
+++ b/qcsrc/common/physics/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <common/physics/movelib.qh>
+#include <common/physics/player.qh>
diff --git a/qcsrc/common/physics/movetypes/_mod.inc b/qcsrc/common/physics/movetypes/_mod.inc
index 674b82964..4effcbd04 100644
--- a/qcsrc/common/physics/movetypes/_mod.inc
+++ b/qcsrc/common/physics/movetypes/_mod.inc
@@ -1,7 +1,7 @@
 // generated file; do not modify
-#include "follow.qc"
-#include "movetypes.qc"
-#include "push.qc"
-#include "step.qc"
-#include "toss.qc"
-#include "walk.qc"
+#include <common/physics/movetypes/follow.qc>
+#include <common/physics/movetypes/movetypes.qc>
+#include <common/physics/movetypes/push.qc>
+#include <common/physics/movetypes/step.qc>
+#include <common/physics/movetypes/toss.qc>
+#include <common/physics/movetypes/walk.qc>
diff --git a/qcsrc/common/physics/movetypes/_mod.qh b/qcsrc/common/physics/movetypes/_mod.qh
new file mode 100644
index 000000000..32ae3813c
--- /dev/null
+++ b/qcsrc/common/physics/movetypes/_mod.qh
@@ -0,0 +1,7 @@
+// generated file; do not modify
+#include <common/physics/movetypes/follow.qh>
+#include <common/physics/movetypes/movetypes.qh>
+#include <common/physics/movetypes/push.qh>
+#include <common/physics/movetypes/step.qh>
+#include <common/physics/movetypes/toss.qh>
+#include <common/physics/movetypes/walk.qh>
diff --git a/qcsrc/common/sounds/_mod.inc b/qcsrc/common/sounds/_mod.inc
index 254d13d7e..787b6f190 100644
--- a/qcsrc/common/sounds/_mod.inc
+++ b/qcsrc/common/sounds/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "all.qc"
+#include <common/sounds/all.qc>
diff --git a/qcsrc/common/sounds/_mod.qh b/qcsrc/common/sounds/_mod.qh
new file mode 100644
index 000000000..99eea865c
--- /dev/null
+++ b/qcsrc/common/sounds/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <common/sounds/all.qh>
diff --git a/qcsrc/common/triggers/_mod.inc b/qcsrc/common/triggers/_mod.inc
index 8c5a22c2f..c049b1082 100644
--- a/qcsrc/common/triggers/_mod.inc
+++ b/qcsrc/common/triggers/_mod.inc
@@ -1,6 +1,6 @@
 // generated file; do not modify
-#include "include.qc"
-#include "platforms.qc"
-#include "subs.qc"
-#include "teleporters.qc"
-#include "triggers.qc"
+#include <common/triggers/include.qc>
+#include <common/triggers/platforms.qc>
+#include <common/triggers/subs.qc>
+#include <common/triggers/teleporters.qc>
+#include <common/triggers/triggers.qc>
diff --git a/qcsrc/common/triggers/_mod.qh b/qcsrc/common/triggers/_mod.qh
new file mode 100644
index 000000000..2fba60461
--- /dev/null
+++ b/qcsrc/common/triggers/_mod.qh
@@ -0,0 +1,6 @@
+// generated file; do not modify
+#include <common/triggers/include.qh>
+#include <common/triggers/platforms.qh>
+#include <common/triggers/subs.qh>
+#include <common/triggers/teleporters.qh>
+#include <common/triggers/triggers.qh>
diff --git a/qcsrc/common/triggers/func/_mod.inc b/qcsrc/common/triggers/func/_mod.inc
index 2497d8508..675e3689b 100644
--- a/qcsrc/common/triggers/func/_mod.inc
+++ b/qcsrc/common/triggers/func/_mod.inc
@@ -1,19 +1,19 @@
 // generated file; do not modify
-#include "bobbing.qc"
-#include "breakable.qc"
-#include "button.qc"
-#include "conveyor.qc"
-#include "door.qc"
-#include "door_rotating.qc"
-#include "door_secret.qc"
-#include "fourier.qc"
-#include "include.qc"
-#include "ladder.qc"
-#include "pendulum.qc"
-#include "plat.qc"
-#include "pointparticles.qc"
-#include "rainsnow.qc"
-#include "rotating.qc"
-#include "stardust.qc"
-#include "train.qc"
-#include "vectormamamam.qc"
+#include <common/triggers/func/bobbing.qc>
+#include <common/triggers/func/breakable.qc>
+#include <common/triggers/func/button.qc>
+#include <common/triggers/func/conveyor.qc>
+#include <common/triggers/func/door.qc>
+#include <common/triggers/func/door_rotating.qc>
+#include <common/triggers/func/door_secret.qc>
+#include <common/triggers/func/fourier.qc>
+#include <common/triggers/func/include.qc>
+#include <common/triggers/func/ladder.qc>
+#include <common/triggers/func/pendulum.qc>
+#include <common/triggers/func/plat.qc>
+#include <common/triggers/func/pointparticles.qc>
+#include <common/triggers/func/rainsnow.qc>
+#include <common/triggers/func/rotating.qc>
+#include <common/triggers/func/stardust.qc>
+#include <common/triggers/func/train.qc>
+#include <common/triggers/func/vectormamamam.qc>
diff --git a/qcsrc/common/triggers/func/_mod.qh b/qcsrc/common/triggers/func/_mod.qh
new file mode 100644
index 000000000..fb179a42c
--- /dev/null
+++ b/qcsrc/common/triggers/func/_mod.qh
@@ -0,0 +1,19 @@
+// generated file; do not modify
+#include <common/triggers/func/bobbing.qh>
+#include <common/triggers/func/breakable.qh>
+#include <common/triggers/func/button.qh>
+#include <common/triggers/func/conveyor.qh>
+#include <common/triggers/func/door.qh>
+#include <common/triggers/func/door_rotating.qh>
+#include <common/triggers/func/door_secret.qh>
+#include <common/triggers/func/fourier.qh>
+#include <common/triggers/func/include.qh>
+#include <common/triggers/func/ladder.qh>
+#include <common/triggers/func/pendulum.qh>
+#include <common/triggers/func/plat.qh>
+#include <common/triggers/func/pointparticles.qh>
+#include <common/triggers/func/rainsnow.qh>
+#include <common/triggers/func/rotating.qh>
+#include <common/triggers/func/stardust.qh>
+#include <common/triggers/func/train.qh>
+#include <common/triggers/func/vectormamamam.qh>
diff --git a/qcsrc/common/triggers/misc/_mod.inc b/qcsrc/common/triggers/misc/_mod.inc
index 5a6a06a93..4a8ec06ef 100644
--- a/qcsrc/common/triggers/misc/_mod.inc
+++ b/qcsrc/common/triggers/misc/_mod.inc
@@ -1,6 +1,6 @@
 // generated file; do not modify
-#include "corner.qc"
-#include "follow.qc"
-#include "include.qc"
-#include "laser.qc"
-#include "teleport_dest.qc"
+#include <common/triggers/misc/corner.qc>
+#include <common/triggers/misc/follow.qc>
+#include <common/triggers/misc/include.qc>
+#include <common/triggers/misc/laser.qc>
+#include <common/triggers/misc/teleport_dest.qc>
diff --git a/qcsrc/common/triggers/misc/_mod.qh b/qcsrc/common/triggers/misc/_mod.qh
new file mode 100644
index 000000000..98615ccb0
--- /dev/null
+++ b/qcsrc/common/triggers/misc/_mod.qh
@@ -0,0 +1,6 @@
+// generated file; do not modify
+#include <common/triggers/misc/corner.qh>
+#include <common/triggers/misc/follow.qh>
+#include <common/triggers/misc/include.qh>
+#include <common/triggers/misc/laser.qh>
+#include <common/triggers/misc/teleport_dest.qh>
diff --git a/qcsrc/common/triggers/target/_mod.inc b/qcsrc/common/triggers/target/_mod.inc
index fdfabf75b..195d5e534 100644
--- a/qcsrc/common/triggers/target/_mod.inc
+++ b/qcsrc/common/triggers/target/_mod.inc
@@ -1,8 +1,8 @@
 // generated file; do not modify
-#include "changelevel.qc"
-#include "include.qc"
-#include "location.qc"
-#include "music.qc"
-#include "spawn.qc"
-#include "speaker.qc"
-#include "voicescript.qc"
+#include <common/triggers/target/changelevel.qc>
+#include <common/triggers/target/include.qc>
+#include <common/triggers/target/location.qc>
+#include <common/triggers/target/music.qc>
+#include <common/triggers/target/spawn.qc>
+#include <common/triggers/target/speaker.qc>
+#include <common/triggers/target/voicescript.qc>
diff --git a/qcsrc/common/triggers/target/_mod.qh b/qcsrc/common/triggers/target/_mod.qh
new file mode 100644
index 000000000..a5462d497
--- /dev/null
+++ b/qcsrc/common/triggers/target/_mod.qh
@@ -0,0 +1,8 @@
+// generated file; do not modify
+#include <common/triggers/target/changelevel.qh>
+#include <common/triggers/target/include.qh>
+#include <common/triggers/target/location.qh>
+#include <common/triggers/target/music.qh>
+#include <common/triggers/target/spawn.qh>
+#include <common/triggers/target/speaker.qh>
+#include <common/triggers/target/voicescript.qh>
diff --git a/qcsrc/common/triggers/trigger/_mod.inc b/qcsrc/common/triggers/trigger/_mod.inc
index 03fa001a8..05a496eb3 100644
--- a/qcsrc/common/triggers/trigger/_mod.inc
+++ b/qcsrc/common/triggers/trigger/_mod.inc
@@ -1,25 +1,25 @@
 // generated file; do not modify
-#include "counter.qc"
-#include "delay.qc"
-#include "disablerelay.qc"
-#include "flipflop.qc"
-#include "gamestart.qc"
-#include "gravity.qc"
-#include "heal.qc"
-#include "hurt.qc"
-#include "impulse.qc"
-#include "include.qc"
-#include "jumppads.qc"
-#include "keylock.qc"
-#include "magicear.qc"
-#include "monoflop.qc"
-#include "multi.qc"
-#include "multivibrator.qc"
-#include "relay.qc"
-#include "relay_activators.qc"
-#include "relay_if.qc"
-#include "relay_teamcheck.qc"
-#include "secret.qc"
-#include "swamp.qc"
-#include "teleport.qc"
-#include "viewloc.qc"
+#include <common/triggers/trigger/counter.qc>
+#include <common/triggers/trigger/delay.qc>
+#include <common/triggers/trigger/disablerelay.qc>
+#include <common/triggers/trigger/flipflop.qc>
+#include <common/triggers/trigger/gamestart.qc>
+#include <common/triggers/trigger/gravity.qc>
+#include <common/triggers/trigger/heal.qc>
+#include <common/triggers/trigger/hurt.qc>
+#include <common/triggers/trigger/impulse.qc>
+#include <common/triggers/trigger/include.qc>
+#include <common/triggers/trigger/jumppads.qc>
+#include <common/triggers/trigger/keylock.qc>
+#include <common/triggers/trigger/magicear.qc>
+#include <common/triggers/trigger/monoflop.qc>
+#include <common/triggers/trigger/multi.qc>
+#include <common/triggers/trigger/multivibrator.qc>
+#include <common/triggers/trigger/relay.qc>
+#include <common/triggers/trigger/relay_activators.qc>
+#include <common/triggers/trigger/relay_if.qc>
+#include <common/triggers/trigger/relay_teamcheck.qc>
+#include <common/triggers/trigger/secret.qc>
+#include <common/triggers/trigger/swamp.qc>
+#include <common/triggers/trigger/teleport.qc>
+#include <common/triggers/trigger/viewloc.qc>
diff --git a/qcsrc/common/triggers/trigger/_mod.qh b/qcsrc/common/triggers/trigger/_mod.qh
new file mode 100644
index 000000000..2c7477b1d
--- /dev/null
+++ b/qcsrc/common/triggers/trigger/_mod.qh
@@ -0,0 +1,25 @@
+// generated file; do not modify
+#include <common/triggers/trigger/counter.qh>
+#include <common/triggers/trigger/delay.qh>
+#include <common/triggers/trigger/disablerelay.qh>
+#include <common/triggers/trigger/flipflop.qh>
+#include <common/triggers/trigger/gamestart.qh>
+#include <common/triggers/trigger/gravity.qh>
+#include <common/triggers/trigger/heal.qh>
+#include <common/triggers/trigger/hurt.qh>
+#include <common/triggers/trigger/impulse.qh>
+#include <common/triggers/trigger/include.qh>
+#include <common/triggers/trigger/jumppads.qh>
+#include <common/triggers/trigger/keylock.qh>
+#include <common/triggers/trigger/magicear.qh>
+#include <common/triggers/trigger/monoflop.qh>
+#include <common/triggers/trigger/multi.qh>
+#include <common/triggers/trigger/multivibrator.qh>
+#include <common/triggers/trigger/relay.qh>
+#include <common/triggers/trigger/relay_activators.qh>
+#include <common/triggers/trigger/relay_if.qh>
+#include <common/triggers/trigger/relay_teamcheck.qh>
+#include <common/triggers/trigger/secret.qh>
+#include <common/triggers/trigger/swamp.qh>
+#include <common/triggers/trigger/teleport.qh>
+#include <common/triggers/trigger/viewloc.qh>
diff --git a/qcsrc/common/turrets/_mod.inc b/qcsrc/common/turrets/_mod.inc
index 552a8050f..40c3114ba 100644
--- a/qcsrc/common/turrets/_mod.inc
+++ b/qcsrc/common/turrets/_mod.inc
@@ -1,8 +1,8 @@
 // generated file; do not modify
-#include "all.qc"
-#include "checkpoint.qc"
-#include "cl_turrets.qc"
-#include "config.qc"
-#include "sv_turrets.qc"
-#include "targettrigger.qc"
-#include "util.qc"
+#include <common/turrets/all.qc>
+#include <common/turrets/checkpoint.qc>
+#include <common/turrets/cl_turrets.qc>
+#include <common/turrets/config.qc>
+#include <common/turrets/sv_turrets.qc>
+#include <common/turrets/targettrigger.qc>
+#include <common/turrets/util.qc>
diff --git a/qcsrc/common/turrets/_mod.qh b/qcsrc/common/turrets/_mod.qh
new file mode 100644
index 000000000..6da539e85
--- /dev/null
+++ b/qcsrc/common/turrets/_mod.qh
@@ -0,0 +1,8 @@
+// generated file; do not modify
+#include <common/turrets/all.qh>
+#include <common/turrets/checkpoint.qh>
+#include <common/turrets/cl_turrets.qh>
+#include <common/turrets/config.qh>
+#include <common/turrets/sv_turrets.qh>
+#include <common/turrets/targettrigger.qh>
+#include <common/turrets/util.qh>
diff --git a/qcsrc/common/turrets/turret/_mod.inc b/qcsrc/common/turrets/turret/_mod.inc
index 367321425..0a1652b1a 100644
--- a/qcsrc/common/turrets/turret/_mod.inc
+++ b/qcsrc/common/turrets/turret/_mod.inc
@@ -1,23 +1,23 @@
 // generated file; do not modify
-#include "ewheel.qc"
-#include "ewheel_weapon.qc"
-#include "flac.qc"
-#include "flac_weapon.qc"
-#include "fusionreactor.qc"
-#include "hellion.qc"
-#include "hellion_weapon.qc"
-#include "hk.qc"
-#include "hk_weapon.qc"
-#include "machinegun.qc"
-#include "machinegun_weapon.qc"
-#include "mlrs.qc"
-#include "mlrs_weapon.qc"
-#include "phaser.qc"
-#include "phaser_weapon.qc"
-#include "plasma.qc"
-#include "plasma_dual.qc"
-#include "plasma_weapon.qc"
-#include "tesla.qc"
-#include "tesla_weapon.qc"
-#include "walker.qc"
-#include "walker_weapon.qc"
+#include <common/turrets/turret/ewheel.qc>
+#include <common/turrets/turret/ewheel_weapon.qc>
+#include <common/turrets/turret/flac.qc>
+#include <common/turrets/turret/flac_weapon.qc>
+#include <common/turrets/turret/fusionreactor.qc>
+#include <common/turrets/turret/hellion.qc>
+#include <common/turrets/turret/hellion_weapon.qc>
+#include <common/turrets/turret/hk.qc>
+#include <common/turrets/turret/hk_weapon.qc>
+#include <common/turrets/turret/machinegun.qc>
+#include <common/turrets/turret/machinegun_weapon.qc>
+#include <common/turrets/turret/mlrs.qc>
+#include <common/turrets/turret/mlrs_weapon.qc>
+#include <common/turrets/turret/phaser.qc>
+#include <common/turrets/turret/phaser_weapon.qc>
+#include <common/turrets/turret/plasma.qc>
+#include <common/turrets/turret/plasma_dual.qc>
+#include <common/turrets/turret/plasma_weapon.qc>
+#include <common/turrets/turret/tesla.qc>
+#include <common/turrets/turret/tesla_weapon.qc>
+#include <common/turrets/turret/walker.qc>
+#include <common/turrets/turret/walker_weapon.qc>
diff --git a/qcsrc/common/turrets/turret/_mod.qh b/qcsrc/common/turrets/turret/_mod.qh
new file mode 100644
index 000000000..465090142
--- /dev/null
+++ b/qcsrc/common/turrets/turret/_mod.qh
@@ -0,0 +1,23 @@
+// generated file; do not modify
+#include <common/turrets/turret/ewheel.qh>
+#include <common/turrets/turret/ewheel_weapon.qh>
+#include <common/turrets/turret/flac.qh>
+#include <common/turrets/turret/flac_weapon.qh>
+#include <common/turrets/turret/fusionreactor.qh>
+#include <common/turrets/turret/hellion.qh>
+#include <common/turrets/turret/hellion_weapon.qh>
+#include <common/turrets/turret/hk.qh>
+#include <common/turrets/turret/hk_weapon.qh>
+#include <common/turrets/turret/machinegun.qh>
+#include <common/turrets/turret/machinegun_weapon.qh>
+#include <common/turrets/turret/mlrs.qh>
+#include <common/turrets/turret/mlrs_weapon.qh>
+#include <common/turrets/turret/phaser.qh>
+#include <common/turrets/turret/phaser_weapon.qh>
+#include <common/turrets/turret/plasma.qh>
+#include <common/turrets/turret/plasma_dual.qh>
+#include <common/turrets/turret/plasma_weapon.qh>
+#include <common/turrets/turret/tesla.qh>
+#include <common/turrets/turret/tesla_weapon.qh>
+#include <common/turrets/turret/walker.qh>
+#include <common/turrets/turret/walker_weapon.qh>
diff --git a/qcsrc/common/vehicles/_mod.inc b/qcsrc/common/vehicles/_mod.inc
index e80489b8f..269858f84 100644
--- a/qcsrc/common/vehicles/_mod.inc
+++ b/qcsrc/common/vehicles/_mod.inc
@@ -1,4 +1,4 @@
 // generated file; do not modify
-#include "all.qc"
-#include "cl_vehicles.qc"
-#include "sv_vehicles.qc"
+#include <common/vehicles/all.qc>
+#include <common/vehicles/cl_vehicles.qc>
+#include <common/vehicles/sv_vehicles.qc>
diff --git a/qcsrc/common/vehicles/_mod.qh b/qcsrc/common/vehicles/_mod.qh
new file mode 100644
index 000000000..d21e829f7
--- /dev/null
+++ b/qcsrc/common/vehicles/_mod.qh
@@ -0,0 +1,4 @@
+// generated file; do not modify
+#include <common/vehicles/all.qh>
+#include <common/vehicles/cl_vehicles.qh>
+#include <common/vehicles/sv_vehicles.qh>
diff --git a/qcsrc/common/vehicles/vehicle/_mod.inc b/qcsrc/common/vehicles/vehicle/_mod.inc
index fbead4741..065f760d2 100644
--- a/qcsrc/common/vehicles/vehicle/_mod.inc
+++ b/qcsrc/common/vehicles/vehicle/_mod.inc
@@ -1,9 +1,9 @@
 // generated file; do not modify
-#include "bumblebee.qc"
-#include "bumblebee_weapons.qc"
-#include "racer.qc"
-#include "racer_weapon.qc"
-#include "raptor.qc"
-#include "raptor_weapons.qc"
-#include "spiderbot.qc"
-#include "spiderbot_weapons.qc"
+#include <common/vehicles/vehicle/bumblebee.qc>
+#include <common/vehicles/vehicle/bumblebee_weapons.qc>
+#include <common/vehicles/vehicle/racer.qc>
+#include <common/vehicles/vehicle/racer_weapon.qc>
+#include <common/vehicles/vehicle/raptor.qc>
+#include <common/vehicles/vehicle/raptor_weapons.qc>
+#include <common/vehicles/vehicle/spiderbot.qc>
+#include <common/vehicles/vehicle/spiderbot_weapons.qc>
diff --git a/qcsrc/common/vehicles/vehicle/_mod.qh b/qcsrc/common/vehicles/vehicle/_mod.qh
new file mode 100644
index 000000000..3d6606eb9
--- /dev/null
+++ b/qcsrc/common/vehicles/vehicle/_mod.qh
@@ -0,0 +1,9 @@
+// generated file; do not modify
+#include <common/vehicles/vehicle/bumblebee.qh>
+#include <common/vehicles/vehicle/bumblebee_weapons.qh>
+#include <common/vehicles/vehicle/racer.qh>
+#include <common/vehicles/vehicle/racer_weapon.qh>
+#include <common/vehicles/vehicle/raptor.qh>
+#include <common/vehicles/vehicle/raptor_weapons.qh>
+#include <common/vehicles/vehicle/spiderbot.qh>
+#include <common/vehicles/vehicle/spiderbot_weapons.qh>
diff --git a/qcsrc/common/weapons/_mod.inc b/qcsrc/common/weapons/_mod.inc
index d2c6fb833..034b149bf 100644
--- a/qcsrc/common/weapons/_mod.inc
+++ b/qcsrc/common/weapons/_mod.inc
@@ -1,4 +1,4 @@
 // generated file; do not modify
-#include "all.qc"
-#include "calculations.qc"
-#include "config.qc"
+#include <common/weapons/all.qc>
+#include <common/weapons/calculations.qc>
+#include <common/weapons/config.qc>
diff --git a/qcsrc/common/weapons/_mod.qh b/qcsrc/common/weapons/_mod.qh
new file mode 100644
index 000000000..f5e07a8c0
--- /dev/null
+++ b/qcsrc/common/weapons/_mod.qh
@@ -0,0 +1,4 @@
+// generated file; do not modify
+#include <common/weapons/all.qh>
+#include <common/weapons/calculations.qh>
+#include <common/weapons/config.qh>
diff --git a/qcsrc/common/weapons/weapon/_mod.inc b/qcsrc/common/weapons/weapon/_mod.inc
index 7852f1e7f..06cd89d8b 100644
--- a/qcsrc/common/weapons/weapon/_mod.inc
+++ b/qcsrc/common/weapons/weapon/_mod.inc
@@ -1,21 +1,21 @@
 // generated file; do not modify
-#include "arc.qc"
-#include "blaster.qc"
-#include "crylink.qc"
-#include "devastator.qc"
-#include "electro.qc"
-#include "fireball.qc"
-#include "hagar.qc"
-#include "hlac.qc"
-#include "hook.qc"
-#include "machinegun.qc"
-#include "minelayer.qc"
-#include "mortar.qc"
-#include "porto.qc"
-#include "rifle.qc"
-#include "seeker.qc"
-#include "shockwave.qc"
-#include "shotgun.qc"
-#include "tuba.qc"
-#include "vaporizer.qc"
-#include "vortex.qc"
+#include <common/weapons/weapon/arc.qc>
+#include <common/weapons/weapon/blaster.qc>
+#include <common/weapons/weapon/crylink.qc>
+#include <common/weapons/weapon/devastator.qc>
+#include <common/weapons/weapon/electro.qc>
+#include <common/weapons/weapon/fireball.qc>
+#include <common/weapons/weapon/hagar.qc>
+#include <common/weapons/weapon/hlac.qc>
+#include <common/weapons/weapon/hook.qc>
+#include <common/weapons/weapon/machinegun.qc>
+#include <common/weapons/weapon/minelayer.qc>
+#include <common/weapons/weapon/mortar.qc>
+#include <common/weapons/weapon/porto.qc>
+#include <common/weapons/weapon/rifle.qc>
+#include <common/weapons/weapon/seeker.qc>
+#include <common/weapons/weapon/shockwave.qc>
+#include <common/weapons/weapon/shotgun.qc>
+#include <common/weapons/weapon/tuba.qc>
+#include <common/weapons/weapon/vaporizer.qc>
+#include <common/weapons/weapon/vortex.qc>
diff --git a/qcsrc/common/weapons/weapon/_mod.qh b/qcsrc/common/weapons/weapon/_mod.qh
new file mode 100644
index 000000000..bc4fff18d
--- /dev/null
+++ b/qcsrc/common/weapons/weapon/_mod.qh
@@ -0,0 +1,21 @@
+// generated file; do not modify
+#include <common/weapons/weapon/arc.qh>
+#include <common/weapons/weapon/blaster.qh>
+#include <common/weapons/weapon/crylink.qh>
+#include <common/weapons/weapon/devastator.qh>
+#include <common/weapons/weapon/electro.qh>
+#include <common/weapons/weapon/fireball.qh>
+#include <common/weapons/weapon/hagar.qh>
+#include <common/weapons/weapon/hlac.qh>
+#include <common/weapons/weapon/hook.qh>
+#include <common/weapons/weapon/machinegun.qh>
+#include <common/weapons/weapon/minelayer.qh>
+#include <common/weapons/weapon/mortar.qh>
+#include <common/weapons/weapon/porto.qh>
+#include <common/weapons/weapon/rifle.qh>
+#include <common/weapons/weapon/seeker.qh>
+#include <common/weapons/weapon/shockwave.qh>
+#include <common/weapons/weapon/shotgun.qh>
+#include <common/weapons/weapon/tuba.qh>
+#include <common/weapons/weapon/vaporizer.qh>
+#include <common/weapons/weapon/vortex.qh>
diff --git a/qcsrc/lib/_mod.inc b/qcsrc/lib/_mod.inc
index ecec32a05..115a6a070 100644
--- a/qcsrc/lib/_mod.inc
+++ b/qcsrc/lib/_mod.inc
@@ -1,8 +1,8 @@
 // generated file; do not modify
-#include "angle.qc"
-#include "json.qc"
-#include "p2mathlib.qc"
-#include "random.qc"
-#include "sortlist.qc"
-#include "test.qc"
-#include "urllib.qc"
+#include <lib/angle.qc>
+#include <lib/json.qc>
+#include <lib/p2mathlib.qc>
+#include <lib/random.qc>
+#include <lib/sortlist.qc>
+#include <lib/test.qc>
+#include <lib/urllib.qc>
diff --git a/qcsrc/lib/_mod.qh b/qcsrc/lib/_mod.qh
new file mode 100644
index 000000000..fd97f51b6
--- /dev/null
+++ b/qcsrc/lib/_mod.qh
@@ -0,0 +1,8 @@
+// generated file; do not modify
+#include <lib/angle.qh>
+#include <lib/json.qh>
+#include <lib/p2mathlib.qh>
+#include <lib/random.qh>
+#include <lib/sortlist.qh>
+#include <lib/test.qh>
+#include <lib/urllib.qh>
diff --git a/qcsrc/lib/csqcmodel/_mod.inc b/qcsrc/lib/csqcmodel/_mod.inc
index 1d4c6ec26..a2012c8fa 100644
--- a/qcsrc/lib/csqcmodel/_mod.inc
+++ b/qcsrc/lib/csqcmodel/_mod.inc
@@ -1,5 +1,5 @@
 // generated file; do not modify
-#include "cl_model.qc"
-#include "cl_player.qc"
-#include "interpolate.qc"
-#include "sv_model.qc"
+#include <lib/csqcmodel/cl_model.qc>
+#include <lib/csqcmodel/cl_player.qc>
+#include <lib/csqcmodel/interpolate.qc>
+#include <lib/csqcmodel/sv_model.qc>
diff --git a/qcsrc/lib/csqcmodel/_mod.qh b/qcsrc/lib/csqcmodel/_mod.qh
new file mode 100644
index 000000000..de3102fa8
--- /dev/null
+++ b/qcsrc/lib/csqcmodel/_mod.qh
@@ -0,0 +1,5 @@
+// generated file; do not modify
+#include <lib/csqcmodel/cl_model.qh>
+#include <lib/csqcmodel/cl_player.qh>
+#include <lib/csqcmodel/interpolate.qh>
+#include <lib/csqcmodel/sv_model.qh>
diff --git a/qcsrc/lib/matrix/_mod.inc b/qcsrc/lib/matrix/_mod.inc
index 84522f199..4854f092a 100644
--- a/qcsrc/lib/matrix/_mod.inc
+++ b/qcsrc/lib/matrix/_mod.inc
@@ -1,3 +1,3 @@
 // generated file; do not modify
-#include "command.qc"
-#include "matrix.qc"
+#include <lib/matrix/command.qc>
+#include <lib/matrix/matrix.qc>
diff --git a/qcsrc/lib/matrix/_mod.qh b/qcsrc/lib/matrix/_mod.qh
new file mode 100644
index 000000000..965812297
--- /dev/null
+++ b/qcsrc/lib/matrix/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <lib/matrix/command.qh>
+#include <lib/matrix/matrix.qh>
diff --git a/qcsrc/lib/warpzone/_mod.inc b/qcsrc/lib/warpzone/_mod.inc
index ef257d6f6..274e8c0ae 100644
--- a/qcsrc/lib/warpzone/_mod.inc
+++ b/qcsrc/lib/warpzone/_mod.inc
@@ -1,7 +1,7 @@
 // generated file; do not modify
-#include "anglestransform.qc"
-#include "client.qc"
-#include "common.qc"
-#include "mathlib.qc"
-#include "server.qc"
-#include "util_server.qc"
+#include <lib/warpzone/anglestransform.qc>
+#include <lib/warpzone/client.qc>
+#include <lib/warpzone/common.qc>
+#include <lib/warpzone/mathlib.qc>
+#include <lib/warpzone/server.qc>
+#include <lib/warpzone/util_server.qc>
diff --git a/qcsrc/lib/warpzone/_mod.qh b/qcsrc/lib/warpzone/_mod.qh
new file mode 100644
index 000000000..d679cc928
--- /dev/null
+++ b/qcsrc/lib/warpzone/_mod.qh
@@ -0,0 +1,7 @@
+// generated file; do not modify
+#include <lib/warpzone/anglestransform.qh>
+#include <lib/warpzone/client.qh>
+#include <lib/warpzone/common.qh>
+#include <lib/warpzone/mathlib.qh>
+#include <lib/warpzone/server.qh>
+#include <lib/warpzone/util_server.qh>
diff --git a/qcsrc/menu/_mod.inc b/qcsrc/menu/_mod.inc
index 8fdd71d84..e1a26e76b 100644
--- a/qcsrc/menu/_mod.inc
+++ b/qcsrc/menu/_mod.inc
@@ -1,5 +1,5 @@
 // generated file; do not modify
-#include "draw.qc"
-#include "item.qc"
-#include "matrix.qc"
-#include "menu.qc"
+#include <menu/draw.qc>
+#include <menu/item.qc>
+#include <menu/matrix.qc>
+#include <menu/menu.qc>
diff --git a/qcsrc/menu/_mod.qh b/qcsrc/menu/_mod.qh
new file mode 100644
index 000000000..a5fe87d3e
--- /dev/null
+++ b/qcsrc/menu/_mod.qh
@@ -0,0 +1,5 @@
+// generated file; do not modify
+#include <menu/draw.qh>
+#include <menu/item.qh>
+#include <menu/matrix.qh>
+#include <menu/menu.qh>
diff --git a/qcsrc/menu/anim/_mod.inc b/qcsrc/menu/anim/_mod.inc
index c8048a117..e979fe2f5 100644
--- a/qcsrc/menu/anim/_mod.inc
+++ b/qcsrc/menu/anim/_mod.inc
@@ -1,5 +1,5 @@
 // generated file; do not modify
-#include "animation.qc"
-#include "animhost.qc"
-#include "easing.qc"
-#include "keyframe.qc"
+#include <menu/anim/animation.qc>
+#include <menu/anim/animhost.qc>
+#include <menu/anim/easing.qc>
+#include <menu/anim/keyframe.qc>
diff --git a/qcsrc/menu/anim/_mod.qh b/qcsrc/menu/anim/_mod.qh
new file mode 100644
index 000000000..8208cdd29
--- /dev/null
+++ b/qcsrc/menu/anim/_mod.qh
@@ -0,0 +1,5 @@
+// generated file; do not modify
+#include <menu/anim/animation.qh>
+#include <menu/anim/animhost.qh>
+#include <menu/anim/easing.qh>
+#include <menu/anim/keyframe.qh>
diff --git a/qcsrc/menu/command/_mod.inc b/qcsrc/menu/command/_mod.inc
index 061d60a45..e721f357a 100644
--- a/qcsrc/menu/command/_mod.inc
+++ b/qcsrc/menu/command/_mod.inc
@@ -1,3 +1,3 @@
 // generated file; do not modify
-#include "all.qc"
-#include "menu_cmd.qc"
+#include <menu/command/all.qc>
+#include <menu/command/menu_cmd.qc>
diff --git a/qcsrc/menu/command/_mod.qh b/qcsrc/menu/command/_mod.qh
new file mode 100644
index 000000000..5e6655730
--- /dev/null
+++ b/qcsrc/menu/command/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <menu/command/all.qh>
+#include <menu/command/menu_cmd.qh>
diff --git a/qcsrc/menu/item/_mod.inc b/qcsrc/menu/item/_mod.inc
index a470788a6..d80de382d 100644
--- a/qcsrc/menu/item/_mod.inc
+++ b/qcsrc/menu/item/_mod.inc
@@ -1,17 +1,17 @@
 // generated file; do not modify
-#include "borderimage.qc"
-#include "button.qc"
-#include "checkbox.qc"
-#include "container.qc"
-#include "dialog.qc"
-#include "image.qc"
-#include "inputbox.qc"
-#include "inputcontainer.qc"
-#include "label.qc"
-#include "listbox.qc"
-#include "modalcontroller.qc"
-#include "nexposee.qc"
-#include "radiobutton.qc"
-#include "slider.qc"
-#include "tab.qc"
-#include "textslider.qc"
+#include <menu/item/borderimage.qc>
+#include <menu/item/button.qc>
+#include <menu/item/checkbox.qc>
+#include <menu/item/container.qc>
+#include <menu/item/dialog.qc>
+#include <menu/item/image.qc>
+#include <menu/item/inputbox.qc>
+#include <menu/item/inputcontainer.qc>
+#include <menu/item/label.qc>
+#include <menu/item/listbox.qc>
+#include <menu/item/modalcontroller.qc>
+#include <menu/item/nexposee.qc>
+#include <menu/item/radiobutton.qc>
+#include <menu/item/slider.qc>
+#include <menu/item/tab.qc>
+#include <menu/item/textslider.qc>
diff --git a/qcsrc/menu/item/_mod.qh b/qcsrc/menu/item/_mod.qh
new file mode 100644
index 000000000..0dee9d933
--- /dev/null
+++ b/qcsrc/menu/item/_mod.qh
@@ -0,0 +1,17 @@
+// generated file; do not modify
+#include <menu/item/borderimage.qh>
+#include <menu/item/button.qh>
+#include <menu/item/checkbox.qh>
+#include <menu/item/container.qh>
+#include <menu/item/dialog.qh>
+#include <menu/item/image.qh>
+#include <menu/item/inputbox.qh>
+#include <menu/item/inputcontainer.qh>
+#include <menu/item/label.qh>
+#include <menu/item/listbox.qh>
+#include <menu/item/modalcontroller.qh>
+#include <menu/item/nexposee.qh>
+#include <menu/item/radiobutton.qh>
+#include <menu/item/slider.qh>
+#include <menu/item/tab.qh>
+#include <menu/item/textslider.qh>
diff --git a/qcsrc/menu/mutators/_mod.qh b/qcsrc/menu/mutators/_mod.qh
new file mode 100644
index 000000000..98fb4815c
--- /dev/null
+++ b/qcsrc/menu/mutators/_mod.qh
@@ -0,0 +1 @@
+// generated file; do not modify
diff --git a/qcsrc/menu/progs.inc b/qcsrc/menu/progs.inc
index 57a34c36c..9b15d8caa 100644
--- a/qcsrc/menu/progs.inc
+++ b/qcsrc/menu/progs.inc
@@ -1,6 +1,6 @@
 #include <lib/_all.inc>
 
-#include "_mod.inc"
+#include "../menu/_mod.inc"
 #include "anim/_mod.inc"
 #include "command/_mod.inc"
 #include "item/_mod.inc"
diff --git a/qcsrc/menu/xonotic/_mod.inc b/qcsrc/menu/xonotic/_mod.inc
index 4702bbf70..867f77b84 100644
--- a/qcsrc/menu/xonotic/_mod.inc
+++ b/qcsrc/menu/xonotic/_mod.inc
@@ -1,116 +1,116 @@
 // generated file; do not modify
-#include "bigbutton.qc"
-#include "bigcommandbutton.qc"
-#include "button.qc"
-#include "campaign.qc"
-#include "charmap.qc"
-#include "checkbox.qc"
-#include "checkbox_slider_invalid.qc"
-#include "checkbox_string.qc"
-#include "colorbutton.qc"
-#include "colorpicker.qc"
-#include "colorpicker_string.qc"
-#include "commandbutton.qc"
-#include "credits.qc"
-#include "crosshairpicker.qc"
-#include "crosshairpreview.qc"
-#include "cvarlist.qc"
-#include "datasource.qc"
-#include "demolist.qc"
-#include "dialog.qc"
-#include "dialog_credits.qc"
-#include "dialog_firstrun.qc"
-#include "dialog_hudpanel_ammo.qc"
-#include "dialog_hudpanel_centerprint.qc"
-#include "dialog_hudpanel_chat.qc"
-#include "dialog_hudpanel_engineinfo.qc"
-#include "dialog_hudpanel_healtharmor.qc"
-#include "dialog_hudpanel_infomessages.qc"
-#include "dialog_hudpanel_itemstime.qc"
-#include "dialog_hudpanel_modicons.qc"
-#include "dialog_hudpanel_notification.qc"
-#include "dialog_hudpanel_physics.qc"
-#include "dialog_hudpanel_powerups.qc"
-#include "dialog_hudpanel_pressedkeys.qc"
-#include "dialog_hudpanel_quickmenu.qc"
-#include "dialog_hudpanel_racetimer.qc"
-#include "dialog_hudpanel_radar.qc"
-#include "dialog_hudpanel_score.qc"
-#include "dialog_hudpanel_timer.qc"
-#include "dialog_hudpanel_vote.qc"
-#include "dialog_hudpanel_weapons.qc"
-#include "dialog_hudsetup_exit.qc"
-#include "dialog_monstertools.qc"
-#include "dialog_multiplayer.qc"
-#include "dialog_multiplayer_create.qc"
-#include "dialog_multiplayer_create_mapinfo.qc"
-#include "dialog_multiplayer_create_mutators.qc"
-#include "dialog_multiplayer_join.qc"
-#include "dialog_multiplayer_join_serverinfo.qc"
-#include "dialog_multiplayer_media.qc"
-#include "dialog_multiplayer_media_demo.qc"
-#include "dialog_multiplayer_media_demo_startconfirm.qc"
-#include "dialog_multiplayer_media_demo_timeconfirm.qc"
-#include "dialog_multiplayer_media_musicplayer.qc"
-#include "dialog_multiplayer_media_screenshot.qc"
-#include "dialog_multiplayer_media_screenshot_viewer.qc"
-#include "dialog_multiplayer_profile.qc"
-#include "dialog_quit.qc"
-#include "dialog_sandboxtools.qc"
-#include "dialog_settings.qc"
-#include "dialog_settings_audio.qc"
-#include "dialog_settings_effects.qc"
-#include "dialog_settings_game.qc"
-#include "dialog_settings_game_crosshair.qc"
-#include "dialog_settings_game_hud.qc"
-#include "dialog_settings_game_hudconfirm.qc"
-#include "dialog_settings_game_messages.qc"
-#include "dialog_settings_game_model.qc"
-#include "dialog_settings_game_view.qc"
-#include "dialog_settings_game_weapons.qc"
-#include "dialog_settings_input.qc"
-#include "dialog_settings_input_userbind.qc"
-#include "dialog_settings_misc.qc"
-#include "dialog_settings_misc_cvars.qc"
-#include "dialog_settings_misc_reset.qc"
-#include "dialog_settings_user.qc"
-#include "dialog_settings_user_languagewarning.qc"
-#include "dialog_settings_video.qc"
-#include "dialog_singleplayer.qc"
-#include "dialog_singleplayer_winner.qc"
-#include "dialog_teamselect.qc"
-#include "gametypelist.qc"
-#include "hudskinlist.qc"
-#include "image.qc"
-#include "inputbox.qc"
-#include "keybinder.qc"
-#include "languagelist.qc"
-#include "listbox.qc"
-#include "mainwindow.qc"
-#include "maplist.qc"
-#include "nexposee.qc"
-#include "picker.qc"
-#include "playerlist.qc"
-#include "playermodel.qc"
-#include "playlist.qc"
-#include "radiobutton.qc"
-#include "rootdialog.qc"
-#include "screenshotimage.qc"
-#include "screenshotlist.qc"
-#include "serverlist.qc"
-#include "skinlist.qc"
-#include "slider.qc"
-#include "slider_decibels.qc"
-#include "slider_particles.qc"
-#include "slider_picmip.qc"
-#include "slider_resolution.qc"
-#include "slider_sbfadetime.qc"
-#include "soundlist.qc"
-#include "statslist.qc"
-#include "tab.qc"
-#include "tabcontroller.qc"
-#include "textlabel.qc"
-#include "textslider.qc"
-#include "util.qc"
-#include "weaponarenacheckbox.qc"
-#include "weaponslist.qc"
+#include <menu/xonotic/bigbutton.qc>
+#include <menu/xonotic/bigcommandbutton.qc>
+#include <menu/xonotic/button.qc>
+#include <menu/xonotic/campaign.qc>
+#include <menu/xonotic/charmap.qc>
+#include <menu/xonotic/checkbox.qc>
+#include <menu/xonotic/checkbox_slider_invalid.qc>
+#include <menu/xonotic/checkbox_string.qc>
+#include <menu/xonotic/colorbutton.qc>
+#include <menu/xonotic/colorpicker.qc>
+#include <menu/xonotic/colorpicker_string.qc>
+#include <menu/xonotic/commandbutton.qc>
+#include <menu/xonotic/credits.qc>
+#include <menu/xonotic/crosshairpicker.qc>
+#include <menu/xonotic/crosshairpreview.qc>
+#include <menu/xonotic/cvarlist.qc>
+#include <menu/xonotic/datasource.qc>
+#include <menu/xonotic/demolist.qc>
+#include <menu/xonotic/dialog.qc>
+#include <menu/xonotic/dialog_credits.qc>
+#include <menu/xonotic/dialog_firstrun.qc>
+#include <menu/xonotic/dialog_hudpanel_ammo.qc>
+#include <menu/xonotic/dialog_hudpanel_centerprint.qc>
+#include <menu/xonotic/dialog_hudpanel_chat.qc>
+#include <menu/xonotic/dialog_hudpanel_engineinfo.qc>
+#include <menu/xonotic/dialog_hudpanel_healtharmor.qc>
+#include <menu/xonotic/dialog_hudpanel_infomessages.qc>
+#include <menu/xonotic/dialog_hudpanel_itemstime.qc>
+#include <menu/xonotic/dialog_hudpanel_modicons.qc>
+#include <menu/xonotic/dialog_hudpanel_notification.qc>
+#include <menu/xonotic/dialog_hudpanel_physics.qc>
+#include <menu/xonotic/dialog_hudpanel_powerups.qc>
+#include <menu/xonotic/dialog_hudpanel_pressedkeys.qc>
+#include <menu/xonotic/dialog_hudpanel_quickmenu.qc>
+#include <menu/xonotic/dialog_hudpanel_racetimer.qc>
+#include <menu/xonotic/dialog_hudpanel_radar.qc>
+#include <menu/xonotic/dialog_hudpanel_score.qc>
+#include <menu/xonotic/dialog_hudpanel_timer.qc>
+#include <menu/xonotic/dialog_hudpanel_vote.qc>
+#include <menu/xonotic/dialog_hudpanel_weapons.qc>
+#include <menu/xonotic/dialog_hudsetup_exit.qc>
+#include <menu/xonotic/dialog_monstertools.qc>
+#include <menu/xonotic/dialog_multiplayer.qc>
+#include <menu/xonotic/dialog_multiplayer_create.qc>
+#include <menu/xonotic/dialog_multiplayer_create_mapinfo.qc>
+#include <menu/xonotic/dialog_multiplayer_create_mutators.qc>
+#include <menu/xonotic/dialog_multiplayer_join.qc>
+#include <menu/xonotic/dialog_multiplayer_join_serverinfo.qc>
+#include <menu/xonotic/dialog_multiplayer_media.qc>
+#include <menu/xonotic/dialog_multiplayer_media_demo.qc>
+#include <menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc>
+#include <menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc>
+#include <menu/xonotic/dialog_multiplayer_media_musicplayer.qc>
+#include <menu/xonotic/dialog_multiplayer_media_screenshot.qc>
+#include <menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc>
+#include <menu/xonotic/dialog_multiplayer_profile.qc>
+#include <menu/xonotic/dialog_quit.qc>
+#include <menu/xonotic/dialog_sandboxtools.qc>
+#include <menu/xonotic/dialog_settings.qc>
+#include <menu/xonotic/dialog_settings_audio.qc>
+#include <menu/xonotic/dialog_settings_effects.qc>
+#include <menu/xonotic/dialog_settings_game.qc>
+#include <menu/xonotic/dialog_settings_game_crosshair.qc>
+#include <menu/xonotic/dialog_settings_game_hud.qc>
+#include <menu/xonotic/dialog_settings_game_hudconfirm.qc>
+#include <menu/xonotic/dialog_settings_game_messages.qc>
+#include <menu/xonotic/dialog_settings_game_model.qc>
+#include <menu/xonotic/dialog_settings_game_view.qc>
+#include <menu/xonotic/dialog_settings_game_weapons.qc>
+#include <menu/xonotic/dialog_settings_input.qc>
+#include <menu/xonotic/dialog_settings_input_userbind.qc>
+#include <menu/xonotic/dialog_settings_misc.qc>
+#include <menu/xonotic/dialog_settings_misc_cvars.qc>
+#include <menu/xonotic/dialog_settings_misc_reset.qc>
+#include <menu/xonotic/dialog_settings_user.qc>
+#include <menu/xonotic/dialog_settings_user_languagewarning.qc>
+#include <menu/xonotic/dialog_settings_video.qc>
+#include <menu/xonotic/dialog_singleplayer.qc>
+#include <menu/xonotic/dialog_singleplayer_winner.qc>
+#include <menu/xonotic/dialog_teamselect.qc>
+#include <menu/xonotic/gametypelist.qc>
+#include <menu/xonotic/hudskinlist.qc>
+#include <menu/xonotic/image.qc>
+#include <menu/xonotic/inputbox.qc>
+#include <menu/xonotic/keybinder.qc>
+#include <menu/xonotic/languagelist.qc>
+#include <menu/xonotic/listbox.qc>
+#include <menu/xonotic/mainwindow.qc>
+#include <menu/xonotic/maplist.qc>
+#include <menu/xonotic/nexposee.qc>
+#include <menu/xonotic/picker.qc>
+#include <menu/xonotic/playerlist.qc>
+#include <menu/xonotic/playermodel.qc>
+#include <menu/xonotic/playlist.qc>
+#include <menu/xonotic/radiobutton.qc>
+#include <menu/xonotic/rootdialog.qc>
+#include <menu/xonotic/screenshotimage.qc>
+#include <menu/xonotic/screenshotlist.qc>
+#include <menu/xonotic/serverlist.qc>
+#include <menu/xonotic/skinlist.qc>
+#include <menu/xonotic/slider.qc>
+#include <menu/xonotic/slider_decibels.qc>
+#include <menu/xonotic/slider_particles.qc>
+#include <menu/xonotic/slider_picmip.qc>
+#include <menu/xonotic/slider_resolution.qc>
+#include <menu/xonotic/slider_sbfadetime.qc>
+#include <menu/xonotic/soundlist.qc>
+#include <menu/xonotic/statslist.qc>
+#include <menu/xonotic/tab.qc>
+#include <menu/xonotic/tabcontroller.qc>
+#include <menu/xonotic/textlabel.qc>
+#include <menu/xonotic/textslider.qc>
+#include <menu/xonotic/util.qc>
+#include <menu/xonotic/weaponarenacheckbox.qc>
+#include <menu/xonotic/weaponslist.qc>
diff --git a/qcsrc/menu/xonotic/_mod.qh b/qcsrc/menu/xonotic/_mod.qh
new file mode 100644
index 000000000..adfefc05d
--- /dev/null
+++ b/qcsrc/menu/xonotic/_mod.qh
@@ -0,0 +1,116 @@
+// generated file; do not modify
+#include <menu/xonotic/bigbutton.qh>
+#include <menu/xonotic/bigcommandbutton.qh>
+#include <menu/xonotic/button.qh>
+#include <menu/xonotic/campaign.qh>
+#include <menu/xonotic/charmap.qh>
+#include <menu/xonotic/checkbox.qh>
+#include <menu/xonotic/checkbox_slider_invalid.qh>
+#include <menu/xonotic/checkbox_string.qh>
+#include <menu/xonotic/colorbutton.qh>
+#include <menu/xonotic/colorpicker.qh>
+#include <menu/xonotic/colorpicker_string.qh>
+#include <menu/xonotic/commandbutton.qh>
+#include <menu/xonotic/credits.qh>
+#include <menu/xonotic/crosshairpicker.qh>
+#include <menu/xonotic/crosshairpreview.qh>
+#include <menu/xonotic/cvarlist.qh>
+#include <menu/xonotic/datasource.qh>
+#include <menu/xonotic/demolist.qh>
+#include <menu/xonotic/dialog.qh>
+#include <menu/xonotic/dialog_credits.qh>
+#include <menu/xonotic/dialog_firstrun.qh>
+#include <menu/xonotic/dialog_hudpanel_ammo.qh>
+#include <menu/xonotic/dialog_hudpanel_centerprint.qh>
+#include <menu/xonotic/dialog_hudpanel_chat.qh>
+#include <menu/xonotic/dialog_hudpanel_engineinfo.qh>
+#include <menu/xonotic/dialog_hudpanel_healtharmor.qh>
+#include <menu/xonotic/dialog_hudpanel_infomessages.qh>
+#include <menu/xonotic/dialog_hudpanel_itemstime.qh>
+#include <menu/xonotic/dialog_hudpanel_modicons.qh>
+#include <menu/xonotic/dialog_hudpanel_notification.qh>
+#include <menu/xonotic/dialog_hudpanel_physics.qh>
+#include <menu/xonotic/dialog_hudpanel_powerups.qh>
+#include <menu/xonotic/dialog_hudpanel_pressedkeys.qh>
+#include <menu/xonotic/dialog_hudpanel_quickmenu.qh>
+#include <menu/xonotic/dialog_hudpanel_racetimer.qh>
+#include <menu/xonotic/dialog_hudpanel_radar.qh>
+#include <menu/xonotic/dialog_hudpanel_score.qh>
+#include <menu/xonotic/dialog_hudpanel_timer.qh>
+#include <menu/xonotic/dialog_hudpanel_vote.qh>
+#include <menu/xonotic/dialog_hudpanel_weapons.qh>
+#include <menu/xonotic/dialog_hudsetup_exit.qh>
+#include <menu/xonotic/dialog_monstertools.qh>
+#include <menu/xonotic/dialog_multiplayer.qh>
+#include <menu/xonotic/dialog_multiplayer_create.qh>
+#include <menu/xonotic/dialog_multiplayer_create_mapinfo.qh>
+#include <menu/xonotic/dialog_multiplayer_create_mutators.qh>
+#include <menu/xonotic/dialog_multiplayer_join.qh>
+#include <menu/xonotic/dialog_multiplayer_join_serverinfo.qh>
+#include <menu/xonotic/dialog_multiplayer_media.qh>
+#include <menu/xonotic/dialog_multiplayer_media_demo.qh>
+#include <menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qh>
+#include <menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qh>
+#include <menu/xonotic/dialog_multiplayer_media_musicplayer.qh>
+#include <menu/xonotic/dialog_multiplayer_media_screenshot.qh>
+#include <menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qh>
+#include <menu/xonotic/dialog_multiplayer_profile.qh>
+#include <menu/xonotic/dialog_quit.qh>
+#include <menu/xonotic/dialog_sandboxtools.qh>
+#include <menu/xonotic/dialog_settings.qh>
+#include <menu/xonotic/dialog_settings_audio.qh>
+#include <menu/xonotic/dialog_settings_effects.qh>
+#include <menu/xonotic/dialog_settings_game.qh>
+#include <menu/xonotic/dialog_settings_game_crosshair.qh>
+#include <menu/xonotic/dialog_settings_game_hud.qh>
+#include <menu/xonotic/dialog_settings_game_hudconfirm.qh>
+#include <menu/xonotic/dialog_settings_game_messages.qh>
+#include <menu/xonotic/dialog_settings_game_model.qh>
+#include <menu/xonotic/dialog_settings_game_view.qh>
+#include <menu/xonotic/dialog_settings_game_weapons.qh>
+#include <menu/xonotic/dialog_settings_input.qh>
+#include <menu/xonotic/dialog_settings_input_userbind.qh>
+#include <menu/xonotic/dialog_settings_misc.qh>
+#include <menu/xonotic/dialog_settings_misc_cvars.qh>
+#include <menu/xonotic/dialog_settings_misc_reset.qh>
+#include <menu/xonotic/dialog_settings_user.qh>
+#include <menu/xonotic/dialog_settings_user_languagewarning.qh>
+#include <menu/xonotic/dialog_settings_video.qh>
+#include <menu/xonotic/dialog_singleplayer.qh>
+#include <menu/xonotic/dialog_singleplayer_winner.qh>
+#include <menu/xonotic/dialog_teamselect.qh>
+#include <menu/xonotic/gametypelist.qh>
+#include <menu/xonotic/hudskinlist.qh>
+#include <menu/xonotic/image.qh>
+#include <menu/xonotic/inputbox.qh>
+#include <menu/xonotic/keybinder.qh>
+#include <menu/xonotic/languagelist.qh>
+#include <menu/xonotic/listbox.qh>
+#include <menu/xonotic/mainwindow.qh>
+#include <menu/xonotic/maplist.qh>
+#include <menu/xonotic/nexposee.qh>
+#include <menu/xonotic/picker.qh>
+#include <menu/xonotic/playerlist.qh>
+#include <menu/xonotic/playermodel.qh>
+#include <menu/xonotic/playlist.qh>
+#include <menu/xonotic/radiobutton.qh>
+#include <menu/xonotic/rootdialog.qh>
+#include <menu/xonotic/screenshotimage.qh>
+#include <menu/xonotic/screenshotlist.qh>
+#include <menu/xonotic/serverlist.qh>
+#include <menu/xonotic/skinlist.qh>
+#include <menu/xonotic/slider.qh>
+#include <menu/xonotic/slider_decibels.qh>
+#include <menu/xonotic/slider_particles.qh>
+#include <menu/xonotic/slider_picmip.qh>
+#include <menu/xonotic/slider_resolution.qh>
+#include <menu/xonotic/slider_sbfadetime.qh>
+#include <menu/xonotic/soundlist.qh>
+#include <menu/xonotic/statslist.qh>
+#include <menu/xonotic/tab.qh>
+#include <menu/xonotic/tabcontroller.qh>
+#include <menu/xonotic/textlabel.qh>
+#include <menu/xonotic/textslider.qh>
+#include <menu/xonotic/util.qh>
+#include <menu/xonotic/weaponarenacheckbox.qh>
+#include <menu/xonotic/weaponslist.qh>
diff --git a/qcsrc/server/_mod.inc b/qcsrc/server/_mod.inc
index 9d0531ac6..f22742f1d 100644
--- a/qcsrc/server/_mod.inc
+++ b/qcsrc/server/_mod.inc
@@ -1,33 +1,33 @@
 // generated file; do not modify
-#include "anticheat.qc"
-#include "antilag.qc"
-#include "campaign.qc"
-#include "cheats.qc"
-#include "cl_client.qc"
-#include "cl_impulse.qc"
-#include "cl_player.qc"
-#include "g_damage.qc"
-#include "g_hook.qc"
-#include "g_lights.qc"
-#include "g_models.qc"
-#include "g_subs.qc"
-#include "g_world.qc"
-#include "ipban.qc"
-#include "item_key.qc"
-#include "mapvoting.qc"
-#include "matrix.qc"
-#include "miscfunctions.qc"
-#include "playerdemo.qc"
-#include "portals.qc"
-#include "race.qc"
-#include "round_handler.qc"
-#include "scores.qc"
-#include "scores_rules.qc"
-#include "spawnpoints.qc"
-#include "steerlib.qc"
-#include "sv_main.qc"
-#include "teamplay.qc"
-#include "tests.qc"
-#include "t_halflife.qc"
-#include "t_quake.qc"
-#include "t_quake3.qc"
+#include <server/anticheat.qc>
+#include <server/antilag.qc>
+#include <server/campaign.qc>
+#include <server/cheats.qc>
+#include <server/cl_client.qc>
+#include <server/cl_impulse.qc>
+#include <server/cl_player.qc>
+#include <server/g_damage.qc>
+#include <server/g_hook.qc>
+#include <server/g_lights.qc>
+#include <server/g_models.qc>
+#include <server/g_subs.qc>
+#include <server/g_world.qc>
+#include <server/ipban.qc>
+#include <server/item_key.qc>
+#include <server/mapvoting.qc>
+#include <server/matrix.qc>
+#include <server/miscfunctions.qc>
+#include <server/playerdemo.qc>
+#include <server/portals.qc>
+#include <server/race.qc>
+#include <server/round_handler.qc>
+#include <server/scores.qc>
+#include <server/scores_rules.qc>
+#include <server/spawnpoints.qc>
+#include <server/steerlib.qc>
+#include <server/sv_main.qc>
+#include <server/teamplay.qc>
+#include <server/tests.qc>
+#include <server/t_halflife.qc>
+#include <server/t_quake.qc>
+#include <server/t_quake3.qc>
diff --git a/qcsrc/server/_mod.qh b/qcsrc/server/_mod.qh
new file mode 100644
index 000000000..17e0a829d
--- /dev/null
+++ b/qcsrc/server/_mod.qh
@@ -0,0 +1,33 @@
+// generated file; do not modify
+#include <server/anticheat.qh>
+#include <server/antilag.qh>
+#include <server/campaign.qh>
+#include <server/cheats.qh>
+#include <server/cl_client.qh>
+#include <server/cl_impulse.qh>
+#include <server/cl_player.qh>
+#include <server/g_damage.qh>
+#include <server/g_hook.qh>
+#include <server/g_lights.qh>
+#include <server/g_models.qh>
+#include <server/g_subs.qh>
+#include <server/g_world.qh>
+#include <server/ipban.qh>
+#include <server/item_key.qh>
+#include <server/mapvoting.qh>
+#include <server/matrix.qh>
+#include <server/miscfunctions.qh>
+#include <server/playerdemo.qh>
+#include <server/portals.qh>
+#include <server/race.qh>
+#include <server/round_handler.qh>
+#include <server/scores.qh>
+#include <server/scores_rules.qh>
+#include <server/spawnpoints.qh>
+#include <server/steerlib.qh>
+#include <server/sv_main.qh>
+#include <server/teamplay.qh>
+#include <server/tests.qh>
+#include <server/t_halflife.qh>
+#include <server/t_quake.qh>
+#include <server/t_quake3.qh>
diff --git a/qcsrc/server/bot/_mod.inc b/qcsrc/server/bot/_mod.inc
index 02ef86761..787939110 100644
--- a/qcsrc/server/bot/_mod.inc
+++ b/qcsrc/server/bot/_mod.inc
@@ -1,6 +1,6 @@
 // generated file; do not modify
-#include "aim.qc"
-#include "bot.qc"
-#include "navigation.qc"
-#include "scripting.qc"
-#include "waypoints.qc"
+#include <server/bot/aim.qc>
+#include <server/bot/bot.qc>
+#include <server/bot/navigation.qc>
+#include <server/bot/scripting.qc>
+#include <server/bot/waypoints.qc>
diff --git a/qcsrc/server/bot/_mod.qh b/qcsrc/server/bot/_mod.qh
new file mode 100644
index 000000000..802d39187
--- /dev/null
+++ b/qcsrc/server/bot/_mod.qh
@@ -0,0 +1,6 @@
+// generated file; do not modify
+#include <server/bot/aim.qh>
+#include <server/bot/bot.qh>
+#include <server/bot/navigation.qh>
+#include <server/bot/scripting.qh>
+#include <server/bot/waypoints.qh>
diff --git a/qcsrc/server/bot/havocbot/_mod.inc b/qcsrc/server/bot/havocbot/_mod.inc
index fa2d660a0..a6270bc13 100644
--- a/qcsrc/server/bot/havocbot/_mod.inc
+++ b/qcsrc/server/bot/havocbot/_mod.inc
@@ -1,3 +1,3 @@
 // generated file; do not modify
-#include "havocbot.qc"
-#include "roles.qc"
+#include <server/bot/havocbot/havocbot.qc>
+#include <server/bot/havocbot/roles.qc>
diff --git a/qcsrc/server/bot/havocbot/_mod.qh b/qcsrc/server/bot/havocbot/_mod.qh
new file mode 100644
index 000000000..4b62d1b8e
--- /dev/null
+++ b/qcsrc/server/bot/havocbot/_mod.qh
@@ -0,0 +1,3 @@
+// generated file; do not modify
+#include <server/bot/havocbot/havocbot.qh>
+#include <server/bot/havocbot/roles.qh>
diff --git a/qcsrc/server/command/_mod.inc b/qcsrc/server/command/_mod.inc
index 1f2b37a0d..fa1543231 100644
--- a/qcsrc/server/command/_mod.inc
+++ b/qcsrc/server/command/_mod.inc
@@ -1,9 +1,11 @@
 // generated file; do not modify
-#include "all.qc"
-#include "banning.qc"
-#include "cmd.qc"
-#include "common.qc"
-#include "getreplies.qc"
-#include "radarmap.qc"
-#include "sv_cmd.qc"
-#include "vote.qc"
+#include <server/command/all.qc>
+#include <server/command/banning.qc>
+#include <server/command/cmd.qc>
+#ifdef SVQC
+    #include <server/command/sv_cmd.qc>
+#endif
+#include <server/command/common.qc>
+#include <server/command/getreplies.qc>
+#include <server/command/radarmap.qc>
+#include <server/command/vote.qc>
diff --git a/qcsrc/server/command/_mod.qh b/qcsrc/server/command/_mod.qh
new file mode 100644
index 000000000..60e34ffe5
--- /dev/null
+++ b/qcsrc/server/command/_mod.qh
@@ -0,0 +1,8 @@
+// generated file; do not modify
+#include <server/command/all.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/command/vote.qh>
diff --git a/qcsrc/server/mutators/_mod.inc b/qcsrc/server/mutators/_mod.inc
index 254d13d7e..3d2321896 100644
--- a/qcsrc/server/mutators/_mod.inc
+++ b/qcsrc/server/mutators/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include "all.qc"
+#include <server/mutators/all.qc>
diff --git a/qcsrc/server/mutators/_mod.qh b/qcsrc/server/mutators/_mod.qh
new file mode 100644
index 000000000..8feb1f37d
--- /dev/null
+++ b/qcsrc/server/mutators/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <server/mutators/all.qh>
diff --git a/qcsrc/server/mutators/mutator/_mod.inc b/qcsrc/server/mutators/mutator/_mod.inc
index c56c2db5a..6835f5d56 100644
--- a/qcsrc/server/mutators/mutator/_mod.inc
+++ b/qcsrc/server/mutators/mutator/_mod.inc
@@ -1,14 +1,14 @@
 // generated file; do not modify
-#include "gamemode_assault.qc"
-#include "gamemode_ca.qc"
-#include "gamemode_ctf.qc"
-#include "gamemode_cts.qc"
-#include "gamemode_deathmatch.qc"
-#include "gamemode_domination.qc"
-#include "gamemode_freezetag.qc"
-#include "gamemode_invasion.qc"
-#include "gamemode_keepaway.qc"
-#include "gamemode_keyhunt.qc"
-#include "gamemode_lms.qc"
-#include "gamemode_race.qc"
-#include "gamemode_tdm.qc"
+#include <server/mutators/mutator/gamemode_assault.qc>
+#include <server/mutators/mutator/gamemode_ca.qc>
+#include <server/mutators/mutator/gamemode_ctf.qc>
+#include <server/mutators/mutator/gamemode_cts.qc>
+#include <server/mutators/mutator/gamemode_deathmatch.qc>
+#include <server/mutators/mutator/gamemode_domination.qc>
+#include <server/mutators/mutator/gamemode_freezetag.qc>
+#include <server/mutators/mutator/gamemode_invasion.qc>
+#include <server/mutators/mutator/gamemode_keepaway.qc>
+#include <server/mutators/mutator/gamemode_keyhunt.qc>
+#include <server/mutators/mutator/gamemode_lms.qc>
+#include <server/mutators/mutator/gamemode_race.qc>
+#include <server/mutators/mutator/gamemode_tdm.qc>
diff --git a/qcsrc/server/mutators/mutator/_mod.qh b/qcsrc/server/mutators/mutator/_mod.qh
new file mode 100644
index 000000000..aef0b332a
--- /dev/null
+++ b/qcsrc/server/mutators/mutator/_mod.qh
@@ -0,0 +1,14 @@
+// generated file; do not modify
+#include <server/mutators/mutator/gamemode_assault.qh>
+#include <server/mutators/mutator/gamemode_ca.qh>
+#include <server/mutators/mutator/gamemode_ctf.qh>
+#include <server/mutators/mutator/gamemode_cts.qh>
+#include <server/mutators/mutator/gamemode_deathmatch.qh>
+#include <server/mutators/mutator/gamemode_domination.qh>
+#include <server/mutators/mutator/gamemode_freezetag.qh>
+#include <server/mutators/mutator/gamemode_invasion.qh>
+#include <server/mutators/mutator/gamemode_keepaway.qh>
+#include <server/mutators/mutator/gamemode_keyhunt.qh>
+#include <server/mutators/mutator/gamemode_lms.qh>
+#include <server/mutators/mutator/gamemode_race.qh>
+#include <server/mutators/mutator/gamemode_tdm.qh>
diff --git a/qcsrc/server/pathlib/_mod.inc b/qcsrc/server/pathlib/_mod.inc
index c737f2440..88ce7fc19 100644
--- a/qcsrc/server/pathlib/_mod.inc
+++ b/qcsrc/server/pathlib/_mod.inc
@@ -1,8 +1,8 @@
 // generated file; do not modify
-#include "costs.qc"
-#include "debug.qc"
-#include "expandnode.qc"
-#include "main.qc"
-#include "movenode.qc"
-#include "path_waypoint.qc"
-#include "utility.qc"
+#include <server/pathlib/costs.qc>
+#include <server/pathlib/debug.qc>
+#include <server/pathlib/expandnode.qc>
+#include <server/pathlib/main.qc>
+#include <server/pathlib/movenode.qc>
+#include <server/pathlib/path_waypoint.qc>
+#include <server/pathlib/utility.qc>
diff --git a/qcsrc/server/pathlib/_mod.qh b/qcsrc/server/pathlib/_mod.qh
new file mode 100644
index 000000000..6fe0472e2
--- /dev/null
+++ b/qcsrc/server/pathlib/_mod.qh
@@ -0,0 +1,8 @@
+// generated file; do not modify
+#include <server/pathlib/costs.qh>
+#include <server/pathlib/debug.qh>
+#include <server/pathlib/expandnode.qh>
+#include <server/pathlib/main.qh>
+#include <server/pathlib/movenode.qh>
+#include <server/pathlib/path_waypoint.qh>
+#include <server/pathlib/utility.qh>
diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc
index 2c7eb9253..0396dee6c 100644
--- a/qcsrc/server/progs.inc
+++ b/qcsrc/server/progs.inc
@@ -5,7 +5,7 @@
 #include <lib/_all.inc>
 #include "_all.qh"
 
-#include "_mod.inc"
+#include "../server/_mod.inc"
 #include "bot/_mod.inc"
 #include "bot/havocbot/_mod.inc"
 #include "command/_mod.inc"
diff --git a/qcsrc/server/weapons/_mod.inc b/qcsrc/server/weapons/_mod.inc
index cb24b279d..b8954f293 100644
--- a/qcsrc/server/weapons/_mod.inc
+++ b/qcsrc/server/weapons/_mod.inc
@@ -1,11 +1,11 @@
 // generated file; do not modify
-#include "accuracy.qc"
-#include "common.qc"
-#include "csqcprojectile.qc"
-#include "hitplot.qc"
-#include "selection.qc"
-#include "spawning.qc"
-#include "throwing.qc"
-#include "tracing.qc"
-#include "weaponstats.qc"
-#include "weaponsystem.qc"
+#include <server/weapons/accuracy.qc>
+#include <server/weapons/common.qc>
+#include <server/weapons/csqcprojectile.qc>
+#include <server/weapons/hitplot.qc>
+#include <server/weapons/selection.qc>
+#include <server/weapons/spawning.qc>
+#include <server/weapons/throwing.qc>
+#include <server/weapons/tracing.qc>
+#include <server/weapons/weaponstats.qc>
+#include <server/weapons/weaponsystem.qc>
diff --git a/qcsrc/server/weapons/_mod.qh b/qcsrc/server/weapons/_mod.qh
new file mode 100644
index 000000000..dfa2cbf58
--- /dev/null
+++ b/qcsrc/server/weapons/_mod.qh
@@ -0,0 +1,11 @@
+// generated file; do not modify
+#include <server/weapons/accuracy.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/csqcprojectile.qh>
+#include <server/weapons/hitplot.qh>
+#include <server/weapons/selection.qh>
+#include <server/weapons/spawning.qh>
+#include <server/weapons/throwing.qh>
+#include <server/weapons/tracing.qh>
+#include <server/weapons/weaponstats.qh>
+#include <server/weapons/weaponsystem.qh>
diff --git a/qcsrc/tools/genmod.sh b/qcsrc/tools/genmod.sh
index 269c631f7..b4c4fc304 100755
--- a/qcsrc/tools/genmod.sh
+++ b/qcsrc/tools/genmod.sh
@@ -2,13 +2,26 @@
 set -eu
 cd "$(dirname "$0")"
 cd ..
+ROOT=$PWD/
 
-MOD=_mod.inc
+MOD=_mod
 
 function genmod() {
-    echo '// generated file; do not modify' > ${MOD}
+    # use context to work around cmake issue #12619
+    CTX="${PWD#$ROOT}/"
+    echo '// generated file; do not modify' > ${MOD}.inc
+    echo '// generated file; do not modify' > ${MOD}.qh
     for f in $(ls | sort -k 1,1 -t .); do
-        if [[ "$f" == *.qc ]]; then echo "#include \"$f\"" >> ${MOD}; fi
+        if [[ "$f" == cl_* ]]; then if [[ -f "${f#cl_}" ]]; then continue; fi; fi
+        if [[ "$f" == sv_* ]]; then if [[ -f "${f#sv_}" ]]; then continue; fi; fi
+        if [[ "$f" == ui_* ]]; then if [[ -f "${f#ui_}" ]]; then continue; fi; fi
+        if [[ "$f" == *.qc ]]; then
+            echo "#include <${CTX}$f>" >> ${MOD}.inc
+            echo "#include <${CTX}${f%.qc}.qh>" >> ${MOD}.qh
+            if [[ -f "cl_$f" ]]; then echo -e "#ifdef CSQC\n    #include <${CTX}cl_$f>\n#endif" >> ${MOD}.inc; fi
+            if [[ -f "sv_$f" ]]; then echo -e "#ifdef SVQC\n    #include <${CTX}sv_$f>\n#endif" >> ${MOD}.inc; fi
+            if [[ -f "ui_$f" ]]; then echo -e "#ifdef MENUQC\n    #include <${CTX}ui_$f>\n#endif" >> ${MOD}.inc; fi
+        fi
     done
     # echo >> ${MOD}
     for f in *; do if [ -d "$f" ]; then
-- 
2.39.2