diff --git a/src/common/kernel/region.h b/src/common/kernel/region.h
index 493c55cff..a3ab887fa 100644
--- a/src/common/kernel/region.h
+++ b/src/common/kernel/region.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include "language.h"
+#include <util/language.h>
 #include <assert.h>
 
 /* FAST_CONNECT: regions are directly connected to neighbours, saves doing
@@ -69,7 +69,7 @@ typedef struct land_region {
   } * demands;
   const struct item_type * herbtype;
   short herbs;
-  int trees[3]; /* 0 -> Samen, 1 -> Sprößlinge, 2 -> Bäume */
+  int trees[3]; /* 0 -> seeds, 1 -> shoots, 2 -> trees */
   int horses;
   int peasants;
   int newpeasants;
diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index 0f96a6814..5f50abfa0 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -816,9 +816,10 @@ xml_readitem(xmlXPathContextPtr xpath, resource_type * rtype)
       assert(property!=NULL);
       if (strcmp((const char*)property, "give")==0) {
         itype->give = (boolean (*)(const struct unit*, const struct unit*, const struct item_type *, int, struct order *))fun;
-      }
-      else if (strcmp((const char*)property, "use")==0) {
+      } else if (strcmp((const char*)property, "use")==0) {
         itype->use = (int (*)(struct unit *, const struct item_type *, int, struct order *))fun;
+      } else if (strcmp((const char*)property, "useonother")==0) {
+        itype->useonother = (int (*)(struct unit *, int targetno, const struct item_type *, int, struct order *))fun;
       } else {
         log_error(("unknown function type '%s' for item '%s'\n",
           (const char*)property, rtype->_name[0]));
diff --git a/src/common/util/cvector.h b/src/common/util/cvector.h
index b2759d890..52d7066f5 100644
--- a/src/common/util/cvector.h
+++ b/src/common/util/cvector.h
@@ -1,6 +1,5 @@
 /* vi: set ts=2:
  *
- *	
  *	Eressea PB(E)M host Copyright (C) 1998-2003
  *      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 eefc4a7d9..d3e73030e 100644
--- a/src/common/util/event.h
+++ b/src/common/util/event.h
@@ -1,6 +1,5 @@
 /* vi: set ts=2:
  *
- *	
  *	Eressea PB(E)M host Copyright (C) 1998-2003
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
diff --git a/src/res/resources.xml b/src/res/resources.xml
index 4df3d100e..c563e94e1 100644
--- a/src/res/resources.xml
+++ b/src/res/resources.xml
@@ -617,7 +617,7 @@
 
   <resource name="p7" appearance="vial" sneak="yes">
     <item weight="0" score="90">
-      <function name="use" value="usefoolpotion"/>
+      <function name="useonother" value="usefoolpotion"/>
       <potion level="3"/>
       <construction skill="alchemy" minskill="6" reqsize="1">
         <requirement type="h2"/>
diff --git a/src/tools/reduce.c b/src/tools/reduce.c
index fc8b6b12d..fcbbefc18 100644
--- a/src/tools/reduce.c
+++ b/src/tools/reduce.c
@@ -10,14 +10,14 @@
  without prior permission by the authors of Eressea.
 */
 #include <config.h>
-#include <eressea.h>
+#include <kernel/eressea.h>
 
-#include <region.h>
-#include <faction.h>
-#include <unit.h>
-#include <save.h>
+#include <kernel/region.h>
+#include <kernel/faction.h>
+#include <kernel/unit.h>
+#include <kernel/save.h>
 
-#include <base36.h>
+#include <util/base36.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/tools/translator.c b/src/tools/translator.c
index 12e222d20..1f13ba79c 100644
--- a/src/tools/translator.c
+++ b/src/tools/translator.c
@@ -60,7 +60,7 @@ test_message(void)
 }
 
 #include <string.h>
-#include <language.h>
+#include <util/language.h>
 
 message *
 new_message(struct faction * receiver, const char* sig, ...)