#if XONOTIC
-#include "_all.qh"
-
-#include "../client/_mod.inc"
-#include "commands/_mod.inc"
-#include "hud/_mod.inc"
-#include "mutators/_mod.inc"
-#include "weapons/_mod.inc"
+#include <client/_mod.inc>
#include <common/_all.inc>
-#include <common/effects/qc/all.qc>
+#include <common/effects/qc/_mod.inc>
#include <lib/csqcmodel/cl_model.qc>
#include <lib/csqcmodel/cl_player.qc>
#include <lib/warpzone/server.qc>
#include <lib/warpzone/util_server.qc>
+#include <ecs/_mod.inc>
#endif
-#include <ecs/_lib.inc>
-
-#if BUILD_MOD
-#include "../../mod/client/progs.inc"
+#ifdef BUILD_MOD
+#include <mod/client/progs.inc>
#endif