8 files changed, 27 insertions, 3 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp
index 071076e..35e5841 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -16,6 +16,13 @@
 #include <fstream>
 #include <set>
 
+#include "../strings/mstring.hpp"
+#include "../strings/fstring.hpp"
+#include "../strings/tstring.hpp"
+#include "../strings/sstring.hpp"
+#include "../strings/zstring.hpp"
+#include "../strings/xstring.hpp"
+
 #include "../common/core.hpp"
 #include "../common/cxxstdio.hpp"
 #include "../common/db.hpp"
diff --git a/src/char/char.hpp b/src/char/char.hpp
index abd5381..78c68cb 100644
--- a/src/char/char.hpp
+++ b/src/char/char.hpp
@@ -1,6 +1,8 @@
 #ifndef CHAR_HPP
 #define CHAR_HPP
 
+#include "../strings/fwd.hpp"
+
 #include "../common/const_array.hpp"
 #include "../common/ip.hpp"
 #include "../common/mmo.hpp"
diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp
index d2c64e1..0597efd 100644
--- a/src/char/int_party.cpp
+++ b/src/char/int_party.cpp
@@ -5,6 +5,10 @@
 
 #include <fstream>
 
+#include "../strings/mstring.hpp"
+#include "../strings/fstring.hpp"
+#include "../strings/xstring.hpp"
+
 #include "../common/cxxstdio.hpp"
 #include "../common/db.hpp"
 #include "../common/extract.hpp"
diff --git a/src/char/int_party.hpp b/src/char/int_party.hpp
index d003250..2793257 100644
--- a/src/char/int_party.hpp
+++ b/src/char/int_party.hpp
@@ -1,7 +1,7 @@
 #ifndef INT_PARTY_HPP
 #define INT_PARTY_HPP
 
-#include "../common/strings.hpp"
+#include "../strings/fwd.hpp"
 
 int inter_party_init(void);
 int inter_party_save(void);
diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp
index aa605bf..205b21e 100644
--- a/src/char/int_storage.cpp
+++ b/src/char/int_storage.cpp
@@ -6,6 +6,10 @@
 #include <functional>
 #include <fstream>
 
+#include "../strings/mstring.hpp"
+#include "../strings/fstring.hpp"
+#include "../strings/xstring.hpp"
+
 #include "../common/cxxstdio.hpp"
 #include "../common/db.hpp"
 #include "../common/extract.hpp"
diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp
index a03d70f..2585d63 100644
--- a/src/char/int_storage.hpp
+++ b/src/char/int_storage.hpp
@@ -1,7 +1,7 @@
 #ifndef INT_STORAGE_HPP
 #define INT_STORAGE_HPP
 
-#include "../common/strings.hpp"
+#include "../strings/fwd.hpp"
 
 int inter_storage_init(void);
 int inter_storage_save(void);
diff --git a/src/char/inter.cpp b/src/char/inter.cpp
index 81c4a9d..b6bc417 100644
--- a/src/char/inter.cpp
+++ b/src/char/inter.cpp
@@ -7,6 +7,13 @@
 #include <fstream>
 #include <vector>
 
+#include "../strings/mstring.hpp"
+#include "../strings/fstring.hpp"
+#include "../strings/tstring.hpp"
+#include "../strings/sstring.hpp"
+#include "../strings/zstring.hpp"
+#include "../strings/xstring.hpp"
+
 #include "../common/cxxstdio.hpp"
 #include "../common/db.hpp"
 #include "../common/extract.hpp"
diff --git a/src/char/inter.hpp b/src/char/inter.hpp
index 447ab53..5216d57 100644
--- a/src/char/inter.hpp
+++ b/src/char/inter.hpp
@@ -1,7 +1,7 @@
 #ifndef INTER_HPP
 #define INTER_HPP
 
-#include "../common/strings.hpp"
+#include "../strings/fwd.hpp"
 
 void inter_init(ZString file);
 void inter_save(void);