Header cleanup

7 files changed, 20 insertions, 24 deletions

diff --git a/src/char/char.cpp b/src/char/char.cpp
index 09d4a36..ae7a10a 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -22,8 +22,6 @@
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include <arpa/inet.h>
-#include <sys/socket.h>
 #include <sys/wait.h>
 
 #include <netdb.h>
@@ -33,14 +31,13 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <cstring>
-#include <ctime>
 
+#include <algorithm>
+#include <array>
 #include <bitset>
+#include <chrono>
 #include <set>
 
-#include "../compat/alg.hpp"
-
 #include "../ints/cmp.hpp"
 #include "../ints/udl.hpp"
 
@@ -49,19 +46,22 @@
 #include "../strings/zstring.hpp"
 #include "../strings/xstring.hpp"
 
-#include "../generic/db.hpp"
+#include "../generic/array.hpp"
 
 #include "../io/cxxstdio.hpp"
 #include "../io/lock.hpp"
 #include "../io/read.hpp"
 #include "../io/tty.hpp"
+#include "../io/write.hpp"
 
 #include "../mmo/config_parse.hpp"
 #include "../mmo/core.hpp"
 #include "../mmo/extract.hpp"
 #include "../mmo/human_time_diff.hpp"
+#include "../mmo/mmo.hpp"
 #include "../mmo/socket.hpp"
 #include "../mmo/timer.hpp"
+#include "../mmo/utils.hpp"
 #include "../mmo/version.hpp"
 
 #include "inter.hpp"
diff --git a/src/char/char.hpp b/src/char/char.hpp
index 5b4f9b9..64d4254 100644
--- a/src/char/char.hpp
+++ b/src/char/char.hpp
@@ -25,11 +25,11 @@
 
 # include "../strings/fwd.hpp"
 
+# include "../generic/array.hpp"
+
 # include "../mmo/ip.hpp"
 # include "../mmo/mmo.hpp"
 
-struct Session;
-
 constexpr int MAX_MAP_SERVERS = 30;
 
 struct mmo_map_server
diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp
index 3afa8a9..1084bed 100644
--- a/src/char/int_party.cpp
+++ b/src/char/int_party.cpp
@@ -20,9 +20,6 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <cstdlib>
-#include <cstring>
-
 #include "../ints/udl.hpp"
 
 #include "../strings/mstring.hpp"
@@ -34,8 +31,10 @@
 #include "../io/cxxstdio.hpp"
 #include "../io/lock.hpp"
 #include "../io/read.hpp"
+#include "../io/write.hpp"
 
 #include "../mmo/extract.hpp"
+#include "../mmo/ids.hpp"
 #include "../mmo/mmo.hpp"
 #include "../mmo/socket.hpp"
 
diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp
index bd87e72..850d99e 100644
--- a/src/char/int_storage.cpp
+++ b/src/char/int_storage.cpp
@@ -20,20 +20,17 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <cstdlib>
-#include <cstring>
-
-#include <functional>
-
 #include "../strings/mstring.hpp"
 #include "../strings/astring.hpp"
 #include "../strings/xstring.hpp"
+#include "../strings/literal.hpp"
 
 #include "../generic/db.hpp"
 
 #include "../io/cxxstdio.hpp"
 #include "../io/lock.hpp"
 #include "../io/read.hpp"
+#include "../io/write.hpp"
 
 #include "../mmo/extract.hpp"
 #include "../mmo/mmo.hpp"
diff --git a/src/char/inter.cpp b/src/char/inter.cpp
index 82704d1..621134f 100644
--- a/src/char/inter.cpp
+++ b/src/char/inter.cpp
@@ -21,8 +21,6 @@
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
-#include <cstdlib>
-#include <cstring>
 
 #include <vector>
 
@@ -30,18 +28,19 @@
 #include "../strings/astring.hpp"
 #include "../strings/zstring.hpp"
 #include "../strings/xstring.hpp"
+#include "../strings/literal.hpp"
 
+#include "../generic/array.hpp"
 #include "../generic/db.hpp"
 
 #include "../io/cxxstdio.hpp"
 #include "../io/lock.hpp"
 #include "../io/read.hpp"
+#include "../io/write.hpp"
 
-#include "../mmo/config_parse.hpp"
 #include "../mmo/extract.hpp"
+#include "../mmo/mmo.hpp"
 #include "../mmo/socket.hpp"
-#include "../mmo/timer.hpp"
-#include "../mmo/utils.hpp"
 
 #include "char.hpp"
 #include "int_party.hpp"
diff --git a/src/char/inter.hpp b/src/char/inter.hpp
index e7a4317..3e48460 100644
--- a/src/char/inter.hpp
+++ b/src/char/inter.hpp
@@ -25,7 +25,7 @@
 
 # include "../strings/fwd.hpp"
 
-struct Session;
+# include "../mmo/fwd.hpp"
 
 bool inter_config(XString key, ZString value);
 void inter_init2();
diff --git a/src/char/main.cpp b/src/char/main.cpp
index 6814574..c2fd038 100644
--- a/src/char/main.cpp
+++ b/src/char/main.cpp
@@ -1,4 +1,3 @@
-#include "char.hpp"
 //    char/main.cpp - dummy file to make Make dependencies work
 //
 //    Copyright © 2013 Ben Longbons <b.r.longbons@gmail.com>
@@ -18,4 +17,6 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "char.hpp"
+
 #include "../poison.hpp"