Eressea can now be compiled and debugged with Eclipse CDT

Several changes to config.h mean that I probably broke compilation on some platforms. That really needs cleaning up.

src/.project

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>eressea</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>?name?</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.stopOnError</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildCommand</key>
+					<value>make</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.contents</key>
+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildLocation</key>
+					<value>${workspace_loc:/eressea/Debug}</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildArguments</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+					<value></value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+	</natures>
+</projectDescription>

src/Jamrules

@@ -61,7 +61,7 @@ if $(PROFILE) = 1 {
 CCFLAGS += -Wall ;
 
 CCFLAGS += -Wwrite-strings 
-#		   -W
+		   -Wundef
 		   -Wstrict-prototypes 
 		   -Werror-implicit-function-declaration
 		   -Wno-char-subscripts

src/common/attributes/alliance.c

@@ -10,7 +10,7 @@
  */
 
 #include <config.h>
-#include <types.h>
+#include <kernel/types.h>
 #include "alliance.h"
 
 #include <kernel/save.h>

src/common/attributes/attributes.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "attributes.h"
 
 /* attributes includes */

src/common/attributes/fleechance.c

@@ -15,7 +15,7 @@
 #include <config.h>
 #include "fleechance.h"
 
-#include <attrib.h>
+#include <util/attrib.h>
 
 attrib_type at_fleechance = {
 	"fleechance",

src/common/attributes/follow.c

@@ -15,13 +15,13 @@
 #include <config.h>
 #include "follow.h"
 
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include <kernel/unit.h>
 #include <kernel/version.h>
 
-#include <attrib.h>
-#include <resolve.h>
-#include <variant.h>
+#include <util/attrib.h>
+#include <util/resolve.h>
+#include <util/variant.h>
 
 static int
 verify_follow(attrib * a)

src/common/attributes/giveitem.c

@@ -14,19 +14,19 @@
 
 #include <config.h>
 #include "giveitem.h"
-#include <eressea.h>
+#include <kernel/eressea.h>
 
 /* kernel includes */
-#include <building.h>
-#include <region.h>
-#include <unit.h>
-#include <item.h>
+#include <kernel/building.h>
+#include <kernel/region.h>
+#include <kernel/unit.h>
+#include <kernel/item.h>
 
 /* util includes */
-#include <attrib.h>
-#include <base36.h>
-#include <resolve.h>
-#include <goodies.h>
+#include <util/attrib.h>
+#include <util/base36.h>
+#include <util/resolve.h>
+#include <util/goodies.h>
 
 /* libc includes */
 #include <stdlib.h>

src/common/attributes/gm.c

@@ -13,14 +13,14 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "gm.h"
 
 /* kernel includes */
-#include <plane.h>
+#include <kernel/plane.h>
 
 /* util includes */
-#include <attrib.h>
+#include <util/attrib.h>
 
 static void
 write_gm(const attrib * a, FILE * F)

src/common/attributes/hate.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "hate.h"
 
 #include <kernel/unit.h>

src/common/attributes/iceberg.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "iceberg.h"
 
 #include <kernel/save.h>

src/common/attributes/key.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "key.h"
 
 #include <kernel/save.h>

src/common/attributes/matmod.c

@@ -15,7 +15,7 @@
 #include <config.h>
 #include "matmod.h"
 
-#include <attrib.h>
+#include <util/attrib.h>
 
 attrib_type at_matmod = {
 	"matmod",

src/common/attributes/moved.c

@@ -13,10 +13,10 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "moved.h"
 
-#include <attrib.h>
+#include <util/attrib.h>
 
 static int
 age_moved(attrib * a)

src/common/attributes/object.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "object.h"
 
 /* kernel includes */

src/common/attributes/option.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "option.h"
 
 #include <kernel/save.h>

src/common/attributes/orcification.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "orcification.h"
 
 #include <kernel/save.h>

src/common/attributes/otherfaction.c

@@ -12,13 +12,12 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "otherfaction.h"
 
-#include <faction.h>
-#include <unit.h>
-#include <attrib.h>
-
+#include <kernel/faction.h>
+#include <kernel/unit.h>
+#include <util/attrib.h>
 #include <assert.h>
 
 /*

src/common/attributes/racename.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "racename.h"
 
 #include <kernel/save.h>

src/common/attributes/raceprefix.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "raceprefix.h"
 #include <kernel/save.h>
 

src/common/attributes/reduceproduction.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "reduceproduction.h"
 #include <kernel/save.h>
 #include <util/attrib.h>

src/common/attributes/variable.c

@@ -12,7 +12,7 @@
 
 #include <config.h>
 #include <kernel/eressea.h>
-#include <attrib.h>
+#include <util/attrib.h>
 #include "variable.h"
 
 #include <kernel/save.h>

src/common/attributes/viewrange.c

@@ -16,8 +16,8 @@
 #include "viewrange.h"
 
 /* util includes */
-#include <attrib.h>
-#include <functions.h>
+#include <util/attrib.h>
+#include <util/functions.h>
 
 /* libc includes */
 #include <assert.h>

src/common/gamecode/archetype.c

@@ -1,5 +1,5 @@
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "archetype.h"
 
 /* kernel includes */

src/common/gamecode/creation.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "creation.h"
 #include "monster.h"
 

src/common/gamecode/creport.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "creport.h"
 
 /* tweakable features */
@@ -164,7 +164,7 @@ reset_translations(void)
   }
 }
 
-#include "objtypes.h"
+#include <kernel/objtypes.h>
 
 static void
 print_items(FILE * F, item * items, const struct locale * lang)

src/common/gamecode/economy.c

@@ -20,7 +20,7 @@
 */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "economy.h"
 
 /* gamecode includes */

src/common/gamecode/give.c

@@ -11,7 +11,7 @@
 
  */
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "give.h"
 
 #include "economy.h"

src/common/gamecode/laws.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "laws.h"
 
 #include <modules/gmcmd.h>
@@ -2509,8 +2509,8 @@ sinkships(region * r)
 }
 
 /* The following functions do not really belong here: */
-#include "eressea.h"
-#include "build.h"
+#include <kernel/eressea.h>
+#include <kernel/build.h>
 
 static attrib_type at_number = {
   "faction_renum",

src/common/gamecode/luck.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 
 #include "luck.h"
 
@@ -32,15 +32,15 @@
 #include "randenc.h"
 
 /* kernel include */
-#include <unit.h>
-#include <faction.h>
-#include <item.h>
-#include <message.h>
-#include <race.h>
-#include <pool.h>
-#include <region.h>
-#include <skill.h>
-#include <karma.h>
+#include <kernel/unit.h>
+#include <kernel/faction.h>
+#include <kernel/item.h>
+#include <kernel/message.h>
+#include <kernel/race.h>
+#include <kernel/pool.h>
+#include <kernel/region.h>
+#include <kernel/skill.h>
+#include <kernel/karma.h>
 
 /* util includes */
 #include <util/rand.h>

src/common/gamecode/monster.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "monster.h"
 
 /* gamecode includes */

src/common/gamecode/randenc.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "randenc.h"
 
 #include "economy.h"

src/common/gamecode/report.c

@@ -16,7 +16,7 @@
 #define ECHECK_VERSION "4.01"
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 
 /* modules includes */
 #include <modules/score.h>

src/common/gamecode/spells.c

@@ -12,7 +12,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "spy.h"
 
 #include <kernel/faction.h>

src/common/gamecode/spy.c

@@ -20,7 +20,7 @@
 */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "spy.h"
 
 /* kernel includes */

src/common/gamecode/study.c

@@ -23,7 +23,7 @@
 #define TEACH_FRIENDS
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "study.h"
 
 #include <kernel/alchemy.h>

src/common/gamecode/summary.c

@@ -10,7 +10,7 @@
 
 /* wenn config.h nicht vor curses included wird, kompiliert es unter windows nicht */
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 
 #include "summary.h"
 

src/common/gamecode/xmlreport.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "xmlreport.h"
 
 /* tweakable features */

src/common/items/artrewards.c

@@ -12,7 +12,7 @@
 */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "artrewards.h"
 
 /* kernel includes */

src/common/items/demonseye.c

@@ -13,19 +13,19 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "demonseye.h"
 
 /* kernel includes */
-#include <faction.h>
-#include <item.h>
-#include <message.h>
-#include <plane.h>
-#include <region.h>
-#include <unit.h>
+#include <kernel/faction.h>
+#include <kernel/item.h>
+#include <kernel/message.h>
+#include <kernel/plane.h>
+#include <kernel/region.h>
+#include <kernel/unit.h>
 
 /* util includes */
-#include <functions.h>
+#include <util/functions.h>
 
 /* libc includes */
 #include <assert.h>

src/common/items/itemtypes.c

@@ -11,7 +11,7 @@
 */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "itemtypes.h"
 
 #include "xerewards.h"

src/common/items/phoenixcompass.c

@@ -12,7 +12,7 @@
 */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "phoenixcompass.h"
 
 /* kernel includes */

src/common/items/seed.c

@@ -15,13 +15,12 @@
 
 #include "seed.h"
 
+/* kernel includes */
 #include <kernel/build.h>
 #include <kernel/eressea.h>
+#include <kernel/item.h>
 #include <kernel/region.h>
 
-/* kernel includes */
-#include <item.h>
-
 /* util includes */
 #include <util/attrib.h>
 #include <util/functions.h>

src/common/items/speedsail.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "speedsail.h"
 
 /* kernel includes */

src/common/items/weapons.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "weapons.h"
 
 #include <kernel/unit.h>

src/common/items/xerewards.c

@@ -12,21 +12,21 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "xerewards.h"
 
 /* kernel includes */
-#include <item.h>
-#include <region.h>
-#include <faction.h>
-#include <unit.h>
-#include <skill.h>
-#include <curse.h>
-#include <message.h>
-#include <magic.h>
+#include <kernel/item.h>
+#include <kernel/region.h>
+#include <kernel/faction.h>
+#include <kernel/unit.h>
+#include <kernel/skill.h>
+#include <kernel/curse.h>
+#include <kernel/message.h>
+#include <kernel/magic.h>
 
 /* util includes */
-#include <functions.h>
+#include <util/functions.h>
 
 /* libc includes */
 #include <assert.h>

src/common/kernel/alchemy.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "alchemy.h"
 
 #include "item.h"

src/common/kernel/alliance.c

@@ -11,7 +11,7 @@
 */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "alliance.h"
 
 #include <attributes/key.h>

src/common/kernel/battle.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "battle.h"
 
 #include "alchemy.h"
@@ -23,7 +23,6 @@
 #include "curse.h"
 #include "equipment.h"
 #include "faction.h"
-#include "goodies.h"
 #include "group.h"
 #include "item.h"
 #include "karma.h"

src/common/kernel/border.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "border.h"
 
 #include "region.h"

src/common/kernel/build.c

@@ -19,7 +19,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "build.h"
 
 /* kernel includes */

src/common/kernel/building.c

@@ -14,9 +14,8 @@
 
 #include <config.h>
 
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "building.h"
-#include "attrib.h"
 
 /* kernel includes */
 #include "item.h"
@@ -29,6 +28,7 @@
 #include "version.h"
 
 /* util includes */
+#include <util/attrib.h>
 #include <util/base36.h>
 #include <util/event.h>
 #include <util/functions.h>

src/common/kernel/command.c

@@ -11,7 +11,7 @@
  
  */
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "command.h"
 
 #include <kernel/order.h>

src/common/kernel/curse.c

@@ -20,11 +20,10 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "curse.h"
 
 /* kernel includes */
-#include "attrib.h"
 #include "building.h"
 #include "faction.h"
 #include "magic.h"
@@ -38,6 +37,7 @@
 #include "version.h"
 
 /* util includes */
+#include <util/attrib.h>
 #include <util/base36.h>
 #include <util/goodies.h>
 #include <util/log.h>
@@ -263,7 +263,7 @@ attrib_type at_curse =
 /* ------------------------------------------------------------- */
 /* Spruch identifizieren */
 
-#include "umlaut.h"
+#include <util/umlaut.h>
 
 typedef struct cursetype_list {
   struct cursetype_list * next;

src/common/kernel/equipment.c

@@ -18,7 +18,7 @@
  * permission from the authors.
  */
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "equipment.h"
 
 /* kernel includes */

src/common/kernel/eressea.c

@@ -19,7 +19,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 
 /* attributes includes */
 #include <attributes/reduceproduction.h>
@@ -75,7 +75,6 @@
 
 /* libc includes */
 #include <stdio.h>
-#include <message.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>

src/common/kernel/faction.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "faction.h"
 
 #include "equipment.h"

src/common/kernel/group.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "group.h"
 
 /* kernel includes */

src/common/kernel/item.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "item.h"
 
 #include <attributes/key.h>

src/common/kernel/karma.c

@@ -13,7 +13,7 @@
 
 /* TODO: enum auf fst_ umstellen. Pointer auf Display-Routine */
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 
 #include "karma.h"
 

src/common/kernel/magic.c

@@ -19,13 +19,12 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "magic.h"
 
 #include "building.h"
 #include "curse.h"
 #include "faction.h"
-#include "goodies.h"
 #include "item.h"
 #include "karma.h"
 #include "message.h"

src/common/kernel/message.c

@@ -19,7 +19,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "message.h"
 
 /* kernel includes */
@@ -56,7 +56,7 @@ typedef struct msg_setting {
 /************ Compatibility function *************/
 #define MAXSTRLEN (4*DISPLAYSIZE+3)
 #include "region.h"
-#include "eressea.h"
+#include <kernel/eressea.h>
 
 static void
 arg_set(variant args[], const message_type * mtype, const char * buffer, variant v)

src/common/kernel/move.c

@@ -19,7 +19,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "move.h"
 
 #include "alchemy.h"

src/common/kernel/names.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "names.h"
 
 /* kernel includes */

src/common/kernel/order.c

@@ -11,7 +11,7 @@
 */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "order.h"
 
 #include "skill.h"

src/common/kernel/pathfinder.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "pathfinder.h"
 
 #include "region.h"

src/common/kernel/plane.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "plane.h"
 
 /* kernel includes */

src/common/kernel/pool.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "pool.h"
 
 #include "faction.h"

src/common/kernel/race.c

@@ -18,7 +18,7 @@
  * permission from the authors.
  */
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "race.h"
 
 #include <races/zombies.h>

src/common/kernel/race.h

@@ -45,7 +45,7 @@ typedef struct att {
 	int type;
 	union {
 		const char * dice;
-		const spell * sp;
+		const struct spell * sp;
 	} data;
 	int flags;
 } att;

src/common/kernel/region.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "region.h"
 
 /* kernel includes */
@@ -47,13 +47,13 @@
 #include <util/resolve.h>
 #include <util/umlaut.h>
 #include <util/language.h>
+#include <util/rand.h>
 #include <util/rng.h>
 
 /* libc includes */
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
-#include <rand.h>
 #include <stdio.h>
 #include <string.h>
 

src/common/kernel/region.h

@@ -199,10 +199,10 @@ void rsethorses(const struct region * r, int value);
 #define rbuildings(r) ((r)->buildings)
 
 #define rherbtype(r) ((r)->land?(r)->land->herbtype:0)
-#define rsetherbtype(r, value) ((r)->land?((r)->land->herbtype=(value)):(value),0)
+#define rsetherbtype(r, value) if ((r)->land) (r)->land->herbtype=(value)
 
 #define rherbs(r) ((r)->land?(r)->land->herbs:0)
-#define rsetherbs(r, value) ((r)->land?((r)->land->herbs=(short)(value)):(value),0)
+#define rsetherbs(r, value) if ((r)->land) ((r)->land->herbs=(short)(value))
 
 extern boolean r_isforest(const struct region * r);
 

src/common/kernel/reports.c

@@ -18,7 +18,7 @@
  * permission from the authors.
  */
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "reports.h"
 
 /* kernel includes */

src/common/kernel/resources.c

@@ -11,7 +11,7 @@
 */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "resources.h"
 
 /* kernel includes */

src/common/kernel/save.c

@@ -19,12 +19,11 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "save.h"
 
 #include "alchemy.h"
 #include "alliance.h"
-#include "attrib.h"
 #include "border.h"
 #include "building.h"
 #include "faction.h"
@@ -689,7 +688,7 @@ typus2race(unsigned char typus)
 void
 create_backup(char *file)
 {
-#ifdef HAVE_UNISTD_H
+#ifdef HAVE_LINK
   char bfile[MAX_PATH];
   int c = 1;
 
@@ -1635,7 +1634,7 @@ readgame(const char * filename, int backup)
     read_alliances(F);
   }
   n = ri(F);
-  if (quiet<2) printf(" - Einzulesende Parteien: %d\n", n);
+  if (quiet<2) log_printf(" - Einzulesende Parteien: %d\n", n);
   fp = &factions;
   while (*fp) fp=&(*fp)->next;
 

src/common/kernel/ship.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "ship.h"
 
 /* kernel includes */

src/common/kernel/skill.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "skill.h"
 
 #include "curse.h"

src/common/kernel/spell.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "spell.h"
 
 /* kernel includes */

src/common/kernel/teleport.c

@@ -20,7 +20,7 @@
 */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "teleport.h"
 
 /* kernel includes */

src/common/kernel/terrain.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "terrain.h"
 #include "terrainid.h"
 

src/common/kernel/unit.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "unit.h"
 
 #include "building.h"

src/common/kernel/xmlreader.c

@@ -11,11 +11,9 @@ without prior permission by the authors of Eressea.
 */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "xmlreader.h"
 
-#include <xml.h>
-
 /* kernel includes */
 #include "building.h"
 #include "equipment.h"
@@ -37,6 +35,7 @@ without prior permission by the authors of Eressea.
 #include <util/log.h>
 #include <util/message.h>
 #include <util/nrmessage.h>
+#include <util/xml.h>
 
 /* libxml includes */
 #include <libxml/tree.h>

src/common/modules/arena.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 
 #ifdef ARENA_MODULE
 #include "arena.h"

src/common/modules/dungeon.c

@@ -11,7 +11,7 @@
 */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 
 #ifdef DUNGEON_MODULE
 #include "dungeon.h"

src/common/modules/gmcmd.c

@@ -11,9 +11,9 @@
 */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "gmcmd.h"
-#include "command.h"
+#include <kernel/command.h>
 
 /* misc includes */
 #include <items/demonseye.h>
@@ -22,17 +22,17 @@
 #include <triggers/unguard.h>
 
 /* kernel includes */
-#include <building.h>
-#include <reports.h>
-#include <faction.h>
-#include <item.h>
-#include <message.h>
-#include <order.h>
-#include <plane.h>
-#include <region.h>
-#include <terrain.h>
-#include <terrainid.h>
-#include <unit.h>
+#include <kernel/building.h>
+#include <kernel/reports.h>
+#include <kernel/faction.h>
+#include <kernel/item.h>
+#include <kernel/message.h>
+#include <kernel/order.h>
+#include <kernel/plane.h>
+#include <kernel/region.h>
+#include <kernel/terrain.h>
+#include <kernel/terrainid.h>
+#include <kernel/unit.h>
 
 /* util includes */
 #include <util/attrib.h>

src/common/modules/infocmd.c

@@ -11,7 +11,7 @@
  
  */
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 
 #ifdef INFOCMD_MODULE
 #include "infocmd.h"

src/common/modules/museum.c

@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include <eressea.h>
+#include <kernel/eressea.h>
 #ifdef MUSEUM_MODULE
 #include "museum.h"
 
@@ -39,9 +39,9 @@
 #include <kernel/faction.h>
 
 /* util includes */
-#include <attrib.h>
-#include <functions.h>
-#include <goodies.h>
+#include <util/attrib.h>
+#include <util/functions.h>
+#include <util/goodies.h>
 
 /* libc includes */
 #include <limits.h>

src/common/modules/oceannames.c

@@ -13,15 +13,15 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "oceannames.h"
 
 /* kernel includes */
-#include <region.h>
-#include <faction.h>
+#include <kernel/region.h>
+#include <kernel/faction.h>
 
 /* util includes */
-#include <attrib.h>
+#include <util/attrib.h>
 
 /* libc includes */
 #include <stdlib.h>

src/common/modules/score.c

@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #ifdef SCORE_MODULE
 #include "score.h"
 
@@ -38,8 +38,7 @@
 #include <kernel/pool.h>
 
 /* util includes */
-#include <base36.h>
-#include <goodies.h>
+#include <util/base36.h>
 
 /* libc includes */
 #include <math.h>

src/common/modules/wormhole.c

@@ -11,7 +11,7 @@
 */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 
 #ifdef WORMHOLE_MODULE
 #include "wormhole.h"

src/common/modules/xecmd.c

@@ -11,7 +11,7 @@
 */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 
 #ifdef XECMD_MODULE
 #include "xecmd.h"

src/common/modules/xmas.c

@@ -11,7 +11,7 @@
 */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "xmas.h"
 
 /* kernel includes */

src/common/races/dragons.c

@@ -13,12 +13,12 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "dragons.h"
 
 /* kernel includes */
-#include <region.h>
-#include <unit.h>
+#include <kernel/region.h>
+#include <kernel/unit.h>
 
 /* util includes */
 #include <util/rng.h>

src/common/races/illusion.c

@@ -13,13 +13,13 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "illusion.h"
 
 /* kernel includes */
-#include <unit.h>
-#include <faction.h>
-#include <message.h>
+#include <kernel/unit.h>
+#include <kernel/faction.h>
+#include <kernel/message.h>
 
 /* libc includes */
 #include <stdlib.h>

src/common/races/races.c

@@ -9,7 +9,7 @@
  */
 
 #include "../../config.h"
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "races.h"
 
 #include "zombies.h"

src/common/races/zombies.c

@@ -13,7 +13,7 @@
  */
 
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 #include "zombies.h"
 
 /* kernel includes */

src/common/spells/buildingcurse.c

@@ -12,7 +12,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "buildingcurse.h"
 
 /* kernel includes */

src/common/spells/combatspells.c

@@ -10,7 +10,7 @@
  without prior permission by the authors of Eressea.
 */
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "combatspells.h"
 
 /* kernel includes */

src/common/spells/regioncurse.c

@@ -12,7 +12,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "regioncurse.h"
 
 /* kernel includes */

src/common/spells/shipcurse.c

@@ -12,15 +12,14 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <kernel/eressea.h>
 #include "shipcurse.h"
 
 /* kernel includes */
-#include <message.h>
-#include <ship.h>
-#include <nrmessage.h>
-#include <objtypes.h>
-#include <curse.h>
+#include <kernel/message.h>
+#include <kernel/ship.h>
+#include <kernel/objtypes.h>
+#include <kernel/curse.h>
 
 /* util includes */
 #include <util/base36.h>