5 files changed, 21 insertions, 53 deletions
diff --git a/src/login/fwd.hpp b/src/login/fwd.hpp
index 94fe3c0..8a2027b 100644
--- a/src/login/fwd.hpp
+++ b/src/login/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
+// login/fwd.hpp is rank ∞ because it is an executable
+
 
 namespace tmwa
 {
diff --git a/src/login/login.cpp b/src/login/login.cpp
index a84c96a..fa528ba 100644
--- a/src/login/login.cpp
+++ b/src/login/login.cpp
@@ -45,23 +45,18 @@
 #include "../generic/random.hpp"
 
 #include "../io/cxxstdio.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"
 
 #include "../mmo/config_parse.hpp"
-#include "../mmo/core.hpp"
-#include "../mmo/extract.hpp"
 #include "../mmo/human_time_diff.hpp"
 #include "../mmo/ids.hpp"
-#include "../mmo/md5more.hpp"
-#include "../mmo/mmo.hpp"
-#include "../mmo/utils.hpp"
 #include "../mmo/version.hpp"
 
 #include "../proto2/any-user.hpp"
@@ -69,6 +64,14 @@
 #include "../proto2/login-char.hpp"
 #include "../proto2/login-user.hpp"
 
+#include "../high/core.hpp"
+#include "../high/extract_mmo.hpp"
+#include "../high/md5more.hpp"
+#include "../high/mmo.hpp"
+#include "../high/utils.hpp"
+
+#include "../wire/packets.hpp"
+
 #include "../poison.hpp"
 
 
diff --git a/src/login/login.hpp b/src/login/login.hpp
index 5900440..88dd4ec 100644
--- a/src/login/login.hpp
+++ b/src/login/login.hpp
@@ -18,8 +18,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 "login.t.hpp"
-
 #include "fwd.hpp"
 
 
diff --git a/src/login/login.t.hpp b/src/login/login.t.hpp
deleted file mode 100644
index f2c775a..0000000
--- a/src/login/login.t.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-//    login.t.hpp - externally useful types from login
-//
-//    Copyright © ????-2004 Athena Dev Teams
-//    Copyright © 2004-2011 The Mana World Development Team
-//    Copyright © 2011-2014 Ben Longbons <b.r.longbons@gmail.com>
-//
-//    This file is part of The Mana World (Athena server)
-//
-//    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation, either version 3 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    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 "fwd.hpp"
-
-#include <cstdint>
-
-#include "../generic/enum.hpp"
-
-
-namespace tmwa
-{
-namespace e
-{
-enum class VERSION_2 : uint8_t
-{
-    /// client supports updatehost
-    UPDATEHOST = 0x01,
-    /// send servers in forward order
-    SERVERORDER = 0x02,
-};
-ENUM_BITWISE_OPERATORS(VERSION_2)
-}
-using e::VERSION_2;
-} // namespace tmwa
diff --git a/src/login/main.cpp b/src/login/main.cpp
index 48a471a..4495bda 100644
--- a/src/login/main.cpp
+++ b/src/login/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 "login.hpp"