8 files changed, 16 insertions, 7 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp
index ae7a10a..e84de03 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -54,13 +54,14 @@
 #include "../io/tty.hpp"
 #include "../io/write.hpp"
 
+#include "../net/socket.hpp"
+#include "../net/timer.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"
 
diff --git a/src/char/char.hpp b/src/char/char.hpp
index 64d4254..3ba455f 100644
--- a/src/char/char.hpp
+++ b/src/char/char.hpp
@@ -27,7 +27,8 @@
 
 # include "../generic/array.hpp"
 
-# include "../mmo/ip.hpp"
+# include "../net/ip.hpp"
+
 # include "../mmo/mmo.hpp"
 
 constexpr int MAX_MAP_SERVERS = 30;
diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp
index 1084bed..472e493 100644
--- a/src/char/int_party.cpp
+++ b/src/char/int_party.cpp
@@ -33,10 +33,11 @@
 #include "../io/read.hpp"
 #include "../io/write.hpp"
 
+#include "../net/socket.hpp"
+
 #include "../mmo/extract.hpp"
 #include "../mmo/ids.hpp"
 #include "../mmo/mmo.hpp"
-#include "../mmo/socket.hpp"
 
 #include "char.hpp"
 #include "inter.hpp"
diff --git a/src/char/int_party.hpp b/src/char/int_party.hpp
index 3c448b0..ab42501 100644
--- a/src/char/int_party.hpp
+++ b/src/char/int_party.hpp
@@ -25,6 +25,8 @@
 
 # include "../strings/fwd.hpp"
 
+# include "../net/fwd.hpp"
+
 # include "../mmo/fwd.hpp"
 
 void inter_party_init(void);
diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp
index 850d99e..82aa07f 100644
--- a/src/char/int_storage.cpp
+++ b/src/char/int_storage.cpp
@@ -32,9 +32,10 @@
 #include "../io/read.hpp"
 #include "../io/write.hpp"
 
+#include "../net/socket.hpp"
+
 #include "../mmo/extract.hpp"
 #include "../mmo/mmo.hpp"
-#include "../mmo/socket.hpp"
 
 #include "../poison.hpp"
 
diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp
index 9f241e3..83981b6 100644
--- a/src/char/int_storage.hpp
+++ b/src/char/int_storage.hpp
@@ -25,6 +25,8 @@
 
 # include "../strings/fwd.hpp"
 
+# include "../net/fwd.hpp"
+
 # include "../mmo/fwd.hpp"
 
 void inter_storage_init(void);
diff --git a/src/char/inter.cpp b/src/char/inter.cpp
index 621134f..a7617c9 100644
--- a/src/char/inter.cpp
+++ b/src/char/inter.cpp
@@ -38,9 +38,10 @@
 #include "../io/read.hpp"
 #include "../io/write.hpp"
 
+#include "../net/socket.hpp"
+
 #include "../mmo/extract.hpp"
 #include "../mmo/mmo.hpp"
-#include "../mmo/socket.hpp"
 
 #include "char.hpp"
 #include "int_party.hpp"
diff --git a/src/char/inter.hpp b/src/char/inter.hpp
index 3e48460..bb3c9da 100644
--- a/src/char/inter.hpp
+++ b/src/char/inter.hpp
@@ -25,7 +25,7 @@
 
 # include "../strings/fwd.hpp"
 
-# include "../mmo/fwd.hpp"
+# include "../net/fwd.hpp"
 
 bool inter_config(XString key, ZString value);
 void inter_init2();