diff --git a/queryserv/database.cpp b/queryserv/database.cpp
index a69b95846..99b125bbd 100644
--- a/queryserv/database.cpp
+++ b/queryserv/database.cpp
@@ -4,8 +4,6 @@
 #include "common/eqemu_logsys.h"
 #include "common/strings.h"
 
-#include <map>
-
 // this function does not delete the ServerPacket, so it must be handled at call site
 void QSDatabase::GeneralQueryReceive(ServerPacket *pack)
 {
diff --git a/queryserv/queryserv.cpp b/queryserv/queryserv.cpp
index aa0fb2a25..1d2ace974 100644
--- a/queryserv/queryserv.cpp
+++ b/queryserv/queryserv.cpp
@@ -10,7 +10,6 @@
 #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"
@@ -18,9 +17,7 @@
 #include "queryserv/zoneserver.h"
 #include "queryservconfig.h"
 
-#include <list>
-#include <signal.h>
-#include <thread>
+#include <csignal>
 
 volatile bool RunLoops = true;