diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b2e9c5bfd..0067463a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -77,6 +77,7 @@ TOLUA_BINDING(settings.pkg bind_settings.h)
 ENDIF()
 
 set (ERESSEA_SRC
+  calendar.c
   move.c
   spells.c
   battle.c
diff --git a/src/bindings.c b/src/bindings.c
index bc3accb69..c2f18d8d5 100755
--- a/src/bindings.c
+++ b/src/bindings.c
@@ -26,6 +26,7 @@ without prior permission by the authors of Eressea.
 #include "console.h"
 #include "reports.h"
 #include "seen.h"
+#include "calendar.h"
 
 #include <kernel/config.h>
 
@@ -33,7 +34,6 @@ without prior permission by the authors of Eressea.
 #include <kernel/building.h>
 #include <kernel/curse.h>
 #include <kernel/equipment.h>
-#include <kernel/calendar.h>
 #include <kernel/unit.h>
 #include <kernel/terrain.h>
 #include <kernel/messages.h>
diff --git a/src/economy.c b/src/economy.c
index 7df3cd310..4aea89f80 100644
--- a/src/economy.c
+++ b/src/economy.c
@@ -32,10 +32,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "monster.h"
 #include "morale.h"
 #include "reports.h"
+#include "calendar.h"
 
 /* kernel includes */
 #include <kernel/building.h>
-#include <kernel/calendar.h>
 #include <kernel/curse.h>
 #include <kernel/equipment.h>
 #include <kernel/faction.h>
diff --git a/src/gmtool.c b/src/gmtool.c
index 3c0ad1136..dcdef8f45 100644
--- a/src/gmtool.c
+++ b/src/gmtool.c
@@ -18,6 +18,7 @@
 #include "console.h"
 #include "listbox.h"
 #include "wormhole.h"
+#include "calendar.h"
 
 #include <modules/xmas.h>
 #include <modules/gmcmd.h>
@@ -30,7 +31,6 @@
 #include <modules/autoseed.h>
 
 #include <kernel/building.h>
-#include <kernel/calendar.h>
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/plane.h>
diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index bc2c20418..b1c3bcd0f 100644
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -29,7 +29,6 @@ alliance.c
 ally.c
 build.c
 building.c
-calendar.c
 command.c
 config.c
 connection.c
diff --git a/src/laws.c b/src/laws.c
index 1ca192f1a..c3e895757 100755
--- a/src/laws.c
+++ b/src/laws.c
@@ -36,6 +36,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "study.h"
 #include "wormhole.h"
 #include "prefix.h"
+#include "calendar.h"
 
 /* kernel includes */
 #include <kernel/alliance.h>
@@ -43,7 +44,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/connection.h>
 #include <kernel/curse.h>
 #include <kernel/building.h>
-#include <kernel/calendar.h>
 #include <kernel/faction.h>
 #include <kernel/group.h>
 #include <kernel/item.h>
diff --git a/src/move.c b/src/move.c
index 99e87c061..e1207f0fa 100644
--- a/src/move.c
+++ b/src/move.c
@@ -30,7 +30,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <kernel/build.h>
 #include <kernel/building.h>
-#include <kernel/calendar.h>
 #include <kernel/connection.h>
 #include <kernel/curse.h>
 #include <kernel/faction.h>
@@ -49,6 +48,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 #include "direction.h"
+#include "calendar.h"
 #include "skill.h"
 
 /* util includes */
diff --git a/src/report.c b/src/report.c
index 998eab441..a48dd0150 100644
--- a/src/report.c
+++ b/src/report.c
@@ -41,13 +41,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "move.h"
 #include "upkeep.h"
 #include "vortex.h"
+#include "calendar.h"
 
 /* kernel includes */
 #include <kernel/ally.h>
 #include <kernel/connection.h>
 #include <kernel/build.h>
 #include <kernel/building.h>
-#include <kernel/calendar.h>
 #include <kernel/curse.h>
 #include <kernel/faction.h>
 #include <kernel/group.h>
diff --git a/src/summary.c b/src/summary.c
index 43c540e55..f38839db0 100644
--- a/src/summary.c
+++ b/src/summary.c
@@ -15,9 +15,9 @@
 #include "summary.h"
 #include "laws.h"
 #include "monster.h"
+#include "calendar.h"
 
 #include <kernel/alliance.h>
-#include <kernel/calendar.h>
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/race.h>