12 files changed, 18 insertions, 18 deletions
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index b4ba254fbeb..0922ac254dc 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -76,7 +76,7 @@
 #endif                                                      // __SHOW_STUPID_WARNINGS__
 #endif                                                      // __GNUC__
 
-#include "UnorderedMap.h"
+#include "Dynamic/UnorderedMap.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -100,8 +100,8 @@
 #include <sstream>
 #include <algorithm>
 
-#include "LockedQueue.h"
-#include "Threading.h"
+#include "Threading/LockedQueue.h"
+#include "Threading/Threading.h"
 
 #include <ace/Basic_Types.h>
 #include <ace/Guard_T.h>
diff --git a/src/server/shared/Cryptography/ARC4.cpp b/src/server/shared/Cryptography/ARC4.cpp
index 80cad4991e9..8427640ba2a 100644
--- a/src/server/shared/Cryptography/ARC4.cpp
+++ b/src/server/shared/Cryptography/ARC4.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Auth/SARC4.h"
+#include "ARC4.h"
 #include <openssl/sha.h>
 
 SARC4::SARC4(uint8 len)
diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
index b34b922b16a..2dfcebfa932 100644
--- a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
+++ b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
@@ -19,9 +19,9 @@
  */
 
 #include "AuthCrypt.h"
-#include "Hmac.h"
-#include "Log.h"
-#include "BigNumber.h"
+#include "Cryptography/HMACSHA1.h"
+#include "Logging/Log.h"
+#include "Cryptography/BigNumber.h"
 
 AuthCrypt::AuthCrypt() : _clientDecrypt(SHA_DIGEST_LENGTH), _serverEncrypt(SHA_DIGEST_LENGTH)
 {
diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.h b/src/server/shared/Cryptography/Authentication/AuthCrypt.h
index 6695dc580cc..5a2430611a4 100644
--- a/src/server/shared/Cryptography/Authentication/AuthCrypt.h
+++ b/src/server/shared/Cryptography/Authentication/AuthCrypt.h
@@ -22,7 +22,7 @@
 #define _AUTHCRYPT_H
 
 #include <Common.h>
-#include "SARC4.h"
+#include "Cryptography/ARC4.h"
 
 class BigNumber;
 
diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp
index 64e9ef21ccc..c05258c73a0 100644
--- a/src/server/shared/Cryptography/BigNumber.cpp
+++ b/src/server/shared/Cryptography/BigNumber.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Auth/BigNumber.h"
+#include "Cryptography/BigNumber.h"
 #include <openssl/bn.h>
 #include <algorithm>
 
diff --git a/src/server/shared/Cryptography/HMACSHA1.cpp b/src/server/shared/Cryptography/HMACSHA1.cpp
index a30f1b2d1e2..aed8940372b 100644
--- a/src/server/shared/Cryptography/HMACSHA1.cpp
+++ b/src/server/shared/Cryptography/HMACSHA1.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Auth/Hmac.h"
+#include "HMACSHA1.h"
 #include "BigNumber.h"
 
 HmacHash::HmacHash(uint32 len, uint8 *seed)
diff --git a/src/server/shared/Cryptography/MD5.c b/src/server/shared/Cryptography/MD5.c
index 3e9735e2dbb..45897503455 100644
--- a/src/server/shared/Cryptography/MD5.c
+++ b/src/server/shared/Cryptography/MD5.c
@@ -51,7 +51,7 @@ self-checking.
 1999-05-03 lpd Original version.
 */
 
-#include "md5.h"
+#include "MD5.h"
 #include <string.h>
 
 #undef BYTE_ORDER                                           /* 1 = big-endian, -1 = little-endian, 0 = unknown */
diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp
index b63deb2c5f3..b50f72af4d3 100644
--- a/src/server/shared/Cryptography/SHA1.cpp
+++ b/src/server/shared/Cryptography/SHA1.cpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Auth/Sha1.h"
-#include "Auth/BigNumber.h"
+#include "SHA1.h"
+#include "BigNumber.h"
 #include <stdarg.h>
 
 Sha1Hash::Sha1Hash()
diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h
index f99f7c93c8f..1a516bdc3d7 100644
--- a/src/server/shared/Database/Database.h
+++ b/src/server/shared/Database/Database.h
@@ -21,7 +21,7 @@
 #ifndef DATABASE_H
 #define DATABASE_H
 
-#include "Threading.h"
+#include "Threading/Threading.h"
 #include "Dynamic/UnorderedMap.h"
 #include "Database/SqlDelayThread.h"
 #include "Policies/Singleton.h"
diff --git a/src/server/shared/Database/DatabaseEnv.h b/src/server/shared/Database/DatabaseEnv.h
index 69236b076e9..15c1b1c599e 100644
--- a/src/server/shared/Database/DatabaseEnv.h
+++ b/src/server/shared/Database/DatabaseEnv.h
@@ -22,8 +22,8 @@
 #define DATABASEENV_H
 
 #include "Common.h"
-#include "Log.h"
-#include "Errors.h"
+#include "Logging/Log.h"
+#include "Debugging/Errors.h"
 
 #include "Database/Field.h"
 #include "Database/QueryResult.h"
diff --git a/src/server/shared/Database/SqlDelayThread.h b/src/server/shared/Database/SqlDelayThread.h
index d603813c8fa..4ef9c67aa5b 100644
--- a/src/server/shared/Database/SqlDelayThread.h
+++ b/src/server/shared/Database/SqlDelayThread.h
@@ -23,7 +23,7 @@
 
 #include "ace/Thread_Mutex.h"
 #include "ace/Activation_Queue.h"
-#include "Threading.h"
+#include "Threading/Threading.h"
 
 class Database;
 class SqlOperation;
diff --git a/src/server/shared/Threading/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h
index 9f8afae6c14..ff6056350f3 100644
--- a/src/server/shared/Threading/LockedQueue.h
+++ b/src/server/shared/Threading/LockedQueue.h
@@ -23,7 +23,7 @@
 #include <ace/Thread_Mutex.h>
 #include <deque>
 #include <assert.h>
-#include "Errors.h"
+#include "Debugging/Errors.h"
 
 namespace ACE_Based
 {