diff --git a/src/stakeinput.cpp b/src/stakeinput.cpp
index b067b9bb3789f4..18b4789129b2b4 100644
--- a/src/stakeinput.cpp
+++ b/src/stakeinput.cpp
@@ -4,10 +4,8 @@
 
 #include "stakeinput.h"
 
-#include "../wallet/wallet.h"
 #include "amount.h"
 #include "chain.h"
-#include "librustzcash.h"
 #include "streams.h"
 #include "txdb.h"
 #include "validation.h"
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index b67c8cc3812c63..ee992227c659dd 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -7,7 +7,6 @@
 
 #include "optional.h"
 #include "consensus/params.h"
-#include "librustzcash.h"
 #include "primitives/transaction.h"
 #include "sapling/saplingscriptpubkeyman.h"
 #include "sapling/zip32.h"
@@ -2752,6 +2751,7 @@ bool CWallet::StakeableUTXOs(std::vector<CStakeableOutput>* stakeableCoins) cons
 bool CWallet::StakeableNotes(std::vector<CStakeableShieldNote>* shieldNotes) const
 {
     if (Params().GetConsensus().NetworkUpgradeActive(this->GetLastBlockHeight(), Consensus::UPGRADE_SHIELD_STAKING)) {
+        LOCK(cs_wallet);
         return m_sspk_man->GetStakeableNotes(shieldNotes, Params().GetConsensus().nStakeMinDepth);
     }
     return false;