1 files changed, 5 insertions, 8 deletions
diff --git a/src/map/magic-expr.hpp b/src/map/magic-expr.hpp
index 294e665..055f37b 100644
--- a/src/map/magic-expr.hpp
+++ b/src/map/magic-expr.hpp
@@ -21,20 +21,16 @@
 
 #include "fwd.hpp"
 
-#include "../generic/fwd.hpp"
-
-#include "../range/fwd.hpp"
-
 #include "../strings/zstring.hpp"
 #include "../strings/literal.hpp"
 
-#include "../mmo/fwd.hpp"
-
 #include "magic-interpreter.t.hpp"
 
 
 namespace tmwa
 {
+namespace map
+{
 namespace magic
 {
 /*
@@ -97,14 +93,15 @@ int magic_find_item(Slice<val_t> args, int index, Item *item, int *stackable);
         default: break;                                         \
     }
 
-int magic_location_in_area(map_local *m, int x, int y, dumb_ptr<area_t> area);
+int magic_location_in_area(Borrowed<map_local> m, int x, int y, dumb_ptr<area_t> area);
 
 /* Helper definitions for dealing with functions and operations */
 
 int magic_signature_check(ZString opname, ZString funname, ZString signature,
         Slice<val_t> args, int line, int column);
 
-void magic_area_rect(map_local **m, int *x, int *y, int *width, int *height,
+Borrowed<map_local> magic_area_rect(int *x, int *y, int *width, int *height,
         area_t& area);
 } // namespace magic
+} // namespace map
 } // namespace tmwa