diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 07f926c5b..951245cab 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,6 +5,8 @@ set (CORE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "Eressea Core h
 
 find_package (Lua51 REQUIRED)
 find_package (LibXml2 REQUIRED)
+find_package (Curses REQUIRED)
+find_package (SQLite3 REQUIRED)
 
 include_directories (${CORE_INCLUDE_DIR})
 include_directories (${CRITBIT_INCLUDE_DIR})
@@ -139,7 +141,6 @@ add_library(${PROJECT_NAME}
   modules/wormhole.c
   modules/xecmd.c
   modules/xmas.c
-  tests.c
   tests_test.c
   triggers/changefaction.c
   triggers/changerace.c
diff --git a/src/kernel/connection.c b/src/kernel/connection.c
index ec3c31b67..5d4d24d19 100644
--- a/src/kernel/connection.c
+++ b/src/kernel/connection.c
@@ -27,6 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "version.h"
 
 #include <util/attrib.h>
+#include <util/bsdstring.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 ff011bc38..7cde125de 100644
--- a/src/kernel/faction.c
+++ b/src/kernel/faction.c
@@ -36,6 +36,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include <util/attrib.h>
 #include <util/base36.h>
+#include <util/bsdstring.h>
 #include <util/event.h>
 #include <util/goodies.h>
 #include <util/lists.h>
diff --git a/src/kernel/pool_test.c b/src/kernel/pool_test.c
index 38be7aaae..3b801a9b9 100644
--- a/src/kernel/pool_test.c
+++ b/src/kernel/pool_test.c
@@ -2,10 +2,12 @@
 #include <kernel/types.h>
 
 #include "pool.h"
+#include "magic.h"
 #include "unit.h"
 #include "item.h"
 #include "region.h"
 #include "skill.h"
+
 #include <CuTest.h>
 #include <tests.h>
 
diff --git a/src/tests_test.c b/src/tests_test.c
index c685d8a50..250ea5ec6 100644
--- a/src/tests_test.c
+++ b/src/tests_test.c
@@ -7,6 +7,7 @@
 #include <util/language.h>
 
 #include <CuTest.h>
+#include <tests.h>
 
 static void test_recreate_world(CuTest * tc)
 {