diff --git a/src/Jamrules b/src/Jamrules
index b46ac35f0..b67fd523b 100644
--- a/src/Jamrules
+++ b/src/Jamrules
@@ -1,15 +1,17 @@
 C++ = g++ ;
 CC = gcc ;
 
+if $(JAMUNAME[5]) = "GNU/Linux" {
+ DEBIAN = 1 ;
+}
+
 LINKFLAGS += -rdynamic ;
 
 if ! $(HAVE_LUA) {
   HAVE_LUA = 1 ;
 }
 
-if ! $(DISTCC_HOSTS) {
-}
-else {
+if $(DISTCC_HOSTS) {
   DISTCC = 1 ;
 }
 
@@ -53,8 +55,11 @@ if ! $(LUABIND) {
 }
 
 C++FLAGS += -DHAVE_LUABIND_$(LUABIND) ;
-if $(HOST) = "hamunaptra" {
-  XMLHDRS = /homes2/info-f/enno/software/hamunaptra/include/libxml2 ;
+if $(LOCAL_USR) {
+  XMLHDRS = $(LOCAL_USR)/include/libxml2 ;
+  C++FLAGS += -I$(LOCAL_USR)/include ;
+  CFLAGS += -I$(LOCAL_USR)/include ;
+  LINKLIBS += -L$(LOCAL_USR)/lib ;
 } else {
   XMLHDRS = /usr/include/libxml2 ;
 }
@@ -70,10 +75,10 @@ rule iconv
 rule luabind
 {
   LINKLIBS on $(<) += -L$(LUABIND_ROOT)/lib ;
-  if $(HOST) = "hamunaptra" {
-    LINKLIBS on $(<) += -llua -llualib ;
-  } else { 
+  if $(DEBIAN) {
     LINKLIBS on $(<) += -llua50 -llualib50 ;
+  } else {
+    LINKLIBS on $(<) += -llua -llualib ;
   }
   LINKLIBS on $(<) += -lm -lluabind ;
 }
diff --git a/src/config.h b/src/config.h
index 2635f8779..d816eb918 100644
--- a/src/config.h
+++ b/src/config.h
@@ -226,7 +226,9 @@ extern char * strdup(const char *s);
 /****                      ****
  ** The Eressea boolean type **
  ****                      ****/
-#ifndef HAS_BOOLEAN
+#ifdef __cplusplus
+  typedef bool boolean;
+#else
   typedef int boolean;
 # define false ((boolean)0)
 # define true ((boolean)!false)
diff --git a/src/eressea/main.c b/src/eressea/main.c
index 7ed172562..c672bb5ff 100644
--- a/src/eressea/main.c
+++ b/src/eressea/main.c
@@ -220,23 +220,6 @@ game_init(void)
 #endif
 }
 
-static void
-getgarbage(void)
-{
-	faction *f;
-
-	/* Get rid of stuff that was only relevant last turn */
-
-#if 0
-	for (r = regions; r; r = r->next) {
-		freestrlist(r->comments);
-		r->comments = 0;
-		freestrlist(r->botschaften);
-		r->botschaften = 0;
-	}
-#endif
-}
-
 #ifdef SHORTPWDS
 static void
 readshortpwds()
@@ -287,9 +270,6 @@ processturn(char *filename)
 	printf(" - Korrekturen Runde %d\n", turn);
 	korrektur();
 	turn++;
-	puts(" - entferne Texte der letzten Runde");
-	getgarbage();
-	puts(" - Nehme Korrekturen am Datenbestand vor");
 	if ((i=readorders(filename))!=0) return i;
   if (!nomonsters) {
     if (turn == 0) srand(time((time_t *) NULL));