Fix header ranking

10 files changed, 40 insertions, 41 deletions

diff --git a/src/char/char.cpp b/src/char/char.cpp
index 98a2178..0b166c2 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -49,13 +49,12 @@
 #include "../generic/array.hpp"
 
 #include "../io/cxxstdio.hpp"
-#include "../io/cxxstdio_enums.hpp"
+#include "../io/extract.hpp"
 #include "../io/lock.hpp"
 #include "../io/read.hpp"
 #include "../io/tty.hpp"
 #include "../io/write.hpp"
 
-#include "../net/packets.hpp"
 #include "../net/socket.hpp"
 #include "../net/timer.hpp"
 
@@ -66,14 +65,18 @@
 #include "../proto2/char-user.hpp"
 
 #include "../mmo/config_parse.hpp"
-#include "../mmo/core.hpp"
-#include "../mmo/extract.hpp"
+#include "../mmo/cxxstdio_enums.hpp"
 #include "../mmo/extract_enums.hpp"
 #include "../mmo/human_time_diff.hpp"
-#include "../mmo/mmo.hpp"
-#include "../mmo/utils.hpp"
 #include "../mmo/version.hpp"
 
+#include "../high/core.hpp"
+#include "../high/extract_mmo.hpp"
+#include "../high/mmo.hpp"
+#include "../high/utils.hpp"
+
+#include "../wire/packets.hpp"
+
 #include "inter.hpp"
 #include "int_party.hpp"
 #include "int_storage.hpp"
diff --git a/src/char/char.hpp b/src/char/char.hpp
index a9c786f..47d94d8 100644
--- a/src/char/char.hpp
+++ b/src/char/char.hpp
@@ -22,13 +22,11 @@
 
 #include "fwd.hpp"
 
-#include "../strings/fwd.hpp"
-
 #include "../generic/array.hpp"
 
 #include "../net/ip.hpp"
 
-#include "../mmo/mmo.hpp"
+#include "../high/mmo.hpp"
 
 
 namespace tmwa
diff --git a/src/char/fwd.hpp b/src/char/fwd.hpp
index 31cd1ba..ff2bf22 100644
--- a/src/char/fwd.hpp
+++ b/src/char/fwd.hpp
@@ -20,6 +20,17 @@
 
 #include "../sanity.hpp"
 
+#include "../ints/fwd.hpp" // rank 1
+#include "../strings/fwd.hpp" // rank 1
+#include "../generic/fwd.hpp" // rank 3
+#include "../io/fwd.hpp" // rank 4
+#include "../net/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
+// char/fwd.hpp is rank ∞ because it is an executable
+
 
 namespace tmwa
 {
diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp
index 0ce827e..9a9dbd9 100644
--- a/src/char/int_party.cpp
+++ b/src/char/int_party.cpp
@@ -29,17 +29,19 @@
 #include "../generic/db.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/extract.hpp"
 #include "../io/lock.hpp"
 #include "../io/read.hpp"
 #include "../io/write.hpp"
 
-#include "../net/packets.hpp"
-
 #include "../proto2/char-map.hpp"
 
-#include "../mmo/extract.hpp"
 #include "../mmo/ids.hpp"
-#include "../mmo/mmo.hpp"
+
+#include "../high/extract_mmo.hpp"
+#include "../high/mmo.hpp"
+
+#include "../wire/packets.hpp"
 
 #include "char.hpp"
 #include "inter.hpp"
diff --git a/src/char/int_party.hpp b/src/char/int_party.hpp
index f33fc0d..79b3bd4 100644
--- a/src/char/int_party.hpp
+++ b/src/char/int_party.hpp
@@ -22,12 +22,6 @@
 
 #include "fwd.hpp"
 
-#include "../strings/fwd.hpp"
-
-#include "../net/fwd.hpp"
-
-#include "../mmo/fwd.hpp"
-
 
 namespace tmwa
 {
diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp
index a2b0bc7..c02f037 100644
--- a/src/char/int_storage.cpp
+++ b/src/char/int_storage.cpp
@@ -28,17 +28,19 @@
 #include "../generic/db.hpp"
 
 #include "../io/cxxstdio.hpp"
-#include "../io/cxxstdio_enums.hpp"
+#include "../io/extract.hpp"
 #include "../io/lock.hpp"
 #include "../io/read.hpp"
 #include "../io/write.hpp"
 
-#include "../net/packets.hpp"
-
 #include "../proto2/char-map.hpp"
 
-#include "../mmo/extract.hpp"
-#include "../mmo/mmo.hpp"
+#include "../mmo/cxxstdio_enums.hpp"
+
+#include "../high/extract_mmo.hpp"
+#include "../high/mmo.hpp"
+
+#include "../wire/packets.hpp"
 
 #include "../poison.hpp"
 
diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp
index 0a80027..c03ebff 100644
--- a/src/char/int_storage.hpp
+++ b/src/char/int_storage.hpp
@@ -22,14 +22,6 @@
 
 #include "fwd.hpp"
 
-#include "../compat/fwd.hpp"
-
-#include "../strings/fwd.hpp"
-
-#include "../net/fwd.hpp"
-
-#include "../mmo/fwd.hpp"
-
 
 namespace tmwa
 {
diff --git a/src/char/inter.cpp b/src/char/inter.cpp
index 2efcc83..03d027a 100644
--- a/src/char/inter.cpp
+++ b/src/char/inter.cpp
@@ -34,16 +34,17 @@
 #include "../generic/db.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/extract.hpp"
 #include "../io/lock.hpp"
 #include "../io/read.hpp"
 #include "../io/write.hpp"
 
-#include "../net/packets.hpp"
-
 #include "../proto2/char-map.hpp"
 
-#include "../mmo/extract.hpp"
-#include "../mmo/mmo.hpp"
+#include "../high/extract_mmo.hpp"
+#include "../high/mmo.hpp"
+
+#include "../wire/packets.hpp"
 
 #include "char.hpp"
 #include "int_party.hpp"
diff --git a/src/char/inter.hpp b/src/char/inter.hpp
index 19900f9..31d80b1 100644
--- a/src/char/inter.hpp
+++ b/src/char/inter.hpp
@@ -22,10 +22,6 @@
 
 #include "fwd.hpp"
 
-#include "../strings/fwd.hpp"
-
-#include "../net/fwd.hpp"
-
 
 namespace tmwa
 {
diff --git a/src/char/main.cpp b/src/char/main.cpp
index 3648a74..7d6fee3 100644
--- a/src/char/main.cpp
+++ b/src/char/main.cpp
@@ -17,7 +17,7 @@
 //    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 "../mmo/core.hpp"
+#include "../high/core.hpp"
 
 #include "char.hpp"