diff --git a/conf/e3/terrains.json b/conf/e3/terrains.json
index 5aa876950..ee0eb0e37 100644
--- a/conf/e3/terrains.json
+++ b/conf/e3/terrains.json
@@ -222,6 +222,6 @@
                     "div": "100"
                 }
             }
-        },
+        }
     }
 }
diff --git a/src/races/dragons.c b/src/races/dragons.c
index 828e68c64..222d63c89 100644
--- a/src/races/dragons.c
+++ b/src/races/dragons.c
@@ -13,7 +13,6 @@
  */
 
 #include <platform.h>
-#include <kernel/config.h>
 
 /* kernel includes */
 #include <kernel/race.h>
diff --git a/src/races/illusion.c b/src/races/illusion.c
index e2a05cfd3..7411ae4d5 100644
--- a/src/races/illusion.c
+++ b/src/races/illusion.c
@@ -11,7 +11,6 @@
  */
 
 #include <platform.h>
-#include <kernel/config.h>
 
 /* kernel includes */
 #include <kernel/race.h>
diff --git a/src/races/races.c b/src/races/races.c
index 68b3c5ae2..2c6cfffa9 100644
--- a/src/races/races.c
+++ b/src/races/races.c
@@ -9,7 +9,6 @@
  */
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "races.h"
 
 #include <kernel/building.h>
diff --git a/src/races/races.h b/src/races/races.h
index c0a516430..ea7be1337 100644
--- a/src/races/races.h
+++ b/src/races/races.h
@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+    struct unit;
 
     void register_races(void);
     void make_undead_unit(struct unit *);
diff --git a/src/races/zombies.c b/src/races/zombies.c
index d86074d26..ab4c89988 100644
--- a/src/races/zombies.c
+++ b/src/races/zombies.c
@@ -13,9 +13,9 @@
  */
 
 #include <platform.h>
-#include <kernel/config.h>
 
 /* kernel includes */
+#include <kernel/config.h>
 #include <kernel/race.h>
 #include <kernel/order.h>
 #include <kernel/unit.h>