1 files changed, 7 insertions, 12 deletions
diff --git a/src/map/magic-interpreter.hpp b/src/map/magic-interpreter.hpp
index 65c64e3..16fc447 100644
--- a/src/map/magic-interpreter.hpp
+++ b/src/map/magic-interpreter.hpp
@@ -26,23 +26,20 @@
 
 # include <cassert>
 
+# include <memory>
+
 # include "../strings/fwd.hpp"
 # include "../strings/rstring.hpp"
 
-# include "magic.hpp"
+# include "../mmo/dumb_ptr.hpp"
+# include "../mmo/ids.hpp"
+# include "../mmo/timer.t.hpp"
+# include "../mmo/utils.hpp"
+
 # include "map.hpp"
 # include "script.hpp"
 # include "skill.t.hpp"
 
-struct fun_t;
-struct op_t;
-struct expr_t;
-struct val_t;
-struct location_t;
-struct area_t;
-struct spell_t;
-struct invocation;
-
 struct location_t
 {
     map_local *m;
@@ -319,8 +316,6 @@ struct magic_conf_t
 # define VAR_SCRIPTTARGET        7
 # define VAR_LOCATION            8
 
-struct magic_config;
-
 struct env_t
 {
     magic_conf_t *base_env;