diff --git a/src/Makefile b/src/Makefile
index 3215bdc2e..f084e52bd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,16 +1,10 @@
 TARGETS = subdirs
 
 SUBDIRS = \
-  util \
-  kernel \
-  gamecode \
-  triggers \
-  items \
-  attributes \
-  races \
-  spells \
-  modules \
+  common \
   eressea \
+#  askalon \
+#  tools \
   mapper
 
 include Makefile.include
diff --git a/src/askalon/attributes.c b/src/askalon/attributes.c
index a9a4525c8..7c0b4e220 100644
--- a/src/askalon/attributes.c
+++ b/src/askalon/attributes.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: attributes.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: attributes.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/askalon/attributes.h b/src/askalon/attributes.h
index 0038d54be..7434a48e7 100644
--- a/src/askalon/attributes.h
+++ b/src/askalon/attributes.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: attributes.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: attributes.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/askalon/main.c b/src/askalon/main.c
index e438ec9f5..0f9cfb752 100644
--- a/src/askalon/main.c
+++ b/src/askalon/main.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: main.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: main.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/askalon/triggers.c b/src/askalon/triggers.c
index 46e495ebf..a31d326cc 100644
--- a/src/askalon/triggers.c
+++ b/src/askalon/triggers.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: triggers.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: triggers.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/askalon/triggers.h b/src/askalon/triggers.h
index 6789ddcb3..88cd4a60f 100644
--- a/src/askalon/triggers.h
+++ b/src/askalon/triggers.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: triggers.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: triggers.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/Makefile b/src/common/attributes/Makefile
index 7c848a43a..23c24f0c5 100644
--- a/src/common/attributes/Makefile
+++ b/src/common/attributes/Makefile
@@ -6,7 +6,7 @@ BINARY =
 SOURCES = $(wildcard *.c)
 OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
 
-include ../Makefile.include
+include $(ERESSEA)/Makefile.include
 
 ## more definitions
 
diff --git a/src/common/attributes/attributes.c b/src/common/attributes/attributes.c
index ccde808da..7c0b4e220 100644
--- a/src/common/attributes/attributes.c
+++ b/src/common/attributes/attributes.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: attributes.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: attributes.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/attributes.h b/src/common/attributes/attributes.h
index 1f6a8d457..7434a48e7 100644
--- a/src/common/attributes/attributes.h
+++ b/src/common/attributes/attributes.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: attributes.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: attributes.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/follow.c b/src/common/attributes/follow.c
index df023cd72..9b78f7b1c 100644
--- a/src/common/attributes/follow.c
+++ b/src/common/attributes/follow.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: follow.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: follow.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/follow.h b/src/common/attributes/follow.h
index a315400c7..7ff00800a 100644
--- a/src/common/attributes/follow.h
+++ b/src/common/attributes/follow.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: follow.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: follow.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/giveitem.c b/src/common/attributes/giveitem.c
index 585dd45c4..7e7bf2ae3 100644
--- a/src/common/attributes/giveitem.c
+++ b/src/common/attributes/giveitem.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: giveitem.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: giveitem.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/giveitem.h b/src/common/attributes/giveitem.h
index 33c483d9a..bb97fe65e 100644
--- a/src/common/attributes/giveitem.h
+++ b/src/common/attributes/giveitem.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: giveitem.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: giveitem.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/hate.c b/src/common/attributes/hate.c
index 7b6db9467..337c3254a 100644
--- a/src/common/attributes/hate.c
+++ b/src/common/attributes/hate.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: hate.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: hate.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/hate.h b/src/common/attributes/hate.h
index ea4f0afef..dad391ab1 100644
--- a/src/common/attributes/hate.h
+++ b/src/common/attributes/hate.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: hate.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: hate.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/iceberg.c b/src/common/attributes/iceberg.c
index 82839e6f5..9f82ab8d0 100644
--- a/src/common/attributes/iceberg.c
+++ b/src/common/attributes/iceberg.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: iceberg.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: iceberg.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/iceberg.h b/src/common/attributes/iceberg.h
index 69dc97863..b8da61489 100644
--- a/src/common/attributes/iceberg.h
+++ b/src/common/attributes/iceberg.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: iceberg.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: iceberg.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/key.c b/src/common/attributes/key.c
index 0c6287cd8..ef74f686d 100644
--- a/src/common/attributes/key.c
+++ b/src/common/attributes/key.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: key.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: key.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/key.h b/src/common/attributes/key.h
index 1f52081bf..966041cc6 100644
--- a/src/common/attributes/key.h
+++ b/src/common/attributes/key.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: key.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: key.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/matmod.c b/src/common/attributes/matmod.c
index 2686e002d..9d9305e23 100644
--- a/src/common/attributes/matmod.c
+++ b/src/common/attributes/matmod.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: matmod.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: matmod.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/matmod.h b/src/common/attributes/matmod.h
index 0a19b82a7..a6e618e89 100644
--- a/src/common/attributes/matmod.h
+++ b/src/common/attributes/matmod.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: matmod.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: matmod.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -12,6 +12,8 @@
  * prior permission by the authors of Eressea.
  */
 
+struct resource_type;
+struct unit;
 typedef int (*mm_fun)(const struct unit * u, const struct resource_type * rtype, int value);
 
 extern struct attrib_type at_matmod;
diff --git a/src/common/attributes/reduceproduction.c b/src/common/attributes/reduceproduction.c
index 7533db5a8..10a30ecfb 100644
--- a/src/common/attributes/reduceproduction.c
+++ b/src/common/attributes/reduceproduction.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: reduceproduction.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: reduceproduction.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/reduceproduction.h b/src/common/attributes/reduceproduction.h
index e4ac49176..bbbf3d61a 100644
--- a/src/common/attributes/reduceproduction.h
+++ b/src/common/attributes/reduceproduction.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: reduceproduction.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: reduceproduction.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/targetregion.c b/src/common/attributes/targetregion.c
index 5b56b480b..d66c73e6f 100644
--- a/src/common/attributes/targetregion.c
+++ b/src/common/attributes/targetregion.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: targetregion.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: targetregion.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/attributes/targetregion.h b/src/common/attributes/targetregion.h
index d8e5fc4d6..a51a2edea 100644
--- a/src/common/attributes/targetregion.h
+++ b/src/common/attributes/targetregion.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: targetregion.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: targetregion.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/Makefile b/src/common/gamecode/Makefile
index c9fc9b77e..4e00fef33 100644
--- a/src/common/gamecode/Makefile
+++ b/src/common/gamecode/Makefile
@@ -7,11 +7,11 @@ BINARY =
 SOURCES = $(wildcard *.c)
 OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
 
-include ../Makefile.include
+include $(ERESSEA)/Makefile.include
 
 ## more definitions
 
-INCLUDES = -I../util -I../kernel
+INCLUDES = -I../util -I../kernel -I..
 
 # library:
 $(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
diff --git a/src/common/gamecode/creation.c b/src/common/gamecode/creation.c
index a7e507dfd..17d8203cc 100644
--- a/src/common/gamecode/creation.c
+++ b/src/common/gamecode/creation.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: creation.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: creation.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/creation.h b/src/common/gamecode/creation.h
index 0cfad2c36..6936d16a3 100644
--- a/src/common/gamecode/creation.h
+++ b/src/common/gamecode/creation.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: creation.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: creation.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index a16e81f0c..73daca2b2 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: creport.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: creport.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c
index 8425f438a..bb8285695 100644
--- a/src/common/gamecode/economy.c
+++ b/src/common/gamecode/economy.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: economy.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: economy.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/economy.h b/src/common/gamecode/economy.h
index 16e776e29..6338386a4 100644
--- a/src/common/gamecode/economy.h
+++ b/src/common/gamecode/economy.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: economy.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: economy.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index 473bb2eeb..2cb267c66 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: laws.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: laws.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/laws.h b/src/common/gamecode/laws.h
index 928ab8ad1..f1cbb9785 100644
--- a/src/common/gamecode/laws.h
+++ b/src/common/gamecode/laws.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: laws.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: laws.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/monster.c b/src/common/gamecode/monster.c
index e11b2640d..307c0cfa2 100644
--- a/src/common/gamecode/monster.c
+++ b/src/common/gamecode/monster.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: monster.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: monster.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c
index c0731dc9c..7f1895130 100644
--- a/src/common/gamecode/randenc.c
+++ b/src/common/gamecode/randenc.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: randenc.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: randenc.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/randenc.h b/src/common/gamecode/randenc.h
index ab3b160cd..e10a95b9e 100644
--- a/src/common/gamecode/randenc.h
+++ b/src/common/gamecode/randenc.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: randenc.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: randenc.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 5fc367517..2ed8c124b 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: report.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: report.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/spy.c b/src/common/gamecode/spy.c
index 55424a8d6..fa938b61b 100644
--- a/src/common/gamecode/spy.c
+++ b/src/common/gamecode/spy.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: spy.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: spy.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/gamecode/study.c b/src/common/gamecode/study.c
index 2d6fb16a9..42d162b8b 100644
--- a/src/common/gamecode/study.c
+++ b/src/common/gamecode/study.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: study.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: study.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/items/Makefile b/src/common/items/Makefile
index 7a0494e6c..f2bc00db9 100644
--- a/src/common/items/Makefile
+++ b/src/common/items/Makefile
@@ -6,7 +6,7 @@ BINARY =
 SOURCES = $(wildcard *.c)
 OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
 
-include ../Makefile.include
+include $(ERESSEA)/Makefile.include
 
 ## more definitions
 
diff --git a/src/common/items/demonseye.c b/src/common/items/demonseye.c
index 9893dcdbe..8a4981d67 100644
--- a/src/common/items/demonseye.c
+++ b/src/common/items/demonseye.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: demonseye.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: demonseye.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/items/demonseye.h b/src/common/items/demonseye.h
index d560f428f..6f299ba5c 100644
--- a/src/common/items/demonseye.h
+++ b/src/common/items/demonseye.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: demonseye.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: demonseye.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/items/weapons.c b/src/common/items/weapons.c
index 7d428c525..7967a0061 100644
--- a/src/common/items/weapons.c
+++ b/src/common/items/weapons.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: weapons.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: weapons.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/Makefile b/src/common/kernel/Makefile
index 01bb40820..fb0c1b5a0 100644
--- a/src/common/kernel/Makefile
+++ b/src/common/kernel/Makefile
@@ -6,11 +6,11 @@ BINARY =
 SOURCES = $(wildcard *.c)
 OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
 
-include ../Makefile.include
+include $(ERESSEA)/Makefile.include
 
 ## more definitions
 
-INCLUDES  += -I../util -I../attributes
+INCLUDES  += -I../util -I..
 
 # library:
 $(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
diff --git a/src/common/kernel/alchemy.c b/src/common/kernel/alchemy.c
index cbadb8e82..972e99d5a 100644
--- a/src/common/kernel/alchemy.c
+++ b/src/common/kernel/alchemy.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: alchemy.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: alchemy.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/alchemy.h b/src/common/kernel/alchemy.h
index a491c0ee9..84543ff62 100644
--- a/src/common/kernel/alchemy.h
+++ b/src/common/kernel/alchemy.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: alchemy.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: alchemy.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 52b854b73..7a3b09b5a 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: battle.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: battle.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/battle.h b/src/common/kernel/battle.h
index 7bc2d6bc7..bc8d8beb5 100644
--- a/src/common/kernel/battle.h
+++ b/src/common/kernel/battle.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: battle.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: battle.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/border.c b/src/common/kernel/border.c
index d288e2e83..6679f4b5a 100644
--- a/src/common/kernel/border.c
+++ b/src/common/kernel/border.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: border.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: border.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/border.h b/src/common/kernel/border.h
index 17009c364..da8e2f3c2 100644
--- a/src/common/kernel/border.h
+++ b/src/common/kernel/border.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: border.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: border.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c
index 98efbb5c3..fc66ed4d7 100644
--- a/src/common/kernel/build.c
+++ b/src/common/kernel/build.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: build.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: build.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/build.h b/src/common/kernel/build.h
index 422b87865..971c508dd 100644
--- a/src/common/kernel/build.h
+++ b/src/common/kernel/build.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: build.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: build.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/building.c b/src/common/kernel/building.c
index d2fa30384..e9b377bea 100644
--- a/src/common/kernel/building.c
+++ b/src/common/kernel/building.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: building.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: building.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/building.h b/src/common/kernel/building.h
index 3f088d0b9..ddce1dd2c 100644
--- a/src/common/kernel/building.h
+++ b/src/common/kernel/building.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: building.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: building.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/curse.c b/src/common/kernel/curse.c
index 5aa4b9756..99eaa0048 100644
--- a/src/common/kernel/curse.c
+++ b/src/common/kernel/curse.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: curse.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: curse.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/curse.h b/src/common/kernel/curse.h
index f011068df..e1b120bfc 100644
--- a/src/common/kernel/curse.h
+++ b/src/common/kernel/curse.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: curse.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: curse.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index d1464628c..f70760882 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: eressea.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: eressea.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h
index f19d13d50..c047b1e3f 100644
--- a/src/common/kernel/eressea.h
+++ b/src/common/kernel/eressea.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: eressea.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: eressea.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/faction.c b/src/common/kernel/faction.c
index fb73d0413..462a440fc 100644
--- a/src/common/kernel/faction.c
+++ b/src/common/kernel/faction.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: faction.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: faction.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/faction.h b/src/common/kernel/faction.h
index 5e6e329f8..0ae1fa55b 100644
--- a/src/common/kernel/faction.h
+++ b/src/common/kernel/faction.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: faction.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: faction.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/group.c b/src/common/kernel/group.c
index 39d43d722..c8fa073db 100644
--- a/src/common/kernel/group.c
+++ b/src/common/kernel/group.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: group.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: group.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/group.h b/src/common/kernel/group.h
index 5e7bc9eff..d28fdd1fe 100644
--- a/src/common/kernel/group.h
+++ b/src/common/kernel/group.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: group.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: group.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c
index 7ac92b458..fa599097c 100644
--- a/src/common/kernel/item.c
+++ b/src/common/kernel/item.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: item.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: item.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/item.h b/src/common/kernel/item.h
index 46b69d396..9d83bfb1f 100644
--- a/src/common/kernel/item.h
+++ b/src/common/kernel/item.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: item.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: item.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/karma.c b/src/common/kernel/karma.c
index 8dbb61088..24be13c0a 100644
--- a/src/common/kernel/karma.c
+++ b/src/common/kernel/karma.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: karma.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: karma.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/karma.h b/src/common/kernel/karma.h
index bd45fb1d7..2f5215a98 100644
--- a/src/common/kernel/karma.h
+++ b/src/common/kernel/karma.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: karma.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: karma.h,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c
index 081c83aef..9449f4698 100644
--- a/src/common/kernel/magic.c
+++ b/src/common/kernel/magic.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: magic.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: magic.c,v 1.2 2001/01/26 16:19:39 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/magic.h b/src/common/kernel/magic.h
index 2722eb382..b90274c66 100644
--- a/src/common/kernel/magic.h
+++ b/src/common/kernel/magic.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: magic.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: magic.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/message.c b/src/common/kernel/message.c
index 4db638ff0..0a4776411 100644
--- a/src/common/kernel/message.c
+++ b/src/common/kernel/message.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: message.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: message.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/message.h b/src/common/kernel/message.h
index 19fe6b4fd..e21e87936 100644
--- a/src/common/kernel/message.h
+++ b/src/common/kernel/message.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: message.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: message.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/monster.h b/src/common/kernel/monster.h
index c36f7e1c7..cb97dd87f 100644
--- a/src/common/kernel/monster.h
+++ b/src/common/kernel/monster.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: monster.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: monster.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c
index 0bab64fe3..269935d09 100644
--- a/src/common/kernel/movement.c
+++ b/src/common/kernel/movement.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: movement.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: movement.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/movement.h b/src/common/kernel/movement.h
index cf9ee145c..2ab55fc0d 100644
--- a/src/common/kernel/movement.h
+++ b/src/common/kernel/movement.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: movement.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: movement.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/names.c b/src/common/kernel/names.c
index 9ec4be93c..6cadde375 100644
--- a/src/common/kernel/names.c
+++ b/src/common/kernel/names.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: names.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: names.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/names.h b/src/common/kernel/names.h
index 9ed2696c1..e3241a78c 100644
--- a/src/common/kernel/names.h
+++ b/src/common/kernel/names.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: names.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: names.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/objtypes.c b/src/common/kernel/objtypes.c
index 4b5ccad0b..094141741 100644
--- a/src/common/kernel/objtypes.c
+++ b/src/common/kernel/objtypes.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: objtypes.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: objtypes.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/objtypes.h b/src/common/kernel/objtypes.h
index 563333274..dc568d1d3 100644
--- a/src/common/kernel/objtypes.h
+++ b/src/common/kernel/objtypes.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: objtypes.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: objtypes.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/orders.c b/src/common/kernel/orders.c
index bdd153b45..73efc82ef 100644
--- a/src/common/kernel/orders.c
+++ b/src/common/kernel/orders.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: orders.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: orders.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/orders.h b/src/common/kernel/orders.h
index 6e2ca61f4..d23a4205f 100644
--- a/src/common/kernel/orders.h
+++ b/src/common/kernel/orders.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: orders.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: orders.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/pathfinder.c b/src/common/kernel/pathfinder.c
index 4d13294f9..0fc5749ad 100644
--- a/src/common/kernel/pathfinder.c
+++ b/src/common/kernel/pathfinder.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: pathfinder.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: pathfinder.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/pathfinder.h b/src/common/kernel/pathfinder.h
index 28037a048..d48238e4c 100644
--- a/src/common/kernel/pathfinder.h
+++ b/src/common/kernel/pathfinder.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: pathfinder.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: pathfinder.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/plane.c b/src/common/kernel/plane.c
index 5fba77cd4..b1d8efa80 100644
--- a/src/common/kernel/plane.c
+++ b/src/common/kernel/plane.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: plane.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: plane.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/plane.h b/src/common/kernel/plane.h
index 19bd0b53b..7733e1d7c 100644
--- a/src/common/kernel/plane.h
+++ b/src/common/kernel/plane.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: plane.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: plane.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/pool.c b/src/common/kernel/pool.c
index 25adf62e0..f1644fd6c 100644
--- a/src/common/kernel/pool.c
+++ b/src/common/kernel/pool.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: pool.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: pool.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/pool.h b/src/common/kernel/pool.h
index 8f0bb0434..a013e251f 100644
--- a/src/common/kernel/pool.h
+++ b/src/common/kernel/pool.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: pool.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: pool.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/race.c b/src/common/kernel/race.c
index e9bc55953..848127635 100644
--- a/src/common/kernel/race.c
+++ b/src/common/kernel/race.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: race.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: race.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c
index c6cb85148..71f6b6132 100644
--- a/src/common/kernel/region.c
+++ b/src/common/kernel/region.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: region.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: region.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/region.h b/src/common/kernel/region.h
index 8c9c94ddb..a9e4e3c91 100644
--- a/src/common/kernel/region.h
+++ b/src/common/kernel/region.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: region.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: region.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/render.c b/src/common/kernel/render.c
index 6e41d181f..ff7abb74f 100644
--- a/src/common/kernel/render.c
+++ b/src/common/kernel/render.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: render.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: render.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/render.h b/src/common/kernel/render.h
index 1f24d781d..8894a1507 100644
--- a/src/common/kernel/render.h
+++ b/src/common/kernel/render.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: render.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: render.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/reports.c b/src/common/kernel/reports.c
index c8498c8bf..0c29503e8 100644
--- a/src/common/kernel/reports.c
+++ b/src/common/kernel/reports.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: reports.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: reports.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/reports.h b/src/common/kernel/reports.h
index 979946702..189a430ec 100644
--- a/src/common/kernel/reports.h
+++ b/src/common/kernel/reports.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: reports.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: reports.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c
index 8da9e65bb..602a9251b 100644
--- a/src/common/kernel/save.c
+++ b/src/common/kernel/save.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: save.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: save.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/save.h b/src/common/kernel/save.h
index 08756dbca..2107caeb4 100644
--- a/src/common/kernel/save.h
+++ b/src/common/kernel/save.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: save.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: save.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/ship.c b/src/common/kernel/ship.c
index 638fdaa0c..1d4686392 100644
--- a/src/common/kernel/ship.c
+++ b/src/common/kernel/ship.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: ship.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: ship.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/ship.h b/src/common/kernel/ship.h
index a9f2b1146..18af46ef8 100644
--- a/src/common/kernel/ship.h
+++ b/src/common/kernel/ship.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: ship.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: ship.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/skill.c b/src/common/kernel/skill.c
index 4ff08f92b..d42dc7f4d 100644
--- a/src/common/kernel/skill.c
+++ b/src/common/kernel/skill.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: skill.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: skill.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/skill.h b/src/common/kernel/skill.h
index 47c8501e3..7171db0f4 100644
--- a/src/common/kernel/skill.h
+++ b/src/common/kernel/skill.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: skill.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: skill.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c
index 0fbbcf2b7..3dcea8da4 100644
--- a/src/common/kernel/spell.c
+++ b/src/common/kernel/spell.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: spell.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: spell.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/spell.h b/src/common/kernel/spell.h
index 6ba677ca5..2f24d64c2 100644
--- a/src/common/kernel/spell.h
+++ b/src/common/kernel/spell.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: spell.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: spell.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/spy.h b/src/common/kernel/spy.h
index 5e11b24b5..fcec60702 100644
--- a/src/common/kernel/spy.h
+++ b/src/common/kernel/spy.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: spy.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: spy.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/study.h b/src/common/kernel/study.h
index 586f381a1..2eee859d6 100644
--- a/src/common/kernel/study.h
+++ b/src/common/kernel/study.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: study.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: study.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/teleport.c b/src/common/kernel/teleport.c
index 4a771eefb..b8dd5c3aa 100644
--- a/src/common/kernel/teleport.c
+++ b/src/common/kernel/teleport.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: teleport.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: teleport.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/teleport.h b/src/common/kernel/teleport.h
index 8272ac167..046276638 100644
--- a/src/common/kernel/teleport.h
+++ b/src/common/kernel/teleport.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: teleport.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: teleport.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/terrain.c b/src/common/kernel/terrain.c
index de7d56b48..22368d0d3 100644
--- a/src/common/kernel/terrain.c
+++ b/src/common/kernel/terrain.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: terrain.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: terrain.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/terrain.h b/src/common/kernel/terrain.h
index 98480c4b2..9c1b71c6e 100644
--- a/src/common/kernel/terrain.h
+++ b/src/common/kernel/terrain.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: terrain.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: terrain.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c
index 17c070aa1..0850dc499 100644
--- a/src/common/kernel/unit.c
+++ b/src/common/kernel/unit.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: unit.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: unit.c,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/kernel/unit.h b/src/common/kernel/unit.h
index 90c41c831..cbf392071 100644
--- a/src/common/kernel/unit.h
+++ b/src/common/kernel/unit.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: unit.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: unit.h,v 1.2 2001/01/26 16:19:40 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/races/Makefile b/src/common/races/Makefile
index e19fe9ff1..514bb03bf 100644
--- a/src/common/races/Makefile
+++ b/src/common/races/Makefile
@@ -6,7 +6,7 @@ BINARY =
 SOURCES = $(wildcard *.c)
 OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
 
-include ../Makefile.include
+include $(ERESSEA)/Makefile.include
 
 ## more definitions
 
diff --git a/src/common/races/dragons.c b/src/common/races/dragons.c
index 8bba132a7..1e21c1daf 100644
--- a/src/common/races/dragons.c
+++ b/src/common/races/dragons.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: dragons.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: dragons.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/races/dragons.h b/src/common/races/dragons.h
index a2281a0f8..389c5512d 100644
--- a/src/common/races/dragons.h
+++ b/src/common/races/dragons.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: dragons.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: dragons.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/races/illusion.c b/src/common/races/illusion.c
index ab246ea12..7a43bc39b 100644
--- a/src/common/races/illusion.c
+++ b/src/common/races/illusion.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: illusion.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: illusion.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/races/illusion.h b/src/common/races/illusion.h
index b01c73bf4..7833ab6b3 100644
--- a/src/common/races/illusion.h
+++ b/src/common/races/illusion.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: illusion.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: illusion.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/races/zombies.c b/src/common/races/zombies.c
index 8f20e896a..2051b68ad 100644
--- a/src/common/races/zombies.c
+++ b/src/common/races/zombies.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: zombies.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: zombies.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/races/zombies.h b/src/common/races/zombies.h
index c64358815..462510fd0 100644
--- a/src/common/races/zombies.h
+++ b/src/common/races/zombies.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: zombies.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: zombies.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/spells/Makefile b/src/common/spells/Makefile
index 578fc8a5a..543ea47ee 100644
--- a/src/common/spells/Makefile
+++ b/src/common/spells/Makefile
@@ -6,11 +6,11 @@ BINARY =
 SOURCES = $(wildcard *.c)
 OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
 
-include ../Makefile.include
+include $(ERESSEA)/Makefile.include
 
 ## more definitions
 
-INCLUDES  += -I../util -I../kernel -I../gamecode
+INCLUDES  += -I../util -I../kernel -I../gamecode -I..
 
 # library:
 $(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
diff --git a/src/common/spells/alp.c b/src/common/spells/alp.c
index 1ac45325e..2444f5be8 100644
--- a/src/common/spells/alp.c
+++ b/src/common/spells/alp.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: alp.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: alp.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/spells/alp.h b/src/common/spells/alp.h
index e2f41bf19..a336b27dd 100644
--- a/src/common/spells/alp.h
+++ b/src/common/spells/alp.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: alp.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: alp.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index d5ecdff3f..0546ab225 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: spells.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: spells.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/spells/spells.h b/src/common/spells/spells.h
index 0d7a15e87..99df9a79c 100644
--- a/src/common/spells/spells.h
+++ b/src/common/spells/spells.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: spells.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: spells.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/Makefile b/src/common/triggers/Makefile
index ca6de9d71..d66f312ed 100644
--- a/src/common/triggers/Makefile
+++ b/src/common/triggers/Makefile
@@ -6,11 +6,11 @@ BINARY =
 SOURCES = $(wildcard *.c)
 OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
 
-include ../Makefile.include
+include $(ERESSEA)/Makefile.include
 
 ## more definitions
 
-INCLUDES  += -I../util -I../kernel -I../gamecode
+INCLUDES  += -I../util -I../kernel -I../gamecode -I..
 
 # library:
 $(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
diff --git a/src/common/triggers/changefaction.c b/src/common/triggers/changefaction.c
index a760e9796..28852a4ed 100644
--- a/src/common/triggers/changefaction.c
+++ b/src/common/triggers/changefaction.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: changefaction.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: changefaction.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/changefaction.h b/src/common/triggers/changefaction.h
index 8aceeae40..3d5ec9d9e 100644
--- a/src/common/triggers/changefaction.h
+++ b/src/common/triggers/changefaction.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: changefaction.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: changefaction.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/changerace.c b/src/common/triggers/changerace.c
index c59509799..3298e93b4 100644
--- a/src/common/triggers/changerace.c
+++ b/src/common/triggers/changerace.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: changerace.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: changerace.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/changerace.h b/src/common/triggers/changerace.h
index 56e506a82..f95d57cc2 100644
--- a/src/common/triggers/changerace.h
+++ b/src/common/triggers/changerace.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: changerace.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: changerace.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/createcurse.c b/src/common/triggers/createcurse.c
index a066e4037..457d9ebc1 100644
--- a/src/common/triggers/createcurse.c
+++ b/src/common/triggers/createcurse.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: createcurse.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: createcurse.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/createcurse.h b/src/common/triggers/createcurse.h
index 1557c7fae..01decf784 100644
--- a/src/common/triggers/createcurse.h
+++ b/src/common/triggers/createcurse.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: createcurse.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: createcurse.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/createunit.c b/src/common/triggers/createunit.c
index 491b7b79b..1690d9c2a 100644
--- a/src/common/triggers/createunit.c
+++ b/src/common/triggers/createunit.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: createunit.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: createunit.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/createunit.h b/src/common/triggers/createunit.h
index 6bd152d30..6b066ae36 100644
--- a/src/common/triggers/createunit.h
+++ b/src/common/triggers/createunit.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: createunit.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: createunit.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/giveitem.c b/src/common/triggers/giveitem.c
index 2ac4935b6..19880a2da 100644
--- a/src/common/triggers/giveitem.c
+++ b/src/common/triggers/giveitem.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: giveitem.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: giveitem.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/giveitem.h b/src/common/triggers/giveitem.h
index 5216881d1..69f72cf47 100644
--- a/src/common/triggers/giveitem.h
+++ b/src/common/triggers/giveitem.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: giveitem.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: giveitem.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/killunit.c b/src/common/triggers/killunit.c
index 70a5834c6..ccc01f4d8 100644
--- a/src/common/triggers/killunit.c
+++ b/src/common/triggers/killunit.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: killunit.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: killunit.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/killunit.h b/src/common/triggers/killunit.h
index a564cc581..487a236d8 100644
--- a/src/common/triggers/killunit.h
+++ b/src/common/triggers/killunit.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: killunit.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: killunit.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/removecurse.c b/src/common/triggers/removecurse.c
index 24396ad12..a32baae1e 100644
--- a/src/common/triggers/removecurse.c
+++ b/src/common/triggers/removecurse.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: removecurse.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: removecurse.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/removecurse.h b/src/common/triggers/removecurse.h
index 9768da556..7decb8eaf 100644
--- a/src/common/triggers/removecurse.h
+++ b/src/common/triggers/removecurse.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: removecurse.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: removecurse.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/shock.c b/src/common/triggers/shock.c
index 137d09042..2e9d739c2 100644
--- a/src/common/triggers/shock.c
+++ b/src/common/triggers/shock.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: shock.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: shock.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/shock.h b/src/common/triggers/shock.h
index 5e5287ef1..90d1384f5 100644
--- a/src/common/triggers/shock.h
+++ b/src/common/triggers/shock.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: shock.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: shock.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/timeout.c b/src/common/triggers/timeout.c
index 4a1886a31..d9773ed2d 100644
--- a/src/common/triggers/timeout.c
+++ b/src/common/triggers/timeout.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: timeout.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: timeout.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/timeout.h b/src/common/triggers/timeout.h
index 90ec894f3..d9e63a614 100644
--- a/src/common/triggers/timeout.h
+++ b/src/common/triggers/timeout.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: timeout.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: timeout.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/triggers.c b/src/common/triggers/triggers.c
index 193b3ef8c..c9a9554d6 100644
--- a/src/common/triggers/triggers.c
+++ b/src/common/triggers/triggers.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: triggers.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: triggers.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/triggers.h b/src/common/triggers/triggers.h
index 7b8596fa3..fb4a4a137 100644
--- a/src/common/triggers/triggers.h
+++ b/src/common/triggers/triggers.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: triggers.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: triggers.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/unitmessage.c b/src/common/triggers/unitmessage.c
index 269287327..6929cdcd2 100644
--- a/src/common/triggers/unitmessage.c
+++ b/src/common/triggers/unitmessage.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: unitmessage.c,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: unitmessage.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/triggers/unitmessage.h b/src/common/triggers/unitmessage.h
index e8da855a3..82e83140c 100644
--- a/src/common/triggers/unitmessage.h
+++ b/src/common/triggers/unitmessage.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: unitmessage.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ *	$Id: unitmessage.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/Makefile b/src/common/util/Makefile
index e079a5378..841f45561 100644
--- a/src/common/util/Makefile
+++ b/src/common/util/Makefile
@@ -6,7 +6,7 @@ BINARY =
 SOURCES = $(wildcard *.c)
 OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
 
-include ../Makefile.include
+include $(ERESSEA)/Makefile.include
 
 ## more definitions
 
diff --git a/src/common/util/attrib.c b/src/common/util/attrib.c
index 5bdab33b6..317ba6164 100644
--- a/src/common/util/attrib.c
+++ b/src/common/util/attrib.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: attrib.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: attrib.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -44,7 +44,8 @@ at_register(attrib_type * at)
 	find = at_hash[at->hashkey % MAXATHASH];
 	while (find && at->hashkey!=find->hashkey) find = find->nexthash;
 	if (find && find==at) {
-		fprintf(stderr, "WARNING: attribute %s was registered more than once\n", at->name);
+		fprintf(stderr, "WARNING: attribute '%s' was registered more than once\n", at->name);
+		return;
 	} else {
 		assert(!find || !"hashkey is already in use");
 	}
diff --git a/src/common/util/attrib.h b/src/common/util/attrib.h
index 1a76d69ad..6b071de3c 100644
--- a/src/common/util/attrib.h
+++ b/src/common/util/attrib.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: attrib.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: attrib.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/base36.c b/src/common/util/base36.c
index f8915a0b3..cef71dd12 100644
--- a/src/common/util/base36.c
+++ b/src/common/util/base36.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: base36.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: base36.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/base36.h b/src/common/util/base36.h
index 3cd1b9032..b622e6390 100644
--- a/src/common/util/base36.h
+++ b/src/common/util/base36.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: base36.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: base36.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/cvector.c b/src/common/util/cvector.c
index 976b7c74d..3318e7154 100644
--- a/src/common/util/cvector.c
+++ b/src/common/util/cvector.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: cvector.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: cvector.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/cvector.h b/src/common/util/cvector.h
index 0401fc1b4..7f80a49c4 100644
--- a/src/common/util/cvector.h
+++ b/src/common/util/cvector.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: cvector.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: cvector.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/dice.c b/src/common/util/dice.c
index af0bc7d35..6f8070bed 100644
--- a/src/common/util/dice.c
+++ b/src/common/util/dice.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: dice.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: dice.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998
  *		Enno Rehling (rehling@usa.net)
  *		Christian Schlittchen (corwin@amber.kn-bremen.de)
diff --git a/src/common/util/event.c b/src/common/util/event.c
index f7f987b2d..ab4ab11be 100644
--- a/src/common/util/event.c
+++ b/src/common/util/event.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: event.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: event.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/event.h b/src/common/util/event.h
index 55cde5718..aa80d7c4d 100644
--- a/src/common/util/event.h
+++ b/src/common/util/event.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: event.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: event.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/functions.c b/src/common/util/functions.c
index d73a7ea84..b8d1edb9e 100644
--- a/src/common/util/functions.c
+++ b/src/common/util/functions.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: functions.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: functions.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/functions.h b/src/common/util/functions.h
index b2d7886d0..2f7e7046f 100644
--- a/src/common/util/functions.h
+++ b/src/common/util/functions.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: functions.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: functions.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/goodies.c b/src/common/util/goodies.c
index 980507a9f..a2cd10abb 100644
--- a/src/common/util/goodies.c
+++ b/src/common/util/goodies.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: goodies.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: goodies.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/goodies.h b/src/common/util/goodies.h
index d7d225fb3..c99b86a35 100644
--- a/src/common/util/goodies.h
+++ b/src/common/util/goodies.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: goodies.h,v 1.1 2001/01/25 09:37:57 enno Exp $
+ * $Id: goodies.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/language.c b/src/common/util/language.c
index f078296a2..c8e2cb1c6 100644
--- a/src/common/util/language.c
+++ b/src/common/util/language.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: language.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: language.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/language.h b/src/common/util/language.h
index c5a1095dd..96915b612 100644
--- a/src/common/util/language.h
+++ b/src/common/util/language.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: language.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: language.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/lists.c b/src/common/util/lists.c
index 1757ffe72..190c394dc 100644
--- a/src/common/util/lists.c
+++ b/src/common/util/lists.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: lists.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: lists.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/lists.h b/src/common/util/lists.h
index 7e4171cd1..a66907e5f 100644
--- a/src/common/util/lists.h
+++ b/src/common/util/lists.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: lists.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: lists.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/rand.c b/src/common/util/rand.c
index 94f372f90..0bd34b5ce 100644
--- a/src/common/util/rand.c
+++ b/src/common/util/rand.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: rand.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: rand.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/rand.h b/src/common/util/rand.h
index fc4f44013..95bdd2732 100644
--- a/src/common/util/rand.h
+++ b/src/common/util/rand.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: rand.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: rand.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/resolve.c b/src/common/util/resolve.c
index 42438816b..55e18a6ae 100644
--- a/src/common/util/resolve.c
+++ b/src/common/util/resolve.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: resolve.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: resolve.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/resolve.h b/src/common/util/resolve.h
index 873642816..b7eefa0e0 100644
--- a/src/common/util/resolve.h
+++ b/src/common/util/resolve.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: resolve.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: resolve.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/umlaut.c b/src/common/util/umlaut.c
index b6a753133..d981761f7 100644
--- a/src/common/util/umlaut.c
+++ b/src/common/util/umlaut.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: umlaut.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: umlaut.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/umlaut.h b/src/common/util/umlaut.h
index 78638e5ad..8f019dd8b 100644
--- a/src/common/util/umlaut.h
+++ b/src/common/util/umlaut.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: umlaut.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: umlaut.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/vmap.c b/src/common/util/vmap.c
index fde09a341..fcfcc08e4 100644
--- a/src/common/util/vmap.c
+++ b/src/common/util/vmap.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: vmap.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: vmap.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/vmap.h b/src/common/util/vmap.h
index fc5494279..7235f0d40 100644
--- a/src/common/util/vmap.h
+++ b/src/common/util/vmap.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: vmap.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: vmap.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/vset.c b/src/common/util/vset.c
index 7190b0697..ab7c031c9 100644
--- a/src/common/util/vset.c
+++ b/src/common/util/vset.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: vset.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: vset.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/vset.h b/src/common/util/vset.h
index e7347843b..6fa4ff2dc 100644
--- a/src/common/util/vset.h
+++ b/src/common/util/vset.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: vset.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: vset.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/windir.c b/src/common/util/windir.c
index 73740764b..ceac36f2e 100644
--- a/src/common/util/windir.c
+++ b/src/common/util/windir.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: windir.c,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: windir.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/common/util/windir.h b/src/common/util/windir.h
index 957270221..d9439b897 100644
--- a/src/common/util/windir.h
+++ b/src/common/util/windir.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: windir.h,v 1.1 2001/01/25 09:37:58 enno Exp $
+ *	$Id: windir.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/config.h b/src/config.h
index 91f115bb5..63b9d2b55 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: config.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: config.h,v 1.2 2001/01/26 16:19:38 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/eressea/Makefile b/src/eressea/Makefile
index f1fa75dfb..003fad084 100644
--- a/src/eressea/Makefile
+++ b/src/eressea/Makefile
@@ -3,7 +3,9 @@ SUBDIRS =
 LIBRARY = 
 BINARY = eressea
 
-SOURCES = $(wildcard *.c)
+## cheating: we link all attributes/items/etc for all the games. TODO - don't.
+#SOURCES = $(wildcard *.c)
+SOURCES = main.c korrektur.c
 OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
 
 include ../Makefile.include
@@ -11,29 +13,29 @@ include ../Makefile.include
 ## more definitions
 
 INCLUDES  += \
-	-I../util \
-	-I../kernel \
-	-I../items \
-	-I../spells \
-	-I../triggers \
-	-I../gamecode \
-	-I../races \
-	-I../attributes
+	-I../common \
+	-I../common/util \
+	-I../common/kernel \
+	-I../common/gamecode
+
+LIBNAMES      = \
+	e-triggers \
+	e-modules \
+	e-gamecode \
+	e-kernel \
+	e-items \
+	e-spells \
+	e-races \
+	e-attributes \
+	e-util
+
+LIBRARIES = $(LIBNAMES:%=$(PUBLISH_DIR)/lib%.a)
+
+LIBS += $(LIBNAMES:%=-l%) -lm
 
-LIBS      += \
-	-le-triggers \
-	-le-modules \
-	-le-gamecode \
-	-le-kernel \
-	-le-items \
-	-le-spells \
-	-le-races \
-	-le-attributes \
-	-le-util \
-	-lm
 
 # executable:
-$(BUILD_DIR)/$(BINARY):: $(BUILD_DIR) $(OBJECTS)
+$(BUILD_DIR)/$(BINARY):: $(BUILD_DIR) $(OBJECTS) $(LIBRARIES)
 	$(LD) -o $@ $(OBJECTS) $(LDFLAGS)
 	$(INSTALL) $@ $(PUBLISH_DIR)/
 
diff --git a/src/eressea/attributes.c b/src/eressea/attributes.c
index a9a4525c8..2b9426301 100644
--- a/src/eressea/attributes.c
+++ b/src/eressea/attributes.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: attributes.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: attributes.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -17,12 +17,12 @@
 #include "attributes.h"
 
 /* attributes includes */
-#include "key.h"
-#include "targetregion.h"
-#include "reduceproduction.h"
-#include "follow.h"
-#include "iceberg.h"
-#include "hate.h"
+#include <attributes/key.h>
+#include <attributes/targetregion.h>
+#include <attributes/reduceproduction.h>
+#include <attributes/follow.h>
+#include <attributes/iceberg.h>
+#include <attributes/hate.h>
 
 /* util includes */
 #include <attrib.h>
diff --git a/src/eressea/attributes.h b/src/eressea/attributes.h
index 0038d54be..5417c6462 100644
--- a/src/eressea/attributes.h
+++ b/src/eressea/attributes.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: attributes.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: attributes.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index 1bedfac0c..560eb94ac 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: korrektur.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: korrektur.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/eressea/main.c b/src/eressea/main.c
index 6020d5877..892c6c488 100644
--- a/src/eressea/main.c
+++ b/src/eressea/main.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: main.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: main.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -34,15 +34,16 @@
 #include <config.h>
 #include <eressea.h>
 
+/* initialization - TODO: init in separate module */
+#include <items/weapons.h>
+#include <attributes/attributes.h>
+
 /* modules includes */
 #include <modules/arena.h>
 #include <modules/museum.h>
 #include <modules/score.h>
 #include <modules/xmas2000.h>
 
-/* items includes - TODO: init in separate module */
-#include <items/weapons.h>
-
 /* gamecode includes */
 #include <creation.h>
 #include <laws.h>
@@ -104,6 +105,7 @@ init_game(void)
 
 	init_resources();
 	init_weapons();
+	init_attributes();
 
 	init_conversion();
 
diff --git a/src/eressea/triggers.c b/src/eressea/triggers.c
index 46e495ebf..c9a9554d6 100644
--- a/src/eressea/triggers.c
+++ b/src/eressea/triggers.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: triggers.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: triggers.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/eressea/triggers.h b/src/eressea/triggers.h
index 6789ddcb3..fb4a4a137 100644
--- a/src/eressea/triggers.h
+++ b/src/eressea/triggers.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: triggers.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: triggers.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/header.txt b/src/header.txt
index 98a2e6164..7803d2214 100644
--- a/src/header.txt
+++ b/src/header.txt
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: header.txt,v 1.1 2001/01/25 09:37:56 enno Exp $
+ * $Id: header.txt,v 1.2 2001/01/26 16:19:38 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/mapper/map_modify.c b/src/mapper/map_modify.c
index dd77e6434..539c8dc69 100644
--- a/src/mapper/map_modify.c
+++ b/src/mapper/map_modify.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: map_modify.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: map_modify.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/mapper/map_partei.c b/src/mapper/map_partei.c
index f33f886c8..243f2186b 100644
--- a/src/mapper/map_partei.c
+++ b/src/mapper/map_partei.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: map_partei.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: map_partei.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/mapper/map_region.c b/src/mapper/map_region.c
index 544a223b8..834a15f98 100644
--- a/src/mapper/map_region.c
+++ b/src/mapper/map_region.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: map_region.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: map_region.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/mapper/map_tools.c b/src/mapper/map_tools.c
index f450335e6..f5ebf1be3 100644
--- a/src/mapper/map_tools.c
+++ b/src/mapper/map_tools.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: map_tools.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: map_tools.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/mapper/map_units.c b/src/mapper/map_units.c
index dfa07bff1..a8c74f346 100644
--- a/src/mapper/map_units.c
+++ b/src/mapper/map_units.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: map_units.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: map_units.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c
index 45a944af7..1c7716e67 100644
--- a/src/mapper/mapper.c
+++ b/src/mapper/mapper.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: mapper.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: mapper.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/mapper/mapper.h b/src/mapper/mapper.h
index bbf5f0531..4fbda0a05 100644
--- a/src/mapper/mapper.h
+++ b/src/mapper/mapper.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: mapper.h,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: mapper.h,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/tools/filter.c b/src/tools/filter.c
index 24dd99db1..812effe70 100644
--- a/src/tools/filter.c
+++ b/src/tools/filter.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2 ai sw=2
  *
- *	$Id: filter.c,v 1.1 2001/01/25 09:37:56 enno Exp $
+ *	$Id: filter.c,v 1.2 2001/01/26 16:19:41 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1997-99
  *		Enno Rehling (rehling@usa.net)
  *		Christian Schlittchen (corwin@amber.kn-bremen.de)