12 files changed, 33 insertions, 23 deletions
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 549d46010e9..517feb9a45c 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -46,10 +46,12 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
   ${CMAKE_SOURCE_DIR}/src/server/shared/Packets
   ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
   ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication
   ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Threading
   ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Authentication
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index e3c76c6e167..51ef171c5eb 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -37,8 +37,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
   ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
   ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Threading
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Management
   ${CMAKE_CURRENT_SOURCE_DIR}/Maps
diff --git a/src/server/shared/Database/AsyncDatabaseImpl.h b/src/server/shared/Database/AsyncDatabaseImpl.h
index f85540a8016..39a5e6551d5 100644
--- a/src/server/shared/Database/AsyncDatabaseImpl.h
+++ b/src/server/shared/Database/AsyncDatabaseImpl.h
@@ -19,8 +19,8 @@
  */
 
 
-#include "Database/DatabaseWorkerPool.h"
-#include "Database/SQLOperation.h"
+#include "DatabaseWorkerPool.h"
+#include "SQLOperation.h"
 
 
 /// Function body definitions for the template function members of the Database class
diff --git a/src/server/shared/Database/DatabaseEnv.h b/src/server/shared/Database/DatabaseEnv.h
index 398ae66f235..a878a358760 100644
--- a/src/server/shared/Database/DatabaseEnv.h
+++ b/src/server/shared/Database/DatabaseEnv.h
@@ -22,14 +22,14 @@
 #define DATABASEENV_H
 
 #include "Common.h"
-#include "Logging/Log.h"
-#include "Debugging/Errors.h"
+#include "Log.h"
+#include "Errors.h"
 
-#include "Database/Field.h"
-#include "Database/QueryResult.h"
+#include "Field.h"
+#include "QueryResult.h"
 
-#include "Database/DatabaseWorkerPool.h"
-#include "Database/MySQLThreading.h"
+#include "DatabaseWorkerPool.h"
+#include "MySQLThreading.h"
 
 typedef DatabaseWorkerPool DatabaseType;
 #define _LIKE_           "LIKE"
diff --git a/src/server/shared/Database/DatabaseWorker.h b/src/server/shared/Database/DatabaseWorker.h
index ad5102d28ca..55f4890f31b 100644
--- a/src/server/shared/Database/DatabaseWorker.h
+++ b/src/server/shared/Database/DatabaseWorker.h
@@ -21,6 +21,7 @@
 
 #include <ace/Task.h>
 #include <ace/Activation_Queue.h>
+#include "SQLOperation.h"
 
 class MySQLConnection;
 
@@ -39,4 +40,4 @@ class DatabaseWorker : protected ACE_Task_Base
         MySQLConnection* m_conn;
 };
 
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/server/shared/Database/DatabaseWorkerPool.cpp b/src/server/shared/Database/DatabaseWorkerPool.cpp
index 532d9cad7df..849fd67d8c0 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.cpp
+++ b/src/server/shared/Database/DatabaseWorkerPool.cpp
@@ -213,4 +213,4 @@ MySQLConnection* DatabaseWorkerPool::GetConnection()
     conn = m_bundle_conn;
     ASSERT (conn);
     return conn;
-}
-\ No newline at end of file
+}
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h
index d6275e0307f..06374e44143 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.h
+++ b/src/server/shared/Database/DatabaseWorkerPool.h
@@ -20,9 +20,7 @@
 #define _DATABASEWORKERPOOL_H
 
 #include "Common.h"
-#include "Logging/Log.h"
 
-#include <ace/Activation_Queue.h>
 #include <ace/Atomic_Op_T.h>
 #include <ace/Thread_Mutex.h>
 
@@ -154,4 +152,4 @@ class DatabaseWorkerPool
         QueryQueues                     m_queryQueues;       //! Query queues from diff threads
 };
 
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index cd28474c63d..24dcb166d49 100644
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -16,10 +16,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <mysql.h>
+#include "Common.h"
+#include "QueryResult.h"
+#include "SQLOperation.h"
 #include "MySQLConnection.h"
 #include "DatabaseWorker.h"
-#include "Utilities/Util.h"
-#include "Utilities/Timer.h"
+#include "Log.h"
+#include "Util.h"
+#include "Timer.h"
 
 MySQLConnection::MySQLConnection() :
 m_Mysql(NULL)
@@ -241,4 +246,4 @@ void MySQLConnection::RollbackTransaction()
 void MySQLConnection::CommitTransaction()
 {
     Execute("COMMIT");
-}
-\ No newline at end of file
+}
diff --git a/src/server/shared/Database/SQLOperation.cpp b/src/server/shared/Database/SQLOperation.cpp
index d3af5949faf..c9e3ba3e937 100644
--- a/src/server/shared/Database/SQLOperation.cpp
+++ b/src/server/shared/Database/SQLOperation.cpp
@@ -18,6 +18,7 @@
 
 #include "SQLOperation.h"
 #include "MySQLConnection.h"
+#include "Log.h"
 
 /*! Basic, ad-hoc queries. */
 BasicStatementTask::BasicStatementTask(const char* sql)
@@ -209,4 +210,4 @@ bool SQLQueryTask::Execute()
     /// add the callback to the sql result queue of the thread it originated from
     m_queue->add(m_callback);
     return true;
-}
-\ No newline at end of file
+}
diff --git a/src/server/shared/Database/SQLOperation.h b/src/server/shared/Database/SQLOperation.h
index 8f2a59151a3..4833e28164e 100644
--- a/src/server/shared/Database/SQLOperation.h
+++ b/src/server/shared/Database/SQLOperation.h
@@ -20,9 +20,10 @@
 #define _SQLOPERATION_H
 
 #include <ace/Method_Request.h>
+#include <ace/Activation_Queue.h>
 
 #include "Common.h"
-#include "Threading/Callback.h"
+#include "Callback.h"
 
 class MySQLConnection;
 
@@ -119,4 +120,4 @@ class SQLQueryTask : public SQLOperation
 };
 
 
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/server/shared/Database/SQLStorage.h b/src/server/shared/Database/SQLStorage.h
index 931c46b1995..84ed937d880 100644
--- a/src/server/shared/Database/SQLStorage.h
+++ b/src/server/shared/Database/SQLStorage.h
@@ -22,7 +22,7 @@
 #define SQLSTORAGE_H
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 class SQLStorage
 {
diff --git a/src/server/shared/Database/SQLStorageImpl.h b/src/server/shared/Database/SQLStorageImpl.h
index b3d06484e2e..c74be48c34c 100644
--- a/src/server/shared/Database/SQLStorageImpl.h
+++ b/src/server/shared/Database/SQLStorageImpl.h
@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Utilities/ProgressBar.h"
-#include "Logging/Log.h"
-#include "DataStores/DBCFileLoader.h"
+#include "ProgressBar.h"
+#include "Log.h"
+#include "DBCFileLoader.h"
 
 template<class T>
 template<class S, class D>