include guard.h directly, not through laws.h

src/battle.c

@@ -21,10 +21,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "battle.h"
 #include "alchemy.h"
 #include "chaos.h"
-#include "move.h"
+#include "guard.h"
 #include "laws.h"
-#include "skill.h"
 #include "monster.h"
+#include "move.h"
+#include "skill.h"
 
 #include <kernel/ally.h>
 #include <kernel/alliance.h>

src/creport.c

@@ -11,6 +11,7 @@ without prior permission by the authors of Eressea.
 #include <kernel/config.h>
 #include <kernel/version.h>
 #include "creport.h"
+#include "guard.h"
 #include "travelthru.h"
 
 /* tweakable features */

src/economy.c

@@ -24,6 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "alchemy.h"
 #include "direction.h"
 #include "donations.h"
+#include "guard.h"
 #include "give.h"
 #include "laws.h"
 #include "randenc.h"

src/kernel/build.c

@@ -24,6 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "direction.h"
 #include "move.h"
 #include "study.h"
+#include "guard.h"
 #include "laws.h"
 #include "skill.h"
 #include "lighthouse.h"

src/laws.h

@@ -20,7 +20,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define H_GC_LAWS
 
 #include <kernel/types.h>
-#include "guard.h"
 
 #ifdef __cplusplus
 extern "C" {

src/laws.test.c

@@ -1,6 +1,7 @@
 #include <platform.h>
 #include "laws.h"
 #include "battle.h"
+#include "guard.h"
 #include "monster.h"
 
 #include <kernel/ally.h>

src/monsters.c

@@ -25,6 +25,7 @@
 #include "economy.h"
 #include "chaos.h"
 #include "give.h"
+#include "guard.h"
 #include "monster.h"
 #include "laws.h"
 #include "keyword.h"

src/move.c

@@ -20,6 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <platform.h>
 #include <kernel/config.h>
 #include "move.h"
+#include "guard.h"
 #include "laws.h"
 #include "reports.h"
 #include "study.h"

src/report.c

@@ -23,6 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "report.h"
 #include "reports.h"
+#include "guard.h"
 #include "laws.h"
 #include "travelthru.h"
 #include "monster.h"

src/reports.c

@@ -19,6 +19,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <platform.h>
 #include <kernel/config.h>
 #include "reports.h"
+#include "guard.h"
 #include "laws.h"
 #include "travelthru.h"
 #include "lighthouse.h"

src/spells.c

@@ -15,6 +15,7 @@
 #include <platform.h>
 #include <kernel/config.h>
 
+#include "guard.h"
 #include "spy.h"
 #include "vortex.h"
 #include "laws.h"

src/spy.c

@@ -19,6 +19,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <platform.h>
 #include <kernel/config.h>
 #include "spy.h"
+#include "guard.h"
 #include "laws.h"
 #include "move.h"
 #include "reports.h"