From 01ecc72f2d69e2be587ee931d9be0aee886f4ea9 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 9 Apr 2016 18:22:20 +0200
Subject: [PATCH] fix a FIXME: include gamedata.h directly, not through save.h

---
 src/bind_storage.c    | 1 +
 src/kernel/building.c | 1 +
 src/kernel/faction.c  | 1 +
 src/kernel/save.h     | 5 ++---
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/bind_storage.c b/src/bind_storage.c
index 0255b2982..5dfca8c89 100644
--- a/src/bind_storage.c
+++ b/src/bind_storage.c
@@ -17,6 +17,7 @@ without prior permission by the authors of Eressea.
 #include <kernel/save.h>
 #include <kernel/version.h>
 
+#include <util/gamedata.h>
 #include <util/log.h>
 
 #include <storage.h>
diff --git a/src/kernel/building.c b/src/kernel/building.c
index f0e46cc7e..a080829f0 100644
--- a/src/kernel/building.c
+++ b/src/kernel/building.c
@@ -39,6 +39,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/bsdstring.h>
 #include <util/event.h>
 #include <util/functions.h>
+#include <util/gamedata.h>
 #include <util/language.h>
 #include <util/log.h>
 #include <quicklist.h>
diff --git a/src/kernel/faction.c b/src/kernel/faction.c
index cf8d73143..216283850 100755
--- a/src/kernel/faction.c
+++ b/src/kernel/faction.c
@@ -40,6 +40,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/base36.h>
 #include <util/bsdstring.h>
 #include <util/event.h>
+#include <util/gamedata.h>
 #include <util/goodies.h>
 #include <util/lists.h>
 #include <util/language.h>
diff --git a/src/kernel/save.h b/src/kernel/save.h
index 3d47fe612..3cd443926 100644
--- a/src/kernel/save.h
+++ b/src/kernel/save.h
@@ -20,7 +20,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define H_KRNL_SAVE
 
 #include <stream.h>
-#include <util/gamedata.h> // FIXME: eliminate include dependency from this file
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -78,8 +77,8 @@ extern "C" {
 
     void create_backup(char *file);
 
-    int write_game(gamedata *data);
-    int read_game(gamedata *data);
+    int write_game(struct gamedata *data);
+    int read_game(struct gamedata *data);
 
     /* test-only functions that give access to internal implementation details (BAD) */
     void _test_write_password(struct gamedata *data, const struct faction *f);