diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
index 4659b0822..7dafb4694 100644
--- a/src/server/shared/DataStores/DBCStore.h
+++ b/src/server/shared/DataStores/DBCStore.h
@@ -21,6 +21,9 @@
 
 #include "DBCFileLoader.h"
 #include "Logging/Log.h"
+#include "Field.h"
+#include "DatabaseWorkerPool.h"
+#include "WorldDatabase.h"
 
 struct SqlDbc
 {
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h
index 8c8a89549..8092e8be7 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.h
+++ b/src/server/shared/Database/DatabaseWorkerPool.h
@@ -28,6 +28,7 @@
 #include "Transaction.h"
 #include "DatabaseWorker.h"
 #include "PreparedStatement.h"
+#include "Log.h"
 
 enum MySQLThreadBundle
 {
diff --git a/src/server/shared/Database/Field.h b/src/server/shared/Database/Field.h
index 8d149858a..2885d9eff 100644
--- a/src/server/shared/Database/Field.h
+++ b/src/server/shared/Database/Field.h
@@ -20,6 +20,8 @@
 
 #if !defined(FIELD_H)
 #define FIELD_H
+#include <iostream>
+#include "Common.h"
 
 class Field
 {
diff --git a/src/server/shared/Database/MySQLConnection.h b/src/server/shared/Database/MySQLConnection.h
index bbb982494..7ed7855af 100644
--- a/src/server/shared/Database/MySQLConnection.h
+++ b/src/server/shared/Database/MySQLConnection.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <ace/Activation_Queue.h>
+#include "DatabaseWorkerPool.h"
+
 #ifndef _MYSQLCONNECTION_H
 #define _MYSQLCONNECTION_H
 
@@ -59,4 +62,4 @@ class MySQLConnection
         ACE_Thread_Mutex      m_Mutex;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp
index 327caf71a..920952d2f 100644
--- a/src/server/shared/Database/PreparedStatement.cpp
+++ b/src/server/shared/Database/PreparedStatement.cpp
@@ -18,6 +18,7 @@
 
 #include "PreparedStatement.h"
 #include "MySQLConnection.h"
+#include "Log.h"
 
 PreparedStatement::PreparedStatement(uint32 index) :
 m_index(index),
@@ -322,4 +323,4 @@ PreparedStatementTask::~PreparedStatementTask()
 bool PreparedStatementTask::Execute()
 {
     return m_conn->Execute(m_stmt);
-}
\ No newline at end of file
+}
diff --git a/src/server/shared/Database/SQLOperation.cpp b/src/server/shared/Database/SQLOperation.cpp
index ae0dff6b2..e67dbd47b 100644
--- a/src/server/shared/Database/SQLOperation.cpp
+++ b/src/server/shared/Database/SQLOperation.cpp
@@ -19,6 +19,7 @@
 #include "Common.h"
 #include "SQLOperation.h"
 #include "MySQLConnection.h"
+#include "Log.h"
 
 /*! Basic, ad-hoc queries. */
 BasicStatementTask::BasicStatementTask(const char* sql) :