1 files changed, 2 insertions, 34 deletions
diff --git a/src/map/map.hpp b/src/map/map.hpp
index cb4273f..183b74d 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -30,7 +30,6 @@
 
 #include "../ints/udl.hpp"
 
-#include "../strings/fwd.hpp"
 #include "../strings/rstring.hpp"
 #include "../strings/astring.hpp"
 #include "../strings/vstring.hpp"
@@ -42,15 +41,13 @@
 #include "../net/socket.hpp"
 #include "../net/timer.t.hpp"
 
-#include "../mmo/utils.hpp"
-
 #include "battle.t.hpp"
-#include "clif.t.hpp"
+#include "../mmo/clif.t.hpp"
 #include "mapflag.hpp"
 #include "mob.t.hpp"
 #include "script-buffer.hpp"
 #include "script-persist.hpp"
-#include "skill.t.hpp"
+#include "../mmo/skill.t.hpp"
 
 
 namespace tmwa
@@ -69,35 +66,6 @@ constexpr int MAX_DROP_PER_MAP = 48;
 
 constexpr interval_t DEFAULT_AUTOSAVE_INTERVAL = 1_min;
 
-// formerly VString<49>, as name::label
-struct NpcEvent
-{
-    NpcName npc;
-    ScriptLabel label;
-
-    explicit operator bool()
-    {
-        return npc || label;
-    }
-    bool operator !()
-    {
-        return !bool(*this);
-    }
-
-    friend bool operator == (const NpcEvent& l, const NpcEvent& r)
-    {
-        return l.npc == r.npc && l.label == r.label;
-    }
-
-    friend bool operator < (const NpcEvent& l, const NpcEvent& r)
-    {
-        return l.npc < r.npc || (l.npc == r.npc && l.label < r.label);
-    }
-
-    friend VString<49> convert_for_printf(NpcEvent ev);
-};
-bool extract(XString str, NpcEvent *ev);
-
 extern map_local undefined_gat;
 
 struct block_list