Merge branch 'master' into Playerbot

src/server/shared/DataStores/DBCDatabaseLoader.cpp

@@ -18,6 +18,7 @@
 #include "DBCDatabaseLoader.h"
 #include "DatabaseEnv.h"
 #include "Errors.h"
+#include "QueryResult.h"
 #include "StringFormat.h"
 
 DBCDatabaseLoader::DBCDatabaseLoader(char const* tableName, char const* dbcFormatString, std::vector<char*>& stringPool)

src/server/shared/DataStores/DBCDatabaseLoader.h

@@ -19,7 +19,6 @@
 #define DBCDatabaseLoader_h__
 
 #include "DBCFileLoader.h"
-#include <string>
 #include <vector>
 
 struct DBCDatabaseLoader

src/server/shared/DataStores/DBCStorageIterator.h

@@ -19,7 +19,6 @@
 #define DBCStorageIterator_h__
 
 #include "Define.h"
-#include <iterator>
 
 template <class T>
 class DBCStorageIterator

src/server/shared/DataStores/DBCStructure.h

@@ -20,7 +20,6 @@
 
 #include "DBCEnums.h"
 #include "Define.h"
-#include "SharedDefines.h"
 #include "Util.h"
 #include <array>
 #include <map>

src/server/shared/Realms/Realm.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "Realm.h"
-#include "IpAddress.h"
 #include "IpNetwork.h"
 #include <boost/asio/ip/tcp.hpp>
 

src/server/shared/Realms/RealmList.h

@@ -22,7 +22,6 @@
 #include "Realm.h"
 #include <array>
 #include <map>
-#include <unordered_set>
 #include <vector>
 
 struct RealmBuildInfo

src/server/shared/Secrets/SecretMgr.cpp

@@ -23,6 +23,7 @@
 #include "DatabaseEnv.h"
 #include "Errors.h"
 #include "Log.h"
+#include "QueryResult.h"
 #include "SharedDefines.h"
 
 #define SECRET_FLAG_FOR(key, val, server) server ## _ ## key = (val ## ull << (16*SERVER_PROCESS_ ## server))

src/server/shared/Secrets/SecretMgr.h

@@ -19,7 +19,6 @@
 #define __ACORE_SECRETMGR_H__
 
 #include "BigNumber.h"
-#include "Common.h"
 #include "Log.h"
 #include "Optional.h"
 #include <array>