Core/Common: Include cleanup

7 files changed, 23 insertions, 8 deletions

diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp
index e680ed834a3..aba2c573c4c 100644
--- a/src/server/database/Database/DatabaseWorkerPool.cpp
+++ b/src/server/database/Database/DatabaseWorkerPool.cpp
@@ -34,6 +34,12 @@ DatabaseWorkerPool<T>::DatabaseWorkerPool()
 }
 
 template <class T>
+DatabaseWorkerPool<T>::~DatabaseWorkerPool()
+{
+    _queue->Cancel();
+}
+
+template <class T>
 void DatabaseWorkerPool<T>::SetConnectionInfo(std::string const& infoString,
     uint8 const asyncThreads, uint8 const synchThreads)
 {
@@ -177,6 +183,12 @@ QueryResultHolderFuture DatabaseWorkerPool<T>::DelayQueryHolder(SQLQueryHolder*
 }
 
 template <class T>
+SQLTransaction DatabaseWorkerPool<T>::BeginTransaction()
+{
+    return std::make_shared<Transaction>();
+}
+
+template <class T>
 void DatabaseWorkerPool<T>::CommitTransaction(SQLTransaction transaction)
 {
 #ifdef TRINITY_DEBUG
diff --git a/src/server/database/Database/DatabaseWorkerPool.h b/src/server/database/Database/DatabaseWorkerPool.h
index 6e5f25ff297..adca6b3f836 100644
--- a/src/server/database/Database/DatabaseWorkerPool.h
+++ b/src/server/database/Database/DatabaseWorkerPool.h
@@ -60,10 +60,7 @@ class DatabaseWorkerPool
         /* Activity state */
         DatabaseWorkerPool();
 
-        ~DatabaseWorkerPool()
-        {
-            _queue->Cancel();
-        }
+        ~DatabaseWorkerPool();
 
         void SetConnectionInfo(std::string const& infoString, uint8 const asyncThreads, uint8 const synchThreads);
 
@@ -211,10 +208,7 @@ class DatabaseWorkerPool
         */
 
         //! Begins an automanaged transaction pointer that will automatically rollback if not commited. (Autocommit=0)
-        SQLTransaction BeginTransaction()
-        {
-            return SQLTransaction(new Transaction);
-        }
+        SQLTransaction BeginTransaction();
 
         //! Enqueues a collection of one-way SQL operations (can be both adhoc and prepared). The order in which these operations
         //! were appended to the transaction will be respected during execution.
diff --git a/src/server/database/Database/Field.h b/src/server/database/Database/Field.h
index 4daa447e481..8035dd16869 100644
--- a/src/server/database/Database/Field.h
+++ b/src/server/database/Database/Field.h
@@ -21,6 +21,9 @@
 #include "Common.h"
 #include "Log.h"
 
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
 #include <mysql.h>
 
 /**
diff --git a/src/server/database/Database/MySQLConnection.h b/src/server/database/Database/MySQLConnection.h
index 0a9b136386d..42fb976c729 100644
--- a/src/server/database/Database/MySQLConnection.h
+++ b/src/server/database/Database/MySQLConnection.h
@@ -19,6 +19,7 @@
 #include "Transaction.h"
 #include "Util.h"
 #include "ProducerConsumerQueue.h"
+#include <map>
 
 #ifndef _MYSQLCONNECTION_H
 #define _MYSQLCONNECTION_H
diff --git a/src/server/database/Database/QueryCallback.h b/src/server/database/Database/QueryCallback.h
index f9c93000da7..8258da37afb 100644
--- a/src/server/database/Database/QueryCallback.h
+++ b/src/server/database/Database/QueryCallback.h
@@ -20,6 +20,8 @@
 
 #include "QueryResult.h"
 #include <future>
+#include <list>
+#include <queue>
 
 class TC_DATABASE_API QueryCallback
 {
diff --git a/src/server/database/Database/QueryResult.h b/src/server/database/Database/QueryResult.h
index 2df5d3a4f70..5d2cc425ae8 100644
--- a/src/server/database/Database/QueryResult.h
+++ b/src/server/database/Database/QueryResult.h
@@ -20,6 +20,7 @@
 #define QUERYRESULT_H
 
 #include <memory>
+#include "Errors.h"
 #include "Field.h"
 
 #ifdef _WIN32
diff --git a/src/server/database/Database/Transaction.h b/src/server/database/Database/Transaction.h
index 6e6d68302f5..fbb96c053ce 100644
--- a/src/server/database/Database/Transaction.h
+++ b/src/server/database/Database/Transaction.h
@@ -20,6 +20,8 @@
 
 #include "SQLOperation.h"
 #include "StringFormat.h"
+#include <list>
+#include <mutex>
 
 //- Forward declare (don't include header to prevent circular includes)
 class PreparedStatement;