diff --git a/cppForSwig/BtcUtils.cpp b/cppForSwig/BtcUtils.cpp
index 59630c835..a645c0f28 100644
--- a/cppForSwig/BtcUtils.cpp
+++ b/cppForSwig/BtcUtils.cpp
@@ -7,9 +7,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "BtcUtils.h"
-#include "hmac.h"
-#include "sha.h"
-#include "base64.h"
+#include "cryptopp/hmac.h"
+#include "cryptopp/sha.h"
+#include "cryptopp/base64.h"
 #include "EncryptionUtils.h"
 #include "BlockDataManagerConfig.h"
 
@@ -361,4 +361,4 @@ string BtcUtils::base64_decode(const string& in)
    base64e.MessageEnd();
 
    return output;
-}
\ No newline at end of file
+}
diff --git a/cppForSwig/BtcUtils.h b/cppForSwig/BtcUtils.h
index 51b2feb90..45aa7bff7 100644
--- a/cppForSwig/BtcUtils.h
+++ b/cppForSwig/BtcUtils.h
@@ -29,10 +29,10 @@
 #include <stdexcept>
 
 #include "BinaryData.h"
-#include "cryptlib.h"
-#include "sha.h"
-#include "integer.h"
-#include "ripemd.h"
+#include "cryptopp/cryptlib.h"
+#include "cryptopp/sha.h"
+#include "cryptopp/integer.h"
+#include "cryptopp/ripemd.h"
 #include "UniversalTimer.h"
 #include "log.h"
 
diff --git a/cppForSwig/EncryptionUtils.cpp b/cppForSwig/EncryptionUtils.cpp
index 9907578df..a5b921c7e 100644
--- a/cppForSwig/EncryptionUtils.cpp
+++ b/cppForSwig/EncryptionUtils.cpp
@@ -7,8 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 #include "EncryptionUtils.h"
 #include "log.h"
-#include "integer.h"
-#include "oids.h"
+#include "cryptopp/integer.h"
+#include "cryptopp/oids.h"
 
 //#include <openssl/ec.h>
 //#include <openssl/ecdsa.h>
diff --git a/cppForSwig/EncryptionUtils.h b/cppForSwig/EncryptionUtils.h
index 02074f3d2..d9a9a9154 100644
--- a/cppForSwig/EncryptionUtils.h
+++ b/cppForSwig/EncryptionUtils.h
@@ -59,14 +59,14 @@
 #include <cmath>
 #include <algorithm>
 
-#include "cryptlib.h"
-#include "osrng.h"
-#include "sha.h"
-#include "aes.h"
-#include "modes.h"
-#include "eccrypto.h"
-#include "filters.h"
-#include "DetSign.h"
+#include "cryptopp/cryptlib.h"
+#include "cryptopp/osrng.h"
+#include "cryptopp/sha.h"
+#include "cryptopp/aes.h"
+#include "cryptopp/modes.h"
+#include "cryptopp/eccrypto.h"
+#include "cryptopp/filters.h"
+#include "cryptopp/DetSign.h"
 
 #include "BinaryData.h"
 #include "BtcUtils.h"