diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ee7758de..fe436cb47 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,3 +8,4 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../../cmake/Modu
 add_subdirectory (../../dependencies "${CMAKE_CURRENT_BINARY_DIR}/dependencies")
 add_subdirectory (util)
 add_subdirectory (kernel)
+add_subdirectory (gamecode)
diff --git a/src/gamecode/CMakeLists.txt b/src/gamecode/CMakeLists.txt
new file mode 100644
index 000000000..dc74f267e
--- /dev/null
+++ b/src/gamecode/CMakeLists.txt
@@ -0,0 +1,31 @@
+cmake_minimum_required (VERSION 2.4)
+project (gamecode)
+
+include_directories (..)
+include_directories (${LIBXML2_INCLUDE_DIR})
+#include_directories (${CRITBIT_INCLUDE_DIR})
+include_directories (${QUICKLIST_INCLUDE_DIR})
+include_directories (${CUTEST_INCLUDE_DIR})
+#include_directories (${INIPARSER_INCLUDE_DIR})
+#include_directories (${CRYPTO_INCLUDE_DIR})
+
+add_library (gamecode
+#  archetype.c
+  creation.c
+  creport.c
+  economy.c
+  economy_test.c
+  give.c
+  items.c
+  laws.c
+  laws_test.c
+  market.c
+  market_test.c
+  monster.c
+  randenc.c
+  report.c
+  spy.c
+  study.c
+  summary.c
+  xmlreport.c
+)
diff --git a/src/gamecode/creport.c b/src/gamecode/creport.c
index 94abc0294..3f7d4fe1d 100644
--- a/src/gamecode/creport.c
+++ b/src/gamecode/creport.c
@@ -35,6 +35,7 @@ without prior permission by the authors of Eressea.
 #include <kernel/alliance.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>
diff --git a/src/gamecode/economy.c b/src/gamecode/economy.c
index cc516d784..cd47f880a 100644
--- a/src/gamecode/economy.c
+++ b/src/gamecode/economy.c
@@ -20,6 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <platform.h>
 #include <kernel/config.h>
+#include <kernel/types.h>
 #include "economy.h"
 
 /* gamecode includes */
@@ -33,6 +34,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/alchemy.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>
diff --git a/src/gamecode/economy_test.c b/src/gamecode/economy_test.c
index effe7e4e8..61294b1da 100644
--- a/src/gamecode/economy_test.c
+++ b/src/gamecode/economy_test.c
@@ -1,4 +1,5 @@
-#include "platform.h"
+#include <platform.h>
+#include <kernel/types.h>
 #include "economy.h"
 
 #include <kernel/unit.h>
diff --git a/src/gamecode/give.c b/src/gamecode/give.c
index 755b97c26..b9254c7c2 100644
--- a/src/gamecode/give.c
+++ b/src/gamecode/give.c
@@ -17,6 +17,7 @@
 #include "economy.h"
 
 /* kernel includes */
+#include <kernel/curse.h>
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
diff --git a/src/gamecode/laws.c b/src/gamecode/laws.c
index 2f1e0b252..6965a8f7d 100644
--- a/src/gamecode/laws.c
+++ b/src/gamecode/laws.c
@@ -39,6 +39,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/alliance.h>
 #include <kernel/battle.h>
 #include <kernel/connection.h>
+#include <kernel/curse.h>
 #include <kernel/building.h>
 #include <kernel/calendar.h>
 #include <kernel/faction.h>
diff --git a/src/gamecode/market_test.c b/src/gamecode/market_test.c
index 7da1963c0..71f9bcf24 100644
--- a/src/gamecode/market_test.c
+++ b/src/gamecode/market_test.c
@@ -1,4 +1,5 @@
-#include "platform.h"
+#include <platform.h>
+#include <kernel/types.h>
 #include "market.h"
 #include "tests.h"
 
diff --git a/src/gamecode/report.c b/src/gamecode/report.c
index 03772de43..2127d2940 100644
--- a/src/gamecode/report.c
+++ b/src/gamecode/report.c
@@ -42,6 +42,7 @@ 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/curse.h>
 #include <kernel/faction.h>
 #include <kernel/group.h>
 #include <kernel/item.h>
diff --git a/src/gamecode/study.c b/src/gamecode/study.c
index a25c56a52..2919e8b1f 100644
--- a/src/gamecode/study.c
+++ b/src/gamecode/study.c
@@ -25,6 +25,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <kernel/alchemy.h>
 #include <kernel/building.h>
+#include <kernel/curse.h>
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
diff --git a/src/gamecode/xmlreport.c b/src/gamecode/xmlreport.c
index 72025e98a..5b93dc887 100644
--- a/src/gamecode/xmlreport.c
+++ b/src/gamecode/xmlreport.c
@@ -32,6 +32,7 @@ without prior permission by the authors of Eressea.
 #include <kernel/alchemy.h>
 #include <kernel/alliance.h>
 #include <kernel/connection.h>
+#include <kernel/curse.h>
 #include <kernel/building.h>
 #include <kernel/faction.h>
 #include <kernel/group.h>
diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index d02f7dddc..fc0a9369c 100644
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -1,14 +1,7 @@
 cmake_minimum_required (VERSION 2.4)
 project (kernel)
 
-#find_package (Lua51 REQUIRED)
-#find_package (LibXml2 REQUIRED)
-#find_package (CuTest REQUIRED HINTS ${DEPENDENCIES_DIR})
-#find_package (QuickList REQUIRED)
-#find_package (CritBit REQUIRED)
-
 include_directories (..)
-#include_directories (${LUA_INCLUDE_DIR})
 include_directories (${LIBXML2_INCLUDE_DIR})
 include_directories (${CRITBIT_INCLUDE_DIR})
 include_directories (${QUICKLIST_INCLUDE_DIR})
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 8d2a38123..dcdc1a3b1 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -3,16 +3,13 @@ project (util)
 
 find_package (Lua51 REQUIRED)
 find_package (LibXml2 REQUIRED)
-#find_package (CuTest REQUIRED HINTS ${DEPENDENCIES_DIR})
-#find_package (QuickList REQUIRED)
-#find_package (CritBit REQUIRED)
 
-include_directories (${LUA_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
-include_directories (..
-  ${CRITBIT_INCLUDE_DIR}
-  ${QUICKLIST_INCLUDE_DIR}
-  ${CUTEST_INCLUDE_DIR}
-  )
+include_directories (..)
+include_directories (${CRITBIT_INCLUDE_DIR})
+include_directories (${QUICKLIST_INCLUDE_DIR})
+include_directories (${CUTEST_INCLUDE_DIR})
+include_directories (${LUA_INCLUDE_DIR})
+include_directories (${LIBXML2_INCLUDE_DIR})
 
 add_library (util attrib.c
   base36.c