diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -443,6 +443,7 @@
 	rpc/rawtransaction_util.cpp
 	rpc/util.cpp
 	scheduler.cpp
+	salteduint256hasher.cpp
 	versionbitsinfo.cpp
 	warnings.cpp
 )
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -214,6 +214,7 @@
   rpc/server.h \
   rpc/util.h \
   rwcollection.h \
+  salteduint256hasher.h \
   scheduler.h \
   script/descriptor.h \
   script/keyorigin.h \
@@ -517,6 +518,7 @@
   psbt.cpp \
   rpc/rawtransaction_util.cpp \
   rpc/util.cpp \
+  salteduint256hasher.cpp \
   scheduler.cpp \
   script/descriptor.cpp \
   script/sign.cpp \
diff --git a/src/bench/duplicate_inputs.cpp b/src/bench/duplicate_inputs.cpp
--- a/src/bench/duplicate_inputs.cpp
+++ b/src/bench/duplicate_inputs.cpp
@@ -9,11 +9,11 @@
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
 #include <pow.h>
+#include <random.h>
 #include <script/scriptcache.h>
 #include <txmempool.h>
 #include <validation.h>
 
-
 static void DuplicateInputs(benchmark::State &state) {
     const CScript SCRIPT_PUB{CScript(OP_TRUE)};
 
diff --git a/src/salteduint256hasher.h b/src/salteduint256hasher.h
new file mode 100644
--- /dev/null
+++ b/src/salteduint256hasher.h
@@ -0,0 +1,23 @@
+// Copyright (c) 2018-2019 The Bitcoin developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_SALTEDUINT256HASHER_H
+#define BITCOIN_SALTEDUINT256HASHER_H
+
+#include <crypto/siphash.h>
+#include <uint256.h>
+
+class SaltedUint256Hasher {
+private:
+    /** Salt */
+    const uint64_t k0, k1;
+
+public:
+    SaltedUint256Hasher();
+
+    size_t hash(const uint256 &h) const { return SipHashUint256(k0, k1, h); }
+    size_t operator()(const uint256 &h) const { return hash(h); }
+};
+
+#endif // BITCOIN_SALTEDUINT256HASHER_H
diff --git a/src/salteduint256hasher.cpp b/src/salteduint256hasher.cpp
new file mode 100644
--- /dev/null
+++ b/src/salteduint256hasher.cpp
@@ -0,0 +1,6 @@
+#include <random.h>
+#include <salteduint256hasher.h>
+
+SaltedUint256Hasher::SaltedUint256Hasher()
+    : k0(GetRand(std::numeric_limits<uint64_t>::max())),
+      k1(GetRand(std::numeric_limits<uint64_t>::max())) {}
diff --git a/src/txmempool.h b/src/txmempool.h
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -9,10 +9,9 @@
 #include <amount.h>
 #include <coins.h>
 #include <core_memusage.h>
-#include <crypto/siphash.h>
 #include <indirectmap.h>
 #include <primitives/transaction.h>
-#include <random.h>
+#include <salteduint256hasher.h>
 #include <sync.h>
 
 #include <boost/multi_index/hashed_index.hpp>
@@ -383,17 +382,11 @@
     REPLACED
 };
 
-class SaltedTxidHasher {
-private:
-    /** Salt */
-    const uint64_t k0, k1;
-
+class SaltedTxIdHasher : private SaltedUint256Hasher {
 public:
-    SaltedTxidHasher();
+    SaltedTxIdHasher() : SaltedUint256Hasher() {}
 
-    size_t operator()(const TxId &txid) const {
-        return SipHashUint256(k0, k1, txid);
-    }
+    size_t operator()(const TxId &txid) const { return hash(txid); }
 };
 
 /**
@@ -499,7 +492,7 @@
         CTxMemPoolEntry, boost::multi_index::indexed_by<
                              // sorted by txid
                              boost::multi_index::hashed_unique<
-                                 mempoolentry_txid, SaltedTxidHasher>,
+                                 mempoolentry_txid, SaltedTxIdHasher>,
                              // sorted by fee rate
                              boost::multi_index::ordered_non_unique<
                                  boost::multi_index::tag<descendant_score>,
@@ -886,7 +879,7 @@
                              // sorted by txid
                              boost::multi_index::hashed_unique<
                                  boost::multi_index::tag<txid_index>,
-                                 mempoolentry_txid, SaltedTxidHasher>,
+                                 mempoolentry_txid, SaltedTxIdHasher>,
                              // sorted by order in the blockchain
                              boost::multi_index::sequenced<
                                  boost::multi_index::tag<insertion_order>>>>
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1279,10 +1279,6 @@
     m_is_loaded = loaded;
 }
 
-SaltedTxidHasher::SaltedTxidHasher()
-    : k0(GetRand(std::numeric_limits<uint64_t>::max())),
-      k1(GetRand(std::numeric_limits<uint64_t>::max())) {}
-
 /** Maximum bytes for transactions to store for processing during reorg */
 static const size_t MAX_DISCONNECTED_TX_POOL_SIZE = 20 * DEFAULT_MAX_BLOCK_SIZE;
 
@@ -1299,7 +1295,7 @@
         addTransaction(tx);
 
         // Fill in the set of parents.
-        std::unordered_set<TxId, SaltedTxidHasher> parents;
+        std::unordered_set<TxId, SaltedTxIdHasher> parents;
         for (const CTxIn &in : tx->vin) {
             parents.insert(in.prevout.GetTxId());
         }
@@ -1308,7 +1304,7 @@
         // if we already know of the parent of the current transaction. If so,
         // we remove them from the set and then add them back.
         while (parents.size() > 0) {
-            std::unordered_set<TxId, SaltedTxidHasher> worklist(
+            std::unordered_set<TxId, SaltedTxIdHasher> worklist(
                 std::move(parents));
             parents.clear();