diff --git a/src/common/items/Jamfile b/src/common/items/Jamfile
index 511b4d0a5..4e14fa108 100644
--- a/src/common/items/Jamfile
+++ b/src/common/items/Jamfile
@@ -6,6 +6,7 @@ SubDirHdrs $(SUBDIR)/../kernel ;
 SubDirHdrs $(SUBDIR)/../util ;
 SubDirHdrs $(SUBDIR)/.. ;
 SubDirHdrs $(SUBDIR)/../.. ;
+SubDirHdrs $(XMLHDRS) ;
 
 SOURCES =
  artrewards.c
diff --git a/src/common/kernel/Jamfile b/src/common/kernel/Jamfile
index 4e394d0ba..78a08bc07 100644
--- a/src/common/kernel/Jamfile
+++ b/src/common/kernel/Jamfile
@@ -15,6 +15,7 @@ SOURCES =
  building.c
  calendar.c
  curse.c
+ command.c
  eressea.c
  equipment.c
  faction.c
diff --git a/src/common/modules/Jamfile b/src/common/modules/Jamfile
index 543e474eb..821a32f4c 100644
--- a/src/common/modules/Jamfile
+++ b/src/common/modules/Jamfile
@@ -6,6 +6,7 @@ SubDirHdrs $(SUBDIR)/../kernel ;
 SubDirHdrs $(SUBDIR)/../util ;
 SubDirHdrs $(SUBDIR)/.. ;
 SubDirHdrs $(SUBDIR)/../.. ;
+SubDirHdrs $(XMLHDRS) ;
 
 SOURCES =
  arena.c
diff --git a/src/common/modules/arena.c b/src/common/modules/arena.c
index aee9bbf3b..2f0e344b1 100644
--- a/src/common/modules/arena.c
+++ b/src/common/modules/arena.c
@@ -68,11 +68,13 @@ plane * arena = NULL;
 /* local vars */
 #define CENTRAL_VOLCANO 1
 
+#ifdef ARENA_CREATION
 static unsigned int arena_id = 0;
 static region * arena_center = NULL;
+static int newarena = 0;
+#endif
 static region * tower_region[6];
 static region * start_region[6];
-static int newarena = 0;
 
 static region *
 arena_region(int magic)
@@ -434,6 +436,7 @@ struct trigger_type tt_caldera = {
 	caldera_read
 };
 
+#ifdef ARENA_CREATION
 static trigger *
 trigger_caldera(building * b)
 {
@@ -441,6 +444,7 @@ trigger_caldera(building * b)
 	t->data.v = b;
 	return t;
 }
+#endif
 
 #ifdef ARENA_CREATION
 static void
diff --git a/src/common/races/Jamfile b/src/common/races/Jamfile
index 62d99ddef..d8b50ab54 100644
--- a/src/common/races/Jamfile
+++ b/src/common/races/Jamfile
@@ -6,6 +6,7 @@ SubDirHdrs $(SUBDIR)/../kernel ;
 SubDirHdrs $(SUBDIR)/../util ;
 SubDirHdrs $(SUBDIR)/.. ;
 SubDirHdrs $(SUBDIR)/../.. ;
+SubDirHdrs $(XMLHDRS) ;
 
 SOURCES =
  dragons.c
diff --git a/src/common/util/Jamfile b/src/common/util/Jamfile
index 5f3694951..16d79e100 100644
--- a/src/common/util/Jamfile
+++ b/src/common/util/Jamfile
@@ -12,7 +12,6 @@ SOURCES =
  attrib.c
  base36.c
  bsdstring.c
- command.c
  crmessage.c
  cvector.c
  dice.c
diff --git a/src/common/util/language.h b/src/common/util/language.h
index 6266b42cf..4678c328a 100644
--- a/src/common/util/language.h
+++ b/src/common/util/language.h
@@ -18,7 +18,6 @@ extern "C" {
 #endif
 
 struct locale;
-typedef unsigned char xmlChar;
 
 /** managing multiple locales: **/
 extern struct locale * find_locale(const char * name);
diff --git a/src/common/util/parser.c b/src/common/util/parser.c
index f1bd63817..9f5358646 100644
--- a/src/common/util/parser.c
+++ b/src/common/util/parser.c
@@ -4,7 +4,7 @@
 #include "log.h"
 
 #include <assert.h>
-#include <ctype.h>
+#include <wctype.h>
 #include <memory.h>
 
 #define SPACE_REPLACEMENT '~'
@@ -30,7 +30,7 @@ eatwhitespace_c(const xmlChar ** str)
   for (;;) {
     xmlChar utf8_character = (*str)[0];
     if (utf8_character <= 0x7F) {
-      if (!isspace(utf8_character)) break;
+      if (!iswspace(utf8_character)) break;
       ++*str;
     } else {
       ret = unicode_utf8_to_ucs4(&ucs, *str, &len);
diff --git a/src/common/util/umlaut.c b/src/common/util/umlaut.c
index 442dcdd8c..fcb4170da 100644
--- a/src/common/util/umlaut.c
+++ b/src/common/util/umlaut.c
@@ -25,7 +25,7 @@
 #include "log.h"
 #include "unicode.h"
 
-#include <ctype.h>
+#include <wctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
@@ -54,7 +54,7 @@ addtoken(tnode * root, const xmlChar * str, variant id)
     { 230, "AE"},
     { 248, "OE"},
     { 229, "AA"},
-    { 0, 0 }
+    { 0, "" }
   };
 
   if (!*str) {