6 files changed, 4 insertions, 20 deletions
diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp
index 8869d3bb9e5..303687c266c 100644
--- a/src/shared/Auth/BigNumber.cpp
+++ b/src/shared/Auth/BigNumber.cpp
@@ -188,21 +188,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 ba116db3965..f1b3a0beda2 100644
--- a/src/shared/Auth/BigNumber.h
+++ b/src/shared/Auth/BigNumber.h
@@ -22,7 +22,6 @@
 #define _AUTH_BIGNUMBER_H
 
 #include "Common.h"
-#include "ByteBuffer.h"
 
 struct bignum_st;
 
@@ -85,8 +84,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 8743a14b838..802f1bbcdff 100644
--- a/src/shared/Auth/Sha1.cpp
+++ b/src/shared/Auth/Sha1.cpp
@@ -19,6 +19,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 099cf99321a..bd2b1afa876 100644
--- a/src/shared/Auth/Sha1.h
+++ b/src/shared/Auth/Sha1.h
@@ -24,7 +24,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 652f468772f..90861b8f425 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 6c3f3724bc1..574b9641aac 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
 {