Core: ported headers cleanup from master branch

1 files changed, 11 insertions, 17 deletions

diff --git a/src/server/database/Database/DatabaseEnv.h b/src/server/database/Database/DatabaseEnv.h
index dde0d5f1847..301b94567ce 100644
--- a/src/server/database/Database/DatabaseEnv.h
+++ b/src/server/database/Database/DatabaseEnv.h
@@ -19,30 +19,24 @@
 #ifndef DATABASEENV_H
 #define DATABASEENV_H
 
-#include "Common.h"
-#include "Errors.h"
-#include "Log.h"
-
-#include "Field.h"
-#include "QueryResult.h"
-
-#include "MySQLThreading.h"
-#include "Transaction.h"
-
-#define _LIKE_           "LIKE"
-#define _TABLE_SIM_      '`'
-#define _CONCAT3_(A, B, C) "CONCAT( " A ", " B ", " C " )"
-#define _OFFSET_         "LIMIT %d, 1"
+#include "Define.h"
+#include "DatabaseWorkerPool.h"
 
 #include "Implementation/LoginDatabase.h"
 #include "Implementation/CharacterDatabase.h"
 #include "Implementation/WorldDatabase.h"
 
+#include "Field.h"
+#include "PreparedStatement.h"
+#include "QueryCallback.h"
+#include "QueryResult.h"
+#include "Transaction.h"
+
 /// Accessor to the world database
-TC_DATABASE_API extern WorldDatabaseWorkerPool WorldDatabase;
+TC_DATABASE_API extern DatabaseWorkerPool<WorldDatabaseConnection> WorldDatabase;
 /// Accessor to the character database
-TC_DATABASE_API extern CharacterDatabaseWorkerPool CharacterDatabase;
+TC_DATABASE_API extern DatabaseWorkerPool<CharacterDatabaseConnection> CharacterDatabase;
 /// Accessor to the realm/login database
-TC_DATABASE_API extern LoginDatabaseWorkerPool LoginDatabase;
+TC_DATABASE_API extern DatabaseWorkerPool<LoginDatabaseConnection> LoginDatabase;
 
 #endif