1 files changed, 5 insertions, 24 deletions
diff --git a/src/map/map.hpp b/src/map/map.hpp
index 620dc52..2bc8e45 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -25,8 +25,7 @@
 
 # include "map.t.hpp"
 
-# include <netinet/in.h>
-
+# include <chrono>
 # include <functional>
 # include <list>
 
@@ -40,10 +39,9 @@
 # include "../generic/db.hpp"
 # include "../generic/matrix.hpp"
 
-# include "../io/cxxstdio.hpp"
-
 # include "../mmo/socket.hpp"
 # include "../mmo/timer.t.hpp"
+# include "../mmo/utils.hpp"
 
 # include "battle.t.hpp"
 # include "magic-interpreter.t.hpp"
@@ -91,20 +89,10 @@ struct NpcEvent
         return l.npc < r.npc || (l.npc == r.npc && l.label < r.label);
     }
 
-    friend VString<49> convert_for_printf(NpcEvent ev)
-    {
-        return STRNPRINTF(50, "%s::%s"_fmt, ev.npc, ev.label);
-    }
+    friend VString<49> convert_for_printf(NpcEvent ev);
 };
 bool extract(XString str, NpcEvent *ev);
 
-struct map_session_data;
-struct npc_data;
-struct mob_data;
-struct flooritem_data;
-struct invocation;
-struct map_local;
-
 struct block_list
 {
     dumb_ptr<block_list> bl_next, bl_prev;
@@ -146,11 +134,6 @@ struct status_change
     BlockId spell_invocation;      /* [Fate] If triggered by a spell, record here */
 };
 
-struct invocation;
-
-struct npc_data;
-struct item_data;
-
 struct quick_regeneration
 {                               // [Fate]
     int amount;                // Amount of HP/SP left to regenerate
@@ -358,14 +341,12 @@ struct npc_item_list
     int value;
 };
 
-class npc_data_script;
-class npc_data_shop;
-class npc_data_warp;
-class npc_data_message;
 struct npc_data : block_list
 {
     NpcSubtype npc_subtype;
     short n;
+    // TODO This *should* be a Species, but the script files give -1 for
+    // event-only which is not valid unsigned
     short npc_class;
     DIR dir;
     interval_t speed;