1 files changed, 35 insertions, 2 deletions
diff --git a/src/map/fwd.hpp b/src/map/fwd.hpp
index 79bbbcd..911d566 100644
--- a/src/map/fwd.hpp
+++ b/src/map/fwd.hpp
@@ -20,11 +20,38 @@
 
 #include "../sanity.hpp"
 
+#include <cstdint>
+
+#include "../ints/fwd.hpp" // rank 1
+#include "../range/fwd.hpp" // rank 1
+#include "../strings/fwd.hpp" // rank 1
+#include "../compat/fwd.hpp" // rank 2
+#include "../generic/fwd.hpp" // rank 3
+#include "../io/fwd.hpp" // rank 4
+#include "../net/fwd.hpp" // rank 5
+#include "../sexpr/fwd.hpp" // rank 5
+#include "../mmo/fwd.hpp" // rank 6
+#include "../proto2/fwd.hpp" // rank 8
+#include "../high/fwd.hpp" // rank 9
+#include "../wire/fwd.hpp" // rank 9
+#include "../ast/fwd.hpp" // rank 10
+// map/fwd.hpp is rank ∞ because it is an executable
+
 
 namespace tmwa
 {
+namespace map
+{
 // meh, add more when I feel like it
-class BlockId;
+struct BattleConf;
+struct MapConf;
+
+struct charid2nick;
+struct map_abstract;
+struct mob_db_;
+struct skill_db_;
+struct event_data;
+
 struct block_list;
 struct map_session_data;
 struct npc_data;
@@ -36,9 +63,13 @@ class npc_data_script;
 class npc_data_shop;
 class npc_data_warp;
 class npc_data_message;
-struct NpcEvent;
 
 struct item_data;
+struct quest_data;
+
+struct ScriptState;
+struct str_data_t;
+class SIR;
 
 namespace magic
 {
@@ -55,5 +86,7 @@ struct env_t;
 struct magic_conf_t;
 struct component_t;
 struct effect_set_t;
+struct proc_t;
 } // namespace magic
+} // namespace map
 } // namespace tmwa