Tweak the order of some #includes

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 64813f2f4506063f3e188aa315dd31f0b26b5db3..99fecda0bbfc2855600c02a3ec2629845511f730 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -1,9 +1,10 @@
+#include "util.qh"
+
 #if defined(CSQC)
        #include "../dpdefs/csprogsdefs.qh"
     #include "../client/defs.qh"
     #include "constants.qh"
     #include "../warpzonelib/mathlib.qh"
-    #include "util.qh"
     #include "mapinfo.qh"
     #include "notifications.qh"
     #include "deathtypes.qh"
@@ -13,7 +14,6 @@
     #include "../dpdefs/dpextensions.qh"
     #include "../warpzonelib/mathlib.qh"
     #include "constants.qh"
-    #include "util.qh"
     #include "../server/autocvars.qh"
     #include "../server/defs.qh"
     #include "notifications.qh"

diff --git a/qcsrc/common/weapons/weapons.qc b/qcsrc/common/weapons/weapons.qc
index b9079a58f74dc46d61da003ea0607c76313f59c8..2b2fca39de4089f4d681600bbff57ec87df6994d 100644 (file)
--- a/qcsrc/common/weapons/weapons.qc
+++ b/qcsrc/common/weapons/weapons.qc
@@ -1,6 +1,8 @@
 #ifndef WEAPONS_C
 #define WEAPONS_C
 
+#include "weapons.qh"
+
 #if defined(CSQC)
        #include "../../dpdefs/csprogsdefs.qh"
        #include "../../client/defs.qh"
@@ -12,7 +14,6 @@
        #include "../../warpzonelib/client.qh"
        #include "../util.qh"
        #include "../buffs.qh"
-       #include "weapons.qh"
        #include "../../client/autocvars.qh"
        #include "../deathtypes.qh"
        #include "../../csqcmodellib/interpolate.qh"
@@ -35,7 +36,6 @@
     #include "../buffs.qh"
     #include "../monsters/monsters.qh"
     #include "config.qh"
-    #include "weapons.qh"
     #include "../../server/weapons/csqcprojectile.qh"
     #include "../../server/weapons/tracing.qh"
     #include "../../server/t_items.qh"