diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c
index 80fd30dba..0bce16a75 100644
--- a/src/common/kernel/magic.c
+++ b/src/common/kernel/magic.c
@@ -1840,9 +1840,9 @@ verify_targets(castorder *co)
 						spobj->flag = TARGET_RESISTS;
 						resists++;
 						add_message(&mage->faction->msgs, new_message(mage->faction,
-							"spellunitresists%u:unit%r:region%s:command%s:id",
+							"spellunitresists%u:unit%r:region%s:command%d:id",
 							mage, mage->region, strdup(co->order),
-							strdup(spobj->data.i)));
+							spobj->data.i));
 						break;
 					}
 
@@ -1864,8 +1864,8 @@ verify_targets(castorder *co)
 						spobj->flag = TARGET_RESISTS;
 						resists++;
 						add_message(&mage->faction->msgs, new_message(mage->faction,
-							"spellbuildingresists%u:unit%r:region%s:command%i:id",
-							mage, mage->region, strdup(co->order), strdup(spobj->data.i)));
+							"spellbuildingresists%u:unit%r:region%s:command%d:id",
+							mage, mage->region, strdup(co->order), spobj->data.i));
 						break;
 					}
 					success++;
@@ -1884,8 +1884,8 @@ verify_targets(castorder *co)
 						spobj->flag = TARGET_RESISTS;
 						resists++;
 						add_message(&mage->faction->msgs, new_message(mage->faction,
-							"spellshipresists%u:unit%r:region%s:command%i:id",
-							mage, mage->region, strdup(co->order), strdup(spobj->data.i)));
+							"spellshipresists%u:unit%r:region%s:command%d:id",
+							mage, mage->region, strdup(co->order), spobj->data.i));
 						break;
 					}
 					success++;
diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c
index d0f8feee8..5235f46c4 100644
--- a/src/common/kernel/spell.c
+++ b/src/common/kernel/spell.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include "eressea.h"
-#include "spell.h"
 
 /* kernel includes */
 /* FIXME: brauchen wir die wirklich alle? */
@@ -48,6 +47,8 @@
 #include "terrain.h"
 #include "unit.h"
 
+#include "spell.h"
+
 /* spells includes */
 #include <spells/alp.h>