diff --git a/src/bindings/bind_attrib.c b/src/bindings/bind_attrib.c
index af43c93d6..c3297248a 100644
--- a/src/bindings/bind_attrib.c
+++ b/src/bindings/bind_attrib.c
@@ -25,7 +25,8 @@ without prior permission by the authors of Eressea.
 #include <util/resolve.h>
 #include <util/storage.h>
 
-#include <bson/bson.h>
+/* external libraries */
+#include <bson.h>
 
 #include <lua.h>
 #include <tolua.h>
diff --git a/src/bindings/bindings.c b/src/bindings/bindings.c
index 228b94ada..ed0c2fc40 100644
--- a/src/bindings/bindings.c
+++ b/src/bindings/bindings.c
@@ -62,7 +62,7 @@ without prior permission by the authors of Eressea.
 #include <util/rng.h>
 #include <util/storage.h>
 
-#include <iniparser/iniparser.h>
+#include <iniparser.h>
 #include <tolua.h>
 #include <lua.h>
 
diff --git a/src/build/external.c b/src/build/external.c
index fd759fbe8..47c3314a8 100644
--- a/src/build/external.c
+++ b/src/build/external.c
@@ -22,5 +22,5 @@
 #include <md5.c>
 
 #ifndef DISABLE_TESTS
-#include <cutest/CuTest.c>
+#include <CuTest.c>
 #endif
diff --git a/src/build/util.c b/src/build/util.c
index 7de1d97e9..7175b9dec 100644
--- a/src/build/util.c
+++ b/src/build/util.c
@@ -2,15 +2,11 @@
 #include <platform.h>
 #include "stdafx.h"
 
-#include <iniparser/iniparser.c>
-#include <mt19937ar.c>
-
 #include <util/bsdstring.c>
 
 #include <util/console.c>
 #include <util/attrib.c>
 #include <util/base36.c>
-#include <util/critbit.c>
 #include <util/crmessage.c>
 #include <util/dice.c>
 #include <util/event.c>
diff --git a/src/gamecode/economy_test.c b/src/gamecode/economy_test.c
index 0d44c2dc1..effe7e4e8 100644
--- a/src/gamecode/economy_test.c
+++ b/src/gamecode/economy_test.c
@@ -6,7 +6,7 @@
 #include <kernel/building.h>
 #include <kernel/ship.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 
 static void test_give_control_building(CuTest * tc)
diff --git a/src/gamecode/laws_test.c b/src/gamecode/laws_test.c
index 0a2bb952c..e624d12ce 100644
--- a/src/gamecode/laws_test.c
+++ b/src/gamecode/laws_test.c
@@ -14,7 +14,7 @@
 
 #include <util/language.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 
 static void test_new_building_can_be_renamed(CuTest * tc)
diff --git a/src/gamecode/market_test.c b/src/gamecode/market_test.c
index 69726b9eb..7da1963c0 100644
--- a/src/gamecode/market_test.c
+++ b/src/gamecode/market_test.c
@@ -13,7 +13,7 @@
 
 #include <util/language.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 
 #include <stdlib.h>
diff --git a/src/kernel/battle_test.c b/src/kernel/battle_test.c
index c86a7f0b8..c8a558af1 100644
--- a/src/kernel/battle_test.c
+++ b/src/kernel/battle_test.c
@@ -9,7 +9,7 @@
 #include "skill.h"
 #include "unit.h"
 #include "tests.h"
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 
 static void test_make_fighter(CuTest * tc)
 {
diff --git a/src/kernel/building_test.c b/src/kernel/building_test.c
index 956266715..fa11cb2e4 100644
--- a/src/kernel/building_test.c
+++ b/src/kernel/building_test.c
@@ -7,7 +7,7 @@
 #include <kernel/building.h>
 #include <kernel/unit.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/kernel/config.c b/src/kernel/config.c
index d2eb422d6..9be2060ef 100644
--- a/src/kernel/config.c
+++ b/src/kernel/config.c
@@ -75,7 +75,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 
-#include <iniparser/iniparser.h>
+/* external libraries */
+#include <iniparser.h>
 
 /* libc includes */
 #include <stdio.h>
diff --git a/src/kernel/curse_test.c b/src/kernel/curse_test.c
index 7ccdd9a90..a7f88218b 100644
--- a/src/kernel/curse_test.c
+++ b/src/kernel/curse_test.c
@@ -4,7 +4,7 @@
 
 #include <util/attrib.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 
 static void test_curse(CuTest * tc)
 {
diff --git a/src/kernel/equipment_test.c b/src/kernel/equipment_test.c
index 5a97502a5..071cf3521 100644
--- a/src/kernel/equipment_test.c
+++ b/src/kernel/equipment_test.c
@@ -10,7 +10,7 @@
 
 #include <util/quicklist.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 
 void test_equipment(CuTest * tc)
diff --git a/src/kernel/item_test.c b/src/kernel/item_test.c
index d9c2172c3..c59e47d33 100644
--- a/src/kernel/item_test.c
+++ b/src/kernel/item_test.c
@@ -4,7 +4,7 @@
 #include <kernel/item.h>
 #include <util/language.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 
 void test_resource_type(CuTest * tc)
diff --git a/src/kernel/magic_test.c b/src/kernel/magic_test.c
index 20899e32d..bca8f6198 100644
--- a/src/kernel/magic_test.c
+++ b/src/kernel/magic_test.c
@@ -13,7 +13,7 @@
 #include <util/quicklist.h>
 #include <util/language.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 
 void test_updatespells(CuTest * tc)
diff --git a/src/kernel/move_test.c b/src/kernel/move_test.c
index 492722253..172012e4d 100644
--- a/src/kernel/move_test.c
+++ b/src/kernel/move_test.c
@@ -7,7 +7,7 @@
 
 #include <util/language.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 
 static void test_building_type_exists(CuTest * tc)
diff --git a/src/kernel/pool_test.c b/src/kernel/pool_test.c
index 28d2a827a..5e521cff5 100644
--- a/src/kernel/pool_test.c
+++ b/src/kernel/pool_test.c
@@ -4,7 +4,7 @@
 #include "unit.h"
 #include "item.h"
 #include "region.h"
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 
 void test_change_resource(CuTest * tc)
diff --git a/src/kernel/reports_test.c b/src/kernel/reports_test.c
index d07217ece..c3ee0c3c1 100644
--- a/src/kernel/reports_test.c
+++ b/src/kernel/reports_test.c
@@ -6,7 +6,7 @@
 #include <kernel/ship.h>
 #include <kernel/unit.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 
 static void test_reorder_units(CuTest * tc)
diff --git a/src/kernel/ship_test.c b/src/kernel/ship_test.c
index 488e61eef..a1aefeed8 100644
--- a/src/kernel/ship_test.c
+++ b/src/kernel/ship_test.c
@@ -7,7 +7,7 @@
 #include <kernel/ship.h>
 #include <kernel/unit.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/kernel/spell_test.c b/src/kernel/spell_test.c
index dc8fc8d47..e8bbeb328 100644
--- a/src/kernel/spell_test.c
+++ b/src/kernel/spell_test.c
@@ -5,7 +5,7 @@
 #include <kernel/spell.h>
 #include <kernel/magic.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 
 #include <stdlib.h>
diff --git a/src/kernel/spellbook_test.c b/src/kernel/spellbook_test.c
index c875a1941..6196d901c 100644
--- a/src/kernel/spellbook_test.c
+++ b/src/kernel/spellbook_test.c
@@ -7,7 +7,7 @@
 #include <util/quicklist.h>
 #include <util/language.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <tests.h>
 
 
diff --git a/src/kernel/types.h b/src/kernel/types.h
index ae53a79bd..ef5ee6013 100644
--- a/src/kernel/types.h
+++ b/src/kernel/types.h
@@ -56,6 +56,7 @@ struct ship;
 struct ship_type;
 struct skill;
 struct spell;
+struct spellbook;
 struct storage;
 struct strlist;
 struct terrain_type;
diff --git a/src/tests.c b/src/tests.c
index 8ffd821b0..b41bdaaf3 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -1,4 +1,4 @@
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <stdio.h>
 
 #include <platform.h>
diff --git a/src/tests_test.c b/src/tests_test.c
index d89cccd39..da4db4103 100644
--- a/src/tests_test.c
+++ b/src/tests_test.c
@@ -2,7 +2,7 @@
 #include <kernel/item.h>
 #include <kernel/region.h>
 
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 
 static void test_recreate_world(CuTest * tc)
 {
diff --git a/src/util/base36_test.c b/src/util/base36_test.c
index 25313cfe4..3d19f94df 100644
--- a/src/util/base36_test.c
+++ b/src/util/base36_test.c
@@ -1,4 +1,4 @@
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include "base36.h"
 #include <stdlib.h>
 #include <limits.h>
diff --git a/src/util/bsdstring_test.c b/src/util/bsdstring_test.c
index b084e5c31..25e7be60d 100644
--- a/src/util/bsdstring_test.c
+++ b/src/util/bsdstring_test.c
@@ -1,4 +1,4 @@
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include "bsdstring.h"
 #include <string.h>
 
diff --git a/src/util/functions_test.c b/src/util/functions_test.c
index 1392662ed..cb229993d 100644
--- a/src/util/functions_test.c
+++ b/src/util/functions_test.c
@@ -1,4 +1,4 @@
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <stdio.h>
 #include <string.h>
 #include "functions.h"
diff --git a/src/util/quicklist_test.c b/src/util/quicklist_test.c
index 7b8564909..36c95e5a2 100644
--- a/src/util/quicklist_test.c
+++ b/src/util/quicklist_test.c
@@ -1,4 +1,4 @@
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <stdio.h>
 #include <string.h>
 #include "quicklist.h"
diff --git a/src/util/umlaut_test.c b/src/util/umlaut_test.c
index 7a70ccd5d..86b07f08e 100644
--- a/src/util/umlaut_test.c
+++ b/src/util/umlaut_test.c
@@ -1,4 +1,4 @@
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>