diff --git a/src/kernel/config.h b/src/kernel/config.h
index 570d7c953..08afc5c22 100644
--- a/src/kernel/config.h
+++ b/src/kernel/config.h
@@ -26,7 +26,6 @@ extern "C" {
     /* this should always be the first thing included after platform.h */
 #include "types.h"
 
-    struct _dictionary_;
     /* experimental gameplay features (that don't affect the savefile) */
     /* TODO: move these settings to settings.h or into configuration files */
 #define GOBLINKILL              /* Goblin-Spezialklau kann tödlich enden */
diff --git a/src/kernel/unit.c b/src/kernel/unit.c
index 9e2a72e3f..042002a48 100644
--- a/src/kernel/unit.c
+++ b/src/kernel/unit.c
@@ -858,7 +858,7 @@ bool leave(unit * u, bool force)
 
 const struct race *urace(const struct unit *u)
 {
-    return u->race_;
+    return u->_race;
 }
 
 bool can_survive(const unit * u, const region * r)
@@ -1766,18 +1766,18 @@ const struct race *u_irace(const struct unit *u)
     if (u->irace && skill_enabled(SK_STEALTH)) {
         return u->irace;
     }
-    return u->race_;
+    return u->_race;
 }
 
 const struct race *u_race(const struct unit *u)
 {
-    return u->race_;
+    return u->_race;
 }
 
 void u_setrace(struct unit *u, const struct race *rc)
 {
     assert(rc);
-    u->race_ = rc;
+    u->_race = rc;
 }
 
 void unit_add_spell(unit * u, sc_mage * m, struct spell * sp, int level)
diff --git a/src/kernel/unit.h b/src/kernel/unit.h
index 6a089d2d4..f091477dc 100644
--- a/src/kernel/unit.h
+++ b/src/kernel/unit.h
@@ -104,7 +104,7 @@ extern "C" {
     struct order *old_orders;
 
     /* race and illusionary race */
-    const struct race *race_;
+    const struct race *_race;
     const struct race *irace;
 
     int flags;
diff --git a/src/laws.test.c b/src/laws.test.c
index 2280b155d..bc8fa7247 100644
--- a/src/laws.test.c
+++ b/src/laws.test.c
@@ -444,7 +444,7 @@ static void test_unarmed_races_can_guard(CuTest *tc) {
     race * rc;
 
     setup_guard(&fix, false);
-    rc = rc_get_or_create(fix.u->race_->_name);
+    rc = rc_get_or_create(fix.u->_race->_name);
     rc->flags |= RCF_UNARMEDGUARD;
     update_guards();
     CuAssertTrue(tc, fval(fix.u, UFL_GUARD));