From 91defcad99cfdecedba69b51f89a01e2499ec41f Mon Sep 17 00:00:00 2001
From: brainiac <brainiac2k@gmail.com>
Date: Wed, 17 Dec 2025 09:34:27 -0800
Subject: [PATCH] normalize includes: queryserv

---
 queryserv/CMakeLists.txt      |  1 +
 queryserv/database.cpp        | 11 +++++----
 queryserv/database.h          | 27 ++++++++++------------
 queryserv/lfguild.cpp         |  9 ++++----
 queryserv/lfguild.h           | 10 ++++-----
 queryserv/queryserv.cpp       | 38 ++++++++++++++++---------------
 queryserv/queryservconfig.cpp |  3 ++-
 queryserv/queryservconfig.h   |  8 ++-----
 queryserv/worldserver.cpp     | 42 +++++++++++++++++------------------
 queryserv/worldserver.h       | 11 +++++----
 queryserv/zonelist.cpp        |  5 +++--
 queryserv/zonelist.h          | 14 +++++-------
 queryserv/zoneserver.cpp      | 11 ++++-----
 queryserv/zoneserver.h        | 19 +++++++---------
 14 files changed, 101 insertions(+), 108 deletions(-)

diff --git a/queryserv/CMakeLists.txt b/queryserv/CMakeLists.txt
index 968a3f6f0..641d3385e 100644
--- a/queryserv/CMakeLists.txt
+++ b/queryserv/CMakeLists.txt
@@ -26,6 +26,7 @@ install(TARGETS queryserv RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 add_definitions(-DQSERV)
 
 target_link_libraries(queryserv common)
+target_include_directories(queryserv PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET queryserv PROPERTY FOLDER executables/servers)
diff --git a/queryserv/database.cpp b/queryserv/database.cpp
index db6be3ce2..5af3e3edc 100644
--- a/queryserv/database.cpp
+++ b/queryserv/database.cpp
@@ -1,9 +1,12 @@
-#include "../common/global_define.h"
-#include "../common/eqemu_logsys.h"
+
+#include "database.h"
+
+#include "common/eqemu_logsys.h"
+#include "common/global_define.h"
+#include "common/strings.h"
+
 #include <iostream>
 #include <map>
-#include "database.h"
-#include "../common/strings.h"
 
 // this function does not delete the ServerPacket, so it must be handled at call site
 void QSDatabase::GeneralQueryReceive(ServerPacket *pack)
diff --git a/queryserv/database.h b/queryserv/database.h
index 69b0b8e36..083b232f7 100644
--- a/queryserv/database.h
+++ b/queryserv/database.h
@@ -1,23 +1,20 @@
-#ifndef CHATSERVER_DATABASE_H
-#define CHATSERVER_DATABASE_H
+#pragma once
+
+#include "common/database.h"
+#include "common/eqemu_logsys.h"
+#include "common/global_define.h"
+#include "common/linked_list.h"
+#include "common/servertalk.h"
+#include "common/types.h"
+
+#include <map>
+#include <string>
+#include <vector>
 
 #define AUTHENTICATION_TIMEOUT	60
 #define INVALID_ID				0xFFFFFFFF
 
-#include "../common/eqemu_logsys.h"
-#include "../common/global_define.h"
-#include "../common/types.h"
-#include "../common/database.h"
-#include "../common/linked_list.h"
-#include "../common/servertalk.h"
-#include <string>
-#include <vector>
-#include <map>
-
 class QSDatabase : public Database {
 public:
 	void GeneralQueryReceive(ServerPacket *pack);
 };
-
-#endif
-
diff --git a/queryserv/lfguild.cpp b/queryserv/lfguild.cpp
index 688102ed1..07b12c4f4 100644
--- a/queryserv/lfguild.cpp
+++ b/queryserv/lfguild.cpp
@@ -1,8 +1,9 @@
 #include "lfguild.h"
-#include "database.h"
-#include "worldserver.h"
-#include "../common/strings.h"
-#include "../common/rulesys.h"
+
+#include "common/rulesys.h"
+#include "common/strings.h"
+#include "queryserv/database.h"
+#include "queryserv/worldserver.h"
 
 extern WorldServer *worldserver;
 extern QSDatabase  qs_database;
diff --git a/queryserv/lfguild.h b/queryserv/lfguild.h
index 1c0cb1cdd..0f655e766 100644
--- a/queryserv/lfguild.h
+++ b/queryserv/lfguild.h
@@ -1,14 +1,13 @@
-#ifndef LFGUILD_H
-#define LFGUILD_H
+#pragma once
+
+#include "common/servertalk.h"
+#include "common/types.h"
 
 #include <list>
 #include <string>
-#include "../common/types.h"
-#include "../common/servertalk.h"
 
 class PlayerLookingForGuild
 {
-
 public:
 	PlayerLookingForGuild(char *Name, char *Comments, uint32 Level, uint32 Class, uint32 AACount, uint32 Timezone, uint32 TimePosted);
 
@@ -60,4 +59,3 @@ private:
 	std::list<PlayerLookingForGuild> Players;
 	std::list<GuildLookingForPlayers> Guilds;
 };
-#endif /* LFGUILD_H */
diff --git a/queryserv/queryserv.cpp b/queryserv/queryserv.cpp
index b6bf21a71..b5dd1b5f9 100644
--- a/queryserv/queryserv.cpp
+++ b/queryserv/queryserv.cpp
@@ -1,25 +1,27 @@
-#include "../common/global_define.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/opcodemgr.h"
-#include "../common/rulesys.h"
-#include "../common/platform.h"
-#include "../common/crash.h"
-#include "../common/strings.h"
-#include "../common/event/event_loop.h"
-#include "../common/timer.h"
-#include "database.h"
+
+#include "common/crash.h"
+#include "common/eqemu_logsys.h"
+#include "common/event/event_loop.h"
+#include "common/events/player_event_logs.h"
+#include "common/global_define.h"
+#include "common/net/console_server.h"
+#include "common/net/servertalk_server.h"
+#include "common/opcodemgr.h"
+#include "common/platform.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
+#include "common/timer.h"
+#include "common/zone_store.h"
+#include "queryserv/database.h"
+#include "queryserv/lfguild.h"
+#include "queryserv/worldserver.h"
+#include "queryserv/zonelist.h"
+#include "queryserv/zoneserver.h"
 #include "queryservconfig.h"
-#include "lfguild.h"
-#include "worldserver.h"
-#include "../common/zone_store.h"
-#include "../common/events/player_event_logs.h"
+
 #include <list>
 #include <signal.h>
 #include <thread>
-#include "../common/net/servertalk_server.h"
-#include "../common/net/console_server.h"
-#include "../queryserv/zonelist.h"
-#include "../queryserv/zoneserver.h"
 
 volatile bool RunLoops = true;
 
diff --git a/queryserv/queryservconfig.cpp b/queryserv/queryservconfig.cpp
index 716ae0618..2383b76f6 100644
--- a/queryserv/queryservconfig.cpp
+++ b/queryserv/queryservconfig.cpp
@@ -17,9 +17,10 @@
 
 */
 
-#include "../common/global_define.h"
 #include "queryservconfig.h"
 
+#include "common/global_define.h"
+
 queryservconfig *queryservconfig::_chat_config = nullptr;
 
 std::string queryservconfig::GetByName(const std::string &var_name) const {
diff --git a/queryserv/queryservconfig.h b/queryserv/queryservconfig.h
index 5c9d63bd6..b7afa7a6d 100644
--- a/queryserv/queryservconfig.h
+++ b/queryserv/queryservconfig.h
@@ -17,10 +17,9 @@
 
 */
 
-#ifndef __queryservconfig_H
-#define __queryservconfig_H
+#pragma once
 
-#include "../common/eqemu_config.h"
+#include "common/eqemu_config.h"
 
 class queryservconfig : public EQEmuConfig {
 public:
@@ -50,6 +49,3 @@ public:
 	}
 
 };
-
-#endif
-
diff --git a/queryserv/worldserver.cpp b/queryserv/worldserver.cpp
index 051a8f009..78d55a177 100644
--- a/queryserv/worldserver.cpp
+++ b/queryserv/worldserver.cpp
@@ -1,27 +1,25 @@
-#include "../common/global_define.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/md5.h"
-#include "../common/packet_dump.h"
-#include "../common/packet_functions.h"
-#include "../common/servertalk.h"
-#include "../common/net/packet.h"
-
-#include "database.h"
-#include "lfguild.h"
-#include "queryservconfig.h"
 #include "worldserver.h"
-#include "../common/events/player_events.h"
-#include "../common/events/player_event_logs.h"
-#include "../common/server_reload_types.h"
-#include <iomanip>
-#include <iostream>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
 
-#include "zonelist.h"
+#include "common/eqemu_logsys.h"
+#include "common/events/player_event_logs.h"
+#include "common/events/player_events.h"
+#include "common/global_define.h"
+#include "common/md5.h"
+#include "common/net/packet.h"
+#include "common/packet_dump.h"
+#include "common/packet_functions.h"
+#include "common/server_reload_types.h"
+#include "common/servertalk.h"
+#include "queryserv/database.h"
+#include "queryserv/lfguild.h"
+#include "queryserv/queryservconfig.h"
+#include "queryserv/zonelist.h"
+
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 extern WorldServer           worldserver;
 extern const queryservconfig *Config;
diff --git a/queryserv/worldserver.h b/queryserv/worldserver.h
index 5774f5ca8..54ad69bee 100644
--- a/queryserv/worldserver.h
+++ b/queryserv/worldserver.h
@@ -15,12 +15,13 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef WORLDSERVER_H
-#define WORLDSERVER_H
+
+#pragma once
+
+#include "common/eq_packet_structs.h"
+#include "common/net/servertalk_client_connection.h"
 
 #include <mutex>
-#include "../common/eq_packet_structs.h"
-#include "../common/net/servertalk_client_connection.h"
 
 class WorldServer {
 public:
@@ -38,5 +39,3 @@ private:
 	std::unique_ptr<EQ::Net::ServertalkClient> m_connection;
 
 };
-#endif
-
diff --git a/queryserv/zonelist.cpp b/queryserv/zonelist.cpp
index 16ad65371..2b204c999 100644
--- a/queryserv/zonelist.cpp
+++ b/queryserv/zonelist.cpp
@@ -1,6 +1,7 @@
 #include "zonelist.h"
-#include "zoneserver.h"
-#include "../common/strings.h"
+
+#include "queryserv/zoneserver.h"
+#include "common/strings.h"
 
 void ZSList::Add(ZoneServer* zoneserver) {
 	zone_server_list.emplace_back(std::unique_ptr<ZoneServer>(zoneserver));
diff --git a/queryserv/zonelist.h b/queryserv/zonelist.h
index 5bcf1b29b..dc8dc4f32 100644
--- a/queryserv/zonelist.h
+++ b/queryserv/zonelist.h
@@ -1,12 +1,12 @@
-#ifndef ZONELIST_H_
-#define ZONELIST_H_
+#pragma once
 
-#include "../common/types.h"
+#include "common/types.h"
+#include "queryserv/zoneserver.h"
+
+#include <list>
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
-#include <list>
-#include "zoneserver.h"
 
 class WorldTCPConnection;
 
@@ -26,5 +26,3 @@ public:
 private:
 	std::list<std::unique_ptr<ZoneServer>> zone_server_list;
 };
-
-#endif /*ZONELIST_H_*/
diff --git a/queryserv/zoneserver.cpp b/queryserv/zoneserver.cpp
index 2aa9b9b9d..ca482c783 100644
--- a/queryserv/zoneserver.cpp
+++ b/queryserv/zoneserver.cpp
@@ -1,9 +1,10 @@
 #include "zoneserver.h"
-#include "../common/global_define.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/repositories/player_event_logs_repository.h"
-#include "../common/events/player_event_logs.h"
-#include "../common/discord/discord_manager.h"
+
+#include "common/discord/discord_manager.h"
+#include "common/eqemu_logsys.h"
+#include "common/events/player_event_logs.h"
+#include "common/global_define.h"
+#include "common/repositories/player_event_logs_repository.h"
 
 ZoneServer::ZoneServer(
 	std::shared_ptr<EQ::Net::ServertalkServerConnection> in_connection,
diff --git a/queryserv/zoneserver.h b/queryserv/zoneserver.h
index f4a4b08e6..374051c4b 100644
--- a/queryserv/zoneserver.h
+++ b/queryserv/zoneserver.h
@@ -1,12 +1,12 @@
-#ifndef ZONESERVER_H
-#define ZONESERVER_H
+#pragma once
+
+#include "common/emu_constants.h"
+#include "common/event/timer.h"
+#include "common/net/servertalk_server.h"
+#include "common/timer.h"
+#include "world/console.h"
+#include "world/world_tcp_connection.h"
 
-#include "../world/world_tcp_connection.h"
-#include "../common/net/servertalk_server.h"
-#include "../common/event/timer.h"
-#include "../common/timer.h"
-#include "../common/emu_constants.h"
-#include "../world/console.h"
 #include <string>
 
 class Client;
@@ -28,6 +28,3 @@ private:
 	bool                                                 m_is_zone_connected = false;
 	EQ::Net::ConsoleServer                               *m_console;
 };
-
-#endif
-