diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h
index 38fbd1704..92c42cefe 100644
--- a/src/game/GridNotifiers.h
+++ b/src/game/GridNotifiers.h
@@ -20,7 +20,6 @@
 #define MANGOS_GRIDNOTIFIERS_H
 
 #include "ObjectGridLoader.h"
-#include "ByteBuffer.h"
 #include "UpdateData.h"
 #include <iostream>
 
diff --git a/src/game/Object.h b/src/game/Object.h
index 265d184a7..1bda374e3 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -85,7 +85,6 @@ enum PhaseMasks
 
 class WorldPacket;
 class UpdateData;
-class ByteBuffer;
 class WorldSession;
 class Creature;
 class Player;
diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h
index cf223ebc9..14154817a 100644
--- a/src/game/ObjectAccessor.h
+++ b/src/game/ObjectAccessor.h
@@ -25,7 +25,6 @@
 #include "Utilities/UnorderedMap.h"
 #include "Policies/ThreadingModel.h"
 
-#include "ByteBuffer.h"
 #include "UpdateData.h"
 
 #include "GridDefines.h"
diff --git a/src/game/UpdateData.h b/src/game/UpdateData.h
index e31140e7d..211025ade 100644
--- a/src/game/UpdateData.h
+++ b/src/game/UpdateData.h
@@ -19,8 +19,11 @@
 #ifndef __UPDATEDATA_H
 #define __UPDATEDATA_H
 
+#include "ByteBuffer.h"
+
 class WorldPacket;
 
+
 enum OBJECT_UPDATE_TYPE
 {
     UPDATETYPE_VALUES               = 0,
diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index b8cf809a8..69dd9ba2f 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -37,6 +37,7 @@
 #include "ByteBuffer.h"
 #include "Opcodes.h"
 #include "Database/DatabaseEnv.h"
+#include "Auth/BigNumber.h"
 #include "Auth/Sha1.h"
 #include "WorldSession.h"
 #include "WorldSocketMgr.h"
diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/AuthSocket.cpp
index 81c15a63e..bac584888 100644
--- a/src/realmd/AuthSocket.cpp
+++ b/src/realmd/AuthSocket.cpp
@@ -480,9 +480,9 @@ bool AuthSocket::_HandleLogonChallenge()
                     pkt << uint8(1);
                     pkt.append(g.AsByteArray(), 1);
                     pkt << uint8(32);
-                    pkt.append(N.AsByteArray(), 32);
+                    pkt.append(N.AsByteArray(32), 32);
                     pkt.append(s.AsByteArray(), s.GetNumBytes());// 32 bytes
-                    pkt.append(unk3.AsByteArray(), 16);
+                    pkt.append(unk3.AsByteArray(16), 16);
                     uint8 securityFlags = 0;
                     pkt << uint8(securityFlags);            // security flags (0x0...0x04)
 
@@ -807,7 +807,7 @@ bool AuthSocket::_HandleReconnectChallenge()
     pkt << (uint8)  AUTH_RECONNECT_CHALLENGE;
     pkt << (uint8)  0x00;
     _reconnectProof.SetRand(16 * 8);
-    pkt.append(_reconnectProof.AsByteBuffer());             // 16 bytes random
+    pkt.append(_reconnectProof.AsByteArray(16),16);         // 16 bytes random
     pkt << (uint64) 0x00 << (uint64) 0x00;                  // 16 bytes zeros
     SendBuf((char const*)pkt.contents(), pkt.size());
     return true;
diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp
index c78745523..56365e889 100644
--- a/src/shared/Auth/BigNumber.cpp
+++ b/src/shared/Auth/BigNumber.cpp
@@ -186,21 +186,6 @@ uint8 *BigNumber::AsByteArray(int minSize)
     return _array;
 }
 
-ByteBuffer BigNumber::AsByteBuffer()
-{
-    ByteBuffer ret(GetNumBytes());
-    ret.append(AsByteArray(), GetNumBytes());
-    return ret;
-}
-
-std::vector<uint8> BigNumber::AsByteVector()
-{
-    std::vector<uint8> ret;
-    ret.resize(GetNumBytes());
-    memcpy(&ret[0], AsByteArray(), GetNumBytes());
-    return ret;
-}
-
 const char *BigNumber::AsHexStr()
 {
     return BN_bn2hex(_bn);
diff --git a/src/shared/Auth/BigNumber.h b/src/shared/Auth/BigNumber.h
index 5900afcb5..49cc2ff35 100644
--- a/src/shared/Auth/BigNumber.h
+++ b/src/shared/Auth/BigNumber.h
@@ -20,7 +20,6 @@
 #define _AUTH_BIGNUMBER_H
 
 #include "Common.h"
-#include "ByteBuffer.h"
 
 struct bignum_st;
 
@@ -83,8 +82,6 @@ class BigNumber
 
         uint32 AsDword();
         uint8* AsByteArray(int minSize = 0);
-        ByteBuffer AsByteBuffer();
-        std::vector<uint8> AsByteVector();
 
         const char *AsHexStr();
         const char *AsDecStr();
diff --git a/src/shared/Auth/Sha1.cpp b/src/shared/Auth/Sha1.cpp
index f5bb7cc32..6beff2699 100644
--- a/src/shared/Auth/Sha1.cpp
+++ b/src/shared/Auth/Sha1.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "Auth/Sha1.h"
+#include "Auth/BigNumber.h"
 #include <stdarg.h>
 
 Sha1Hash::Sha1Hash()
diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h
index ffb4a1711..754ab3f9e 100644
--- a/src/shared/Auth/Sha1.h
+++ b/src/shared/Auth/Sha1.h
@@ -22,7 +22,8 @@
 #include "Common.h"
 #include <openssl/sha.h>
 #include <openssl/crypto.h>
-#include "Auth/BigNumber.h"
+
+class BigNumber;
 
 class Sha1Hash
 {
diff --git a/src/shared/Threading.cpp b/src/shared/Threading.cpp
index 652f46877..90861b8f4 100644
--- a/src/shared/Threading.cpp
+++ b/src/shared/Threading.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "Threading.h"
+#include "Errors.h"
 #include <ace/OS_NS_unistd.h>
 #include <ace/Sched_Params.h>
 #include <vector>
diff --git a/src/shared/Threading.h b/src/shared/Threading.h
index 6c3f3724b..574b9641a 100644
--- a/src/shared/Threading.h
+++ b/src/shared/Threading.h
@@ -23,7 +23,6 @@
 #include <ace/TSS_T.h>
 #include "ace/Atomic_Op.h"
 #include <assert.h>
-#include "Errors.h"
 
 namespace ACE_Based
 {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 0c0b08d5c..937bce2a4 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8495"
+ #define REVISION_NR "8496"
 #endif // __REVISION_NR_H__