normalize includes: loginserver

loginserver/account_management.cpp

@@ -1,7 +1,10 @@
 #include "account_management.h"
 
+#include "common/event/event_loop.h"
 #include "common/event/task_scheduler.h"
+#include "common/net/dns.h"
 #include "common/repositories/login_accounts_repository.h"
+#include "common/types.h"
 #include "loginserver/login_server.h"
 
 EQ::Event::TaskScheduler task_runner;

loginserver/account_management.h

@@ -2,9 +2,10 @@
 
 #include "common/types.h"
 #include "loginserver/login_types.h"
-#include "loginserver/encryption.h"
 #include "loginserver/login_server.h"
 
+#include <string>
+
 extern LoginServer server;
 extern Database database;
 

loginserver/client.h

@@ -1,13 +1,12 @@
-#ifndef EQEMU_CLIENT_H
+#pragma once
-#define EQEMU_CLIENT_H
+
+#include "common/eq_stream_intf.h"
+#include "common/net/reliable_stream_connection.h"
+#include "common/opcodemgr.h"
+#include "common/random.h"
+#include "common/repositories/login_accounts_repository.h"
+#include "loginserver/login_types.h"
 
-#include "../common/opcodemgr.h"
-#include "../common/random.h"
-#include "../common/eq_stream_intf.h"
-#include "../common/net/dns.h"
-#include "../common/net/reliable_stream_connection.h"
-#include "login_types.h"
-#include "../common/repositories/login_accounts_repository.h"
 #include <memory>
 
 class Client {
@@ -62,6 +61,3 @@ private:
 		return username == "healthcheckuser";
 	}
 };
-
-#endif
-

loginserver/client_manager.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common/net/eqstream.h"
-#include "common/opcodemgr.h"
 #include "loginserver/client.h"
 
 #include <list>

loginserver/encryption.h

@@ -41,7 +41,7 @@ struct EncryptionResult {
 	std::string mode_name;
 };
 
-static EncryptionResult EncryptPasswordFromContext(LoginAccountContext c, int mode = EncryptionModeSCrypt)
+inline EncryptionResult EncryptPasswordFromContext(LoginAccountContext c, int mode = EncryptionModeSCrypt)
 {
 	if (mode == 0) {
 		LogError("Encryption mode not set!");

loginserver/login_server.h

@@ -2,13 +2,10 @@
 
 #include "common/json_config.h"
 #include "loginserver/client_manager.h"
-#include "loginserver/encryption.h"
 #include "loginserver/loginserver_webserver.h"
 #include "loginserver/options.h"
 #include "loginserver/world_server_manager.h"
 
-#include <utility>
-
 struct LoginServer {
 public:
 

loginserver/loginserver_webserver.h

@@ -2,7 +2,6 @@
 
 #include "common/http/httplib.h"
 #include "common/json/json.h"
-#include "common/types.h"
 
 namespace LoginserverWebserver {
 

loginserver/main.cpp

@@ -2,24 +2,19 @@
 #include "common/database.h"
 #include "common/eqemu_logsys.h"
 #include "common/event/event_loop.h"
+#include "common/event/timer.h"
 #include "common/events/player_event_logs.h"
 #include "common/http/httplib.h"
-#include "common/opcodemgr.h"
 #include "common/path_manager.h"
 #include "common/platform.h"
-#include "common/strings.h"
 #include "common/timer.h"
 #include "common/types.h"
-#include "common/zone_store.h"
 #include "loginserver/login_server.h"
 #include "loginserver/loginserver_command_handler.h"
 #include "loginserver/loginserver_webserver.h"
 
-#include <sstream>
-#include <stdlib.h>
 #include <string>
 #include <thread>
-#include <time.h>
 
 LoginServer     server;
 bool            run_server = true;

loginserver/world_server.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/event/timer.h"
 #include "common/net/servertalk_server_connection.h"
 #include "common/packet_dump.h"
 #include "common/repositories/login_server_admins_repository.h"

loginserver/world_server_manager.cpp

@@ -3,9 +3,8 @@
 #include "common/eqemu_logsys.h"
 #include "common/ip_util.h"
 #include "loginserver/login_server.h"
-#include "loginserver/login_types.h"
 
-#include <cstdlib>
+#include <utility>
 
 extern LoginServer server;
 extern bool        run_server;

loginserver/world_server_manager.h

@@ -2,7 +2,6 @@
 
 #include "common/net/servertalk_server.h"
 #include "common/packet_dump.h"
-#include "common/servertalk.h"
 #include "loginserver/client.h"
 #include "loginserver/world_server.h"