diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -404,6 +404,7 @@
 	netbase.cpp
 	primitives/block.cpp
 	protocol.cpp
+	psbt.cpp
 	scheduler.cpp
 	versionbitsinfo.cpp
 	warnings.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -177,6 +177,7 @@
   policy/policy.h \
   pow.h \
   protocol.h \
+  psbt.h \
   radix.h \
   random.h \
   rcu.h \
@@ -234,6 +235,7 @@
   wallet/finaltx.h \
   wallet/rpcdump.h \
   wallet/fees.h \
+  wallet/psbtwallet.h \
   wallet/rpcwallet.h \
   wallet/wallet.h \
   wallet/walletdb.h \
@@ -343,6 +345,7 @@
   wallet/finaltx.cpp \
   wallet/fees.cpp \
   wallet/init.cpp \
+  wallet/psbtwallet.cpp \
   wallet/rpcdump.cpp \
   wallet/rpcwallet.cpp \
   wallet/wallet.cpp \
@@ -464,6 +467,7 @@
   netaddress.cpp \
   netbase.cpp \
   protocol.cpp \
+  psbt.cpp \
   scheduler.cpp \
   script/descriptor.cpp \
   script/ismine.cpp \
diff --git a/src/core_read.cpp b/src/core_read.cpp
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -6,6 +6,7 @@
 
 #include <primitives/block.h>
 #include <primitives/transaction.h>
+#include <psbt.h>
 #include <script/script.h>
 #include <script/sign.h>
 #include <serialize.h>
diff --git a/src/script/sign.h b/src/psbt.h
copy from src/script/sign.h
copy to src/psbt.h
--- a/src/script/sign.h
+++ b/src/psbt.h
@@ -1,139 +1,14 @@
-// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Copyright (c) 2009-2018 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_SCRIPT_SIGN_H
-#define BITCOIN_SCRIPT_SIGN_H
+#ifndef BITCOIN_PSBT_H
+#define BITCOIN_PSBT_H
 
-#include <hash.h>
+#include <attributes.h>
+#include <primitives/transaction.h>
 #include <pubkey.h>
-#include <script/interpreter.h>
-#include <script/sighashtype.h>
-#include <streams.h>
-
-#include <boost/optional.hpp>
-
-class CKey;
-class CKeyID;
-class CMutableTransaction;
-class CScript;
-class CScriptID;
-class CTransaction;
-
-struct KeyOriginInfo {
-    uint8_t fingerprint[4];
-    std::vector<uint32_t> path;
-};
-
-/** An interface to be implemented by keystores that support signing. */
-class SigningProvider {
-public:
-    virtual ~SigningProvider() {}
-    virtual bool GetCScript(const CScriptID &scriptid, CScript &script) const {
-        return false;
-    }
-    virtual bool GetPubKey(const CKeyID &address, CPubKey &pubkey) const {
-        return false;
-    }
-    virtual bool GetKey(const CKeyID &address, CKey &key) const {
-        return false;
-    }
-    virtual bool GetKeyOrigin(const CKeyID &id, KeyOriginInfo &info) const {
-        return false;
-    }
-};
-
-extern const SigningProvider &DUMMY_SIGNING_PROVIDER;
-
-class HidingSigningProvider : public SigningProvider {
-private:
-    const bool m_hide_secret;
-    const bool m_hide_origin;
-    const SigningProvider *m_provider;
-
-public:
-    HidingSigningProvider(const SigningProvider *provider, bool hide_secret,
-                          bool hide_origin)
-        : m_hide_secret(hide_secret), m_hide_origin(hide_origin),
-          m_provider(provider) {}
-    bool GetCScript(const CScriptID &scriptid, CScript &script) const override;
-    bool GetPubKey(const CKeyID &keyid, CPubKey &pubkey) const override;
-    bool GetKey(const CKeyID &keyid, CKey &key) const override;
-    bool GetKeyOrigin(const CKeyID &keyid, KeyOriginInfo &info) const override;
-};
-
-struct FlatSigningProvider final : public SigningProvider {
-    std::map<CScriptID, CScript> scripts;
-    std::map<CKeyID, CPubKey> pubkeys;
-    std::map<CKeyID, CKey> keys;
-
-    bool GetCScript(const CScriptID &scriptid, CScript &script) const override;
-    bool GetPubKey(const CKeyID &keyid, CPubKey &pubkey) const override;
-    bool GetKey(const CKeyID &keyid, CKey &key) const override;
-};
-
-FlatSigningProvider Merge(const FlatSigningProvider &a,
-                          const FlatSigningProvider &b);
-
-/** Interface for signature creators. */
-class BaseSignatureCreator {
-public:
-    virtual ~BaseSignatureCreator() {}
-    virtual const BaseSignatureChecker &Checker() const = 0;
-
-    /** Create a singular (non-script) signature. */
-    virtual bool CreateSig(const SigningProvider &provider,
-                           std::vector<uint8_t> &vchSig, const CKeyID &keyid,
-                           const CScript &scriptCode) const = 0;
-};
-
-/** A signature creator for transactions. */
-class MutableTransactionSignatureCreator : public BaseSignatureCreator {
-    const CMutableTransaction *txTo;
-    unsigned int nIn;
-    Amount amount;
-    SigHashType sigHashType;
-    const MutableTransactionSignatureChecker checker;
-
-public:
-    MutableTransactionSignatureCreator(
-        const CMutableTransaction *txToIn, unsigned int nInIn,
-        const Amount &amountIn, SigHashType sigHashTypeIn = SigHashType());
-    const BaseSignatureChecker &Checker() const override { return checker; }
-    bool CreateSig(const SigningProvider &provider,
-                   std::vector<uint8_t> &vchSig, const CKeyID &keyid,
-                   const CScript &scriptCode) const override;
-};
-
-/** A signature creator that just produces 71-byte empty signatures. */
-extern const BaseSignatureCreator &DUMMY_SIGNATURE_CREATOR;
-/** A signature creator that just produces 72-byte empty signatures. */
-extern const BaseSignatureCreator &DUMMY_MAXIMUM_SIGNATURE_CREATOR;
-
-typedef std::pair<CPubKey, std::vector<uint8_t>> SigPair;
-
-// This struct contains information from a transaction input and also contains
-// signatures for that input. The information contained here can be used to
-// create a signature and is also filled by ProduceSignature in order to
-// construct final scriptSigs.
-struct SignatureData {
-    /// Stores whether the scriptSig are complete.
-    bool complete = false;
-    /// The scriptSig of an input. Contains complete signatures or the
-    /// traditional partial signatures format.
-    CScript scriptSig;
-    /// The redeemScript (if any) for the input.
-    CScript redeem_script;
-    /// BIP 174 style partial signatures for the input. May contain all
-    /// signatures necessary for producing a final scriptSig.
-    std::map<CKeyID, SigPair> signatures;
-    std::map<CKeyID, std::pair<CPubKey, KeyOriginInfo>> misc_pubkeys;
-
-    SignatureData() {}
-    explicit SignatureData(const CScript &script) : scriptSig(script) {}
-    void MergeSignatureData(SignatureData sigdata);
-};
+#include <script/sign.h>
 
 // Magic bytes
 static constexpr uint8_t PSBT_MAGIC_BYTES[5] = {'p', 's', 'b', 't', 0xff};
@@ -158,83 +33,6 @@
 // The separator has no value.
 static constexpr uint8_t PSBT_SEPARATOR = 0x00;
 
-// Takes a stream and multiple arguments and serializes them as if first
-// serialized into a vector and then into the stream. The resulting output into
-// the stream has the total serialized length of all of the objects followed by
-// all objects concatenated with each other.
-template <typename Stream, typename... X>
-void SerializeToVector(Stream &s, const X &... args) {
-    WriteCompactSize(s, GetSerializeSizeMany(s.GetVersion(), args...));
-    SerializeMany(s, args...);
-}
-
-// Takes a stream and multiple arguments and unserializes them first as a vector
-// then each object individually in the order provided in the arguments.
-template <typename Stream, typename... X>
-void UnserializeFromVector(Stream &s, X &... args) {
-    size_t expected_size = ReadCompactSize(s);
-    size_t remaining_before = s.size();
-    UnserializeMany(s, args...);
-    size_t remaining_after = s.size();
-    if (remaining_after + expected_size != remaining_before) {
-        throw std::ios_base::failure("Size of value was not the stated size");
-    }
-}
-
-// Deserialize HD keypaths into a map
-template <typename Stream>
-void DeserializeHDKeypaths(Stream &s, const std::vector<uint8_t> &key,
-                           std::map<CPubKey, KeyOriginInfo> &hd_keypaths) {
-    // Make sure that the key is the size of pubkey + 1
-    if (key.size() != CPubKey::PUBLIC_KEY_SIZE + 1 &&
-        key.size() != CPubKey::COMPRESSED_PUBLIC_KEY_SIZE + 1) {
-        throw std::ios_base::failure(
-            "Size of key was not the expected size for the type BIP32 keypath");
-    }
-    // Read in the pubkey from key
-    CPubKey pubkey(key.begin() + 1, key.end());
-    if (!pubkey.IsFullyValid()) {
-        throw std::ios_base::failure("Invalid pubkey");
-    }
-    if (hd_keypaths.count(pubkey) > 0) {
-        throw std::ios_base::failure(
-            "Duplicate Key, pubkey derivation path already provided");
-    }
-
-    // Read in key path
-    uint64_t value_len = ReadCompactSize(s);
-    if (value_len % 4 || value_len == 0) {
-        throw std::ios_base::failure("Invalid length for HD key path");
-    }
-
-    KeyOriginInfo keypath;
-    s >> keypath.fingerprint;
-    for (unsigned int i = 4; i < value_len; i += sizeof(uint32_t)) {
-        uint32_t index;
-        s >> index;
-        keypath.path.push_back(index);
-    }
-
-    // Add to map
-    hd_keypaths.emplace(pubkey, std::move(keypath));
-}
-
-// Serialize HD keypaths to a stream from a map
-template <typename Stream>
-void SerializeHDKeypaths(Stream &s,
-                         const std::map<CPubKey, KeyOriginInfo> &hd_keypaths,
-                         uint8_t type) {
-    for (auto keypath_pair : hd_keypaths) {
-        SerializeToVector(s, type, MakeSpan(keypath_pair.first));
-        WriteCompactSize(s, (keypath_pair.second.path.size() + 1) *
-                                sizeof(uint32_t));
-        s << keypath_pair.second.fingerprint;
-        for (const auto &path : keypath_pair.second.path) {
-            s << path;
-        }
-    }
-}
-
 /** A structure for PSBTs which contain per-input information */
 struct PSBTInput {
     CTxOut utxo;
@@ -673,19 +471,6 @@
     }
 };
 
-/** Produce a script signature using a generic signature creator. */
-bool ProduceSignature(const SigningProvider &provider,
-                      const BaseSignatureCreator &creator,
-                      const CScript &scriptPubKey, SignatureData &sigdata);
-
-/** Produce a script signature for a transaction. */
-bool SignSignature(const SigningProvider &provider, const CScript &fromPubKey,
-                   CMutableTransaction &txTo, unsigned int nIn,
-                   const Amount amount, SigHashType sigHashType);
-bool SignSignature(const SigningProvider &provider, const CTransaction &txFrom,
-                   CMutableTransaction &txTo, unsigned int nIn,
-                   SigHashType sigHashType);
-
 /** Checks whether a PSBTInput is already signed. */
 bool PSBTInputSigned(PSBTInput &input);
 
@@ -697,17 +482,4 @@
                    PartiallySignedTransaction &psbt, int index,
                    SigHashType sighash = SigHashType());
 
-/** Extract signature data from a transaction input, and insert it. */
-SignatureData DataFromTransaction(const CMutableTransaction &tx,
-                                  unsigned int nIn, const CTxOut &txout);
-void UpdateInput(CTxIn &input, const SignatureData &data);
-
-/**
- * Check whether we know how to sign for an output like this, assuming we have
- * all private keys. While this function does not need private keys, the passed
- * keystore is used to look up public keys and redeemscripts by hash.
- * Solvability is unrelated to whether we consider this output to be ours.
- */
-bool IsSolvable(const SigningProvider &provider, const CScript &script);
-
-#endif // BITCOIN_SCRIPT_SIGN_H
+#endif // BITCOIN_PSBT_H
diff --git a/src/psbt.cpp b/src/psbt.cpp
new file mode 100644
--- /dev/null
+++ b/src/psbt.cpp
@@ -0,0 +1,171 @@
+// Copyright (c) 2009-2018 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <psbt.h>
+#include <util/strencodings.h>
+
+PartiallySignedTransaction::PartiallySignedTransaction(const CTransaction &txIn)
+    : tx(txIn) {
+    inputs.resize(txIn.vin.size());
+    outputs.resize(txIn.vout.size());
+}
+
+bool PartiallySignedTransaction::IsNull() const {
+    return !tx && inputs.empty() && outputs.empty() && unknown.empty();
+}
+
+void PartiallySignedTransaction::Merge(const PartiallySignedTransaction &psbt) {
+    for (size_t i = 0; i < inputs.size(); ++i) {
+        inputs[i].Merge(psbt.inputs[i]);
+    }
+    for (size_t i = 0; i < outputs.size(); ++i) {
+        outputs[i].Merge(psbt.outputs[i]);
+    }
+    unknown.insert(psbt.unknown.begin(), psbt.unknown.end());
+}
+
+bool PartiallySignedTransaction::IsSane() const {
+    for (PSBTInput input : inputs) {
+        if (!input.IsSane()) {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool PSBTInput::IsNull() const {
+    return utxo.IsNull() && partial_sigs.empty() && unknown.empty() &&
+           hd_keypaths.empty() && redeem_script.empty();
+}
+
+void PSBTInput::FillSignatureData(SignatureData &sigdata) const {
+    if (!final_script_sig.empty()) {
+        sigdata.scriptSig = final_script_sig;
+        sigdata.complete = true;
+    }
+    if (sigdata.complete) {
+        return;
+    }
+
+    sigdata.signatures.insert(partial_sigs.begin(), partial_sigs.end());
+    if (!redeem_script.empty()) {
+        sigdata.redeem_script = redeem_script;
+    }
+    for (const auto &key_pair : hd_keypaths) {
+        sigdata.misc_pubkeys.emplace(key_pair.first.GetID(), key_pair);
+    }
+}
+
+void PSBTInput::FromSignatureData(const SignatureData &sigdata) {
+    if (sigdata.complete) {
+        partial_sigs.clear();
+        hd_keypaths.clear();
+        redeem_script.clear();
+
+        if (!sigdata.scriptSig.empty()) {
+            final_script_sig = sigdata.scriptSig;
+        }
+        return;
+    }
+
+    partial_sigs.insert(sigdata.signatures.begin(), sigdata.signatures.end());
+    if (redeem_script.empty() && !sigdata.redeem_script.empty()) {
+        redeem_script = sigdata.redeem_script;
+    }
+    for (const auto &entry : sigdata.misc_pubkeys) {
+        hd_keypaths.emplace(entry.second);
+    }
+}
+
+void PSBTInput::Merge(const PSBTInput &input) {
+    if (utxo.IsNull() && !input.utxo.IsNull()) {
+        utxo = input.utxo;
+    }
+
+    partial_sigs.insert(input.partial_sigs.begin(), input.partial_sigs.end());
+    hd_keypaths.insert(input.hd_keypaths.begin(), input.hd_keypaths.end());
+    unknown.insert(input.unknown.begin(), input.unknown.end());
+
+    if (redeem_script.empty() && !input.redeem_script.empty()) {
+        redeem_script = input.redeem_script;
+    }
+    if (final_script_sig.empty() && !input.final_script_sig.empty()) {
+        final_script_sig = input.final_script_sig;
+    }
+}
+
+bool PSBTInput::IsSane() const {
+    return true;
+}
+
+void PSBTOutput::FillSignatureData(SignatureData &sigdata) const {
+    if (!redeem_script.empty()) {
+        sigdata.redeem_script = redeem_script;
+    }
+    for (const auto &key_pair : hd_keypaths) {
+        sigdata.misc_pubkeys.emplace(key_pair.first.GetID(), key_pair);
+    }
+}
+
+void PSBTOutput::FromSignatureData(const SignatureData &sigdata) {
+    if (redeem_script.empty() && !sigdata.redeem_script.empty()) {
+        redeem_script = sigdata.redeem_script;
+    }
+    for (const auto &entry : sigdata.misc_pubkeys) {
+        hd_keypaths.emplace(entry.second);
+    }
+}
+
+bool PSBTOutput::IsNull() const {
+    return redeem_script.empty() && hd_keypaths.empty() && unknown.empty();
+}
+
+void PSBTOutput::Merge(const PSBTOutput &output) {
+    hd_keypaths.insert(output.hd_keypaths.begin(), output.hd_keypaths.end());
+    unknown.insert(output.unknown.begin(), output.unknown.end());
+
+    if (redeem_script.empty() && !output.redeem_script.empty()) {
+        redeem_script = output.redeem_script;
+    }
+}
+
+bool PSBTInputSigned(PSBTInput &input) {
+    return !input.final_script_sig.empty();
+}
+
+bool SignPSBTInput(const SigningProvider &provider,
+                   PartiallySignedTransaction &psbt, int index,
+                   SigHashType sighash) {
+    PSBTInput &input = psbt.inputs.at(index);
+    const CMutableTransaction &tx = *psbt.tx;
+
+    if (PSBTInputSigned(input)) {
+        return true;
+    }
+
+    // Fill SignatureData with input info
+    SignatureData sigdata;
+    input.FillSignatureData(sigdata);
+
+    // Get UTXO
+    CTxOut utxo;
+
+    // Verify input sanity
+    if (!input.IsSane()) {
+        return false;
+    }
+
+    if (input.utxo.IsNull()) {
+        return false;
+    }
+
+    utxo = input.utxo;
+    MutableTransactionSignatureCreator creator(&tx, index, utxo.nValue,
+                                               sighash);
+    bool sig_complete =
+        ProduceSignature(provider, creator, utxo.scriptPubKey, sigdata);
+    input.FromSignatureData(sigdata);
+
+    return sig_complete;
+}
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -18,6 +18,7 @@
 #include <node/transaction.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
+#include <psbt.h>
 #include <rpc/rawtransaction.h>
 #include <rpc/server.h>
 #include <rpc/util.h>
diff --git a/src/script/sign.h b/src/script/sign.h
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -135,29 +135,6 @@
     void MergeSignatureData(SignatureData sigdata);
 };
 
-// Magic bytes
-static constexpr uint8_t PSBT_MAGIC_BYTES[5] = {'p', 's', 'b', 't', 0xff};
-
-// Global types
-static constexpr uint8_t PSBT_GLOBAL_UNSIGNED_TX = 0x00;
-
-// Input types
-static constexpr uint8_t PSBT_IN_UTXO = 0x00;
-static constexpr uint8_t PSBT_IN_PARTIAL_SIG = 0x02;
-static constexpr uint8_t PSBT_IN_SIGHASH = 0x03;
-static constexpr uint8_t PSBT_IN_REDEEMSCRIPT = 0x04;
-static constexpr uint8_t PSBT_IN_BIP32_DERIVATION = 0x06;
-static constexpr uint8_t PSBT_IN_SCRIPTSIG = 0x07;
-
-// Output types
-static constexpr uint8_t PSBT_OUT_REDEEMSCRIPT = 0x00;
-static constexpr uint8_t PSBT_OUT_BIP32_DERIVATION = 0x02;
-
-// The separator is 0x00. Reading this in means that the unserializer can
-// interpret it as a 0 length key which indicates that this is the separator.
-// The separator has no value.
-static constexpr uint8_t PSBT_SEPARATOR = 0x00;
-
 // Takes a stream and multiple arguments and serializes them as if first
 // serialized into a vector and then into the stream. The resulting output into
 // the stream has the total serialized length of all of the objects followed by
@@ -235,444 +212,6 @@
     }
 }
 
-/** A structure for PSBTs which contain per-input information */
-struct PSBTInput {
-    CTxOut utxo;
-    CScript redeem_script;
-    CScript final_script_sig;
-    std::map<CPubKey, KeyOriginInfo> hd_keypaths;
-    std::map<CKeyID, SigPair> partial_sigs;
-    std::map<std::vector<uint8_t>, std::vector<uint8_t>> unknown;
-    SigHashType sighash_type = SigHashType(0);
-
-    bool IsNull() const;
-    void FillSignatureData(SignatureData &sigdata) const;
-    void FromSignatureData(const SignatureData &sigdata);
-    void Merge(const PSBTInput &input);
-    bool IsSane() const;
-    PSBTInput() {}
-
-    template <typename Stream> inline void Serialize(Stream &s) const {
-        // Write the utxo
-        if (!utxo.IsNull()) {
-            SerializeToVector(s, PSBT_IN_UTXO);
-            SerializeToVector(s, utxo);
-        }
-
-        if (final_script_sig.empty()) {
-            // Write any partial signatures
-            for (auto sig_pair : partial_sigs) {
-                SerializeToVector(s, PSBT_IN_PARTIAL_SIG,
-                                  MakeSpan(sig_pair.second.first));
-                s << sig_pair.second.second;
-            }
-
-            // Write the sighash type
-            if (sighash_type.getRawSigHashType() != 0) {
-                SerializeToVector(s, PSBT_IN_SIGHASH);
-                SerializeToVector(s, sighash_type);
-            }
-
-            // Write the redeem script
-            if (!redeem_script.empty()) {
-                SerializeToVector(s, PSBT_IN_REDEEMSCRIPT);
-                s << redeem_script;
-            }
-
-            // Write any hd keypaths
-            SerializeHDKeypaths(s, hd_keypaths, PSBT_IN_BIP32_DERIVATION);
-        }
-
-        // Write script sig
-        if (!final_script_sig.empty()) {
-            SerializeToVector(s, PSBT_IN_SCRIPTSIG);
-            s << final_script_sig;
-        }
-
-        // Write unknown things
-        for (auto &entry : unknown) {
-            s << entry.first;
-            s << entry.second;
-        }
-
-        s << PSBT_SEPARATOR;
-    }
-
-    template <typename Stream> inline void Unserialize(Stream &s) {
-        // Read loop
-        while (!s.empty()) {
-            // Read
-            std::vector<uint8_t> key;
-            s >> key;
-
-            // the key is empty if that was actually a separator byte
-            // This is a special case for key lengths 0 as those are not allowed
-            // (except for separator)
-            if (key.empty()) {
-                return;
-            }
-
-            // First byte of key is the type
-            uint8_t type = key[0];
-
-            // Do stuff based on type
-            switch (type) {
-                case PSBT_IN_UTXO:
-                    if (!utxo.IsNull()) {
-                        throw std::ios_base::failure(
-                            "Duplicate Key, input utxo already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure(
-                            "utxo key is more than one byte type");
-                    }
-                    UnserializeFromVector(s, utxo);
-                    break;
-                case PSBT_IN_PARTIAL_SIG: {
-                    // Make sure that the key is the size of pubkey + 1
-                    if (key.size() != CPubKey::PUBLIC_KEY_SIZE + 1 &&
-                        key.size() != CPubKey::COMPRESSED_PUBLIC_KEY_SIZE + 1) {
-                        throw std::ios_base::failure(
-                            "Size of key was not the expected size for the "
-                            "type partial signature pubkey");
-                    }
-                    // Read in the pubkey from key
-                    CPubKey pubkey(key.begin() + 1, key.end());
-                    if (!pubkey.IsFullyValid()) {
-                        throw std::ios_base::failure("Invalid pubkey");
-                    }
-                    if (partial_sigs.count(pubkey.GetID()) > 0) {
-                        throw std::ios_base::failure(
-                            "Duplicate Key, input partial signature for pubkey "
-                            "already provided");
-                    }
-
-                    // Read in the signature from value
-                    std::vector<uint8_t> sig;
-                    s >> sig;
-
-                    // Add to list
-                    partial_sigs.emplace(pubkey.GetID(),
-                                         SigPair(pubkey, std::move(sig)));
-                    break;
-                }
-                case PSBT_IN_SIGHASH:
-                    if (sighash_type.getRawSigHashType() != 0) {
-                        throw std::ios_base::failure(
-                            "Duplicate Key, input sighash type already "
-                            "provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure(
-                            "Sighash type key is more than one byte type");
-                    }
-                    UnserializeFromVector(s, sighash_type);
-                    break;
-                case PSBT_IN_REDEEMSCRIPT: {
-                    if (!redeem_script.empty()) {
-                        throw std::ios_base::failure(
-                            "Duplicate Key, input redeemScript already "
-                            "provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure(
-                            "Input redeemScript key is more than one byte "
-                            "type");
-                    }
-                    s >> redeem_script;
-                    break;
-                }
-                case PSBT_IN_BIP32_DERIVATION: {
-                    DeserializeHDKeypaths(s, key, hd_keypaths);
-                    break;
-                }
-                case PSBT_IN_SCRIPTSIG: {
-                    if (!final_script_sig.empty()) {
-                        throw std::ios_base::failure(
-                            "Duplicate Key, input final scriptSig already "
-                            "provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure(
-                            "Final scriptSig key is more than one byte type");
-                    }
-                    s >> final_script_sig;
-                    break;
-                }
-                // Unknown stuff
-                default:
-                    if (unknown.count(key) > 0) {
-                        throw std::ios_base::failure(
-                            "Duplicate Key, key for unknown value already "
-                            "provided");
-                    }
-                    // Read in the value
-                    std::vector<uint8_t> val_bytes;
-                    s >> val_bytes;
-                    unknown.emplace(std::move(key), std::move(val_bytes));
-                    break;
-            }
-        }
-    }
-
-    template <typename Stream> PSBTInput(deserialize_type, Stream &s) {
-        Unserialize(s);
-    }
-};
-
-/** A structure for PSBTs which contains per output information */
-struct PSBTOutput {
-    CScript redeem_script;
-    std::map<CPubKey, KeyOriginInfo> hd_keypaths;
-    std::map<std::vector<uint8_t>, std::vector<uint8_t>> unknown;
-
-    bool IsNull() const;
-    void FillSignatureData(SignatureData &sigdata) const;
-    void FromSignatureData(const SignatureData &sigdata);
-    void Merge(const PSBTOutput &output);
-    bool IsSane() const;
-    PSBTOutput() {}
-
-    template <typename Stream> inline void Serialize(Stream &s) const {
-        // Write the redeem script
-        if (!redeem_script.empty()) {
-            SerializeToVector(s, PSBT_OUT_REDEEMSCRIPT);
-            s << redeem_script;
-        }
-
-        // Write any hd keypaths
-        SerializeHDKeypaths(s, hd_keypaths, PSBT_OUT_BIP32_DERIVATION);
-
-        // Write unknown things
-        for (auto &entry : unknown) {
-            s << entry.first;
-            s << entry.second;
-        }
-
-        s << PSBT_SEPARATOR;
-    }
-
-    template <typename Stream> inline void Unserialize(Stream &s) {
-        // Read loop
-        while (!s.empty()) {
-            // Read
-            std::vector<uint8_t> key;
-            s >> key;
-
-            // the key is empty if that was actually a separator byte
-            // This is a special case for key lengths 0 as those are not allowed
-            // (except for separator)
-            if (key.empty()) {
-                return;
-            }
-
-            // First byte of key is the type
-            uint8_t type = key[0];
-
-            // Do stuff based on type
-            switch (type) {
-                case PSBT_OUT_REDEEMSCRIPT: {
-                    if (!redeem_script.empty()) {
-                        throw std::ios_base::failure(
-                            "Duplicate Key, output redeemScript already "
-                            "provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure(
-                            "Output redeemScript key is more than one byte "
-                            "type");
-                    }
-                    s >> redeem_script;
-                    break;
-                }
-                case PSBT_OUT_BIP32_DERIVATION: {
-                    DeserializeHDKeypaths(s, key, hd_keypaths);
-                    break;
-                }
-                // Unknown stuff
-                default: {
-                    if (unknown.count(key) > 0) {
-                        throw std::ios_base::failure(
-                            "Duplicate Key, key for unknown value already "
-                            "provided");
-                    }
-                    // Read in the value
-                    std::vector<uint8_t> val_bytes;
-                    s >> val_bytes;
-                    unknown.emplace(std::move(key), std::move(val_bytes));
-                    break;
-                }
-            }
-        }
-    }
-
-    template <typename Stream> PSBTOutput(deserialize_type, Stream &s) {
-        Unserialize(s);
-    }
-};
-
-/**
- * A version of CTransaction with the PSBT format.
- */
-struct PartiallySignedTransaction {
-    boost::optional<CMutableTransaction> tx;
-    std::vector<PSBTInput> inputs;
-    std::vector<PSBTOutput> outputs;
-    std::map<std::vector<uint8_t>, std::vector<uint8_t>> unknown;
-
-    bool IsNull() const;
-    void Merge(const PartiallySignedTransaction &psbt);
-    bool IsSane() const;
-    PartiallySignedTransaction() {}
-    PartiallySignedTransaction(const PartiallySignedTransaction &psbt_in)
-        : tx(psbt_in.tx), inputs(psbt_in.inputs), outputs(psbt_in.outputs),
-          unknown(psbt_in.unknown) {}
-    explicit PartiallySignedTransaction(const CTransaction &txIn);
-
-    // Only checks if they refer to the same transaction
-    friend bool operator==(const PartiallySignedTransaction &a,
-                           const PartiallySignedTransaction &b) {
-        return a.tx == b.tx;
-    }
-    friend bool operator!=(const PartiallySignedTransaction &a,
-                           const PartiallySignedTransaction &b) {
-        return !(a == b);
-    }
-
-    template <typename Stream> inline void Serialize(Stream &s) const {
-        // magic bytes
-        s << PSBT_MAGIC_BYTES;
-
-        // unsigned tx flag
-        SerializeToVector(s, PSBT_GLOBAL_UNSIGNED_TX);
-
-        // Write serialized tx to a stream
-        SerializeToVector(s, *tx);
-
-        // Write the unknown things
-        for (auto &entry : unknown) {
-            s << entry.first;
-            s << entry.second;
-        }
-
-        // Separator
-        s << PSBT_SEPARATOR;
-
-        // Write inputs
-        for (const PSBTInput &input : inputs) {
-            s << input;
-        }
-
-        // Write outputs
-        for (const PSBTOutput &output : outputs) {
-            s << output;
-        }
-    }
-
-    template <typename Stream> inline void Unserialize(Stream &s) {
-        // Read the magic bytes
-        uint8_t magic[5];
-        s >> magic;
-        if (!std::equal(magic, magic + 5, PSBT_MAGIC_BYTES)) {
-            throw std::ios_base::failure("Invalid PSBT magic bytes");
-        }
-
-        // Read global data
-        while (!s.empty()) {
-            // Read
-            std::vector<uint8_t> key;
-            s >> key;
-
-            // the key is empty if that was actually a separator byte
-            // This is a special case for key lengths 0 as those are not allowed
-            // (except for separator)
-            if (key.empty()) {
-                break;
-            }
-
-            // First byte of key is the type
-            uint8_t type = key[0];
-
-            // Do stuff based on type
-            switch (type) {
-                case PSBT_GLOBAL_UNSIGNED_TX: {
-                    if (tx) {
-                        throw std::ios_base::failure(
-                            "Duplicate Key, unsigned tx already provided");
-                    } else if (key.size() != 1) {
-                        throw std::ios_base::failure(
-                            "Global unsigned tx key is more than one byte "
-                            "type");
-                    }
-                    CMutableTransaction mtx;
-                    UnserializeFromVector(s, mtx);
-                    tx = std::move(mtx);
-                    // Make sure that all scriptSigs are empty.
-                    for (const CTxIn &txin : tx->vin) {
-                        if (!txin.scriptSig.empty()) {
-                            throw std::ios_base::failure(
-                                "Unsigned tx does not have empty scriptSigs.");
-                        }
-                    }
-                    break;
-                }
-                // Unknown stuff
-                default: {
-                    if (unknown.count(key) > 0) {
-                        throw std::ios_base::failure(
-                            "Duplicate Key, key for unknown value already "
-                            "provided");
-                    }
-                    // Read in the value
-                    std::vector<uint8_t> val_bytes;
-                    s >> val_bytes;
-                    unknown.emplace(std::move(key), std::move(val_bytes));
-                }
-            }
-        }
-
-        // Make sure that we got an unsigned tx
-        if (!tx) {
-            throw std::ios_base::failure(
-                "No unsigned transcation was provided");
-        }
-
-        // Read input data
-        size_t i = 0;
-        while (!s.empty() && i < tx->vin.size()) {
-            PSBTInput input;
-            s >> input;
-            inputs.push_back(input);
-            ++i;
-        }
-        // Make sure that the number of inputs matches the number of inputs in
-        // the transaction
-        if (inputs.size() != tx->vin.size()) {
-            throw std::ios_base::failure("Inputs provided does not match the "
-                                         "number of inputs in transaction.");
-        }
-
-        // Read output data
-        i = 0;
-        while (!s.empty() && i < tx->vout.size()) {
-            PSBTOutput output;
-            s >> output;
-            outputs.push_back(output);
-            ++i;
-        }
-        // Make sure that the number of outputs matches the number of outputs in
-        // the transaction
-        if (outputs.size() != tx->vout.size()) {
-            throw std::ios_base::failure("Outputs provided does not match the "
-                                         "number of outputs in transaction.");
-        }
-        // Sanity check
-        if (!IsSane()) {
-            throw std::ios_base::failure("PSBT is not sane.");
-        }
-    }
-
-    template <typename Stream>
-    PartiallySignedTransaction(deserialize_type, Stream &s) {
-        Unserialize(s);
-    }
-};
-
 /** Produce a script signature using a generic signature creator. */
 bool ProduceSignature(const SigningProvider &provider,
                       const BaseSignatureCreator &creator,
@@ -686,17 +225,6 @@
                    CMutableTransaction &txTo, unsigned int nIn,
                    SigHashType sigHashType);
 
-/** Checks whether a PSBTInput is already signed. */
-bool PSBTInputSigned(PSBTInput &input);
-
-/**
- * Signs a PSBTInput, verifying that all provided data matches what is being
- * signed.
- */
-bool SignPSBTInput(const SigningProvider &provider,
-                   PartiallySignedTransaction &psbt, int index,
-                   SigHashType sighash = SigHashType());
-
 /** Extract signature data from a transaction input, and insert it. */
 SignatureData DataFromTransaction(const CMutableTransaction &tx,
                                   unsigned int nIn, const CTxOut &txout);
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -220,46 +220,6 @@
     return sigdata.complete;
 }
 
-bool PSBTInputSigned(PSBTInput &input) {
-    return !input.final_script_sig.empty();
-}
-
-bool SignPSBTInput(const SigningProvider &provider,
-                   PartiallySignedTransaction &psbt, int index,
-                   SigHashType sighash) {
-    PSBTInput &input = psbt.inputs.at(index);
-    const CMutableTransaction &tx = *psbt.tx;
-
-    if (PSBTInputSigned(input)) {
-        return true;
-    }
-
-    // Fill SignatureData with input info
-    SignatureData sigdata;
-    input.FillSignatureData(sigdata);
-
-    // Get UTXO
-    CTxOut utxo;
-
-    // Verify input sanity
-    if (!input.IsSane()) {
-        return false;
-    }
-
-    if (input.utxo.IsNull()) {
-        return false;
-    }
-
-    utxo = input.utxo;
-    MutableTransactionSignatureCreator creator(&tx, index, utxo.nValue,
-                                               sighash);
-    bool sig_complete =
-        ProduceSignature(provider, creator, utxo.scriptPubKey, sigdata);
-    input.FromSignatureData(sigdata);
-
-    return sig_complete;
-}
-
 class SignatureExtractorChecker final : public BaseSignatureChecker {
 private:
     SignatureData &sigdata;
@@ -463,131 +423,6 @@
     DummySignatureCreator(33, 32);
 const SigningProvider &DUMMY_SIGNING_PROVIDER = SigningProvider();
 
-PartiallySignedTransaction::PartiallySignedTransaction(const CTransaction &txIn)
-    : tx(txIn) {
-    inputs.resize(txIn.vin.size());
-    outputs.resize(txIn.vout.size());
-}
-
-bool PartiallySignedTransaction::IsNull() const {
-    return !tx && inputs.empty() && outputs.empty() && unknown.empty();
-}
-
-void PartiallySignedTransaction::Merge(const PartiallySignedTransaction &psbt) {
-    for (size_t i = 0; i < inputs.size(); ++i) {
-        inputs[i].Merge(psbt.inputs[i]);
-    }
-    for (size_t i = 0; i < outputs.size(); ++i) {
-        outputs[i].Merge(psbt.outputs[i]);
-    }
-    unknown.insert(psbt.unknown.begin(), psbt.unknown.end());
-}
-
-bool PartiallySignedTransaction::IsSane() const {
-    for (PSBTInput input : inputs) {
-        if (!input.IsSane()) {
-            return false;
-        }
-    }
-    return true;
-}
-
-bool PSBTInput::IsNull() const {
-    return utxo.IsNull() && partial_sigs.empty() && unknown.empty() &&
-           hd_keypaths.empty() && redeem_script.empty();
-}
-
-void PSBTInput::FillSignatureData(SignatureData &sigdata) const {
-    if (!final_script_sig.empty()) {
-        sigdata.scriptSig = final_script_sig;
-        sigdata.complete = true;
-    }
-    if (sigdata.complete) {
-        return;
-    }
-
-    sigdata.signatures.insert(partial_sigs.begin(), partial_sigs.end());
-    if (!redeem_script.empty()) {
-        sigdata.redeem_script = redeem_script;
-    }
-    for (const auto &key_pair : hd_keypaths) {
-        sigdata.misc_pubkeys.emplace(key_pair.first.GetID(), key_pair);
-    }
-}
-
-void PSBTInput::FromSignatureData(const SignatureData &sigdata) {
-    if (sigdata.complete) {
-        partial_sigs.clear();
-        hd_keypaths.clear();
-        redeem_script.clear();
-
-        if (!sigdata.scriptSig.empty()) {
-            final_script_sig = sigdata.scriptSig;
-        }
-        return;
-    }
-
-    partial_sigs.insert(sigdata.signatures.begin(), sigdata.signatures.end());
-    if (redeem_script.empty() && !sigdata.redeem_script.empty()) {
-        redeem_script = sigdata.redeem_script;
-    }
-    for (const auto &entry : sigdata.misc_pubkeys) {
-        hd_keypaths.emplace(entry.second);
-    }
-}
-
-void PSBTInput::Merge(const PSBTInput &input) {
-    if (utxo.IsNull() && !input.utxo.IsNull()) {
-        utxo = input.utxo;
-    }
-
-    partial_sigs.insert(input.partial_sigs.begin(), input.partial_sigs.end());
-    hd_keypaths.insert(input.hd_keypaths.begin(), input.hd_keypaths.end());
-    unknown.insert(input.unknown.begin(), input.unknown.end());
-
-    if (redeem_script.empty() && !input.redeem_script.empty()) {
-        redeem_script = input.redeem_script;
-    }
-    if (final_script_sig.empty() && !input.final_script_sig.empty()) {
-        final_script_sig = input.final_script_sig;
-    }
-}
-
-bool PSBTInput::IsSane() const {
-    return true;
-}
-
-void PSBTOutput::FillSignatureData(SignatureData &sigdata) const {
-    if (!redeem_script.empty()) {
-        sigdata.redeem_script = redeem_script;
-    }
-    for (const auto &key_pair : hd_keypaths) {
-        sigdata.misc_pubkeys.emplace(key_pair.first.GetID(), key_pair);
-    }
-}
-
-void PSBTOutput::FromSignatureData(const SignatureData &sigdata) {
-    if (redeem_script.empty() && !sigdata.redeem_script.empty()) {
-        redeem_script = sigdata.redeem_script;
-    }
-    for (const auto &entry : sigdata.misc_pubkeys) {
-        hd_keypaths.emplace(entry.second);
-    }
-}
-
-bool PSBTOutput::IsNull() const {
-    return redeem_script.empty() && hd_keypaths.empty() && unknown.empty();
-}
-
-void PSBTOutput::Merge(const PSBTOutput &output) {
-    hd_keypaths.insert(output.hd_keypaths.begin(), output.hd_keypaths.end());
-    unknown.insert(output.unknown.begin(), output.unknown.end());
-
-    if (redeem_script.empty() && !output.redeem_script.empty()) {
-        redeem_script = output.redeem_script;
-    }
-}
-
 bool HidingSigningProvider::GetCScript(const CScriptID &scriptid,
                                        CScript &script) const {
     return m_provider->GetCScript(scriptid, script);
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -18,6 +18,7 @@
 	fees.cpp
 	finaltx.cpp
 	init.cpp
+	psbtwallet.cpp
 	rpcdump.cpp
 	rpcwallet.cpp
 	wallet.cpp
diff --git a/src/wallet/psbtwallet.h b/src/wallet/psbtwallet.h
new file mode 100644
--- /dev/null
+++ b/src/wallet/psbtwallet.h
@@ -0,0 +1,16 @@
+// Copyright (c) 2009-2018 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_WALLET_PSBTWALLET_H
+#define BITCOIN_WALLET_PSBTWALLET_H
+
+#include <primitives/transaction.h>
+#include <psbt.h>
+#include <wallet/wallet.h>
+
+bool FillPSBT(const CWallet *pwallet, PartiallySignedTransaction &psbtx,
+              SigHashType sighash_type = SigHashType(), bool sign = true,
+              bool bip32derivs = false);
+
+#endif // BITCOIN_WALLET_PSBTWALLET_H
diff --git a/src/wallet/psbtwallet.cpp b/src/wallet/psbtwallet.cpp
new file mode 100644
--- /dev/null
+++ b/src/wallet/psbtwallet.cpp
@@ -0,0 +1,70 @@
+// Copyright (c) 2009-2018 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <wallet/psbtwallet.h>
+
+#include <rpc/protocol.h>
+
+bool FillPSBT(const CWallet *pwallet, PartiallySignedTransaction &psbtx,
+              SigHashType sighash_type, bool sign, bool bip32derivs) {
+    LOCK(pwallet->cs_wallet);
+    // Get all of the previous transactions
+    bool complete = true;
+    for (size_t i = 0; i < psbtx.tx->vin.size(); ++i) {
+        const CTxIn &txin = psbtx.tx->vin[i];
+        PSBTInput &input = psbtx.inputs.at(i);
+
+        if (PSBTInputSigned(input)) {
+            continue;
+        }
+
+        // Verify input looks sane.
+        if (!input.IsSane()) {
+            throw JSONRPCError(RPC_DESERIALIZATION_ERROR,
+                               "PSBT input is not sane.");
+        }
+
+        // If we have no utxo, grab it from the wallet.
+        if (input.utxo.IsNull()) {
+            const TxId &txid = txin.prevout.GetTxId();
+            const auto it = pwallet->mapWallet.find(txid);
+            if (it != pwallet->mapWallet.end()) {
+                const CWalletTx &wtx = it->second;
+                CTxOut utxo = wtx.tx->vout[txin.prevout.GetN()];
+                // Update UTXOs from the wallet.
+                input.utxo = utxo;
+            }
+        }
+
+        // Get the Sighash type
+        if (sign && input.sighash_type.getRawSigHashType() > 0 &&
+            input.sighash_type != sighash_type) {
+            throw JSONRPCError(
+                RPC_DESERIALIZATION_ERROR,
+                "Specified sighash and sighash in PSBT do not match.");
+        }
+
+        complete &=
+            SignPSBTInput(HidingSigningProvider(pwallet, !sign, !bip32derivs),
+                          psbtx, i, sighash_type);
+    }
+
+    // Fill in the bip32 keypaths and redeemscripts for the outputs so that
+    // hardware wallets can identify change
+    for (size_t i = 0; i < psbtx.tx->vout.size(); ++i) {
+        const CTxOut &out = psbtx.tx->vout.at(i);
+        PSBTOutput &psbt_out = psbtx.outputs.at(i);
+
+        // Fill a SignatureData with output info
+        SignatureData sigdata;
+        psbt_out.FillSignatureData(sigdata);
+
+        MutableTransactionSignatureCreator creator(
+            psbtx.tx.get_ptr(), 0, out.nValue, SigHashType().withForkId());
+        ProduceSignature(HidingSigningProvider(pwallet, true, !bip32derivs),
+                         creator, out.scriptPubKey, sigdata);
+        psbt_out.FromSignatureData(sigdata);
+    }
+    return complete;
+}
diff --git a/src/wallet/rpcwallet.h b/src/wallet/rpcwallet.h
--- a/src/wallet/rpcwallet.h
+++ b/src/wallet/rpcwallet.h
@@ -35,8 +35,5 @@
 UniValue signrawtransactionwithwallet(const Config &config,
                                       const JSONRPCRequest &request);
 UniValue getaddressinfo(const Config &config, const JSONRPCRequest &request);
-bool FillPSBT(const CWallet *pwallet, PartiallySignedTransaction &psbtx,
-              SigHashType sighash_type = SigHashType(), bool sign = true,
-              bool bip32derivs = false);
 
 #endif // BITCOIN_WALLET_RPCWALLET_H
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -26,6 +26,7 @@
 #include <util/system.h>
 #include <validation.h>
 #include <wallet/coincontrol.h>
+#include <wallet/psbtwallet.h>
 #include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
 #include <wallet/walletdb.h>
@@ -4579,69 +4580,6 @@
     return NullUniValue;
 }
 
-bool FillPSBT(const CWallet *pwallet, PartiallySignedTransaction &psbtx,
-              SigHashType sighash_type, bool sign, bool bip32derivs) {
-    LOCK(pwallet->cs_wallet);
-    // Get all of the previous transactions
-    bool complete = true;
-    for (size_t i = 0; i < psbtx.tx->vin.size(); ++i) {
-        const CTxIn &txin = psbtx.tx->vin[i];
-        PSBTInput &input = psbtx.inputs.at(i);
-
-        if (PSBTInputSigned(input)) {
-            continue;
-        }
-
-        // Verify input looks sane.
-        if (!input.IsSane()) {
-            throw JSONRPCError(RPC_DESERIALIZATION_ERROR,
-                               "PSBT input is not sane.");
-        }
-
-        // If we have no utxo, grab it from the wallet.
-        if (input.utxo.IsNull()) {
-            const TxId &txid = txin.prevout.GetTxId();
-            const auto it = pwallet->mapWallet.find(txid);
-            if (it != pwallet->mapWallet.end()) {
-                const CWalletTx &wtx = it->second;
-                CTxOut utxo = wtx.tx->vout[txin.prevout.GetN()];
-                // Update UTXOs from the wallet.
-                input.utxo = utxo;
-            }
-        }
-
-        // Get the Sighash type
-        if (sign && input.sighash_type.getRawSigHashType() > 0 &&
-            input.sighash_type != sighash_type) {
-            throw JSONRPCError(
-                RPC_DESERIALIZATION_ERROR,
-                "Specified sighash and sighash in PSBT do not match.");
-        }
-
-        complete &=
-            SignPSBTInput(HidingSigningProvider(pwallet, !sign, !bip32derivs),
-                          psbtx, i, sighash_type);
-    }
-
-    // Fill in the bip32 keypaths and redeemscripts for the outputs so that
-    // hardware wallets can identify change
-    for (size_t i = 0; i < psbtx.tx->vout.size(); ++i) {
-        const CTxOut &out = psbtx.tx->vout.at(i);
-        PSBTOutput &psbt_out = psbtx.outputs.at(i);
-
-        // Fill a SignatureData with output info
-        SignatureData sigdata;
-        psbt_out.FillSignatureData(sigdata);
-
-        MutableTransactionSignatureCreator creator(
-            psbtx.tx.get_ptr(), 0, out.nValue, SigHashType().withForkId());
-        ProduceSignature(HidingSigningProvider(pwallet, true, !bip32derivs),
-                         creator, out.scriptPubKey, sigdata);
-        psbt_out.FromSignatureData(sigdata);
-    }
-    return complete;
-}
-
 static UniValue walletprocesspsbt(const Config &config,
                                   const JSONRPCRequest &request) {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp
--- a/src/wallet/test/psbt_wallet_tests.cpp
+++ b/src/wallet/test/psbt_wallet_tests.cpp
@@ -4,6 +4,7 @@
 
 #include <key_io.h>
 #include <util/strencodings.h>
+#include <wallet/psbtwallet.h>
 #include <wallet/test/wallet_test_fixture.h>
 #include <wallet/wallet.h>