diff --git a/src/common/kernel/Jamfile b/src/common/kernel/Jamfile
index efc1adebe..18112e215 100644
--- a/src/common/kernel/Jamfile
+++ b/src/common/kernel/Jamfile
@@ -14,7 +14,6 @@ SOURCES =
build.c
building.c
calendar.c
- combatspells.c
curse.c
eressea.c
equipment.c
diff --git a/src/common/kernel/kernel.vcproj b/src/common/kernel/kernel.vcproj
index 0f8fe45ab..8f21ec865 100644
--- a/src/common/kernel/kernel.vcproj
+++ b/src/common/kernel/kernel.vcproj
@@ -320,9 +320,6 @@
-
-
diff --git a/src/common/spells/Jamfile b/src/common/spells/Jamfile
index e6a099dd7..de52e8744 100644
--- a/src/common/spells/Jamfile
+++ b/src/common/spells/Jamfile
@@ -10,6 +10,7 @@ SubDirHdrs $(SUBDIR)/../.. ;
SOURCES =
alp.c
buildingcurse.c
+ combatspells.c
regioncurse.c
shipcurse.c
spells.c
diff --git a/src/common/kernel/combatspells.c b/src/common/spells/combatspells.c
similarity index 99%
rename from src/common/kernel/combatspells.c
rename to src/common/spells/combatspells.c
index cce9e7ccf..1b9821c0a 100644
--- a/src/common/kernel/combatspells.c
+++ b/src/common/spells/combatspells.c
@@ -14,21 +14,21 @@
#include "combatspells.h"
/* kernel includes */
-#include "battle.h"
-#include "build.h"
-#include "building.h"
-#include "faction.h"
-#include "item.h"
-#include "magic.h"
-#include "message.h"
-#include "order.h"
-#include "region.h"
-#include "unit.h"
-#include "movement.h"
-#include "spell.h"
-#include "spellid.h"
-#include "race.h"
-#include "skill.h"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
/* util includes */
#include
diff --git a/src/common/kernel/combatspells.h b/src/common/spells/combatspells.h
similarity index 100%
rename from src/common/kernel/combatspells.h
rename to src/common/spells/combatspells.h
diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index 8068664ac..47983b750 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -17,6 +17,7 @@
#include "spells.h"
#include "alp.h"
+#include "combatspells.h"
#include
@@ -28,7 +29,6 @@ extern void ct_register(const struct curse_type * ct);
#include /* für lovar */
#include
#include
-#include
#include
#include
#include
diff --git a/src/common/spells/spells.vcproj b/src/common/spells/spells.vcproj
index 9c4d248b6..bf0a4fda1 100644
--- a/src/common/spells/spells.vcproj
+++ b/src/common/spells/spells.vcproj
@@ -179,6 +179,9 @@
+
+
@@ -198,6 +201,9 @@
+
+