diff --git a/scripts/tests/process.lua b/scripts/tests/process.lua
index 0006fcd74..1fc9a64f5 100644
--- a/scripts/tests/process.lua
+++ b/scripts/tests/process.lua
@@ -24,21 +24,31 @@ local function assert_file(filename, exists)
 end
 
 function test_process_turn()
+    turn_begin()
     turn = get_turn()
+    turn_process()
+    turn_end()
+    assert_equal(turn, get_turn())
     turn_begin()
     assert_equal(turn+1, get_turn())
+    turn_process()
+    turn_end()
+end
+
+function test_write_reports()
+    turn_begin()
+    turn = get_turn()
     u:add_order("NUMMER PARTEI 777")
     turn_process()
     assert_equal(0, init_reports())
     assert_equal(0, write_reports())
-    assert_equal(0, eressea.write_game("test.dat"))
-    assert_file("data/test.dat")
-    assert_file("reports/" .. get_turn() .. "-777.nr")
-    assert_file("reports/" .. get_turn() .. "-777.cr")
-    assert_file("reports/" .. get_turn() .. "-777.txt")
+    assert_file("reports/" .. turn .. "-777.nr")
+    assert_file("reports/" .. turn .. "-777.cr")
+    assert_file("reports/" .. turn .. "-777.txt")
     assert_file("reports/reports.txt")
     os.remove("reports")
-    os.remove("data")
+    assert_equal(0, eressea.write_game("test.dat"))
+    assert_file("data/test.dat")
+    os.remove("data/test.dat")
     turn_end()
-    assert_equal(turn+1, get_turn())
 end
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a74d1d732..3c47385f1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -86,7 +86,6 @@ ENDIF()
 
 set (ERESSEA_SRC
   vortex.c
-  calendar.c
   move.c
   piracy.c
   spells.c
@@ -198,7 +197,6 @@ set(TESTS_SRC
   academy.test.c
   alchemy.test.c
   battle.test.c
-  calendar.test.c
   creport.test.c
   direction.test.c
   donations.test.c
diff --git a/src/bind_region.c b/src/bind_region.c
index 8514bf639..a87b6f856 100644
--- a/src/bind_region.c
+++ b/src/bind_region.c
@@ -9,6 +9,7 @@
 
 #include "chaos.h"
 
+#include <kernel/calendar.h>
 #include <kernel/config.h>
 #include <kernel/curse.h>
 #include <kernel/region.h>
diff --git a/src/bindings.c b/src/bindings.c
index 811c1853e..35657b5be 100755
--- a/src/bindings.c
+++ b/src/bindings.c
@@ -3,6 +3,28 @@
 #endif
 
 #include "bindings.h"
+
+#include "kernel/calendar.h"
+#include "kernel/config.h"
+#include "kernel/alliance.h"
+#include "kernel/building.h"
+#include "kernel/curse.h"
+#include "kernel/equipment.h"
+#include "kernel/unit.h"
+#include "kernel/terrain.h"
+#include "kernel/messages.h"
+#include "kernel/region.h"
+#include "kernel/building.h"
+#include "kernel/plane.h"
+#include "kernel/race.h"
+#include "kernel/item.h"
+#include "kernel/order.h"
+#include "kernel/ship.h"
+#include "kernel/faction.h"
+#include "kernel/save.h"
+#include "kernel/spell.h"
+#include "kernel/spellbook.h"
+
 #include "bind_unit.h"
 #include "bind_storage.h"
 #include "bind_building.h"
@@ -13,33 +35,11 @@
 #include "bind_ship.h"
 #include "bind_gmtool.h"
 #include "bind_region.h"
+
 #include "helpers.h"
 #include "console.h"
 #include "reports.h"
 #include "study.h"
-#include "calendar.h"
-
-#include <kernel/config.h>
-
-#include <kernel/alliance.h>
-#include <kernel/building.h>
-#include <kernel/curse.h>
-#include <kernel/equipment.h>
-#include <kernel/unit.h>
-#include <kernel/terrain.h>
-#include <kernel/messages.h>
-#include <kernel/region.h>
-#include <kernel/building.h>
-#include <kernel/plane.h>
-#include <kernel/race.h>
-#include <kernel/item.h>
-#include <kernel/order.h>
-#include <kernel/ship.h>
-#include <kernel/faction.h>
-#include <kernel/save.h>
-#include <kernel/spell.h>
-#include <kernel/spellbook.h>
-
 #include "economy.h"
 #include "summary.h"
 #include "teleport.h"
diff --git a/src/creport.c b/src/creport.c
index 04f6c6bc4..773628a82 100644
--- a/src/creport.c
+++ b/src/creport.c
@@ -42,25 +42,26 @@ without prior permission by the authors of Eressea.
 #include "teleport.h"
 
 /* kernel includes */
-#include <kernel/alliance.h>
-#include <kernel/ally.h>
-#include <kernel/connection.h>
-#include <kernel/building.h>
-#include <kernel/curse.h>
-#include <kernel/faction.h>
-#include <kernel/group.h>
-#include <kernel/item.h>
-#include <kernel/messages.h>
-#include <kernel/order.h>
-#include <kernel/plane.h>
-#include <kernel/race.h>
-#include <kernel/region.h>
-#include <kernel/resources.h>
-#include <kernel/ship.h>
-#include <kernel/spell.h>
-#include <kernel/spellbook.h>
-#include <kernel/terrain.h>
-#include <kernel/unit.h>
+#include "kernel/alliance.h"
+#include "kernel/ally.h"
+#include "kernel/calendar.h"
+#include "kernel/connection.h"
+#include "kernel/building.h"
+#include "kernel/curse.h"
+#include "kernel/faction.h"
+#include "kernel/group.h"
+#include "kernel/item.h"
+#include "kernel/messages.h"
+#include "kernel/order.h"
+#include "kernel/plane.h"
+#include "kernel/race.h"
+#include "kernel/region.h"
+#include "kernel/resources.h"
+#include "kernel/ship.h"
+#include "kernel/spell.h"
+#include "kernel/spellbook.h"
+#include "kernel/terrain.h"
+#include "kernel/unit.h"
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/economy.c b/src/economy.c
index 219d818f9..9774ab3eb 100644
--- a/src/economy.c
+++ b/src/economy.c
@@ -36,7 +36,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "monsters.h"
 #include "morale.h"
 #include "reports.h"
-#include "calendar.h"
 
 #include <attributes/reduceproduction.h>
 #include <attributes/racename.h>
@@ -45,23 +44,24 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <spells/unitcurse.h>
 
 /* kernel includes */
-#include <kernel/ally.h>
-#include <kernel/building.h>
-#include <kernel/curse.h>
-#include <kernel/equipment.h>
-#include <kernel/faction.h>
-#include <kernel/item.h>
-#include <kernel/messages.h>
-#include <kernel/order.h>
-#include <kernel/plane.h>
-#include <kernel/pool.h>
-#include <kernel/race.h>
-#include <kernel/region.h>
-#include <kernel/resources.h>
-#include <kernel/ship.h>
-#include <kernel/terrain.h>
-#include <kernel/terrainid.h>
-#include <kernel/unit.h>
+#include "kernel/ally.h"
+#include "kernel/building.h"
+#include "kernel/calendar.h"
+#include "kernel/curse.h"
+#include "kernel/equipment.h"
+#include "kernel/faction.h"
+#include "kernel/item.h"
+#include "kernel/messages.h"
+#include "kernel/order.h"
+#include "kernel/plane.h"
+#include "kernel/pool.h"
+#include "kernel/race.h"
+#include "kernel/region.h"
+#include "kernel/resources.h"
+#include "kernel/ship.h"
+#include "kernel/terrain.h"
+#include "kernel/terrainid.h"
+#include "kernel/unit.h"
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/eressea.c b/src/eressea.c
index 95d190d70..03f194238 100644
--- a/src/eressea.c
+++ b/src/eressea.c
@@ -1,29 +1,28 @@
 #include <platform.h>
-#include "settings.h"
 #include "eressea.h"
 
-#include <kernel/config.h>
-#include <util/log.h>
+#include "kernel/calendar.h"
+#include "kernel/config.h"
+#include "kernel/curse.h"
+#include "kernel/building.h"
+#include "kernel/equipment.h"
+#include "kernel/item.h"
+#include "kernel/database.h"
 
-#include <modules/museum.h>
-#include <triggers/triggers.h>
-#include <util/language.h>
-#include <util/functions.h>
-#include <kernel/building.h>
-#include <kernel/curse.h>
-#include <kernel/equipment.h>
-#include <kernel/item.h>
-#include <kernel/database.h>
-#include <modules/gmcmd.h>
-#include <modules/xmas.h>
-#include <items/xerewards.h>
-#include <items/weapons.h>
+#include "util/functions.h"
+#include "util/language.h"
+#include "util/log.h"
+#include "util/message.h"
 
-#include <attributes/attributes.h>
-#include <util/message.h>
-#include <races/races.h>
+#include "modules/gmcmd.h"
+#include "modules/xmas.h"
+#include "modules/museum.h"
+#include "triggers/triggers.h"
+#include "items/xerewards.h"
+#include "items/weapons.h"
+#include "attributes/attributes.h"
+#include "races/races.h"
 
-#include "calendar.h"
 #include "chaos.h"
 #include "items.h"
 #include "creport.h"
diff --git a/src/gmtool.c b/src/gmtool.c
index 51a86e16c..ffe189611 100644
--- a/src/gmtool.c
+++ b/src/gmtool.c
@@ -23,18 +23,19 @@
 #include <modules/museum.h>
 #include <modules/autoseed.h>
 
-#include <kernel/building.h>
-#include <kernel/faction.h>
-#include <kernel/item.h>
-#include <kernel/plane.h>
-#include <kernel/race.h>
-#include <kernel/region.h>
-#include <kernel/terrainid.h>
-#include <kernel/unit.h>
-#include <kernel/resources.h>
-#include <kernel/save.h>
-#include <kernel/ship.h>
-#include <kernel/terrain.h>
+#include "kernel/building.h"
+#include "kernel/calendar.h"
+#include "kernel/faction.h"
+#include "kernel/item.h"
+#include "kernel/plane.h"
+#include "kernel/race.h"
+#include "kernel/region.h"
+#include "kernel/terrainid.h"
+#include "kernel/unit.h"
+#include "kernel/resources.h"
+#include "kernel/save.h"
+#include "kernel/ship.h"
+#include "kernel/terrain.h"
 
 #include <attributes/attributes.h>
 #include <triggers/triggers.h>
@@ -53,7 +54,6 @@
 #include "console.h"
 #include "listbox.h"
 #include "wormhole.h"
-#include "calendar.h"
 #include "teleport.h"
 #include "xmlreader.h"
 
diff --git a/src/jsonconf.c b/src/jsonconf.c
index ed10f558f..c14ac9216 100644
--- a/src/jsonconf.c
+++ b/src/jsonconf.c
@@ -11,36 +11,36 @@ without prior permission by the authors of Eressea.
 */
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "jsonconf.h"
 
 /* kernel includes */
-#include <kernel/building.h>
-#include <kernel/equipment.h>
-#include <kernel/item.h>
-#include <kernel/messages.h>
-#include <kernel/race.h>
-#include <kernel/region.h>
-#include <kernel/resources.h>
-#include <kernel/ship.h>
-#include <kernel/terrain.h>
-#include <kernel/spell.h>
-#include <kernel/spellbook.h>
+#include "kernel/building.h"
+#include "kernel/calendar.h"
+#include "kernel/config.h"
+#include "kernel/equipment.h"
+#include "kernel/item.h"
+#include "kernel/messages.h"
+#include "kernel/race.h"
+#include "kernel/region.h"
+#include "kernel/resources.h"
+#include "kernel/ship.h"
+#include "kernel/terrain.h"
+#include "kernel/spell.h"
+#include "kernel/spellbook.h"
 
 /* util includes */
-#include <util/attrib.h>
-#include <util/crmessage.h>
-#include <util/functions.h>
-#include <util/language.h>
-#include <util/log.h>
-#include <util/message.h>
-#include <util/nrmessage.h>
-#include <util/path.h>
-#include <util/strings.h>
-#include <util/xml.h>
+#include "util/attrib.h"
+#include "util/crmessage.h"
+#include "util/functions.h"
+#include "util/language.h"
+#include "util/log.h"
+#include "util/message.h"
+#include "util/nrmessage.h"
+#include "util/path.h"
+#include "util/strings.h"
+#include "util/xml.h"
 
 /* game modules */
-#include "calendar.h"
 #include "direction.h"
 #include "keyword.h"
 #include "move.h"
diff --git a/src/jsonconf.test.c b/src/jsonconf.test.c
index 29c68e600..88630c833 100644
--- a/src/jsonconf.test.c
+++ b/src/jsonconf.test.c
@@ -17,7 +17,7 @@
 
 #include "util/language.h"
 
-#include "calendar.h"
+#include "kernel/calendar.h"
 #include "direction.h"
 #include "keyword.h"
 #include "move.h"
diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index cb8373fa2..59b8cb806 100644
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -7,6 +7,7 @@ ally.test.c
 build.test.c
 building.test.c
 # callbacks.test.c
+calendar.test.c
 command.test.c
 config.test.c
 # connection.test.c
@@ -49,6 +50,7 @@ ally.c
 build.c
 building.c
 callbacks.c
+calendar.c
 command.c
 config.c
 connection.c
diff --git a/src/kernel/alliance.c b/src/kernel/alliance.c
index 1aa3edd95..d5dda0143 100644
--- a/src/kernel/alliance.c
+++ b/src/kernel/alliance.c
@@ -11,19 +11,20 @@ without prior permission by the authors of Eressea.
 */
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "alliance.h"
 
-#include <attributes/key.h>
-
 /* kernel includes */
-#include <kernel/building.h>
-#include <kernel/faction.h>
-#include <kernel/messages.h>
-#include <kernel/order.h>
-#include <kernel/region.h>
-#include <kernel/unit.h>
-#include <kernel/command.h>
+#include "calendar.h"
+#include "config.h"
+#include "building.h"
+#include "faction.h"
+#include "messages.h"
+#include "order.h"
+#include "region.h"
+#include "unit.h"
+#include "command.h"
+
+#include <attributes/key.h>
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/kernel/building.test.c b/src/kernel/building.test.c
index 8d5b86dc9..9c7013db3 100644
--- a/src/kernel/building.test.c
+++ b/src/kernel/building.test.c
@@ -1,5 +1,6 @@
 #include <platform.h>
 
+#include <kernel/calendar.h>
 #include <kernel/config.h>
 #include <kernel/race.h>
 #include <kernel/region.h>
diff --git a/src/calendar.c b/src/kernel/calendar.c
similarity index 99%
rename from src/calendar.c
rename to src/kernel/calendar.c
index 23562daa6..df9f6c204 100644
--- a/src/calendar.c
+++ b/src/kernel/calendar.c
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+int turn = 0;
 int first_month = 0;
 int weeks_per_month = 3;
 int months_per_year = 12;
diff --git a/src/calendar.h b/src/kernel/calendar.h
similarity index 97%
rename from src/calendar.h
rename to src/kernel/calendar.h
index af4bd6a4f..164a96bf4 100644
--- a/src/calendar.h
+++ b/src/kernel/calendar.h
@@ -17,6 +17,7 @@ extern "C" {
     extern int months_per_year;
     extern int *month_season;
     extern int first_month;
+    extern int turn;
 
     extern char **weeknames;
     extern char **weeknames2;
diff --git a/src/calendar.test.c b/src/kernel/calendar.test.c
similarity index 100%
rename from src/calendar.test.c
rename to src/kernel/calendar.test.c
diff --git a/src/kernel/config.c b/src/kernel/config.c
index 2895ed70a..05690e301 100644
--- a/src/kernel/config.c
+++ b/src/kernel/config.c
@@ -29,7 +29,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "curse.h"
 #include "connection.h"
 #include "building.h"
-#include "calendar.h"
 #include "direction.h"
 #include "equipment.h"
 #include "faction.h"
@@ -98,8 +97,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 struct settings global;
 
-int turn = 0;
-
 const char *parameters[MAXPARAMS] = {
     "LOCALE",
     "ALLES",
diff --git a/src/kernel/config.h b/src/kernel/config.h
index e0ad682c6..94abcb7f4 100644
--- a/src/kernel/config.h
+++ b/src/kernel/config.h
@@ -141,8 +141,6 @@ extern "C" {
     extern const char *parameters[];
     extern settings global;
 
-    extern int turn;
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/kernel/faction.c b/src/kernel/faction.c
index 90649600f..36f467c6e 100755
--- a/src/kernel/faction.c
+++ b/src/kernel/faction.c
@@ -17,8 +17,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **/
 
 #include <platform.h>
-#include <kernel/config.h>
+
 #include "faction.h"
+
+#include "calendar.h"
+#include "config.h"
 #include "alliance.h"
 #include "ally.h"
 #include "curse.h"
diff --git a/src/kernel/faction.test.c b/src/kernel/faction.test.c
index 904609be5..18a64ee90 100644
--- a/src/kernel/faction.test.c
+++ b/src/kernel/faction.test.c
@@ -2,6 +2,7 @@
 
 #include <kernel/ally.h>
 #include <kernel/alliance.h>
+#include <kernel/calendar.h>
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/plane.h>
diff --git a/src/kernel/region.c b/src/kernel/region.c
index 28d4e8bee..40b6ad484 100644
--- a/src/kernel/region.c
+++ b/src/kernel/region.c
@@ -17,12 +17,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **/
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "region.h"
 
 /* kernel includes */
 #include "alliance.h"
 #include "building.h"
+#include "calendar.h"
+#include "config.h"
 #include "connection.h"
 #include "curse.h"
 #include "equipment.h"
diff --git a/src/kernel/save.c b/src/kernel/save.c
index a4bfdcbca..3dce7185e 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -25,6 +25,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "alliance.h"
 #include "ally.h"
 #include "building.h"
+#include "calendar.h"
 #include "connection.h"
 #include "equipment.h"
 #include "faction.h"
diff --git a/src/kernel/unit.c b/src/kernel/unit.c
index acc28fff3..037ca7c06 100644
--- a/src/kernel/unit.c
+++ b/src/kernel/unit.c
@@ -22,6 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "ally.h"
 #include "building.h"
+#include "calendar.h"
 #include "faction.h"
 #include "group.h"
 #include "connection.h"
diff --git a/src/laws.c b/src/laws.c
index a31d67589..739b6a0a4 100644
--- a/src/laws.c
+++ b/src/laws.c
@@ -41,43 +41,33 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "prefix.h"
 #include "reports.h"
 #include "teleport.h"
-#include "calendar.h"
 #include "guard.h"
 #include "volcano.h"
 
-/* attributes includes */
-#include <attributes/racename.h>
-#include <attributes/raceprefix.h>
-#include <attributes/seenspell.h>
-#include <attributes/stealth.h>
-
-#include <spells/buildingcurse.h>
-#include <spells/regioncurse.h>
-#include <spells/unitcurse.h>
-
 /* kernel includes */
-#include <kernel/alliance.h>
-#include <kernel/ally.h>
-#include <kernel/callbacks.h>
-#include <kernel/connection.h>
-#include <kernel/curse.h>
-#include <kernel/building.h>
-#include <kernel/faction.h>
-#include <kernel/group.h>
-#include <kernel/item.h>
-#include <kernel/messages.h>
-#include <kernel/order.h>
-#include <kernel/plane.h>
-#include <kernel/pool.h>
-#include <kernel/race.h>
-#include <kernel/region.h>
-#include <kernel/resources.h>
-#include <kernel/ship.h>
-#include <kernel/spell.h>
-#include <kernel/spellbook.h>
-#include <kernel/terrain.h>
-#include <kernel/terrainid.h>
-#include <kernel/unit.h>
+#include "kernel/alliance.h"
+#include "kernel/ally.h"
+#include "kernel/calendar.h"
+#include "kernel/callbacks.h"
+#include "kernel/connection.h"
+#include "kernel/curse.h"
+#include "kernel/building.h"
+#include "kernel/faction.h"
+#include "kernel/group.h"
+#include "kernel/item.h"
+#include "kernel/messages.h"
+#include "kernel/order.h"
+#include "kernel/plane.h"
+#include "kernel/pool.h"
+#include "kernel/race.h"
+#include "kernel/region.h"
+#include "kernel/resources.h"
+#include "kernel/ship.h"
+#include "kernel/spell.h"
+#include "kernel/spellbook.h"
+#include "kernel/terrain.h"
+#include "kernel/terrainid.h"
+#include "kernel/unit.h"
 
 /* util includes */
 #include <util/attrib.h>
@@ -98,10 +88,20 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/umlaut.h>
 #include <util/unicode.h>
 
+/* attributes includes */
 #include <attributes/otherfaction.h>
+#include <attributes/racename.h>
+#include <attributes/raceprefix.h>
+#include <attributes/seenspell.h>
+#include <attributes/stealth.h>
+
+#include <spells/buildingcurse.h>
+#include <spells/regioncurse.h>
+#include <spells/unitcurse.h>
 
 #include <selist.h>
 #include <iniparser.h>
+
 /* libc includes */
 #include <assert.h>
 #include <stdio.h>
diff --git a/src/laws.test.c b/src/laws.test.c
index 5edde187d..888614a1a 100644
--- a/src/laws.test.c
+++ b/src/laws.test.c
@@ -6,6 +6,7 @@
 
 #include <kernel/ally.h>
 #include <kernel/alliance.h>
+#include <kernel/calendar.h>
 #include <kernel/config.h>
 #include <kernel/building.h>
 #include <kernel/faction.h>
diff --git a/src/main.c b/src/main.c
index f50f65472..ae6d2158c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,6 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <platform.h>
 #endif
 
+#include <kernel/calendar.h>
 #include <kernel/config.h>
 #include <kernel/database.h>
 #include <kernel/messages.h>
diff --git a/src/monsters.c b/src/monsters.c
index d1979414d..97b29d2cc 100644
--- a/src/monsters.c
+++ b/src/monsters.c
@@ -18,7 +18,6 @@
  */
 
 #include <platform.h>
-#include <kernel/config.h>
 
 #include "monsters.h"
 
@@ -29,32 +28,27 @@
 #include "laws.h"
 #include "keyword.h"
 #include "study.h"
-
-/* attributes includes */
-#include <attributes/targetregion.h>
-#include <attributes/hate.h>
-
-#include <spells/regioncurse.h>
+#include "move.h"
 
 /* kernel includes */
-#include <kernel/build.h>
-#include <kernel/building.h>
-#include <kernel/curse.h>
-#include <kernel/equipment.h>
-#include <kernel/faction.h>
-#include <kernel/item.h>
-#include <kernel/messages.h>
-#include <kernel/order.h>
-#include <kernel/pathfinder.h>
-#include <kernel/pool.h>
-#include <kernel/race.h>
-#include <kernel/region.h>
-#include <kernel/ship.h>
-#include <kernel/terrain.h>
-#include <kernel/terrainid.h>
-#include <kernel/unit.h>
-
-#include <move.h>
+#include "kernel/build.h"
+#include "kernel/building.h"
+#include "kernel/calendar.h"
+#include "kernel/config.h"
+#include "kernel/curse.h"
+#include "kernel/equipment.h"
+#include "kernel/faction.h"
+#include "kernel/item.h"
+#include "kernel/messages.h"
+#include "kernel/order.h"
+#include "kernel/pathfinder.h"
+#include "kernel/pool.h"
+#include "kernel/race.h"
+#include "kernel/region.h"
+#include "kernel/ship.h"
+#include "kernel/terrain.h"
+#include "kernel/terrainid.h"
+#include "kernel/unit.h"
 
 /* util includes */
 #include <util/attrib.h>
@@ -68,6 +62,12 @@
 #include <util/rng.h>
 #include <util/strings.h>
 
+/* attributes includes */
+#include <attributes/targetregion.h>
+#include <attributes/hate.h>
+
+#include <spells/regioncurse.h>
+
 #include <selist.h>
 
 /* libc includes */
diff --git a/src/morale.c b/src/morale.c
index a8a7cc9d9..6155426ac 100644
--- a/src/morale.c
+++ b/src/morale.c
@@ -20,17 +20,18 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <platform.h>
 #include "morale.h"
 
-#include <spells/regioncurse.h>
-
-#include <kernel/config.h>
-#include <kernel/curse.h>
-#include <kernel/region.h>
-#include <kernel/faction.h>
-#include <kernel/race.h>
-#include <kernel/building.h>
+#include "kernel/calendar.h"
+#include "kernel/config.h"
+#include "kernel/curse.h"
+#include "kernel/region.h"
+#include "kernel/faction.h"
+#include "kernel/race.h"
+#include "kernel/building.h"
 
 #include <util/rand.h>
 
+#include <spells/regioncurse.h>
+
 #include <assert.h>
 
 static double popularity(void)
diff --git a/src/move.c b/src/move.c
index 72d311395..00a787cac 100644
--- a/src/move.c
+++ b/src/move.c
@@ -20,7 +20,28 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef _MSC_VER
 #include <platform.h>
 #endif
-#include <kernel/config.h>
+
+/* kernel includes */
+#include "kernel/ally.h"
+#include "kernel/build.h"
+#include "kernel/building.h"
+#include "kernel/calendar.h"
+#include "kernel/config.h"
+#include "kernel/connection.h"
+#include "kernel/curse.h"
+#include "kernel/faction.h"
+#include "kernel/item.h"
+#include "kernel/messages.h"
+#include "kernel/order.h"
+#include "kernel/plane.h"
+#include "kernel/race.h"
+#include "kernel/region.h"
+#include "kernel/render.h"
+#include "kernel/ship.h"
+#include "kernel/terrain.h"
+#include "kernel/terrainid.h"
+#include "kernel/unit.h"
+
 #include "move.h"
 #include "guard.h"
 #include "laws.h"
@@ -44,28 +65,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <attributes/stealth.h>
 #include <attributes/targetregion.h>
 
-/* kernel includes */
-#include <kernel/ally.h>
-#include <kernel/build.h>
-#include <kernel/building.h>
-#include <kernel/connection.h>
-#include <kernel/curse.h>
-#include <kernel/faction.h>
-#include <kernel/item.h>
-#include <kernel/messages.h>
-#include <kernel/order.h>
-#include <kernel/plane.h>
-#include <kernel/race.h>
-#include <kernel/region.h>
-#include <kernel/render.h>
-#include <kernel/ship.h>
-#include <kernel/terrain.h>
-#include <kernel/terrainid.h>
-#include <kernel/unit.h>
-
 #include "teleport.h"
 #include "direction.h"
-#include "calendar.h"
 #include "skill.h"
 
 /* util includes */
diff --git a/src/orderfile.c b/src/orderfile.c
index a82b599a0..ed4860d77 100644
--- a/src/orderfile.c
+++ b/src/orderfile.c
@@ -2,10 +2,11 @@
 #include <kernel/config.h>
 #include "orderfile.h"
 
-#include <kernel/faction.h>
-#include <kernel/unit.h>
-#include <kernel/order.h>
-#include <kernel/messages.h>
+#include "kernel/calendar.h"
+#include "kernel/faction.h"
+#include "kernel/messages.h"
+#include "kernel/order.h"
+#include "kernel/unit.h"
 
 #include <util/base36.h>
 #include <util/message.h>
diff --git a/src/orderfile.test.c b/src/orderfile.test.c
index 500c68fdf..f5d4997ae 100644
--- a/src/orderfile.test.c
+++ b/src/orderfile.test.c
@@ -3,6 +3,7 @@
 
 #include "orderfile.h"
 
+#include <kernel/calendar.h>
 #include <kernel/faction.h>
 #include <util/message.h>
 
diff --git a/src/report.c b/src/report.c
index 9e98e5162..44b1bd6ad 100644
--- a/src/report.c
+++ b/src/report.c
@@ -43,7 +43,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* gamecode includes */
 #include "alchemy.h"
-#include "calendar.h"
 #include "economy.h"
 #include "move.h"
 #include "upkeep.h"
@@ -51,30 +50,31 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "teleport.h"
 
 /* kernel includes */
-#include <kernel/ally.h>
-#include <kernel/connection.h>
-#include <kernel/build.h>
-#include <kernel/building.h>
-#include <kernel/curse.h>
-#include <kernel/faction.h>
-#include <kernel/group.h>
-#include <kernel/item.h>
-#include <kernel/messages.h>
-#include <kernel/objtypes.h>
-#include <kernel/order.h>
-#include <kernel/plane.h>
-#include <kernel/pool.h>
-#include <kernel/race.h>
-#include <kernel/region.h>
-#include <kernel/render.h>
-#include <kernel/resources.h>
-#include <kernel/ship.h>
-#include <kernel/spell.h>
-#include <kernel/spellbook.h>
-#include <kernel/terrain.h>
-#include <kernel/terrainid.h>
-#include <kernel/unit.h>
-#include <kernel/alliance.h>
+#include "kernel/ally.h"
+#include "kernel/calendar.h"
+#include "kernel/connection.h"
+#include "kernel/build.h"
+#include "kernel/building.h"
+#include "kernel/curse.h"
+#include "kernel/faction.h"
+#include "kernel/group.h"
+#include "kernel/item.h"
+#include "kernel/messages.h"
+#include "kernel/objtypes.h"
+#include "kernel/order.h"
+#include "kernel/plane.h"
+#include "kernel/pool.h"
+#include "kernel/race.h"
+#include "kernel/region.h"
+#include "kernel/render.h"
+#include "kernel/resources.h"
+#include "kernel/ship.h"
+#include "kernel/spell.h"
+#include "kernel/spellbook.h"
+#include "kernel/terrain.h"
+#include "kernel/terrainid.h"
+#include "kernel/unit.h"
+#include "kernel/alliance.h"
 
 /* util includes */
 #include <util/attrib.h>
diff --git a/src/reports.c b/src/reports.c
index d4be5c8ce..20f2068e8 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -21,7 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "reports.h"
 
 #include "battle.h"
-#include "calendar.h"
+#include "kernel/calendar.h"
 #include "guard.h"
 #include "laws.h"
 #include "spells.h"
diff --git a/src/reports.test.c b/src/reports.test.c
index ca0f98f57..cdc09c83c 100644
--- a/src/reports.test.c
+++ b/src/reports.test.c
@@ -1,7 +1,7 @@
 #include <platform.h>
 #include "reports.h"
 
-#include "calendar.h"
+#include "kernel/calendar.h"
 #include "keyword.h"
 #include "lighthouse.h"
 #include "laws.h"
diff --git a/src/study.c b/src/study.c
index 1dbc890ed..46da90b74 100644
--- a/src/study.c
+++ b/src/study.c
@@ -21,11 +21,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 #include <kernel/config.h>
 #include "study.h"
+
 #include "laws.h"
 #include "move.h"
 #include "monsters.h"
 #include "alchemy.h"
 #include "academy.h"
+#include "kernel/calendar.h"
 
 #include <spells/regioncurse.h>
 
diff --git a/src/summary.c b/src/summary.c
index ee047bc8f..64bb055b5 100644
--- a/src/summary.c
+++ b/src/summary.c
@@ -16,7 +16,7 @@
 #include "summary.h"
 #include "laws.h"
 #include "monsters.h"
-#include "calendar.h"
+#include "kernel/calendar.h"
 
 #include <kernel/alliance.h>
 #include <kernel/faction.h>
diff --git a/src/summary.test.c b/src/summary.test.c
index 5df4849c3..7b7df93b6 100644
--- a/src/summary.test.c
+++ b/src/summary.test.c
@@ -1,7 +1,7 @@
 #include <platform.h>
 
 #include "summary.h"
-#include "calendar.h"
+#include "kernel/calendar.h"
 
 #include <CuTest.h>
 #include "tests.h"
diff --git a/src/tests.c b/src/tests.c
index 18ecdef34..4b764b23f 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -3,7 +3,7 @@
 #include "keyword.h"
 #include "prefix.h"
 #include "reports.h"
-#include "calendar.h"
+#include "kernel/calendar.h"
 #include "vortex.h"
 
 #include <kernel/config.h>
diff --git a/src/xmlreader.c b/src/xmlreader.c
index a711b7dbd..66b04e611 100644
--- a/src/xmlreader.c
+++ b/src/xmlreader.c
@@ -29,7 +29,7 @@ without prior permission by the authors of Eressea.
 #include "kernel/spellbook.h"
 
 #include "alchemy.h"
-#include "calendar.h"
+#include "kernel/calendar.h"
 #include "guard.h"
 #include "keyword.h"
 #include "move.h"