diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -281,12 +281,12 @@
 	consensus/merkle.cpp
 	coins.cpp
 	compressor.cpp
-	dstencode.cpp
 	feerate.cpp
 	globals.cpp
 	core_read.cpp
 	core_write.cpp
 	key.cpp
+	key_io.cpp
 	keystore.cpp
 	netaddress.cpp
 	netbase.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -136,7 +136,6 @@
   core_memusage.h \
   cuckoocache.h \
   diskblockpos.h \
-  dstencode.h \
   fs.h \
   globals.h \
   httprpc.h \
@@ -149,6 +148,7 @@
   interfaces/node.h \
   interfaces/wallet.h \
   key.h \
+  key_io.h \
   keystore.h \
   dbwrapper.h \
   limitedmap.h \
@@ -418,12 +418,12 @@
   config.cpp \
   coins.cpp \
   compressor.cpp \
-  dstencode.cpp \
   feerate.cpp \
   globals.cpp \
   core_read.cpp \
   core_write.cpp \
   key.cpp \
+  key_io.cpp \
   keystore.cpp \
   netaddress.cpp \
   netbase.cpp \
diff --git a/src/base58.h b/src/base58.h
--- a/src/base58.h
+++ b/src/base58.h
@@ -16,12 +16,6 @@
 #ifndef BITCOIN_BASE58_H
 #define BITCOIN_BASE58_H
 
-#include <chainparams.h>
-#include <key.h>
-#include <pubkey.h>
-#include <script/standard.h>
-#include <support/allocators/zeroafterfree.h>
-
 #include <string>
 #include <vector>
 
@@ -58,25 +52,12 @@
  * Decode a base58-encoded string (psz) that includes a checksum into a byte
  * vector (vchRet), return true if decoding is successful
  */
-inline bool DecodeBase58Check(const char *psz, std::vector<uint8_t> &vchRet);
+bool DecodeBase58Check(const char *psz, std::vector<uint8_t> &vchRet);
 
 /**
  * Decode a base58-encoded string (str) that includes a checksum into a byte
  * vector (vchRet), return true if decoding is successful
  */
-inline bool DecodeBase58Check(const std::string &str,
-                              std::vector<uint8_t> &vchRet);
-
-CKey DecodeSecret(const std::string &str);
-std::string EncodeSecret(const CKey &key);
-
-CExtKey DecodeExtKey(const std::string &str);
-std::string EncodeExtKey(const CExtKey &extkey);
-CExtPubKey DecodeExtPubKey(const std::string &str);
-std::string EncodeExtPubKey(const CExtPubKey &extpubkey);
-
-std::string EncodeLegacyAddr(const CTxDestination &dest, const CChainParams &);
-CTxDestination DecodeLegacyAddr(const std::string &str,
-                                const CChainParams &params);
+bool DecodeBase58Check(const std::string &str, std::vector<uint8_t> &vchRet);
 
 #endif // BITCOIN_BASE58_H
diff --git a/src/base58.cpp b/src/base58.cpp
--- a/src/base58.cpp
+++ b/src/base58.cpp
@@ -5,18 +5,12 @@
 #include <base58.h>
 
 #include <hash.h>
-#include <script/script.h>
 #include <uint256.h>
 #include <utilstrencodings.h>
 
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/static_visitor.hpp>
-
 #include <cassert>
 #include <cstdint>
 #include <cstring>
-#include <string>
-#include <vector>
 
 /** All alphanumeric characters except for "0", "I", "O", and "l" */
 static const char *pszBase58 =
@@ -155,145 +149,3 @@
 bool DecodeBase58Check(const std::string &str, std::vector<uint8_t> &vchRet) {
     return DecodeBase58Check(str.c_str(), vchRet);
 }
-
-namespace {
-class DestinationEncoder : public boost::static_visitor<std::string> {
-private:
-    const CChainParams &m_params;
-
-public:
-    explicit DestinationEncoder(const CChainParams &params)
-        : m_params(params) {}
-
-    std::string operator()(const CKeyID &id) const {
-        std::vector<uint8_t> data =
-            m_params.Base58Prefix(CChainParams::PUBKEY_ADDRESS);
-        data.insert(data.end(), id.begin(), id.end());
-        return EncodeBase58Check(data);
-    }
-
-    std::string operator()(const CScriptID &id) const {
-        std::vector<uint8_t> data =
-            m_params.Base58Prefix(CChainParams::SCRIPT_ADDRESS);
-        data.insert(data.end(), id.begin(), id.end());
-        return EncodeBase58Check(data);
-    }
-
-    std::string operator()(const CNoDestination &no) const { return ""; }
-};
-
-CTxDestination DecodeLegacyDestination(const std::string &str,
-                                       const CChainParams &params) {
-    std::vector<uint8_t> data;
-    uint160 hash;
-    if (!DecodeBase58Check(str, data)) {
-        return CNoDestination();
-    }
-    // Base58Check decoding
-    const std::vector<uint8_t> &pubkey_prefix =
-        params.Base58Prefix(CChainParams::PUBKEY_ADDRESS);
-    if (data.size() == 20 + pubkey_prefix.size() &&
-        std::equal(pubkey_prefix.begin(), pubkey_prefix.end(), data.begin())) {
-        memcpy(hash.begin(), &data[pubkey_prefix.size()], 20);
-        return CKeyID(hash);
-    }
-    const std::vector<uint8_t> &script_prefix =
-        params.Base58Prefix(CChainParams::SCRIPT_ADDRESS);
-    if (data.size() == 20 + script_prefix.size() &&
-        std::equal(script_prefix.begin(), script_prefix.end(), data.begin())) {
-        memcpy(hash.begin(), &data[script_prefix.size()], 20);
-        return CScriptID(hash);
-    }
-    return CNoDestination();
-}
-} // namespace
-
-CKey DecodeSecret(const std::string &str) {
-    CKey key;
-    std::vector<uint8_t> data;
-    if (DecodeBase58Check(str, data)) {
-        const std::vector<uint8_t> &privkey_prefix =
-            Params().Base58Prefix(CChainParams::SECRET_KEY);
-        if ((data.size() == 32 + privkey_prefix.size() ||
-             (data.size() == 33 + privkey_prefix.size() && data.back() == 1)) &&
-            std::equal(privkey_prefix.begin(), privkey_prefix.end(),
-                       data.begin())) {
-            bool compressed = data.size() == 33 + privkey_prefix.size();
-            key.Set(data.begin() + privkey_prefix.size(),
-                    data.begin() + privkey_prefix.size() + 32, compressed);
-        }
-    }
-    memory_cleanse(data.data(), data.size());
-    return key;
-}
-
-std::string EncodeSecret(const CKey &key) {
-    assert(key.IsValid());
-    std::vector<uint8_t> data = Params().Base58Prefix(CChainParams::SECRET_KEY);
-    data.insert(data.end(), key.begin(), key.end());
-    if (key.IsCompressed()) {
-        data.push_back(1);
-    }
-    std::string ret = EncodeBase58Check(data);
-    memory_cleanse(data.data(), data.size());
-    return ret;
-}
-
-CExtPubKey DecodeExtPubKey(const std::string &str) {
-    CExtPubKey key;
-    std::vector<uint8_t> data;
-    if (DecodeBase58Check(str, data)) {
-        const std::vector<uint8_t> &prefix =
-            Params().Base58Prefix(CChainParams::EXT_PUBLIC_KEY);
-        if (data.size() == BIP32_EXTKEY_SIZE + prefix.size() &&
-            std::equal(prefix.begin(), prefix.end(), data.begin())) {
-            key.Decode(data.data() + prefix.size());
-        }
-    }
-    return key;
-}
-
-std::string EncodeExtPubKey(const CExtPubKey &key) {
-    std::vector<uint8_t> data =
-        Params().Base58Prefix(CChainParams::EXT_PUBLIC_KEY);
-    size_t size = data.size();
-    data.resize(size + BIP32_EXTKEY_SIZE);
-    key.Encode(data.data() + size);
-    std::string ret = EncodeBase58Check(data);
-    return ret;
-}
-
-CExtKey DecodeExtKey(const std::string &str) {
-    CExtKey key;
-    std::vector<uint8_t> data;
-    if (DecodeBase58Check(str, data)) {
-        const std::vector<uint8_t> &prefix =
-            Params().Base58Prefix(CChainParams::EXT_SECRET_KEY);
-        if (data.size() == BIP32_EXTKEY_SIZE + prefix.size() &&
-            std::equal(prefix.begin(), prefix.end(), data.begin())) {
-            key.Decode(data.data() + prefix.size());
-        }
-    }
-    return key;
-}
-
-std::string EncodeExtKey(const CExtKey &key) {
-    std::vector<uint8_t> data =
-        Params().Base58Prefix(CChainParams::EXT_SECRET_KEY);
-    size_t size = data.size();
-    data.resize(size + BIP32_EXTKEY_SIZE);
-    key.Encode(data.data() + size);
-    std::string ret = EncodeBase58Check(data);
-    memory_cleanse(data.data(), data.size());
-    return ret;
-}
-
-std::string EncodeLegacyAddr(const CTxDestination &dest,
-                             const CChainParams &params) {
-    return boost::apply_visitor(DestinationEncoder(params), dest);
-}
-
-CTxDestination DecodeLegacyAddr(const std::string &str,
-                                const CChainParams &params) {
-    return DecodeLegacyDestination(str, params);
-}
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -6,13 +6,12 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <base58.h>
 #include <chainparams.h>
 #include <clientversion.h>
 #include <coins.h>
 #include <consensus/consensus.h>
 #include <core_io.h>
-#include <dstencode.h>
+#include <key_io.h>
 #include <keystore.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
diff --git a/src/core_write.cpp b/src/core_write.cpp
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -5,7 +5,7 @@
 #include <core_io.h>
 
 #include <config.h>
-#include <dstencode.h>
+#include <key_io.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
 #include <script/sigencoding.h>
diff --git a/src/dstencode.h b/src/dstencode.h
deleted file mode 100644
--- a/src/dstencode.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef BITCOIN_DSTENCODE_H
-#define BITCOIN_DSTENCODE_H
-
-// key.h and pubkey.h are not used here, but gcc doesn't want to instantiate
-// CTxDestination if types are unknown
-#include <key.h>
-#include <pubkey.h>
-#include <script/standard.h>
-
-#include <string>
-
-class Config;
-class CChainParams;
-
-std::string EncodeDestination(const CTxDestination &dest, const Config &config);
-CTxDestination DecodeDestination(const std::string &addr, const CChainParams &);
-bool IsValidDestinationString(const std::string &addr,
-                              const CChainParams &params);
-
-#endif // BITCOIN_DSTENCODE_H
diff --git a/src/dstencode.cpp b/src/dstencode.cpp
deleted file mode 100644
--- a/src/dstencode.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2017 The Bitcoin developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include <dstencode.h>
-
-#include <base58.h>
-#include <cashaddrenc.h>
-#include <chainparams.h>
-#include <config.h>
-#include <script/standard.h>
-
-std::string EncodeDestination(const CTxDestination &dest,
-                              const Config &config) {
-    const CChainParams &params = config.GetChainParams();
-    return config.UseCashAddrEncoding() ? EncodeCashAddr(dest, params)
-                                        : EncodeLegacyAddr(dest, params);
-}
-
-CTxDestination DecodeDestination(const std::string &addr,
-                                 const CChainParams &params) {
-    CTxDestination dst = DecodeCashAddr(addr, params);
-    if (IsValidDestination(dst)) {
-        return dst;
-    }
-    return DecodeLegacyAddr(addr, params);
-}
-
-bool IsValidDestinationString(const std::string &addr,
-                              const CChainParams &params) {
-    return IsValidDestination(DecodeDestination(addr, params));
-}
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -4,11 +4,11 @@
 
 #include <httprpc.h>
 
-#include <base58.h>
 #include <chainparams.h>
 #include <config.h>
 #include <crypto/hmac_sha256.h>
 #include <httpserver.h>
+#include <key_io.h>
 #include <random.h>
 #include <rpc/protocol.h>
 #include <rpc/server.h>
diff --git a/src/key_io.h b/src/key_io.h
new file mode 100644
--- /dev/null
+++ b/src/key_io.h
@@ -0,0 +1,36 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_KEY_IO_H
+#define BITCOIN_KEY_IO_H
+
+#include <key.h>
+#include <pubkey.h>
+#include <script/standard.h>
+
+#include <string>
+
+class Config;
+class CChainParams;
+
+CKey DecodeSecret(const std::string &str);
+std::string EncodeSecret(const CKey &key);
+
+CExtKey DecodeExtKey(const std::string &str);
+std::string EncodeExtKey(const CExtKey &extkey);
+CExtPubKey DecodeExtPubKey(const std::string &str);
+std::string EncodeExtPubKey(const CExtPubKey &extpubkey);
+
+std::string EncodeDestination(const CTxDestination &dest, const Config &config);
+CTxDestination DecodeDestination(const std::string &addr, const CChainParams &);
+bool IsValidDestinationString(const std::string &str,
+                              const CChainParams &params);
+
+std::string EncodeLegacyAddr(const CTxDestination &dest,
+                             const CChainParams &params);
+CTxDestination DecodeLegacyAddr(const std::string &str,
+                                const CChainParams &params);
+
+#endif // BITCOIN_KEY_IO_H
diff --git a/src/base58.cpp b/src/key_io.cpp
copy from src/base58.cpp
copy to src/key_io.cpp
--- a/src/base58.cpp
+++ b/src/key_io.cpp
@@ -2,159 +2,21 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <base58.h>
+#include <key_io.h>
 
-#include <hash.h>
+#include <base58.h>
+#include <cashaddrenc.h>
+#include <chainparams.h>
+#include <config.h>
 #include <script/script.h>
-#include <uint256.h>
 #include <utilstrencodings.h>
 
 #include <boost/variant/apply_visitor.hpp>
 #include <boost/variant/static_visitor.hpp>
 
+#include <algorithm>
 #include <cassert>
-#include <cstdint>
 #include <cstring>
-#include <string>
-#include <vector>
-
-/** All alphanumeric characters except for "0", "I", "O", and "l" */
-static const char *pszBase58 =
-    "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
-
-bool DecodeBase58(const char *psz, std::vector<uint8_t> &vch) {
-    // Skip leading spaces.
-    while (*psz && IsSpace(*psz)) {
-        psz++;
-    }
-    // Skip and count leading '1's.
-    int zeroes = 0;
-    int length = 0;
-    while (*psz == '1') {
-        zeroes++;
-        psz++;
-    }
-    // Allocate enough space in big-endian base256 representation.
-    // log(58) / log(256), rounded up.
-    int size = strlen(psz) * 733 / 1000 + 1;
-    std::vector<uint8_t> b256(size);
-    // Process the characters.
-    while (*psz && !IsSpace(*psz)) {
-        // Decode base58 character
-        const char *ch = strchr(pszBase58, *psz);
-        if (ch == nullptr) {
-            return false;
-        }
-        // Apply "b256 = b256 * 58 + ch".
-        int carry = ch - pszBase58;
-        int i = 0;
-        for (std::vector<uint8_t>::reverse_iterator it = b256.rbegin();
-             (carry != 0 || i < length) && (it != b256.rend()); ++it, ++i) {
-            carry += 58 * (*it);
-            *it = carry % 256;
-            carry /= 256;
-        }
-        assert(carry == 0);
-        length = i;
-        psz++;
-    }
-    // Skip trailing spaces.
-    while (IsSpace(*psz)) {
-        psz++;
-    }
-    if (*psz != 0) {
-        return false;
-    }
-    // Skip leading zeroes in b256.
-    std::vector<uint8_t>::iterator it = b256.begin() + (size - length);
-    while (it != b256.end() && *it == 0)
-        it++;
-    // Copy result into output vector.
-    vch.reserve(zeroes + (b256.end() - it));
-    vch.assign(zeroes, 0x00);
-    while (it != b256.end()) {
-        vch.push_back(*(it++));
-    }
-    return true;
-}
-
-std::string EncodeBase58(const uint8_t *pbegin, const uint8_t *pend) {
-    // Skip & count leading zeroes.
-    int zeroes = 0;
-    int length = 0;
-    while (pbegin != pend && *pbegin == 0) {
-        pbegin++;
-        zeroes++;
-    }
-    // Allocate enough space in big-endian base58 representation.
-    // log(256) / log(58), rounded up.
-    int size = (pend - pbegin) * 138 / 100 + 1;
-    std::vector<uint8_t> b58(size);
-    // Process the bytes.
-    while (pbegin != pend) {
-        int carry = *pbegin;
-        int i = 0;
-        // Apply "b58 = b58 * 256 + ch".
-        for (std::vector<uint8_t>::reverse_iterator it = b58.rbegin();
-             (carry != 0 || i < length) && (it != b58.rend()); it++, i++) {
-            carry += 256 * (*it);
-            *it = carry % 58;
-            carry /= 58;
-        }
-
-        assert(carry == 0);
-        length = i;
-        pbegin++;
-    }
-    // Skip leading zeroes in base58 result.
-    std::vector<uint8_t>::iterator it = b58.begin() + (size - length);
-    while (it != b58.end() && *it == 0) {
-        it++;
-    }
-    // Translate the result into a string.
-    std::string str;
-    str.reserve(zeroes + (b58.end() - it));
-    str.assign(zeroes, '1');
-    while (it != b58.end()) {
-        str += pszBase58[*(it++)];
-    }
-    return str;
-}
-
-std::string EncodeBase58(const std::vector<uint8_t> &vch) {
-    return EncodeBase58(vch.data(), vch.data() + vch.size());
-}
-
-bool DecodeBase58(const std::string &str, std::vector<uint8_t> &vchRet) {
-    return DecodeBase58(str.c_str(), vchRet);
-}
-
-std::string EncodeBase58Check(const std::vector<uint8_t> &vchIn) {
-    // add 4-byte hash check to the end
-    std::vector<uint8_t> vch(vchIn);
-    uint256 hash = Hash(vch.begin(), vch.end());
-    vch.insert(vch.end(), (uint8_t *)&hash, (uint8_t *)&hash + 4);
-    return EncodeBase58(vch);
-}
-
-bool DecodeBase58Check(const char *psz, std::vector<uint8_t> &vchRet) {
-    if (!DecodeBase58(psz, vchRet) || (vchRet.size() < 4)) {
-        vchRet.clear();
-        return false;
-    }
-    // re-calculate the checksum, ensure it matches the included 4-byte checksum
-    uint256 hash = Hash(vchRet.begin(), vchRet.end() - 4);
-    if (memcmp(&hash, &vchRet[vchRet.size() - 4], 4) != 0) {
-        vchRet.clear();
-        return false;
-    }
-    vchRet.resize(vchRet.size() - 4);
-    return true;
-}
-
-bool DecodeBase58Check(const std::string &str, std::vector<uint8_t> &vchRet) {
-    return DecodeBase58Check(str.c_str(), vchRet);
-}
 
 namespace {
 class DestinationEncoder : public boost::static_visitor<std::string> {
@@ -162,8 +24,7 @@
     const CChainParams &m_params;
 
 public:
-    explicit DestinationEncoder(const CChainParams &params)
-        : m_params(params) {}
+    DestinationEncoder(const CChainParams &params) : m_params(params) {}
 
     std::string operator()(const CKeyID &id) const {
         std::vector<uint8_t> data =
@@ -179,7 +40,7 @@
         return EncodeBase58Check(data);
     }
 
-    std::string operator()(const CNoDestination &no) const { return ""; }
+    std::string operator()(const CNoDestination &no) const { return {}; }
 };
 
 CTxDestination DecodeLegacyDestination(const std::string &str,
@@ -189,19 +50,27 @@
     if (!DecodeBase58Check(str, data)) {
         return CNoDestination();
     }
-    // Base58Check decoding
+    // base58-encoded Bitcoin addresses.
+    // Public-key-hash-addresses have version 0 (or 111 testnet).
+    // The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is
+    // the serialized public key.
     const std::vector<uint8_t> &pubkey_prefix =
         params.Base58Prefix(CChainParams::PUBKEY_ADDRESS);
-    if (data.size() == 20 + pubkey_prefix.size() &&
+    if (data.size() == hash.size() + pubkey_prefix.size() &&
         std::equal(pubkey_prefix.begin(), pubkey_prefix.end(), data.begin())) {
-        memcpy(hash.begin(), &data[pubkey_prefix.size()], 20);
+        std::copy(data.begin() + pubkey_prefix.size(), data.end(),
+                  hash.begin());
         return CKeyID(hash);
     }
+    // Script-hash-addresses have version 5 (or 196 testnet).
+    // The data vector contains RIPEMD160(SHA256(cscript)), where cscript is
+    // the serialized redemption script.
     const std::vector<uint8_t> &script_prefix =
         params.Base58Prefix(CChainParams::SCRIPT_ADDRESS);
-    if (data.size() == 20 + script_prefix.size() &&
+    if (data.size() == hash.size() + script_prefix.size() &&
         std::equal(script_prefix.begin(), script_prefix.end(), data.begin())) {
-        memcpy(hash.begin(), &data[script_prefix.size()], 20);
+        std::copy(data.begin() + script_prefix.size(), data.end(),
+                  hash.begin());
         return CScriptID(hash);
     }
     return CNoDestination();
@@ -288,6 +157,27 @@
     return ret;
 }
 
+std::string EncodeDestination(const CTxDestination &dest,
+                              const Config &config) {
+    const CChainParams &params = config.GetChainParams();
+    return config.UseCashAddrEncoding() ? EncodeCashAddr(dest, params)
+                                        : EncodeLegacyAddr(dest, params);
+}
+
+CTxDestination DecodeDestination(const std::string &addr,
+                                 const CChainParams &params) {
+    CTxDestination dst = DecodeCashAddr(addr, params);
+    if (IsValidDestination(dst)) {
+        return dst;
+    }
+    return DecodeLegacyAddr(addr, params);
+}
+
+bool IsValidDestinationString(const std::string &str,
+                              const CChainParams &params) {
+    return IsValidDestination(DecodeDestination(str, params));
+}
+
 std::string EncodeLegacyAddr(const CTxDestination &dest,
                              const CChainParams &params) {
     return boost::apply_visitor(DestinationEncoder(params), dest);
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -5,8 +5,8 @@
 #include <qt/addresstablemodel.h>
 
 #include <cashaddrenc.h>
-#include <dstencode.h>
 #include <interfaces/node.h>
+#include <key_io.h>
 #include <qt/guiutil.h>
 #include <qt/walletmodel.h>
 #include <wallet/wallet.h>
diff --git a/src/qt/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp
--- a/src/qt/bitcoinaddressvalidator.cpp
+++ b/src/qt/bitcoinaddressvalidator.cpp
@@ -5,9 +5,8 @@
 
 #include <qt/bitcoinaddressvalidator.h>
 
-#include <cashaddr.h>
 #include <config.h>
-#include <dstencode.h>
+#include <key_io.h>
 
 /* Base58 characters are:
      "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -6,8 +6,8 @@
 #include <qt/forms/ui_coincontroldialog.h>
 
 #include <cashaddrenc.h>
-#include <dstencode.h>
 #include <interfaces/node.h>
+#include <key_io.h>
 #include <policy/policy.h>
 #include <qt/addresstablemodel.h>
 #include <qt/bitcoinunits.h>
@@ -15,7 +15,6 @@
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/walletmodel.h>
-#include <txmempool.h>
 #include <validation.h> // For mempool
 #include <wallet/coincontrol.h>
 #include <wallet/wallet.h>
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -6,9 +6,9 @@
 
 #include <cashaddrenc.h>
 #include <chainparams.h>
-#include <dstencode.h>
 #include <fs.h>
 #include <interfaces/node.h>
+#include <key_io.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <protocol.h>
diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h
--- a/src/qt/paymentrequestplus.h
+++ b/src/qt/paymentrequestplus.h
@@ -10,7 +10,8 @@
 #include <qt/paymentrequest.pb.h>
 #pragma GCC diagnostic pop
 
-#include <base58.h>
+#include <amount.h>
+#include <script/script.h>
 
 #include <openssl/x509.h>
 
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -8,6 +8,7 @@
 
 #include <qt/paymentrequestplus.h>
 
+#include <script/script.h>
 #include <util.h>
 
 #include <openssl/x509_vfy.h>
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -6,8 +6,8 @@
 
 #include <cashaddrenc.h>
 #include <chainparams.h>
-#include <dstencode.h>
 #include <interfaces/node.h>
+#include <key_io.h>
 #include <policy/policy.h>
 #include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -6,8 +6,8 @@
 #include <qt/sendcoinsdialog.h>
 
 #include <chainparams.h>
-#include <dstencode.h>
 #include <interfaces/node.h>
+#include <key_io.h>
 #include <qt/addresstablemodel.h>
 #include <qt/bitcoinunits.h>
 #include <qt/clientmodel.h>
@@ -16,7 +16,6 @@
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/sendcoinsentry.h>
-#include <qt/walletmodel.h>
 #include <txmempool.h>
 #include <ui_interface.h>
 #include <wallet/coincontrol.h>
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -5,8 +5,8 @@
 #include <qt/forms/ui_signverifymessagedialog.h>
 #include <qt/signverifymessagedialog.h>
 
-#include <dstencode.h>
 #include <init.h>
+#include <key_io.h>
 #include <qt/addressbookpage.h>
 #include <qt/guiutil.h>
 #include <qt/platformstyle.h>
diff --git a/src/qt/test/guiutiltests.cpp b/src/qt/test/guiutiltests.cpp
--- a/src/qt/test/guiutiltests.cpp
+++ b/src/qt/test/guiutiltests.cpp
@@ -6,7 +6,7 @@
 
 #include <chainparams.h>
 #include <config.h>
-#include <dstencode.h>
+#include <key_io.h>
 #include <qt/guiutil.h>
 
 namespace {
diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp
--- a/src/qt/test/paymentservertests.cpp
+++ b/src/qt/test/paymentservertests.cpp
@@ -12,7 +12,6 @@
 #include <script/standard.h>
 #include <util.h>
 #include <utilstrencodings.h>
-
 #include <qt/test/paymentrequestdata.h>
 
 #include <openssl/x509.h>
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -3,8 +3,8 @@
 #include <cashaddrenc.h>
 #include <chain.h>
 #include <chainparams.h>
-#include <dstencode.h>
 #include <interfaces/node.h>
+#include <key_io.h>
 #include <qt/bitcoinamountfield.h>
 #include <qt/optionsmodel.h>
 #include <qt/overviewpage.h>
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -7,8 +7,8 @@
 #include <cashaddrenc.h>
 #include <chain.h>
 #include <consensus/consensus.h>
-#include <dstencode.h>
 #include <interfaces/node.h>
+#include <key_io.h>
 #include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
 #include <qt/paymentserver.h>
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -5,11 +5,11 @@
 #include <qt/transactionrecord.h>
 
 #include <cashaddrenc.h>
-#include <chain.h>
+#include <chain.h>       // For MAX_BLOCK_TIME_GAP
 #include <chainparams.h> // For Params()
 #include <consensus/consensus.h>
-#include <dstencode.h>
 #include <interfaces/wallet.h>
+#include <key_io.h>
 #include <timedata.h>
 #include <validation.h>
 #include <wallet/finaltx.h>
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -5,9 +5,9 @@
 #include <qt/walletmodel.h>
 
 #include <cashaddrenc.h>
-#include <dstencode.h>
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
+#include <key_io.h>
 #include <qt/addresstablemodel.h>
 #include <qt/guiconstants.h>
 #include <qt/paymentserver.h>
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -12,8 +12,8 @@
 #include <consensus/params.h>
 #include <consensus/validation.h>
 #include <core_io.h>
-#include <dstencode.h>
 #include <init.h>
+#include <key_io.h>
 #include <miner.h>
 #include <net.h>
 #include <policy/policy.h>
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -3,13 +3,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <base58.h>
 #include <chain.h>
 #include <clientversion.h>
 #include <config.h>
 #include <core_io.h>
-#include <dstencode.h>
 #include <init.h>
+#include <key_io.h>
 #include <net.h>
 #include <netbase.h>
 #include <rpc/blockchain.h>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -3,15 +3,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <base58.h>
 #include <chain.h>
 #include <coins.h>
 #include <config.h>
 #include <consensus/validation.h>
 #include <core_io.h>
-#include <dstencode.h>
 #include <index/txindex.h>
 #include <init.h>
+#include <key_io.h>
 #include <keystore.h>
 #include <merkleblock.h>
 #include <net.h>
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -6,10 +6,10 @@
 
 #include <rpc/server.h>
 
-#include <base58.h>
 #include <config.h>
 #include <fs.h>
 #include <init.h>
+#include <key_io.h>
 #include <random.h>
 #include <sync.h>
 #include <ui_interface.h>
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -2,8 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <base58.h>
-#include <dstencode.h>
+#include <key_io.h>
 #include <keystore.h>
 #include <pubkey.h>
 #include <rpc/protocol.h>
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -4,7 +4,9 @@
 
 #include <base58.h>
 
+#include <chainparams.h> // For Params()
 #include <key.h>
+#include <key_io.h>
 #include <script/script.h>
 #include <uint256.h>
 #include <util.h>
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -2,9 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <base58.h>
 #include <clientversion.h>
 #include <key.h>
+#include <key_io.h>
 #include <streams.h>
 #include <uint256.h>
 #include <util.h>
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -4,10 +4,10 @@
 
 #include <bloom.h>
 
-#include <base58.h>
 #include <clientversion.h>
 #include <consensus/merkle.h>
 #include <key.h>
+#include <key_io.h>
 #include <merkleblock.h>
 #include <random.h>
 #include <serialize.h>
diff --git a/src/test/dstencode_tests.cpp b/src/test/dstencode_tests.cpp
--- a/src/test/dstencode_tests.cpp
+++ b/src/test/dstencode_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <dstencode.h>
+#include <key_io.h>
 
 #include <chainparams.h>
 #include <config.h>
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
--- a/src/test/key_tests.cpp
+++ b/src/test/key_tests.cpp
@@ -4,8 +4,8 @@
 
 #include <key.h>
 
-#include <base58.h>
-#include <dstencode.h>
+#include <chainparams.h> // For Params()
+#include <key_io.h>
 #include <script/script.h>
 #include <uint256.h>
 #include <util.h>
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -5,9 +5,9 @@
 #include <rpc/client.h>
 #include <rpc/server.h>
 
-#include <base58.h>
 #include <config.h>
 #include <core_io.h>
+#include <key_io.h>
 #include <netbase.h>
 
 #include <test/test_bitcoin.h>
diff --git a/src/test/sigcache_tests.cpp b/src/test/sigcache_tests.cpp
--- a/src/test/sigcache_tests.cpp
+++ b/src/test/sigcache_tests.cpp
@@ -6,9 +6,8 @@
 
 #include <script/sigcache.h>
 
-#include <base58.h>
-#include <dstencode.h>
 #include <key.h>
+#include <key_io.h>
 #include <streams.h>
 #include <tinyformat.h>
 #include <utilstrencodings.h>
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -2,12 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <base58.h>
 #include <chain.h>
 #include <config.h>
 #include <core_io.h>
-#include <dstencode.h>
 #include <init.h>
+#include <key_io.h>
 #include <merkleblock.h>
 #include <rpc/server.h>
 #include <script/script.h>
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -9,7 +9,7 @@
 #include <config.h>
 #include <consensus/validation.h>
 #include <core_io.h>
-#include <dstencode.h>
+#include <key_io.h>
 #include <net.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -10,10 +10,10 @@
 #include <config.h>
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
-#include <dstencode.h>
 #include <fs.h>
 #include <init.h>
 #include <key.h>
+#include <key_io.h>
 #include <keystore.h>
 #include <net.h>
 #include <policy/policy.h>
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -6,11 +6,11 @@
 
 #include <wallet/walletdb.h>
 
-#include <base58.h>
+#include <chainparams.h>
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
-#include <dstencode.h>
 #include <fs.h>
+#include <key_io.h>
 #include <protocol.h>
 #include <serialize.h>
 #include <sync.h>