diff --git a/src/common/attributes/Jamfile b/src/common/attributes/Jamfile
index 67c12e770..0b00f0379 100644
--- a/src/common/attributes/Jamfile
+++ b/src/common/attributes/Jamfile
@@ -8,7 +8,6 @@ SubDirHdrs $(SUBDIR)/.. ;
 SubDirHdrs $(SUBDIR)/../.. ;
 
 SOURCES =
- aggressive.c
  alliance.c
  attributes.c
  fleechance.c
diff --git a/src/common/attributes/aggressive.c b/src/common/attributes/aggressive.c
deleted file mode 100644
index bfd823a57..000000000
--- a/src/common/attributes/aggressive.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 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)
- *      Henning Peters (faroul@beyond.kn-bremen.de)
- *      Enno Rehling (enno@eressea-pbem.de)
- *      Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de)
- *
- * This program may not be used, modified or distributed without
- * prior permission by the authors of Eressea.
- */
-
-#include <config.h>
-#include "aggressive.h"
-
-#include <attrib.h>
-
-attrib_type at_aggressive = {
-  "aggressive",
-  NULL,
-  NULL,
-  NULL,
-  a_writedefault,
-  a_readdefault,
-  ATF_UNIQUE
-};
-
-void
-init_aggressive(void)
-{
-	at_register(&at_aggressive);
-}
diff --git a/src/common/attributes/alliance.c b/src/common/attributes/alliance.c
index a5ca86e7f..1836f67fa 100644
--- a/src/common/attributes/alliance.c
+++ b/src/common/attributes/alliance.c
@@ -10,7 +10,7 @@
  */
 
 #include <config.h>
-#include "eressea.h"
+#include <eressea.h>
 #include "alliance.h"
 
 #include <kernel/save.h>
diff --git a/src/common/attributes/reduceproduction.c b/src/common/attributes/reduceproduction.c
index b5a3202df..fb99cb77a 100644
--- a/src/common/attributes/reduceproduction.c
+++ b/src/common/attributes/reduceproduction.c
@@ -13,6 +13,7 @@
  */
 
 #include <config.h>
+#include <eressea.h>
 #include "reduceproduction.h"
 #include <kernel/save.h>
 #include <util/attrib.h>
diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index 3cecfb174..ccb0a233f 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -537,9 +537,6 @@ select_familiar(const race * magerace, magic_t magiegebiet)
     retval = magerace->familiars[magiegebiet];
   }
 
-  if (retval!=NULL && retval->init_familiar!=NULL) {
-    return NULL;
-  }
   return retval;
 }
 
diff --git a/src/common/util/rand.c b/src/common/util/rand.c
index dad694d6a..eec3b3372 100644
--- a/src/common/util/rand.c
+++ b/src/common/util/rand.c
@@ -32,9 +32,6 @@
 #define drand() ((rand()%RAND_MAX)/(double)RAND_MAX)
 #define M_PIl   3.1415926535897932384626433832795029L  /* pi */
 
-static double nv_next;
-static char valid_next = 0;
-
 /* NormalRand aus python, random.py geklaut, dort ist Referenz auf
 * den Algorithmus. mu = Mittelwert, sigma = Standardabweichung. */
 double