diff --git a/src/blockchain_db/CMakeLists.txt b/src/blockchain_db/CMakeLists.txt
index e94705b22..1e2f06809 100644
--- a/src/blockchain_db/CMakeLists.txt
+++ b/src/blockchain_db/CMakeLists.txt
@@ -45,7 +45,8 @@ target_link_libraries(blockchain_db
   PUBLIC
     common
     cncrypto
-    ringct
+    cryptonote_basic
+    ringct_basic
     ${LMDB_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_THREAD_LIBRARY}
diff --git a/src/cryptonote_basic/CMakeLists.txt b/src/cryptonote_basic/CMakeLists.txt
index 639c5a654..5b4a84b67 100644
--- a/src/cryptonote_basic/CMakeLists.txt
+++ b/src/cryptonote_basic/CMakeLists.txt
@@ -71,6 +71,7 @@ target_link_libraries(cryptonote_basic
     checkpoints
     cryptonote_format_utils_basic
     device
+    ringct_basic
     ${Boost_DATE_TIME_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${Boost_SERIALIZATION_LIBRARY}
diff --git a/src/cryptonote_basic/cryptonote_format_utils.cpp b/src/cryptonote_basic/cryptonote_format_utils.cpp
index edbe76fef..d3c7dba48 100644
--- a/src/cryptonote_basic/cryptonote_format_utils.cpp
+++ b/src/cryptonote_basic/cryptonote_format_utils.cpp
@@ -38,7 +38,7 @@
 #include "cryptonote_config.h"
 #include "crypto/crypto.h"
 #include "crypto/hash.h"
-#include "ringct/rctSigs.h"
+#include "ringct/rctOps.h"
 
 using namespace epee;
 
diff --git a/src/ringct/CMakeLists.txt b/src/ringct/CMakeLists.txt
index 656ef494a..8a6ed9f8f 100644
--- a/src/ringct/CMakeLists.txt
+++ b/src/ringct/CMakeLists.txt
@@ -69,7 +69,6 @@ target_link_libraries(ringct
   PUBLIC
     common
     cncrypto
-    cryptonote_basic
     device
   PRIVATE
     ${OPENSSL_LIBRARIES}
diff --git a/src/ringct/rctSigs.cpp b/src/ringct/rctSigs.cpp
index 663730295..206a9a51d 100644
--- a/src/ringct/rctSigs.cpp
+++ b/src/ringct/rctSigs.cpp
@@ -28,16 +28,18 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include "rctSigs.h"
+
 #include "misc_log_ex.h"
 #include "misc_language.h"
 #include "common/perf_timer.h"
 #include "common/threadpool.h"
 #include "common/util.h"
-#include "rctSigs.h"
 #include "bulletproofs.h"
 #include "bulletproofs_plus.h"
-#include "cryptonote_basic/cryptonote_format_utils.h"
 #include "cryptonote_config.h"
+#include "device/device.hpp"
+#include "serialization/crypto.h"
 
 using namespace crypto;
 using namespace std;
@@ -612,7 +614,8 @@ namespace rct {
       key prehash;
       CHECK_AND_ASSERT_THROW_MES(const_cast<rctSig&>(rv).serialize_rctsig_base(ba, inputs, outputs),
           "Failed to serialize rctSigBase");
-      cryptonote::get_blob_hash(ss.str(), h);
+      const std::string sig_base_blob = ss.str();
+      cn_fast_hash(sig_base_blob.data(), sig_base_blob.size(), h);
       hashes.push_back(hash2rct(h));
 
       keyV kv;