Moving some things around in the external directory.

I am deliberately breaking the VS2010 projects with this.
I am probably breaking the Eressea server.

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>

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>
 

src/build/external.c

@@ -22,5 +22,5 @@
 #include <md5.c>
 
 #ifndef DISABLE_TESTS
-#include <cutest/CuTest.c>
+#include <CuTest.c>
 #endif

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>

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)

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)

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>

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)
 {

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>

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>

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)
 {

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)

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)

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)

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)

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)

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)

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>

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>

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>
 
 

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;

src/tests.c

@@ -1,4 +1,4 @@
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include <stdio.h>
 
 #include <platform.h>

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)
 {

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>

src/util/bsdstring_test.c

@@ -1,4 +1,4 @@
-#include <cutest/CuTest.h>
+#include <CuTest.h>
 #include "bsdstring.h"
 #include <string.h>
 

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"

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"

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>