From b7fcee632e9b652682bcb67ba0f3fcca068338f4 Mon Sep 17 00:00:00 2001
From: brainiac <brainiac2k@gmail.com>
Date: Thu, 18 Dec 2025 00:25:57 -0800
Subject: [PATCH] normalize includes: loginserver

---
 loginserver/CMakeLists.txt                  |  1 +
 loginserver/account_management.cpp          |  7 ++--
 loginserver/account_management.h            | 15 +++-----
 loginserver/client.h                        |  1 -
 loginserver/client_manager.cpp              | 10 ++---
 loginserver/client_manager.h                | 14 +++----
 loginserver/encryption.h                    |  9 +++--
 loginserver/eq_crypto_api.h                 |  6 +--
 loginserver/login_server.h                  | 19 ++++------
 loginserver/login_types.h                   | 11 ++++--
 loginserver/loginserver_command_handler.cpp | 13 +++----
 loginserver/loginserver_command_handler.h   |  9 +----
 loginserver/loginserver_webserver.cpp       | 13 ++++---
 loginserver/loginserver_webserver.h         | 11 ++----
 loginserver/main.cpp                        | 42 ++++++++++-----------
 loginserver/options.h                       |  9 ++---
 loginserver/world_server.cpp                | 13 ++++---
 loginserver/world_server.h                  | 24 +++++-------
 loginserver/world_server_manager.cpp        | 11 +++---
 loginserver/world_server_manager.h          | 19 ++++------
 20 files changed, 112 insertions(+), 145 deletions(-)

diff --git a/loginserver/CMakeLists.txt b/loginserver/CMakeLists.txt
index 013c64d5f..71466df1b 100644
--- a/loginserver/CMakeLists.txt
+++ b/loginserver/CMakeLists.txt
@@ -33,6 +33,7 @@ add_executable(loginserver ${eqlogin_sources} ${eqlogin_headers})
 install(TARGETS loginserver RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(loginserver common)
+target_include_directories(loginserver PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET loginserver PROPERTY FOLDER executables/servers)
diff --git a/loginserver/account_management.cpp b/loginserver/account_management.cpp
index f7c0ed535..314fb4492 100644
--- a/loginserver/account_management.cpp
+++ b/loginserver/account_management.cpp
@@ -1,7 +1,8 @@
 #include "account_management.h"
-#include "login_server.h"
-#include "../common/event/task_scheduler.h"
-#include "../common/repositories/login_accounts_repository.h"
+
+#include "common/event/task_scheduler.h"
+#include "common/repositories/login_accounts_repository.h"
+#include "loginserver/login_server.h"
 
 EQ::Event::TaskScheduler task_runner;
 
diff --git a/loginserver/account_management.h b/loginserver/account_management.h
index e047e4468..7f23c8775 100644
--- a/loginserver/account_management.h
+++ b/loginserver/account_management.h
@@ -1,11 +1,9 @@
-#ifndef EQEMU_ACCOUNT_MANAGEMENT_H
-#define EQEMU_ACCOUNT_MANAGEMENT_H
+#pragma once
 
-#include "iostream"
-#include "../common/types.h"
-#include "login_types.h"
-#include "encryption.h"
-#include "login_server.h"
+#include "common/types.h"
+#include "loginserver/login_types.h"
+#include "loginserver/encryption.h"
+#include "loginserver/login_server.h"
 
 extern LoginServer server;
 extern Database database;
@@ -28,6 +26,3 @@ public:
 		const std::string &ip_address = ""
 	);
 };
-
-
-#endif //EQEMU_ACCOUNT_MANAGEMENT_H
diff --git a/loginserver/client.h b/loginserver/client.h
index 0dc71d00c..75d972f92 100644
--- a/loginserver/client.h
+++ b/loginserver/client.h
@@ -1,7 +1,6 @@
 #ifndef EQEMU_CLIENT_H
 #define EQEMU_CLIENT_H
 
-#include "../common/global_define.h"
 #include "../common/opcodemgr.h"
 #include "../common/random.h"
 #include "../common/eq_stream_intf.h"
diff --git a/loginserver/client_manager.cpp b/loginserver/client_manager.cpp
index 5767f538b..87ea3ecd5 100644
--- a/loginserver/client_manager.cpp
+++ b/loginserver/client_manager.cpp
@@ -1,13 +1,13 @@
 #include "client_manager.h"
-#include "login_server.h"
+
+#include "common/file.h"
+#include "common/misc.h"
+#include "common/path_manager.h"
+#include "loginserver/login_server.h"
 
 extern LoginServer server;
 extern bool        run_server;
 
-#include "../common/misc.h"
-#include "../common/path_manager.h"
-#include "../common/file.h"
-
 void CheckTitaniumOpcodeFile(const std::string &path)
 {
 	if (File::Exists(path)) {
diff --git a/loginserver/client_manager.h b/loginserver/client_manager.h
index 17c87b43d..3171fdcca 100644
--- a/loginserver/client_manager.h
+++ b/loginserver/client_manager.h
@@ -1,10 +1,9 @@
-#ifndef EQEMU_CLIENTMANAGER_H
-#define EQEMU_CLIENTMANAGER_H
+#pragma once
+
+#include "common/net/eqstream.h"
+#include "common/opcodemgr.h"
+#include "loginserver/client.h"
 
-#include "../common/global_define.h"
-#include "../common/opcodemgr.h"
-#include "../common/net/eqstream.h"
-#include "client.h"
 #include <list>
 
 class ClientManager {
@@ -25,6 +24,3 @@ private:
 	OpcodeManager            *m_larion_ops;
 	EQ::Net::EQStreamManager *m_larion_stream;
 };
-
-#endif
-
diff --git a/loginserver/encryption.h b/loginserver/encryption.h
index 43d556d53..0ebb3e1fd 100644
--- a/loginserver/encryption.h
+++ b/loginserver/encryption.h
@@ -1,10 +1,11 @@
 #pragma once
 
+#include "common/eqemu_logsys.h"
+#include "common/strings.h"
+#include "common/types.h"
+#include "loginserver/login_types.h"
+
 #include <string>
-#include "../common/types.h"
-#include "login_types.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/strings.h"
 
 enum EncryptionMode {
 	EncryptionModeMD5            = 1,
diff --git a/loginserver/eq_crypto_api.h b/loginserver/eq_crypto_api.h
index 89d9cbe3c..87461543c 100644
--- a/loginserver/eq_crypto_api.h
+++ b/loginserver/eq_crypto_api.h
@@ -1,9 +1,5 @@
-#ifndef EQEMUCAPI__H
-#define EQEMUCAPI__H
+#pragma once
 
 char* DecryptUsernamePassword(const char* encryptedBuffer, unsigned int bufferSize, int mode);
 char* Encrypt(const char* buffer, unsigned int bufferSize, unsigned int &outSize);
 void _HeapDeleteCharBuffer(char *buffer);
-
-#endif
-
diff --git a/loginserver/login_server.h b/loginserver/login_server.h
index 5104a48e0..0602ba528 100644
--- a/loginserver/login_server.h
+++ b/loginserver/login_server.h
@@ -1,13 +1,13 @@
-#ifndef EQEMU_LOGINSERVER_H
-#define EQEMU_LOGINSERVER_H
+#pragma once
+
+#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>
-#include "../common/json_config.h"
-#include "encryption.h"
-#include "options.h"
-#include "world_server_manager.h"
-#include "client_manager.h"
-#include "loginserver_webserver.h"
 
 struct LoginServer {
 public:
@@ -23,6 +23,3 @@ public:
 	WorldServerManager                 *server_manager;
 	ClientManager                      *client_manager{};
 };
-
-#endif
-
diff --git a/loginserver/login_types.h b/loginserver/login_types.h
index 127514696..b760eb7fe 100644
--- a/loginserver/login_types.h
+++ b/loginserver/login_types.h
@@ -1,6 +1,10 @@
-#ifndef EQEMU_LOGINSTRUCTURES_H
-#define EQEMU_LOGINSTRUCTURES_H
+#pragma once
 
+#include "common/types.h"
+
+#include <string>
+
+#pragma pack(push)
 #pragma pack(1)
 
 // unencrypted base message header in all packets
@@ -161,5 +165,4 @@ namespace LS {
 	};
 }
 
-#endif
-
+#pragma pack(pop)
diff --git a/loginserver/loginserver_command_handler.cpp b/loginserver/loginserver_command_handler.cpp
index a445bcb4e..d3552930a 100644
--- a/loginserver/loginserver_command_handler.cpp
+++ b/loginserver/loginserver_command_handler.cpp
@@ -1,11 +1,10 @@
-#include <iostream>
-#include <random>
 #include "loginserver_command_handler.h"
-#include "../common/util/uuid.h"
-#include "login_server.h"
-#include "loginserver_webserver.h"
-#include "account_management.h"
-#include "../common/repositories/login_api_tokens_repository.h"
+
+#include "common/repositories/login_api_tokens_repository.h"
+#include "common/util/uuid.h"
+#include "loginserver/account_management.h"
+#include "loginserver/login_server.h"
+#include "loginserver/loginserver_webserver.h"
 
 extern LoginServer server;
 
diff --git a/loginserver/loginserver_command_handler.h b/loginserver/loginserver_command_handler.h
index fc2f2cbeb..265fb046c 100644
--- a/loginserver/loginserver_command_handler.h
+++ b/loginserver/loginserver_command_handler.h
@@ -1,8 +1,6 @@
-#include "iostream"
-#include "../common/cli/eqemu_command_handler.h"
+#pragma once
 
-#ifndef EQEMU_LOGINSERVER_COMMAND_HANDLER_H
-#define EQEMU_LOGINSERVER_COMMAND_HANDLER_H
+#include "common/cli/eqemu_command_handler.h"
 
 namespace LoginserverCommandHandler {
 	void CommandHandler(int argc, char **argv);
@@ -16,6 +14,3 @@ namespace LoginserverCommandHandler {
 	void UpdateLoginserverWorldAdminAccountPassword(int argc, char **argv, argh::parser &cmd, std::string &description);
 	void HealthCheckLogin(int argc, char **argv, argh::parser &cmd, std::string &description);
 };
-
-
-#endif //EQEMU_LOGINSERVER_COMMAND_HANDLER_H
diff --git a/loginserver/loginserver_webserver.cpp b/loginserver/loginserver_webserver.cpp
index a880feb85..2884e2108 100644
--- a/loginserver/loginserver_webserver.cpp
+++ b/loginserver/loginserver_webserver.cpp
@@ -1,10 +1,11 @@
 #include "loginserver_webserver.h"
-#include "world_server_manager.h"
-#include "login_server.h"
-#include "../common/json/json.h"
-#include "../common/strings.h"
-#include "account_management.h"
-#include "../common/repositories/login_api_tokens_repository.h"
+
+#include "common/json/json.h"
+#include "common/repositories/login_api_tokens_repository.h"
+#include "common/strings.h"
+#include "loginserver/account_management.h"
+#include "loginserver/login_server.h"
+#include "loginserver/world_server_manager.h"
 
 extern LoginServer server;
 
diff --git a/loginserver/loginserver_webserver.h b/loginserver/loginserver_webserver.h
index 9de510152..dba59824c 100644
--- a/loginserver/loginserver_webserver.h
+++ b/loginserver/loginserver_webserver.h
@@ -1,9 +1,8 @@
-#ifndef EQEMU_LOGINSERVER_WEBSERVER_H
-#define EQEMU_LOGINSERVER_WEBSERVER_H
+#pragma once
 
-#include "../common/http/httplib.h"
-#include "../common/json/json.h"
-#include "../common/types.h"
+#include "common/http/httplib.h"
+#include "common/json/json.h"
+#include "common/types.h"
 
 namespace LoginserverWebserver {
 
@@ -35,5 +34,3 @@ namespace LoginserverWebserver {
 	void SendResponse(const Json::Value &payload, httplib::Response &res);
 	static Json::Value ParseRequestBody(const httplib::Request &request);
 };
-
-#endif //EQEMU_LOGINSERVER_WEBSERVER_H
diff --git a/loginserver/main.cpp b/loginserver/main.cpp
index 9047db8c8..636118d02 100644
--- a/loginserver/main.cpp
+++ b/loginserver/main.cpp
@@ -1,34 +1,30 @@
-#include "../common/global_define.h"
-#include "../common/types.h"
-#include "../common/opcodemgr.h"
-#include "../common/event/event_loop.h"
-#include "../common/timer.h"
-#include "../common/platform.h"
-#include "../common/crash.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/http/httplib.h"
-#include "login_server.h"
-#include "loginserver_webserver.h"
-#include "loginserver_command_handler.h"
-#include "../common/strings.h"
-#include "../common/path_manager.h"
-#include "../common/database.h"
-#include "../common/events/player_event_logs.h"
-#include "../common/zone_store.h"
-#include <time.h>
+#include "common/crash.h"
+#include "common/database.h"
+#include "common/eqemu_logsys.h"
+#include "common/event/event_loop.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 <sstream>
 #include <thread>
+#include <time.h>
 
 LoginServer     server;
 bool            run_server = true;
 Database        database;
 
-void CatchSignal(int sig_num)
-{
-}
-
 void LoadDatabaseConnection()
 {
 	LogInfo("MySQL Database Init");
diff --git a/loginserver/options.h b/loginserver/options.h
index 73d6f6216..e2578454c 100644
--- a/loginserver/options.h
+++ b/loginserver/options.h
@@ -1,5 +1,6 @@
-#ifndef EQEMU_OPTIONS_H
-#define EQEMU_OPTIONS_H
+#pragma once
+
+#include <string>
 
 class Options {
 public:
@@ -51,7 +52,3 @@ private:
 	std::string m_eqemu_loginserver_address;
 	std::string m_default_loginserver_name;
 };
-
-
-#endif
-
diff --git a/loginserver/world_server.cpp b/loginserver/world_server.cpp
index 44e6049d1..85b9d6c74 100644
--- a/loginserver/world_server.cpp
+++ b/loginserver/world_server.cpp
@@ -1,10 +1,11 @@
 #include "world_server.h"
-#include "login_server.h"
-#include "login_types.h"
-#include "../common/ip_util.h"
-#include "../common/strings.h"
-#include "../common/repositories/login_world_servers_repository.h"
-#include "../common/repositories/login_server_admins_repository.h"
+
+#include "common/ip_util.h"
+#include "common/repositories/login_server_admins_repository.h"
+#include "common/repositories/login_world_servers_repository.h"
+#include "common/strings.h"
+#include "loginserver/login_server.h"
+#include "loginserver/login_types.h"
 
 extern LoginServer server;
 extern Database    database;
diff --git a/loginserver/world_server.h b/loginserver/world_server.h
index f5120d38e..5cd504310 100644
--- a/loginserver/world_server.h
+++ b/loginserver/world_server.h
@@ -1,16 +1,15 @@
-#ifndef EQEMU_WORLDSERVER_H
-#define EQEMU_WORLDSERVER_H
+#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"
+#include "common/servertalk.h"
+#include "loginserver/client.h"
+#include "loginserver/login_types.h"
 
-#include "../common/global_define.h"
-#include "../common/net/servertalk_server_connection.h"
-#include "../common/servertalk.h"
-#include "../common/packet_dump.h"
-#include "../common/event/timer.h"
-#include "login_types.h"
-#include "client.h"
-#include "../common/repositories/login_server_admins_repository.h"
-#include <string>
 #include <memory>
+#include <string>
 
 /**
  * World server class, controls the connected server processing.
@@ -84,6 +83,3 @@ private:
 
 	static void FormatWorldServerName(char *name, int8 server_list_type);
 };
-
-#endif
-
diff --git a/loginserver/world_server_manager.cpp b/loginserver/world_server_manager.cpp
index f18b48537..9c1219071 100644
--- a/loginserver/world_server_manager.cpp
+++ b/loginserver/world_server_manager.cpp
@@ -1,10 +1,11 @@
 #include "world_server_manager.h"
-#include "login_server.h"
-#include "login_types.h"
-#include <stdlib.h>
 
-#include "../common/eqemu_logsys.h"
-#include "../common/ip_util.h"
+#include "common/eqemu_logsys.h"
+#include "common/ip_util.h"
+#include "loginserver/login_server.h"
+#include "loginserver/login_types.h"
+
+#include <cstdlib>
 
 extern LoginServer server;
 extern bool        run_server;
diff --git a/loginserver/world_server_manager.h b/loginserver/world_server_manager.h
index 711bc7560..6ed6ed96c 100644
--- a/loginserver/world_server_manager.h
+++ b/loginserver/world_server_manager.h
@@ -1,12 +1,11 @@
-#ifndef EQEMU_SERVERMANAGER_H
-#define EQEMU_SERVERMANAGER_H
+#pragma once
+
+#include "common/net/servertalk_server.h"
+#include "common/packet_dump.h"
+#include "common/servertalk.h"
+#include "loginserver/client.h"
+#include "loginserver/world_server.h"
 
-#include "../common/global_define.h"
-#include "../common/servertalk.h"
-#include "../common/packet_dump.h"
-#include "../common/net/servertalk_server.h"
-#include "world_server.h"
-#include "client.h"
 #include <list>
 
 class WorldServerManager {
@@ -26,8 +25,4 @@ public:
 private:
 	std::unique_ptr<EQ::Net::ServertalkServer> m_server_connection;
 	std::list<std::unique_ptr<WorldServer>>    m_world_servers;
-
 };
-
-#endif
-