diff --git a/src/alchemy.c b/src/alchemy.c
index fb0516359..d2dd64a04 100644
--- a/src/alchemy.c
+++ b/src/alchemy.c
@@ -34,7 +34,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* util includes */
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/base36.h>
 #include <util/log.h>
 #include <util/macros.h>
diff --git a/src/attributes/attributes.c b/src/attributes/attributes.c
index cf75efc58..400282ae7 100644
--- a/src/attributes/attributes.c
+++ b/src/attributes/attributes.c
@@ -55,7 +55,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include <kernel/attrib.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/macros.h>
 #include <util/resolve.h>
 
diff --git a/src/attributes/dict.c b/src/attributes/dict.c
index aa34886a6..70e88219d 100644
--- a/src/attributes/dict.c
+++ b/src/attributes/dict.c
@@ -32,7 +32,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/log.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/resolve.h>
 #include <util/strings.h>
 
diff --git a/src/attributes/follow.c b/src/attributes/follow.c
index 07fffbfd6..caeecee54 100644
--- a/src/attributes/follow.c
+++ b/src/attributes/follow.c
@@ -23,7 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/variant.h>
 
 #include <storage.h>
diff --git a/src/attributes/hate.c b/src/attributes/hate.c
index aff71d0e7..cef483cf6 100644
--- a/src/attributes/hate.c
+++ b/src/attributes/hate.c
@@ -23,7 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/macros.h>
 #include <util/resolve.h>
 
diff --git a/src/attributes/key.c b/src/attributes/key.c
index 462c7a63b..76a18c876 100644
--- a/src/attributes/key.c
+++ b/src/attributes/key.c
@@ -21,7 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "key.h"
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <storage.h>
 
diff --git a/src/attributes/movement.c b/src/attributes/movement.c
index 552ff51aa..01c75ffae 100644
--- a/src/attributes/movement.c
+++ b/src/attributes/movement.c
@@ -21,7 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "movement.h"
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/macros.h>
 
 #include <storage.h>
diff --git a/src/attributes/otherfaction.c b/src/attributes/otherfaction.c
index 87b29f252..fcf05da05 100644
--- a/src/attributes/otherfaction.c
+++ b/src/attributes/otherfaction.c
@@ -24,7 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/faction.h>
 #include <kernel/unit.h>
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 
 #include <storage.h>
 #include <assert.h>
diff --git a/src/attributes/seenspell.c b/src/attributes/seenspell.c
index 6108465cd..ae46980c3 100644
--- a/src/attributes/seenspell.c
+++ b/src/attributes/seenspell.c
@@ -24,7 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/spell.h>
 #include <kernel/spellbook.h>
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 
diff --git a/src/attributes/targetregion.c b/src/attributes/targetregion.c
index f67689052..600d2e184 100644
--- a/src/attributes/targetregion.c
+++ b/src/attributes/targetregion.c
@@ -23,7 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/region.h>
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/resolve.h>
 
 #include <storage.h>
diff --git a/src/bind_storage.c b/src/bind_storage.c
index aa7935312..5df148bb4 100644
--- a/src/bind_storage.c
+++ b/src/bind_storage.c
@@ -6,7 +6,7 @@
 
 #include <kernel/save.h>
 
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 
diff --git a/src/helpers.c b/src/helpers.c
index 2835b153d..223089c9c 100644
--- a/src/helpers.c
+++ b/src/helpers.c
@@ -22,7 +22,7 @@ without prior permission by the authors of Eressea.
 #include <kernel/attrib.h>
 #include <kernel/event.h>
 #include <util/functions.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/parser.h>
diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index 093a41429..06f58fc1b 100644
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -25,6 +25,7 @@ database.test.c
 equipment.test.c
 # event.test.c
 faction.test.c
+gamedata.test.c
 group.test.c
 item.test.c
 messages.test.c
@@ -60,6 +61,7 @@ curse.c
 equipment.c
 event.c
 faction.c
+gamedata.c
 group.c
 item.c
 messages.c
diff --git a/src/kernel/ally.c b/src/kernel/ally.c
index a2536c7d9..1fd7c0efd 100644
--- a/src/kernel/ally.c
+++ b/src/kernel/ally.c
@@ -12,7 +12,7 @@
 
 #include <kernel/attrib.h>
 #include <util/strings.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 
 #include <storage.h>
 
diff --git a/src/kernel/attrib.c b/src/kernel/attrib.c
index 375997df4..d84a8c8e9 100644
--- a/src/kernel/attrib.c
+++ b/src/kernel/attrib.c
@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/log.h>
 #include <util/strings.h>
 #include <util/variant.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 
 #include <storage.h>
 #include <critbit.h>
diff --git a/src/kernel/attrib.test.c b/src/kernel/attrib.test.c
index d266196e6..918b768fd 100644
--- a/src/kernel/attrib.test.c
+++ b/src/kernel/attrib.test.c
@@ -1,7 +1,7 @@
 #include <platform.h>
 #include "attrib.h"
 
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/strings.h>
 
 #include <storage.h>
diff --git a/src/kernel/building.c b/src/kernel/building.c
index 9627567ab..215c304e7 100644
--- a/src/kernel/building.c
+++ b/src/kernel/building.c
@@ -42,7 +42,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/base36.h>
 #include <kernel/event.h>
 #include <util/functions.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/log.h>
 #include <util/resolve.h>
diff --git a/src/kernel/connection.c b/src/kernel/connection.c
index c66bd06e0..7fc1213e0 100644
--- a/src/kernel/connection.c
+++ b/src/kernel/connection.c
@@ -28,7 +28,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/log.h>
 #include <util/macros.h>
diff --git a/src/kernel/curse.c b/src/kernel/curse.c
index 5f0c4a776..62e7ab9b2 100644
--- a/src/kernel/curse.c
+++ b/src/kernel/curse.c
@@ -36,7 +36,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/goodies.h>
 #include <util/language.h>
 #include <util/log.h>
diff --git a/src/kernel/curse.test.c b/src/kernel/curse.test.c
index 23a5ad54f..da0806914 100644
--- a/src/kernel/curse.test.c
+++ b/src/kernel/curse.test.c
@@ -6,7 +6,7 @@
 #include <kernel/unit.h>
 #include <kernel/attrib.h>
 #include <util/rng.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/message.h>
 #include <binarystore.h>
 #include <filestream.h>
diff --git a/src/kernel/event.c b/src/kernel/event.c
index ab095a008..f1ff825f5 100644
--- a/src/kernel/event.c
+++ b/src/kernel/event.c
@@ -21,7 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "attrib.h"
 
 /* util includes */
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/strings.h>
 
diff --git a/src/kernel/faction.c b/src/kernel/faction.c
index dea4ca54f..a78cd943a 100755
--- a/src/kernel/faction.c
+++ b/src/kernel/faction.c
@@ -45,7 +45,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/goodies.h>
 #include <util/lists.h>
 #include <util/language.h>
diff --git a/src/util/gamedata.c b/src/kernel/gamedata.c
similarity index 98%
rename from src/util/gamedata.c
rename to src/kernel/gamedata.c
index cd3fa01a7..4173332c4 100644
--- a/src/util/gamedata.c
+++ b/src/kernel/gamedata.c
@@ -1,7 +1,8 @@
 #include <platform.h>
 
 #include "gamedata.h"
-#include "log.h"
+
+#include <util/log.h>
 
 #include <storage.h>
 #include <filestream.h>
diff --git a/src/util/gamedata.h b/src/kernel/gamedata.h
similarity index 100%
rename from src/util/gamedata.h
rename to src/kernel/gamedata.h
diff --git a/src/util/gamedata.test.c b/src/kernel/gamedata.test.c
similarity index 100%
rename from src/util/gamedata.test.c
rename to src/kernel/gamedata.test.c
diff --git a/src/kernel/group.c b/src/kernel/group.c
index 9ebbf244d..54aa87aeb 100755
--- a/src/kernel/group.c
+++ b/src/kernel/group.c
@@ -32,7 +32,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/resolve.h>
 #include <util/strings.h>
 #include <util/unicode.h>
diff --git a/src/kernel/group.test.c b/src/kernel/group.test.c
index 5d1a28f6b..1c6d6339e 100644
--- a/src/kernel/group.test.c
+++ b/src/kernel/group.test.c
@@ -8,7 +8,7 @@
 #include "region.h"
 #include "save.h"
 
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <kernel/attrib.h>
 #include <attributes/key.h>
 
diff --git a/src/kernel/region.c b/src/kernel/region.c
index 2cb93b4a3..377bf1e22 100644
--- a/src/kernel/region.c
+++ b/src/kernel/region.c
@@ -43,7 +43,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include <util/assert.h>
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/strings.h>
 #include <util/lists.h>
 #include <util/log.h>
diff --git a/src/kernel/save.c b/src/kernel/save.c
index eb731e8d7..3bef185c3 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -61,9 +61,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/base36.h>
 #include <kernel/event.h>
 #include <util/filereader.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/goodies.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/lists.h>
 #include <util/log.h>
diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c
index 04ef9b1bb..8e738863f 100644
--- a/src/kernel/save.test.c
+++ b/src/kernel/save.test.c
@@ -20,7 +20,7 @@
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/password.h>
 #include <util/path.h>
 #include <util/strings.h>
diff --git a/src/kernel/spellbook.c b/src/kernel/spellbook.c
index 868f9757c..d230992cf 100644
--- a/src/kernel/spellbook.c
+++ b/src/kernel/spellbook.c
@@ -4,7 +4,7 @@
 #include <kernel/spell.h>
 
 #include <util/log.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/strings.h>
 
 #include "spellbook.h"
diff --git a/src/kernel/unit.c b/src/kernel/unit.c
index 13b2b1bf2..00d0aeece 100644
--- a/src/kernel/unit.c
+++ b/src/kernel/unit.c
@@ -53,7 +53,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/strings.h>
 #include <util/language.h>
 #include <util/lists.h>
diff --git a/src/magic.c b/src/magic.c
index 41aa0dbce..047ed167b 100644
--- a/src/magic.c
+++ b/src/magic.c
@@ -65,7 +65,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/lists.h>
 #include <util/log.h>
diff --git a/src/modules/gmcmd.c b/src/modules/gmcmd.c
index 56386f2a6..4cc573f16 100644
--- a/src/modules/gmcmd.c
+++ b/src/modules/gmcmd.c
@@ -33,7 +33,7 @@
 
 /* util includes */
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/macros.h>
 
 #include <storage.h>
diff --git a/src/modules/museum.c b/src/modules/museum.c
index b5cbf05ce..7e3a04f2d 100644
--- a/src/modules/museum.c
+++ b/src/modules/museum.c
@@ -41,7 +41,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/functions.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/strings.h>
 #include <util/language.h>
 #include <util/macros.h>
diff --git a/src/modules/xmas.c b/src/modules/xmas.c
index b4fd2cd24..aa296866a 100644
--- a/src/modules/xmas.c
+++ b/src/modules/xmas.c
@@ -28,7 +28,7 @@
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/goodies.h>
 #include <util/resolve.h>
 
diff --git a/src/move.c b/src/move.c
index b633d0ff7..8de997480 100644
--- a/src/move.c
+++ b/src/move.c
@@ -74,7 +74,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/assert.h>
 #include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/lists.h>
 #include <util/log.h>
diff --git a/src/spells.c b/src/spells.c
index 1238c1dae..00f256f26 100644
--- a/src/spells.c
+++ b/src/spells.c
@@ -73,7 +73,7 @@
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/macros.h>
 #include <util/message.h>
diff --git a/src/spells/borders.c b/src/spells/borders.c
index ff15ea971..5d99b1307 100644
--- a/src/spells/borders.c
+++ b/src/spells/borders.c
@@ -14,7 +14,7 @@
 #include <kernel/unit.h>
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/macros.h>
 #include <util/rand.h>
diff --git a/src/spells/flyingship.c b/src/spells/flyingship.c
index e23f6906b..2b830da2e 100644
--- a/src/spells/flyingship.c
+++ b/src/spells/flyingship.c
@@ -11,7 +11,7 @@
 #include <kernel/unit.h>
 #include <kernel/ship.h>
 
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 
 #include <magic.h>
 
diff --git a/src/spells/unitcurse.c b/src/spells/unitcurse.c
index a99eb082c..d0b381050 100644
--- a/src/spells/unitcurse.c
+++ b/src/spells/unitcurse.c
@@ -23,7 +23,7 @@
 #include <kernel/objtypes.h>
 
 /* util includes */
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/nrmessage.h>
 #include <util/macros.h>
diff --git a/src/triggers/changefaction.c b/src/triggers/changefaction.c
index 44edec269..8aa73168d 100644
--- a/src/triggers/changefaction.c
+++ b/src/triggers/changefaction.c
@@ -27,7 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>
diff --git a/src/triggers/changerace.c b/src/triggers/changerace.c
index 758df4dc6..5a834314a 100644
--- a/src/triggers/changerace.c
+++ b/src/triggers/changerace.c
@@ -27,7 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>
diff --git a/src/triggers/clonedied.c b/src/triggers/clonedied.c
index 5713a2b6c..c6593c2a4 100644
--- a/src/triggers/clonedied.c
+++ b/src/triggers/clonedied.c
@@ -29,7 +29,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>
diff --git a/src/triggers/createcurse.c b/src/triggers/createcurse.c
index 666c82a0f..544b9aafe 100644
--- a/src/triggers/createcurse.c
+++ b/src/triggers/createcurse.c
@@ -27,7 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>
diff --git a/src/triggers/createunit.c b/src/triggers/createunit.c
index 4ce2730dc..d4dd8f983 100644
--- a/src/triggers/createunit.c
+++ b/src/triggers/createunit.c
@@ -29,7 +29,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>
diff --git a/src/triggers/gate.c b/src/triggers/gate.c
index 8690d5752..065be8cf8 100644
--- a/src/triggers/gate.c
+++ b/src/triggers/gate.c
@@ -20,7 +20,7 @@
 /* util includes */
 #include <kernel/attrib.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>
diff --git a/src/triggers/giveitem.c b/src/triggers/giveitem.c
index 7815350a1..118497c86 100644
--- a/src/triggers/giveitem.c
+++ b/src/triggers/giveitem.c
@@ -27,7 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>
diff --git a/src/triggers/killunit.c b/src/triggers/killunit.c
index 37e55b25b..0338da4af 100644
--- a/src/triggers/killunit.c
+++ b/src/triggers/killunit.c
@@ -26,7 +26,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>
diff --git a/src/triggers/shock.c b/src/triggers/shock.c
index 767f0fd17..9a9d1c74b 100644
--- a/src/triggers/shock.c
+++ b/src/triggers/shock.c
@@ -32,7 +32,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>
diff --git a/src/triggers/timeout.c b/src/triggers/timeout.c
index 8acaaa38b..8e8a6b9bf 100644
--- a/src/triggers/timeout.c
+++ b/src/triggers/timeout.c
@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include <kernel/attrib.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index d0e505af2..4258a5edc 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -9,7 +9,6 @@ base36.test.c
 # dice.test.c
 # filereader.test.c
 functions.test.c
-gamedata.test.c
 # goodies.test.c
 language.test.c
 # lists.test.c
@@ -37,7 +36,6 @@ crmessage.c
 dice.c
 filereader.c
 functions.c
-gamedata.c
 goodies.c
 language.c
 lists.c
diff --git a/src/vortex.c b/src/vortex.c
index 948ad80fc..805b407c4 100644
--- a/src/vortex.c
+++ b/src/vortex.c
@@ -5,7 +5,7 @@
 #include <kernel/region.h>
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/log.h>
 #include <util/strings.h>
diff --git a/src/wormhole.c b/src/wormhole.c
index 5cf044d92..382e64d16 100644
--- a/src/wormhole.c
+++ b/src/wormhole.c
@@ -25,7 +25,7 @@
 
 /* util includes */
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/macros.h>
 #include <util/resolve.h>
diff --git a/tests/orders.txt b/tests/orders.txt
deleted file mode 100644
index a4a4f7456..000000000
--- a/tests/orders.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ERESSEA uhfr "Hodor"
-EINHEIT 8bz3
-BENENNEN EINHEIT 'Goldene Herde'