diff --git a/src/attributes/dict.c b/src/attributes/dict.c
index fa65d1f3d..cb24b148b 100644
--- a/src/attributes/dict.c
+++ b/src/attributes/dict.c
@@ -27,7 +27,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/save.h>
 #include <kernel/ship.h>
 #include <kernel/unit.h>
-#include <kernel/version.h>
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/attributes/hate.c b/src/attributes/hate.c
index 3d9a2fb0a..98a36a029 100644
--- a/src/attributes/hate.c
+++ b/src/attributes/hate.c
@@ -21,7 +21,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "hate.h"
 
 #include <kernel/unit.h>
-#include <kernel/version.h>
 
 #include <util/attrib.h>
 #include <util/gamedata.h>
diff --git a/src/attributes/targetregion.c b/src/attributes/targetregion.c
index b293b458c..93ef08d0b 100644
--- a/src/attributes/targetregion.c
+++ b/src/attributes/targetregion.c
@@ -22,7 +22,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include <kernel/region.h>
 #include <kernel/save.h>
-#include <kernel/version.h>
 
 #include <util/attrib.h>
 #include <util/gamedata.h>
diff --git a/src/bind_storage.c b/src/bind_storage.c
index 5dfca8c89..489255d3f 100644
--- a/src/bind_storage.c
+++ b/src/bind_storage.c
@@ -15,7 +15,6 @@ without prior permission by the authors of Eressea.
 #include "bind_storage.h"
 
 #include <kernel/save.h>
-#include <kernel/version.h>
 
 #include <util/gamedata.h>
 #include <util/log.h>
diff --git a/src/building_action.c b/src/building_action.c
index b6ce0f72c..5c533f4d0 100644
--- a/src/building_action.c
+++ b/src/building_action.c
@@ -13,7 +13,6 @@ without prior permission by the authors of Eressea.
 #include <platform.h>
 #include <kernel/config.h>
 #include <kernel/building.h>
-#include <kernel/version.h>
 #include <util/attrib.h>
 #include <util/gamedata.h>
 #include <util/log.h>
diff --git a/src/gmtool.c b/src/gmtool.c
index 7a87e4ae6..47b7794a2 100644
--- a/src/gmtool.c
+++ b/src/gmtool.c
@@ -44,7 +44,6 @@
 #include <kernel/ship.h>
 #include <kernel/terrain.h>
 #include <kernel/xmlreader.h>
-#include <kernel/version.h>
 
 #include <attributes/attributes.h>
 #include <triggers/triggers.h>
diff --git a/src/helpers.c b/src/helpers.c
index 3d08f1c08..aa9bc12eb 100644
--- a/src/helpers.c
+++ b/src/helpers.c
@@ -31,7 +31,6 @@ without prior permission by the authors of Eressea.
 #include <kernel/building.h>
 #include <kernel/item.h>
 #include <kernel/region.h>
-#include <kernel/version.h>
 
 #include <storage.h>
 
diff --git a/src/kernel/building.c b/src/kernel/building.c
index e4ae8f991..60b588912 100644
--- a/src/kernel/building.c
+++ b/src/kernel/building.c
@@ -30,7 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "skill.h"
 #include "save.h"
 #include "lighthouse.h"
-#include "version.h"
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/kernel/connection.c b/src/kernel/connection.c
index ef86f9a3a..9bbff5778 100644
--- a/src/kernel/connection.c
+++ b/src/kernel/connection.c
@@ -24,7 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "save.h"
 #include "terrain.h"
 #include "unit.h"
-#include "version.h"
 
 #include <util/attrib.h>
 #include <util/bsdstring.h>
diff --git a/src/kernel/curse.c b/src/kernel/curse.c
index 612127182..646c99687 100644
--- a/src/kernel/curse.c
+++ b/src/kernel/curse.c
@@ -30,7 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "ship.h"
 #include "skill.h"
 #include "unit.h"
-#include "version.h"
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/kernel/curse.test.c b/src/kernel/curse.test.c
index 2be81b19c..6514b2f3e 100644
--- a/src/kernel/curse.test.c
+++ b/src/kernel/curse.test.c
@@ -4,7 +4,6 @@
 #include <kernel/region.h>
 #include <kernel/save.h>
 #include <kernel/unit.h>
-#include <kernel/version.h>
 #include <util/attrib.h>
 #include <util/gamedata.h>
 #include <util/message.h>
diff --git a/src/kernel/faction.c b/src/kernel/faction.c
index 5db5f6404..69231ff43 100755
--- a/src/kernel/faction.c
+++ b/src/kernel/faction.c
@@ -33,7 +33,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "spellbook.h"
 #include "terrain.h"
 #include "unit.h"
-#include "version.h"
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/kernel/group.c b/src/kernel/group.c
index 600c5c6ab..054cf44dc 100755
--- a/src/kernel/group.c
+++ b/src/kernel/group.c
@@ -25,7 +25,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "faction.h"
 #include "save.h"
 #include "unit.h"
-#include "version.h"
 
 /* attrib includes */
 #include <attributes/raceprefix.h>
diff --git a/src/kernel/group.test.c b/src/kernel/group.test.c
index d8663d7b8..22d55e36f 100644
--- a/src/kernel/group.test.c
+++ b/src/kernel/group.test.c
@@ -7,7 +7,6 @@
 #include "unit.h"
 #include "region.h"
 #include "save.h"
-#include "version.h"
 
 #include <util/gamedata.h>
 #include <util/attrib.h>
diff --git a/src/kernel/race.c b/src/kernel/race.c
index b6a80e864..57f443ea5 100644
--- a/src/kernel/race.c
+++ b/src/kernel/race.c
@@ -34,7 +34,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "skill.h"
 #include "terrain.h"
 #include "unit.h"
-#include "version.h"
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/kernel/region.c b/src/kernel/region.c
index b04dc6709..d6aa9ef27 100644
--- a/src/kernel/region.c
+++ b/src/kernel/region.c
@@ -37,7 +37,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "terrain.h"
 #include "terrainid.h"
 #include "unit.h"
-#include "version.h"
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/kernel/save.c b/src/kernel/save.c
index fccd8468e..c0549ecdf 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -47,7 +47,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "terrainid.h"          /* only for conversion code */
 #include "unit.h"
 #include "lighthouse.h"
-#include "version.h"
 
 /* attributes includes */
 #include <attributes/key.h>
diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c
index f9998367a..ac356e89b 100644
--- a/src/kernel/save.test.c
+++ b/src/kernel/save.test.c
@@ -11,7 +11,6 @@
 #include "faction.h"
 #include "plane.h"
 #include "region.h"
-#include "version.h"
 
 #include <triggers/changefaction.h>
 #include <triggers/createunit.h>
diff --git a/src/kernel/version.h b/src/kernel/version.h
index 4aab16f5f..79251ab99 100644
--- a/src/kernel/version.h
+++ b/src/kernel/version.h
@@ -10,38 +10,3 @@
  without prior permission by the authors of Eressea.
  
  */
-#define INTPAK_VERSION 329      /* in binary, ints can get packed. starting with E2/572 */
-#define NOZEROIDS_VERSION 330   /* 2008-05-16 zero is not a valid ID for anything (including factions) */
-#define NOBORDERATTRIBS_VERSION 331     /* 2008-05-17 connection::attribs has been moved to userdata */
-#define UIDHASH_VERSION 332     /* 2008-05-22 borders use the region.uid to store */
-#define REGIONOWNER_VERSION 333 /* 2009-05-14 regions have owners and morale */
-#define ALLIANCELEADER_VERSION 333      /* alliances have a leader */
-#define CURSEFLOAT_VERSION 334  /* all curse-effects are float */
-#define MOURNING_VERSION 335    /* mourning peasants */
-#define FOSS_VERSION 336        /* the open source release */
-#define OWNER_2_VERSION 337     /* region owners contain an alliance */
-#define FIX_WATCHERS_VERSION 338     /* fixed storage of watchers */
-#define UNIQUE_SPELLS_VERSION 339    /* turn 775, spell names are now unique globally, not just per school */
-#define SPELLBOOK_VERSION 340        /* turn 775, full spellbooks are stored for factions */
-#define NOOVERRIDE_VERSION 341        /* turn 775, full spellbooks are stored for factions */
-#define INTFLAGS_VERSION 342   /* turn 876, FFL_NPC is now bit 25, flags is an int */
-#define SAVEGAMEID_VERSION 343 /* instead of XMLNAME, save the game.id parameter from the config */
-#define BUILDNO_VERSION 344 /* storing the build number in the save */
-#define AUTO_RACENAME_VERSION 345 /* NPC units with name==NULL will automatically get their race for a name */
-#define JSON_REPORT_VERSION 346 /* bit 3 in f->options flags the json report */
-#define EXPLICIT_CURSE_ISNEW_VERSION 347 /* CURSE_ISNEW is not reset in read/write, but in age() */
-#define SPELL_LEVEL_VERSION 348 /* f->max_spelllevel gets stored, not calculated */
-#define OWNER_3_VERSION 349 /* regions store last owner, not last alliance */
-#define ATTRIBOWNER_VERSION 351 /* all attrib_type functions know who owns the attribute */
-#define BADCRYPT_VERSION 351 /* passwords are broken, 969.dat only. */
-#define NOCRYPT_VERSION 352 /* passwords are plaintext again */
-#define ATHASH_VERSION 353 /* attribute-type hash, not name */
-#define NOWATCH_VERSION 354 /* plane->watchers is gone */
-/* unfinished: */
-#define CRYPT_VERSION 400 /* passwords are encrypted */
-
-#define RELEASE_VERSION NOWATCH_VERSION /* current datafile */
-#define MIN_VERSION INTPAK_VERSION      /* minimal datafile we support */
-#define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */
-
-#define STREAM_VERSION 2 /* internal encoding of binary files */
diff --git a/src/magic.c b/src/magic.c
index 6ff2ac8e5..1c4ca2adb 100644
--- a/src/magic.c
+++ b/src/magic.c
@@ -44,7 +44,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/spellbook.h>
 #include <kernel/terrain.h>
 #include <kernel/unit.h>
-#include <kernel/version.h>
 
 #include <triggers/timeout.h>
 #include <triggers/shock.h>
diff --git a/src/main.c b/src/main.c
index d011a473b..5aa5d7727 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,7 +21,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <kernel/config.h>
 #include <kernel/save.h>
-#include <kernel/version.h>
 #include <util/filereader.h>
 #include <util/language.h>
 #include "eressea.h"
diff --git a/src/spells.c b/src/spells.c
index e4bccadc8..ab4d6dd6d 100644
--- a/src/spells.c
+++ b/src/spells.c
@@ -53,7 +53,6 @@
 #include <kernel/terrainid.h>
 #include <kernel/unit.h>
 #include <kernel/xmlreader.h>
-#include <kernel/version.h>
 
 #include <races/races.h>
 
diff --git a/src/spells/borders.c b/src/spells/borders.c
index 2c222a9dd..474d37796 100644
--- a/src/spells/borders.c
+++ b/src/spells/borders.c
@@ -11,7 +11,6 @@
 #include <kernel/save.h>
 #include <kernel/terrain.h>
 #include <kernel/unit.h>
-#include <kernel/version.h>
 
 #include <util/attrib.h>
 #include <util/gamedata.h>
diff --git a/src/spells/flyingship.c b/src/spells/flyingship.c
index 1b6b56d26..4a3c62e5e 100644
--- a/src/spells/flyingship.c
+++ b/src/spells/flyingship.c
@@ -1,6 +1,5 @@
 #include <platform.h>
 #include <kernel/config.h>
-#include <kernel/version.h>
 #include "flyingship.h"
 
 #include <kernel/build.h>
diff --git a/src/spells/shipcurse.c b/src/spells/shipcurse.c
index 75e07a4ca..8da3c7c89 100644
--- a/src/spells/shipcurse.c
+++ b/src/spells/shipcurse.c
@@ -13,7 +13,6 @@
 
 #include <platform.h>
 #include <kernel/config.h>
-#include <kernel/version.h>
 #include "shipcurse.h"
 
 /* kernel includes */
diff --git a/src/spells/unitcurse.c b/src/spells/unitcurse.c
index c29935479..944db2032 100644
--- a/src/spells/unitcurse.c
+++ b/src/spells/unitcurse.c
@@ -22,7 +22,6 @@
 #include <kernel/unit.h>
 #include <kernel/faction.h>
 #include <kernel/objtypes.h>
-#include <kernel/version.h>
 
 /* util includes */
 #include <util/gamedata.h>
diff --git a/src/triggers/createcurse.c b/src/triggers/createcurse.c
index d0d65571b..fe39e8b7f 100644
--- a/src/triggers/createcurse.c
+++ b/src/triggers/createcurse.c
@@ -21,7 +21,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "createcurse.h"
 
 /* kernel includes */
-#include <kernel/version.h>
 #include <kernel/curse.h>
 #include <kernel/unit.h>
 
diff --git a/src/triggers/createunit.c b/src/triggers/createunit.c
index 6e98901ca..2fec00ade 100644
--- a/src/triggers/createunit.c
+++ b/src/triggers/createunit.c
@@ -25,7 +25,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 #include <kernel/race.h>
 #include <kernel/region.h>
-#include <kernel/version.h>
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/triggers/gate.c b/src/triggers/gate.c
index 2a9c5693d..acf2bb5d4 100644
--- a/src/triggers/gate.c
+++ b/src/triggers/gate.c
@@ -17,7 +17,6 @@
 #include <kernel/building.h>
 #include <kernel/region.h>
 #include <kernel/unit.h>
-#include <kernel/version.h>
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/util/gamedata.h b/src/util/gamedata.h
index e75f7d681..bb1632838 100644
--- a/src/util/gamedata.h
+++ b/src/util/gamedata.h
@@ -5,6 +5,42 @@
 
 #include <stream.h>
 
+#define INTPAK_VERSION 329      /* in binary, ints can get packed. starting with E2/572 */
+#define NOZEROIDS_VERSION 330   /* 2008-05-16 zero is not a valid ID for anything (including factions) */
+#define NOBORDERATTRIBS_VERSION 331     /* 2008-05-17 connection::attribs has been moved to userdata */
+#define UIDHASH_VERSION 332     /* 2008-05-22 borders use the region.uid to store */
+#define REGIONOWNER_VERSION 333 /* 2009-05-14 regions have owners and morale */
+#define ALLIANCELEADER_VERSION 333      /* alliances have a leader */
+#define CURSEFLOAT_VERSION 334  /* all curse-effects are float */
+#define MOURNING_VERSION 335    /* mourning peasants */
+#define FOSS_VERSION 336        /* the open source release */
+#define OWNER_2_VERSION 337     /* region owners contain an alliance */
+#define FIX_WATCHERS_VERSION 338     /* fixed storage of watchers */
+#define UNIQUE_SPELLS_VERSION 339    /* turn 775, spell names are now unique globally, not just per school */
+#define SPELLBOOK_VERSION 340        /* turn 775, full spellbooks are stored for factions */
+#define NOOVERRIDE_VERSION 341        /* turn 775, full spellbooks are stored for factions */
+#define INTFLAGS_VERSION 342   /* turn 876, FFL_NPC is now bit 25, flags is an int */
+#define SAVEGAMEID_VERSION 343 /* instead of XMLNAME, save the game.id parameter from the config */
+#define BUILDNO_VERSION 344 /* storing the build number in the save */
+#define AUTO_RACENAME_VERSION 345 /* NPC units with name==NULL will automatically get their race for a name */
+#define JSON_REPORT_VERSION 346 /* bit 3 in f->options flags the json report */
+#define EXPLICIT_CURSE_ISNEW_VERSION 347 /* CURSE_ISNEW is not reset in read/write, but in age() */
+#define SPELL_LEVEL_VERSION 348 /* f->max_spelllevel gets stored, not calculated */
+#define OWNER_3_VERSION 349 /* regions store last owner, not last alliance */
+#define ATTRIBOWNER_VERSION 351 /* all attrib_type functions know who owns the attribute */
+#define BADCRYPT_VERSION 351 /* passwords are broken, 969.dat only. */
+#define NOCRYPT_VERSION 352 /* passwords are plaintext again */
+#define ATHASH_VERSION 353 /* attribute-type hash, not name */
+#define NOWATCH_VERSION 354 /* plane->watchers is gone */
+/* unfinished: */
+#define CRYPT_VERSION 400 /* passwords are encrypted */
+
+#define RELEASE_VERSION NOWATCH_VERSION /* current datafile */
+#define MIN_VERSION INTPAK_VERSION      /* minimal datafile we support */
+#define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */
+
+#define STREAM_VERSION 2 /* internal encoding of binary files */
+
 struct storage;
 
 typedef struct gamedata {
diff --git a/src/vortex.c b/src/vortex.c
index 4b512476b..244c83a29 100644
--- a/src/vortex.c
+++ b/src/vortex.c
@@ -2,7 +2,6 @@
 #include "vortex.h"
 
 #include <kernel/config.h>
-#include <kernel/version.h>
 #include <kernel/region.h>
 
 #include <util/attrib.h>
diff --git a/src/wormhole.c b/src/wormhole.c
index 916c0509d..6a115a9f7 100644
--- a/src/wormhole.c
+++ b/src/wormhole.c
@@ -23,7 +23,6 @@
 #include <kernel/plane.h>
 #include <kernel/region.h>
 #include <kernel/unit.h>
-#include <kernel/version.h>
 
 /* util includes */
 #include <util/attrib.h>