diff --git a/src/battle.c b/src/battle.c
index 5bf35f191..20e80e7c7 100644
--- a/src/battle.c
+++ b/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>
diff --git a/src/creport.c b/src/creport.c
index 986f58e09..8f32d3ac3 100644
--- a/src/creport.c
+++ b/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 */
diff --git a/src/economy.c b/src/economy.c
index 1836c1305..50978152d 100644
--- a/src/economy.c
+++ b/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"
diff --git a/src/kernel/build.c b/src/kernel/build.c
index f963797fd..649679d93 100644
--- a/src/kernel/build.c
+++ b/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"
diff --git a/src/laws.h b/src/laws.h
index 55020dc06..c5e9d573c 100755
--- a/src/laws.h
+++ b/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" {
diff --git a/src/laws.test.c b/src/laws.test.c
index 0f2d54e47..65f48012d 100644
--- a/src/laws.test.c
+++ b/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>
diff --git a/src/monsters.c b/src/monsters.c
index 3301f157a..9f49a2603 100644
--- a/src/monsters.c
+++ b/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"
diff --git a/src/move.c b/src/move.c
index dffa1243c..e7148a521 100644
--- a/src/move.c
+++ b/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"
diff --git a/src/report.c b/src/report.c
index dbd15f5e2..ddf78bc73 100644
--- a/src/report.c
+++ b/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"
diff --git a/src/reports.c b/src/reports.c
index a136645de..c183786b4 100644
--- a/src/reports.c
+++ b/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"
diff --git a/src/spells.c b/src/spells.c
index e4ca75fbc..46eda80bd 100644
--- a/src/spells.c
+++ b/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"
diff --git a/src/spy.c b/src/spy.c
index 2abd10b75..3233fb563 100644
--- a/src/spy.c
+++ b/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"