diff --git a/src/common/gamecode/Jamfile b/src/common/gamecode/Jamfile
index 0ddecddc4..506a3eb5b 100644
--- a/src/common/gamecode/Jamfile
+++ b/src/common/gamecode/Jamfile
@@ -17,7 +17,6 @@ SOURCES =
  monster.c
  randenc.c
  report.c
- spy.c
  study.c
  xmlreport.c
  ;
diff --git a/src/common/kernel/Jamfile b/src/common/kernel/Jamfile
index 6fbad0930..ad2c8d8a2 100644
--- a/src/common/kernel/Jamfile
+++ b/src/common/kernel/Jamfile
@@ -38,6 +38,7 @@ SOURCES =
  save.c
  ship.c
  skill.c
+ spy.c
  spell.c
  teleport.c
  terrain.c
diff --git a/src/common/kernel/curse.c b/src/common/kernel/curse.c
index e563e0f4d..7aab8514f 100644
--- a/src/common/kernel/curse.c
+++ b/src/common/kernel/curse.c
@@ -50,12 +50,6 @@
 #include <math.h>
 #include <ctype.h>
 
-/* spells includes */
-#include <spells/regioncurse.h>
-#include <spells/unitcurse.h>
-#include <spells/shipcurse.h>
-#include <spells/buildingcurse.h>
-
 
 /* ------------------------------------------------------------- */
 
@@ -679,16 +673,6 @@ resolve_curse(variant id)
    return cfindhash(id.i);
 }
 
-void
-register_curses(void)
-{
-  register_unitcurse();
-  register_regioncurse();
-  register_shipcurse();
-  register_buildingcurse();
-}
-
-
 static const char * oldnames[MAXCURSE] = {
   "fogtrap",
   "antimagiczone",
diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index 25983f1bd..69f2af7eb 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -16,7 +16,10 @@
 #include <eressea.h>
 #include "spells.h"
 
+#include "buildingcurse.h"
 #include "regioncurse.h"
+#include "unitcurse.h"
+#include "shipcurse.h"
 #include "alp.h"
 #include "combatspells.h"
 
@@ -9475,6 +9478,7 @@ init_spells(void)
 void
 register_spells(void)
 {
+  
   /* sp_summon_alp */
   register_alp();
   /* init_firewall(); */
@@ -9482,6 +9486,9 @@ register_spells(void)
   ct_register(&ct_deathcloud);
 
   at_register(&at_deathcloud_compat);
-  register_curses();
+  register_unitcurse();
+  register_regioncurse();
+  register_shipcurse();
+  register_buildingcurse();
   register_function((pf_generic)&sp_wdwpyramid, "wdwpyramid");
 }
diff --git a/src/eressea/Jamfile b/src/eressea/Jamfile
index d28ed6254..8e55c512b 100644
--- a/src/eressea/Jamfile
+++ b/src/eressea/Jamfile
@@ -61,14 +61,14 @@ GMTOOL_SOURCES =
 
 # old eressea server. use only for testing.
 LinkLibraries $(SERVER) :
- gamecode kernel items modules attributes spells races triggers util ;
+ gamecode items spells kernel modules attributes races triggers util ;
 libxml2 $(SERVER) ;
 LINKLIBS on $(SERVER) += -lm ;
 Main $(SERVER) : $(SERVER_SOURCES) ;
 
 # eressea-server with lua scripting
 LinkLibraries $(LUASERVER) :
- gamecode kernel items modules attributes spells races triggers util ;
+ gamecode items spells kernel modules attributes races triggers util ;
 luabind $(LUASERVER) ;
 libxml2 $(LUASERVER) ;
 LINKLIBS on $(LUASERVER) += -lm -ldl -lstdc++ ;
@@ -76,7 +76,7 @@ Main $(LUASERVER) : $(LUASERVER_SOURCES) ;
 
 # the curses-based GM tool (now with luabind)
 LinkLibraries $(GMTOOL) :
- kernel modules items attributes spells races triggers util ;
+ items spells kernel modules attributes races triggers util ;
 luabind $(GMTOOL) ;
 libxml2 $(GMTOOL) ;
 LINKLIBS on $(GMTOOL) += -lm -lncurses -ldl -lstdc++ ;
diff --git a/src/mapper/Jamfile b/src/mapper/Jamfile
index e53cb1ff4..c84846f9e 100644
--- a/src/mapper/Jamfile
+++ b/src/mapper/Jamfile
@@ -22,11 +22,11 @@ SOURCES =
 Main mapper : $(SOURCES) ;
 LinkLibraries mapper :
  gamecode 
+ items
+ spells
  kernel
  modules 
- items
  attributes
- spells
  races
  triggers
  util ;
diff --git a/src/scripts/samples.lua b/src/scripts/samples.lua
index 7e3ec2f5b..f67e01b31 100644
--- a/src/scripts/samples.lua
+++ b/src/scripts/samples.lua
@@ -323,8 +323,6 @@ function move_north(u)
 end
 
 function test_monsters()
-  read_game("23")
-
   -- magrathea = get_region(-67, -5)
   local magrathea = get_region(0, 0)
   if magrathea ~= nil then
@@ -411,9 +409,9 @@ end
 
 -- test_movement()
 -- test_fail()
-test_handler()
+-- test_handler()
 -- test_parser()
--- test_monsters()
+test_monsters()
 -- test_combat()
 -- test_rewards()
 -- test_give()
@@ -423,8 +421,10 @@ test_handler()
 -- write_game("../testg.txt")
 -- read_game("../testg.txt")
 
-run_scripts()
-process_orders()
-write_reports() 
+if 0==1 then
+  run_scripts()
+  process_orders()
+  write_reports() 
+end
 
 -- test_moving()