diff --git a/src/spells/flyingship.c b/src/spells/flyingship.c
index 914ca4deb..7751451ed 100644
--- a/src/spells/flyingship.c
+++ b/src/spells/flyingship.c
@@ -9,6 +9,9 @@
 #include <kernel/messages.h>
 #include <kernel/region.h>
 #include <kernel/unit.h>
+#include <kernel/ship.h>
+
+#include <magic.h>
 
 #include <spells/shipcurse.h>
 
diff --git a/src/spells/flyingship.h b/src/spells/flyingship.h
index 92e81ad27..35c847e03 100644
--- a/src/spells/flyingship.h
+++ b/src/spells/flyingship.h
@@ -3,18 +3,14 @@
 #ifndef FLYINGSHIP_H
 #define FLYINGSHIP_H
 
-#include "magic.h"
-
-#include <kernel/ship.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-    int sp_flying_ship(castorder * co);
+    int sp_flying_ship(struct castorder * co);
 
     void register_flyingship(void);
-    bool flying_ship(const ship * sh);
+    bool flying_ship(const struct ship * sh);
     int levitate_ship(struct ship *sh, struct unit *mage, double power,
         int duration);
 
diff --git a/src/spells/flyingship.test.c b/src/spells/flyingship.test.c
index 9657aea46..00199e971 100644
--- a/src/spells/flyingship.test.c
+++ b/src/spells/flyingship.test.c
@@ -7,6 +7,8 @@
 #include <kernel/unit.h>
 #include <kernel/ship.h>
 
+#include <magic.h>
+
 #include <CuTest.h>
 #include <tests.h>
 #include <assert.h>
@@ -17,8 +19,6 @@ static void test_flyingship(CuTest * tc)
     spellparameter par;
     spllprm par_data;
     spllprm *par_data_ptr = &par_data;
-    par.param = &par_data_ptr;
-    par_data.typ = SPP_SHIP;
 
     region *r;
     faction *f;
@@ -26,6 +26,9 @@ static void test_flyingship(CuTest * tc)
     ship_type *shipType1, *shipType2;
     ship *sh1, *sh2;
 
+    par.param = &par_data_ptr;
+    par_data.typ = SPP_SHIP;
+
     test_cleanup();
     test_create_world();