1 files changed, 8 insertions, 5 deletions
diff --git a/src/map/grfio.cpp b/src/map/grfio.cpp
index 4a1656b..3475108 100644
--- a/src/map/grfio.cpp
+++ b/src/map/grfio.cpp
@@ -33,19 +33,21 @@
 #include "../strings/zstring.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/extract.hpp"
 #include "../io/read.hpp"
 
-#include "../mmo/extract.hpp"
-#include "../mmo/mmo.hpp"
+#include "../high/extract_mmo.hpp"
+#include "../high/mmo.hpp"
+
+#include "globals.hpp"
 
 #include "../poison.hpp"
 
 
 namespace tmwa
 {
-static
-std::map<MapName, RString> resnametable;
-
+namespace map
+{
 bool load_resnametable(ZString filename)
 {
     io::ReadFile in(filename);
@@ -106,4 +108,5 @@ std::vector<uint8_t> grfio_reads(MapName rname)
     close(fd);
     return buffer;
 }
+} // namespace map
 } // namespace tmwa