diff --git a/src/script/standard.cpp b/src/script/standard.cpp
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -82,7 +82,7 @@
 
     // Scan templates
     const CScript &script1 = scriptPubKey;
-    for (const std::pair<txnouttype, CScript> &tplate : mTemplates) {
+    for (const std::pair<const txnouttype, CScript> &tplate : mTemplates) {
         const CScript &script2 = tplate.second;
         vSolutionsRet.clear();
 
diff --git a/src/test/rwcollection_tests.cpp b/src/test/rwcollection_tests.cpp
--- a/src/test/rwcollection_tests.cpp
+++ b/src/test/rwcollection_tests.cpp
@@ -116,7 +116,7 @@
         BOOST_CHECK_EQUAL(w["2"], "two");
         BOOST_CHECK_EQUAL(w["3"], "three");
 
-        for (const std::pair<std::string, std::string> &p : w) {
+        for (const std::pair<const std::string, std::string> &p : w) {
             BOOST_CHECK_EQUAL(w[p.first], p.second);
         }
     }
@@ -127,7 +127,7 @@
         BOOST_CHECK_EQUAL(r->find("1")->first, "1");
         BOOST_CHECK_EQUAL(r->find("1")->second, "one");
 
-        for (const std::pair<std::string, std::string> &p : r) {
+        for (const std::pair<const std::string, std::string> &p : r) {
             BOOST_CHECK_EQUAL(r->at(p.first), p.second);
         }
     }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -804,8 +804,7 @@
 
     // Tally
     Amount nAmount = Amount::zero();
-    for (const std::pair<const uint256, CWalletTx> &pairWtx :
-         pwallet->mapWallet) {
+    for (const std::pair<const TxId, CWalletTx> &pairWtx : pwallet->mapWallet) {
         const CWalletTx &wtx = pairWtx.second;
 
         CValidationState state;
@@ -879,8 +878,7 @@
 
     // Tally
     Amount nAmount = Amount::zero();
-    for (const std::pair<const uint256, CWalletTx> &pairWtx :
-         pwallet->mapWallet) {
+    for (const std::pair<const TxId, CWalletTx> &pairWtx : pwallet->mapWallet) {
         const CWalletTx &wtx = pairWtx.second;
         CValidationState state;
         if (wtx.IsCoinBase() || !ContextualCheckTransactionForCurrentBlock(
@@ -1525,8 +1523,7 @@
 
     // Tally
     std::map<CTxDestination, tallyitem> mapTally;
-    for (const std::pair<const uint256, CWalletTx> &pairWtx :
-         pwallet->mapWallet) {
+    for (const std::pair<const TxId, CWalletTx> &pairWtx : pwallet->mapWallet) {
         const CWalletTx &wtx = pairWtx.second;
 
         CValidationState state;
@@ -2128,8 +2125,7 @@
         }
     }
 
-    for (const std::pair<const uint256, CWalletTx> &pairWtx :
-         pwallet->mapWallet) {
+    for (const std::pair<const TxId, CWalletTx> &pairWtx : pwallet->mapWallet) {
         const CWalletTx &wtx = pairWtx.second;
         Amount nFee;
         std::string strSentAccount;
@@ -2333,8 +2329,7 @@
 
     UniValue transactions(UniValue::VARR);
 
-    for (const std::pair<const uint256, CWalletTx> &pairWtx :
-         pwallet->mapWallet) {
+    for (const std::pair<const TxId, CWalletTx> &pairWtx : pwallet->mapWallet) {
         CWalletTx tx = pairWtx.second;
 
         if (depth == -1 || tx.GetDepthInMainChain() < depth) {