diff --git a/src/bench/wallet_balance.cpp b/src/bench/wallet_balance.cpp
--- a/src/bench/wallet_balance.cpp
+++ b/src/bench/wallet_balance.cpp
@@ -6,7 +6,7 @@
 #include <config.h>
 #include <interfaces/chain.h>
 #include <node/context.h>
-#include <optional.h>
+
 #include <test/util/mining.h>
 #include <test/util/setup_common.h>
 #include <test/util/wallet.h>
@@ -34,16 +34,16 @@
 
     auto handler = chain->handleNotifications({&wallet, [](CWallet *) {}});
 
-    const Optional<std::string> address_mine{
-        add_mine ? Optional<std::string>{getnewaddress(config, wallet)}
-                 : nullopt};
+    const std::optional<std::string> address_mine{
+        add_mine ? std::optional<std::string>{getnewaddress(config, wallet)}
+                 : std::nullopt};
     if (add_watchonly) {
         importaddress(wallet, ADDRESS_WATCHONLY);
     }
 
     for (int i = 0; i < 100; ++i) {
         generatetoaddress(config, g_testing_setup->m_node,
-                          address_mine.get_value_or(ADDRESS_WATCHONLY));
+                          address_mine.value_or(ADDRESS_WATCHONLY));
         generatetoaddress(config, g_testing_setup->m_node, ADDRESS_WATCHONLY);
     }
     SyncWithValidationInterfaceQueue();
diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h
--- a/src/interfaces/chain.h
+++ b/src/interfaces/chain.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_INTERFACES_CHAIN_H
 #define BITCOIN_INTERFACES_CHAIN_H
 
-#include <optional.h>
 #include <primitives/transaction.h>
 #include <primitives/txid.h>
 
@@ -105,14 +104,14 @@
     virtual ~Chain() {}
 
     //! Get current chain height, not including genesis block (returns 0 if
-    //! chain only contains genesis block, nullopt if chain does not contain
-    //! any blocks)
-    virtual Optional<int> getHeight() = 0;
+    //! chain only contains genesis block, std::nullopt if chain does not
+    //! contain any blocks)
+    virtual std::optional<int> getHeight() = 0;
 
     //! Get block height above genesis block. Returns 0 for genesis block,
-    //! 1 for following block, and so on. Returns nullopt for a block not
+    //! 1 for following block, and so on. Returns std::nullopt for a block not
     //! included in the current chain.
-    virtual Optional<int> getBlockHeight(const BlockHash &hash) = 0;
+    virtual std::optional<int> getBlockHeight(const BlockHash &hash) = 0;
 
     //! Get block hash. Height must be valid or this function will abort.
     virtual BlockHash getBlockHash(int height) = 0;
@@ -123,13 +122,13 @@
 
     //! Return height of the first block in the chain with timestamp equal
     //! or greater than the given time and height equal or greater than the
-    //! given height, or nullopt if there is no block with a high enough
+    //! given height, or std::nullopt if there is no block with a high enough
     //! timestamp and height. Also return the block hash as an optional output
     //! parameter (to avoid the cost of a second lookup in case this information
     //! is needed.)
-    virtual Optional<int> findFirstBlockWithTimeAndHeight(int64_t time,
-                                                          int height,
-                                                          BlockHash *hash) = 0;
+    virtual std::optional<int>
+    findFirstBlockWithTimeAndHeight(int64_t time, int height,
+                                    BlockHash *hash) = 0;
 
     //! Get locator for the current chain tip.
     virtual CBlockLocator getTipLocator() = 0;
@@ -137,7 +136,8 @@
     //! Return height of the highest block on chain in common with the locator,
     //! which will either be the original block used to create the locator,
     //! or one of its ancestors.
-    virtual Optional<int> findLocatorFork(const CBlockLocator &locator) = 0;
+    virtual std::optional<int>
+    findLocatorFork(const CBlockLocator &locator) = 0;
 
     //! Check if transaction will be final given chain height current time.
     virtual bool
@@ -197,7 +197,7 @@
     //! of blocks. This checks all blocks that are ancestors of block_hash in
     //! the height range from min_height to max_height, inclusive.
     virtual bool hasBlocks(const BlockHash &block_hash, int min_height = 0,
-                           Optional<int> max_height = {}) = 0;
+                           std::optional<int> max_height = {}) = 0;
 
     //! Check if transaction has descendants in mempool.
     virtual bool hasDescendantsInMempool(const TxId &txid) = 0;
diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp
--- a/src/interfaces/chain.cpp
+++ b/src/interfaces/chain.cpp
@@ -166,21 +166,21 @@
     public:
         explicit ChainImpl(NodeContext &node, const CChainParams &params)
             : m_node(node), m_params(params) {}
-        Optional<int> getHeight() override {
+        std::optional<int> getHeight() override {
             LOCK(::cs_main);
             int height = ::ChainActive().Height();
             if (height >= 0) {
                 return height;
             }
-            return nullopt;
+            return std::nullopt;
         }
-        Optional<int> getBlockHeight(const BlockHash &hash) override {
+        std::optional<int> getBlockHeight(const BlockHash &hash) override {
             LOCK(::cs_main);
             CBlockIndex *block = LookupBlockIndex(hash);
             if (block && ::ChainActive().Contains(block)) {
                 return block->nHeight;
             }
-            return nullopt;
+            return std::nullopt;
         }
         BlockHash getBlockHash(int height) override {
             LOCK(::cs_main);
@@ -193,7 +193,7 @@
             CBlockIndex *block = ::ChainActive()[height];
             return block && (block->nStatus.hasData() != 0) && block->nTx > 0;
         }
-        Optional<int>
+        std::optional<int>
         findFirstBlockWithTimeAndHeight(int64_t time, int height,
                                         BlockHash *hash) override {
             LOCK(cs_main);
@@ -205,7 +205,7 @@
                 }
                 return block->nHeight;
             }
-            return nullopt;
+            return std::nullopt;
         }
         CBlockLocator getTipLocator() override {
             LOCK(cs_main);
@@ -217,13 +217,14 @@
             return ContextualCheckTransactionForCurrentBlock(
                 m_params.GetConsensus(), tx, state);
         }
-        Optional<int> findLocatorFork(const CBlockLocator &locator) override {
+        std::optional<int>
+        findLocatorFork(const CBlockLocator &locator) override {
             LOCK(cs_main);
             if (CBlockIndex *fork =
                     FindForkInGlobalIndex(::ChainActive(), locator)) {
                 return fork->nHeight;
             }
-            return nullopt;
+            return std::nullopt;
         }
         bool findBlock(const BlockHash &hash,
                        const FoundBlock &block) override {
@@ -297,7 +298,7 @@
                                              LookupBlockIndex(block_hash));
         }
         bool hasBlocks(const BlockHash &block_hash, int min_height,
-                       Optional<int> max_height) override {
+                       std::optional<int> max_height) override {
             // hasBlocks returns true if all ancestors of block_hash in
             // specified range have block data (are not pruned), false if any
             // ancestors in specified range are missing data.
diff --git a/src/miner.h b/src/miner.h
--- a/src/miner.h
+++ b/src/miner.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_MINER_H
 #define BITCOIN_MINER_H
 
-#include <optional.h>
 #include <primitives/block.h>
 #include <txmempool.h>
 
@@ -175,8 +174,8 @@
 
     uint64_t GetMaxGeneratedBlockSize() const { return nMaxGeneratedBlockSize; }
 
-    static Optional<int64_t> m_last_block_num_txs;
-    static Optional<int64_t> m_last_block_size;
+    static std::optional<int64_t> m_last_block_num_txs;
+    static std::optional<int64_t> m_last_block_size;
 
 private:
     // utility functions
diff --git a/src/miner.cpp b/src/miner.cpp
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -115,8 +115,8 @@
     nFees = Amount::zero();
 }
 
-Optional<int64_t> BlockAssembler::m_last_block_num_txs{nullopt};
-Optional<int64_t> BlockAssembler::m_last_block_size{nullopt};
+std::optional<int64_t> BlockAssembler::m_last_block_num_txs{std::nullopt};
+std::optional<int64_t> BlockAssembler::m_last_block_size{std::nullopt};
 
 std::unique_ptr<CBlockTemplate>
 BlockAssembler::CreateNewBlock(const CScript &scriptPubKeyIn) {
diff --git a/src/node/psbt.h b/src/node/psbt.h
--- a/src/node/psbt.h
+++ b/src/node/psbt.h
@@ -31,11 +31,11 @@
  */
 struct PSBTAnalysis {
     //! Estimated weight of the transaction
-    Optional<size_t> estimated_vsize;
+    std::optional<size_t> estimated_vsize;
     //! Estimated feerate (fee / weight) of the transaction
-    Optional<CFeeRate> estimated_feerate;
+    std::optional<CFeeRate> estimated_feerate;
     //! Amount of fee being paid by the transaction
-    Optional<Amount> fee;
+    std::optional<Amount> fee;
     //! More information about the individual inputs of the transaction
     std::vector<PSBTInputAnalysis> inputs;
     //! Which of the BIP 174 roles needs to handle the transaction next
@@ -44,9 +44,9 @@
     std::string error;
 
     void SetInvalid(std::string err_msg) {
-        estimated_vsize = nullopt;
-        estimated_feerate = nullopt;
-        fee = nullopt;
+        estimated_vsize = std::nullopt;
+        estimated_feerate = std::nullopt;
+        fee = std::nullopt;
         inputs.clear();
         next = PSBTRole::CREATOR;
         error = err_msg;
diff --git a/src/optional.h b/src/optional.h
deleted file mode 100644
--- a/src/optional.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2017 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_OPTIONAL_H
-#define BITCOIN_OPTIONAL_H
-
-#include <utility>
-
-#include <boost/optional.hpp>
-
-//! Substitute for C++17 std::optional
-template <typename T> using Optional = boost::optional<T>;
-
-//! Substitute for C++17 std::make_optional
-template <typename T> Optional<T> MakeOptional(bool condition, T &&value) {
-    return boost::make_optional(condition, std::forward<T>(value));
-}
-
-//! Substitute for C++17 std::nullopt
-static auto &nullopt = boost::none;
-
-#endif // BITCOIN_OPTIONAL_H
diff --git a/src/psbt.h b/src/psbt.h
--- a/src/psbt.h
+++ b/src/psbt.h
@@ -7,7 +7,7 @@
 
 #include <attributes.h>
 #include <node/transaction.h>
-#include <optional.h>
+
 #include <primitives/transaction.h>
 #include <pubkey.h>
 #include <script/sign.h>
@@ -334,7 +334,7 @@
  * A version of CTransaction with the PSBT format.
  */
 struct PartiallySignedTransaction {
-    Optional<CMutableTransaction> tx;
+    std::optional<CMutableTransaction> tx;
     std::vector<PSBTInput> inputs;
     std::vector<PSBTOutput> outputs;
     std::map<std::vector<uint8_t>, std::vector<uint8_t>> unknown;
diff --git a/src/psbt.cpp b/src/psbt.cpp
--- a/src/psbt.cpp
+++ b/src/psbt.cpp
@@ -185,9 +185,9 @@
     // Note that ProduceSignature is used to fill in metadata (not actual
     // signatures), so provider does not need to provide any private keys (it
     // can be a HidingSigningProvider).
-    MutableTransactionSignatureCreator creator(psbt.tx.get_ptr(), /* index */ 0,
-                                               out.nValue,
-                                               SigHashType().withForkId());
+    MutableTransactionSignatureCreator creator(
+        psbt.tx.has_value() ? &psbt.tx.value() : nullptr, /* index */ 0,
+        out.nValue, SigHashType().withForkId());
     ProduceSignature(provider, creator, out.scriptPubKey, sigdata);
 
     // Put redeem_script and key paths, into PSBTOutput.
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -2140,14 +2140,14 @@
     if (!inputs_result.empty()) {
         result.pushKV("inputs", inputs_result);
     }
-    if (psbta.estimated_vsize != nullopt) {
+    if (psbta.estimated_vsize != std::nullopt) {
         result.pushKV("estimated_vsize", (int)*psbta.estimated_vsize);
     }
-    if (psbta.estimated_feerate != nullopt) {
+    if (psbta.estimated_feerate != std::nullopt) {
         result.pushKV("estimated_feerate",
                       ValueFromAmount(psbta.estimated_feerate->GetFeePerK()));
     }
-    if (psbta.fee != nullopt) {
+    if (psbta.fee != std::nullopt) {
         result.pushKV("fee", ValueFromAmount(*psbta.fee));
     }
     result.pushKV("next", PSBTRoleName(psbta.next));
diff --git a/src/script/descriptor.h b/src/script/descriptor.h
--- a/src/script/descriptor.h
+++ b/src/script/descriptor.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_SCRIPT_DESCRIPTOR_H
 #define BITCOIN_SCRIPT_DESCRIPTOR_H
 
-#include <optional.h>
 #include <outputtype.h>
 #include <script/script.h>
 #include <script/sign.h>
@@ -161,9 +160,9 @@
 
     /**
      * @return The OutputType of the scriptPubKey(s) produced by this
-     * descriptor. Or nullopt if indeterminate (multiple or none)
+     * descriptor. Or std::nullopt if indeterminate (multiple or none)
      */
-    virtual Optional<OutputType> GetOutputType() const = 0;
+    virtual std::optional<OutputType> GetOutputType() const = 0;
 };
 
 /**
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
--- a/src/script/descriptor.cpp
+++ b/src/script/descriptor.cpp
@@ -706,7 +706,9 @@
         }
     }
 
-    Optional<OutputType> GetOutputType() const override { return nullopt; }
+    std::optional<OutputType> GetOutputType() const override {
+        return std::nullopt;
+    }
 };
 
 /** A parsed addr(A) descriptor. */
@@ -729,14 +731,14 @@
           m_destination(std::move(destination)) {}
     bool IsSolvable() const final { return false; }
 
-    Optional<OutputType> GetOutputType() const override {
+    std::optional<OutputType> GetOutputType() const override {
         switch (m_destination.which()) {
             case 1 /* PKHash */:
             case 2 /* ScriptHash */:
                 return OutputType::LEGACY;
             case 0 /* CNoDestination */:
             default:
-                return nullopt;
+                return std::nullopt;
         }
     }
     bool IsSingleType() const final { return true; }
@@ -761,7 +763,7 @@
         : DescriptorImpl({}, {}, "raw"), m_script(std::move(script)) {}
     bool IsSolvable() const final { return false; }
 
-    Optional<OutputType> GetOutputType() const override {
+    std::optional<OutputType> GetOutputType() const override {
         CTxDestination dest;
         ExtractDestination(m_script, dest);
         switch (dest.which()) {
@@ -770,7 +772,7 @@
                 return OutputType::LEGACY;
             case 0 /* CNoDestination */:
             default:
-                return nullopt;
+                return std::nullopt;
         }
     }
     bool IsSingleType() const final { return true; }
@@ -805,7 +807,7 @@
 public:
     PKHDescriptor(std::unique_ptr<PubkeyProvider> prov)
         : DescriptorImpl(Vector(std::move(prov)), {}, "pkh") {}
-    Optional<OutputType> GetOutputType() const override {
+    std::optional<OutputType> GetOutputType() const override {
         return OutputType::LEGACY;
     }
     bool IsSingleType() const final { return true; }
@@ -875,7 +877,7 @@
 public:
     SHDescriptor(std::unique_ptr<DescriptorImpl> desc)
         : DescriptorImpl({}, std::move(desc), "sh") {}
-    Optional<OutputType> GetOutputType() const override {
+    std::optional<OutputType> GetOutputType() const override {
         return OutputType::LEGACY;
     }
     bool IsSingleType() const final { return true; }
diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp
--- a/src/test/descriptor_tests.cpp
+++ b/src/test/descriptor_tests.cpp
@@ -82,7 +82,7 @@
 
 void DoCheck(const std::string &prv, const std::string &pub, int flags,
              const std::vector<std::vector<std::string>> &scripts,
-             const Optional<OutputType> &type,
+             const std::optional<OutputType> &type,
              const std::set<std::vector<uint32_t>> &paths = ONLY_EMPTY,
              bool replace_apostrophe_with_h_in_prv = false,
              bool replace_apostrophe_with_h_in_pub = false) {
@@ -321,7 +321,7 @@
 
 void Check(const std::string &prv, const std::string &pub, int flags,
            const std::vector<std::vector<std::string>> &scripts,
-           const Optional<OutputType> &type,
+           const std::optional<OutputType> &type,
            const std::set<std::vector<uint32_t>> &paths = ONLY_EMPTY) {
     bool found_apostrophes_in_prv = false;
     bool found_apostrophes_in_pub = false;
@@ -369,14 +369,14 @@
           {{"2103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5"
             "bdac",
             "76a9149a1c78a507689f6f54b847ad1cef1e614ee23f1e88ac"}},
-          nullopt);
+          std::nullopt);
     Check("pk(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)",
           "pk("
           "03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)",
           SIGNABLE,
           {{"2103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5"
             "bdac"}},
-          nullopt);
+          std::nullopt);
     Check("pkh([deadbeef/1/2'/3/4']"
           "L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)",
           "pkh([deadbeef/1/2'/3/4']"
@@ -411,7 +411,7 @@
         {{"4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd"
           "5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235ac",
           "76a914b5bd079c4d57cc7fc28ecf8213a6b791625b818388ac"}},
-        nullopt);
+        std::nullopt);
     Check("pk(5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)",
           "pk("
           "04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b"
@@ -420,7 +420,7 @@
           {{"4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5"
             "bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235"
             "ac"}},
-          nullopt);
+          std::nullopt);
     Check("pkh(5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)",
           "pkh("
           "04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b"
@@ -453,7 +453,7 @@
           {{"2102d2b36900396c9282fa14628566582f206a5dd0bcc8d5e892611806cafb0301"
             "f0ac",
             "76a91431a507b815593dfc51ffc7245ae7e5aee304246e88ac"}},
-          nullopt);
+          std::nullopt);
     Check("pk("
           "xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7"
           "AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0)",
@@ -463,7 +463,7 @@
           DEFAULT,
           {{"210379e45b3cf75f9c5f9befd8e9506fb962f6a9d185ac87001ec44a8d3df8d4a9"
             "e3ac"}},
-          nullopt, {{0}});
+          std::nullopt, {{0}});
     Check("pkh("
           "xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssr"
           "dK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483647'/0)",
@@ -513,7 +513,7 @@
            {"21032869a233c9adff9a994e4966e5b821fd5bac066da6c3112488dc52383b4a98"
             "ecac",
             "76a914a8409d1b6dfb1ed2a3e8aa5e0ef2ff26b15b75b788ac"}},
-          nullopt, {{0}, {1}});
+          std::nullopt, {{0}, {1}});
 
     // Too long key fingerprint
     CheckUnparsable("combo([012345678]"
@@ -555,7 +555,7 @@
             "c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c5"
             "40c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abe"
             "a23552ae"}},
-          nullopt);
+          std::nullopt);
     Check("sortedmulti(1,L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1,"
           "5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)",
           "sortedmulti(1,"
@@ -567,7 +567,7 @@
             "c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c5"
             "40c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abe"
             "a23552ae"}},
-          nullopt);
+          std::nullopt);
     Check("sortedmulti(1,5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss,"
           "L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)",
           "sortedmulti(1,"
@@ -579,7 +579,7 @@
             "c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c5"
             "40c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abe"
             "a23552ae"}},
-          nullopt);
+          std::nullopt);
     Check("sh(multi(2,[00000000/111'/222]"
           "xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39"
           "njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,"
@@ -614,7 +614,7 @@
            {"5221022ccabda84c30bad578b13c89eb3b9544ce149787e5b538175b1d1ba259cb"
             "b83321024d902e1a2fc7a8755ab5b694c575fce742c48d9ff192e63df5193e4c7a"
             "fe1f9c52ae"}},
-          nullopt, {{0}, {1}, {2}, {0, 0, 0}, {0, 0, 1}, {0, 0, 2}});
+          std::nullopt, {{0}, {1}, {2}, {0, 0, 0}, {0, 0, 1}, {0, 0, 2}});
     Check("sh(multi(2,"
           "xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssr"
           "dK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483647'/"
diff --git a/src/test/fuzz/addrdb.cpp b/src/test/fuzz/addrdb.cpp
--- a/src/test/fuzz/addrdb.cpp
+++ b/src/test/fuzz/addrdb.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <addrdb.h>
-#include <optional.h>
+
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
@@ -23,7 +23,7 @@
                     fuzzed_data_provider.ConsumeIntegral<int64_t>()};
                 break;
             case 1: {
-                const Optional<CBanEntry> ban_entry =
+                const std::optional<CBanEntry> ban_entry =
                     ConsumeDeserializable<CBanEntry>(fuzzed_data_provider);
                 if (ban_entry) {
                     return *ban_entry;
diff --git a/src/test/fuzz/bloom_filter.cpp b/src/test/fuzz/bloom_filter.cpp
--- a/src/test/fuzz/bloom_filter.cpp
+++ b/src/test/fuzz/bloom_filter.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bloom.h>
-#include <optional.h>
+
 #include <primitives/transaction.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
@@ -38,7 +38,7 @@
                 break;
             }
             case 1: {
-                const Optional<COutPoint> out_point =
+                const std::optional<COutPoint> out_point =
                     ConsumeDeserializable<COutPoint>(fuzzed_data_provider);
                 if (!out_point) {
                     break;
@@ -50,7 +50,7 @@
                 break;
             }
             case 2: {
-                const Optional<uint256> u256 =
+                const std::optional<uint256> u256 =
                     ConsumeDeserializable<uint256>(fuzzed_data_provider);
                 if (!u256) {
                     break;
@@ -69,7 +69,7 @@
                     fuzzed_data_provider.ConsumeIntegral<unsigned int>());
                 break;
             case 5: {
-                const Optional<CMutableTransaction> mut_tx =
+                const std::optional<CMutableTransaction> mut_tx =
                     ConsumeDeserializable<CMutableTransaction>(
                         fuzzed_data_provider);
                 if (!mut_tx) {
diff --git a/src/test/fuzz/net_permissions.cpp b/src/test/fuzz/net_permissions.cpp
--- a/src/test/fuzz/net_permissions.cpp
+++ b/src/test/fuzz/net_permissions.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <net_permissions.h>
-#include <optional.h>
+
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
diff --git a/src/test/fuzz/psbt.cpp b/src/test/fuzz/psbt.cpp
--- a/src/test/fuzz/psbt.cpp
+++ b/src/test/fuzz/psbt.cpp
@@ -5,7 +5,7 @@
 #include <test/fuzz/fuzz.h>
 
 #include <node/psbt.h>
-#include <optional.h>
+
 #include <psbt.h>
 #include <pubkey.h>
 #include <script/script.h>
@@ -39,7 +39,7 @@
     (void)psbt.IsNull();
     (void)psbt.IsSane();
 
-    Optional<CMutableTransaction> tx = psbt.tx;
+    std::optional<CMutableTransaction> tx = psbt.tx;
     if (tx) {
         const CMutableTransaction &mtx = *tx;
         const PartiallySignedTransaction psbt_from_tx{mtx};
diff --git a/src/test/fuzz/rolling_bloom_filter.cpp b/src/test/fuzz/rolling_bloom_filter.cpp
--- a/src/test/fuzz/rolling_bloom_filter.cpp
+++ b/src/test/fuzz/rolling_bloom_filter.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bloom.h>
-#include <optional.h>
+
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
@@ -33,7 +33,7 @@
                 break;
             }
             case 1: {
-                const Optional<uint256> u256 =
+                const std::optional<uint256> u256 =
                     ConsumeDeserializable<uint256>(fuzzed_data_provider);
                 if (!u256) {
                     break;
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -6,7 +6,7 @@
 #define BITCOIN_TEST_FUZZ_UTIL_H
 
 #include <attributes.h>
-#include <optional.h>
+
 #include <serialize.h>
 #include <streams.h>
 #include <test/fuzz/FuzzedDataProvider.h>
@@ -25,7 +25,7 @@
 }
 
 template <typename T>
-NODISCARD inline Optional<T>
+NODISCARD inline std::optional<T>
 ConsumeDeserializable(FuzzedDataProvider &fuzzed_data_provider,
                       size_t max_length = 4096) noexcept {
     const std::vector<uint8_t> &buffer =
@@ -35,7 +35,7 @@
     try {
         ds >> obj;
     } catch (const std::ios_base::failure &) {
-        return nullopt;
+        return std::nullopt;
     }
     return obj;
 }
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -8,7 +8,7 @@
 #include <clientversion.h>
 #include <hash.h> // For Hash()
 #include <key.h>  // For CKey
-#include <optional.h>
+
 #include <sync.h>
 #include <test/util/logging.h>
 #include <test/util/str.h>
@@ -211,9 +211,9 @@
         bool default_int = false;
         bool default_bool = false;
         const char *string_value = nullptr;
-        Optional<int64_t> int_value;
-        Optional<bool> bool_value;
-        Optional<std::vector<std::string>> list_value;
+        std::optional<int64_t> int_value;
+        std::optional<bool> bool_value;
+        std::optional<std::vector<std::string>> list_value;
         const char *error = nullptr;
 
         explicit Expect(util::SettingsValue s) : setting(std::move(s)) {}
diff --git a/src/txmempool.h b/src/txmempool.h
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -10,7 +10,7 @@
 #include <coins.h>
 #include <core_memusage.h>
 #include <indirectmap.h>
-#include <optional.h>
+
 #include <primitives/transaction.h>
 #include <salteduint256hasher.h>
 #include <sync.h>
@@ -647,7 +647,7 @@
         EXCLUSIVE_LOCKS_REQUIRED(cs);
 
     /** Returns an iterator to the given txid, if found */
-    Optional<txiter> GetIter(const TxId &txid) const
+    std::optional<txiter> GetIter(const TxId &txid) const
         EXCLUSIVE_LOCKS_REQUIRED(cs);
 
     /**
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -193,7 +193,7 @@
         // GetMemPoolParents() is only valid for entries in the mempool, so we
         // iterate mapTx to find parents.
         for (const CTxIn &in : tx.vin) {
-            Optional<txiter> piter = GetIter(in.prevout.GetTxId());
+            std::optional<txiter> piter = GetIter(in.prevout.GetTxId());
             if (!piter) {
                 continue;
             }
@@ -1000,12 +1000,12 @@
     return it == mapNextTx.end() ? nullptr : it->second;
 }
 
-Optional<CTxMemPool::txiter> CTxMemPool::GetIter(const TxId &txid) const {
+std::optional<CTxMemPool::txiter> CTxMemPool::GetIter(const TxId &txid) const {
     auto it = mapTx.find(txid);
     if (it != mapTx.end()) {
         return it;
     }
-    return Optional<txiter>{};
+    return std::optional<txiter>{};
 }
 
 CTxMemPool::setEntries
diff --git a/src/util/system.h b/src/util/system.h
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -19,7 +19,7 @@
 #include <compat/assumptions.h>
 #include <fs.h>
 #include <logging.h>
-#include <optional.h>
+
 #include <sync.h>
 #include <tinyformat.h>
 #include <util/settings.h>
@@ -356,9 +356,9 @@
 
     /**
      * Return Flags for known arg.
-     * Return nullopt for unknown arg.
+     * Return std::nullopt for unknown arg.
      */
-    Optional<unsigned int> GetArgFlags(const std::string &name) const;
+    std::optional<unsigned int> GetArgFlags(const std::string &name) const;
 
     /**
      * Read and update settings file with saved settings. This needs to be
diff --git a/src/util/system.cpp b/src/util/system.cpp
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -335,7 +335,7 @@
         key.erase(0, 1);
         std::string section;
         util::SettingsValue value = InterpretOption(section, key, val);
-        Optional<unsigned int> flags = GetArgFlags('-' + key);
+        std::optional<unsigned int> flags = GetArgFlags('-' + key);
         if (flags) {
             if (!CheckValid(key, value, *flags, error)) {
                 return false;
@@ -367,7 +367,8 @@
     return success;
 }
 
-Optional<unsigned int> ArgsManager::GetArgFlags(const std::string &name) const {
+std::optional<unsigned int>
+ArgsManager::GetArgFlags(const std::string &name) const {
     LOCK(cs_args);
     for (const auto &arg_map : m_available_args) {
         const auto search = arg_map.second.find(name);
@@ -375,7 +376,7 @@
             return search->second.m_flags;
         }
     }
-    return nullopt;
+    return std::nullopt;
 }
 
 std::vector<std::string> ArgsManager::GetArgs(const std::string &strArg) const {
@@ -888,7 +889,7 @@
         std::string key = option.first;
         util::SettingsValue value =
             InterpretOption(section, key, option.second);
-        Optional<unsigned int> flags = GetArgFlags('-' + key);
+        std::optional<unsigned int> flags = GetArgFlags('-' + key);
         if (flags) {
             if (!CheckValid(key, value, *flags, error)) {
                 return false;
@@ -1065,7 +1066,7 @@
     std::string section_str = section.empty() ? "" : "[" + section + "] ";
     for (const auto &arg : args) {
         for (const auto &value : arg.second) {
-            Optional<unsigned int> flags = GetArgFlags('-' + arg.first);
+            std::optional<unsigned int> flags = GetArgFlags('-' + arg.first);
             if (flags) {
                 std::string value_str =
                     (*flags & SENSITIVE) ? "****" : value.write();
diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
--- a/src/wallet/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_WALLET_COINCONTROL_H
 #define BITCOIN_WALLET_COINCONTROL_H
 
-#include <optional.h>
 #include <outputtype.h>
 #include <primitives/transaction.h>
 #include <script/standard.h>
@@ -21,7 +20,7 @@
 public:
     CTxDestination destChange;
     //! Override the default change type if set, ignored if destChange is set
-    Optional<OutputType> m_change_type;
+    std::optional<OutputType> m_change_type;
     //! If false, allows unselected inputs, but requires all selected inputs be
     //! used
     bool fAllowOtherInputs;
@@ -30,9 +29,9 @@
     //! Override automatic min/max checks on fee, m_feerate must be set if true
     bool fOverrideFeeRate;
     //! Override the wallet's m_pay_tx_fee if set
-    Optional<CFeeRate> m_feerate;
+    std::optional<CFeeRate> m_feerate;
     //! Override the default confirmation target if set
-    Optional<unsigned int> m_confirm_target;
+    std::optional<unsigned int> m_confirm_target;
     //! Avoid partial use of funds sent to a given address
     bool m_avoid_partial_spends;
     //! Forbids inclusion of dirty (previously used) addresses
diff --git a/src/wallet/coinselection.cpp b/src/wallet/coinselection.cpp
--- a/src/wallet/coinselection.cpp
+++ b/src/wallet/coinselection.cpp
@@ -4,7 +4,6 @@
 
 #include <wallet/coinselection.h>
 
-#include <optional.h>
 #include <util/moneystr.h>
 #include <util/system.h>
 
@@ -256,7 +255,7 @@
     nValueRet = Amount::zero();
 
     // List of values less than target
-    Optional<OutputGroup> lowest_larger;
+    std::optional<OutputGroup> lowest_larger;
     std::vector<OutputGroup> applicable_groups;
     Amount nTotalLower = Amount::zero();
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1885,13 +1885,12 @@
 
     LOCK(pwallet->cs_wallet);
 
-    // The way the 'height' is initialized is just a workaround for the gcc bug
-    // #47679 since version 4.6.0. Height of the specified block or the common
-    // ancestor, if the block provided was in a deactivated chain.
-    Optional<int> height = MakeOptional(false, int());
+    // Height of the specified block or the common ancestor, if the block
+    // provided was in a deactivated chain.
+    std::optional<int> height;
 
     // Height of the specified block, even if it's in a deactivated chain.
-    Optional<int> altheight;
+    std::optional<int> altheight;
     int target_confirms = 1;
     isminefilter filter = ISMINE_SPENDABLE;
 
@@ -4101,7 +4100,7 @@
     }
 
     int start_height = 0;
-    Optional<int> stop_height;
+    std::optional<int> stop_height;
     BlockHash start_block;
     {
         LOCK(pwallet->cs_wallet);
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -1556,7 +1556,7 @@
             return false;
         }
 
-        Optional<OutputType> out_script_type =
+        std::optional<OutputType> out_script_type =
             m_wallet_descriptor.descriptor->GetOutputType();
         if (out_script_type && out_script_type == type) {
             ExtractDestination(scripts_temp[0], dest);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1062,7 +1062,7 @@
         //! Unset if no blocks were scanned due to read errors or the chain
         //! being empty.
         BlockHash last_scanned_block;
-        Optional<int> last_scanned_height;
+        std::optional<int> last_scanned_height;
 
         //! Hash of the most recent block that could not be scanned due to
         //! read errors or pruning. Will be set if status is FAILURE, unset if
@@ -1072,7 +1072,7 @@
     };
     ScanResult ScanForWalletTransactions(const BlockHash &start_block,
                                          int start_height,
-                                         Optional<int> max_height,
+                                         std::optional<int> max_height,
                                          const WalletRescanReserver &reserver,
                                          bool fUpdate);
     void transactionRemovedFromMempool(const CTransactionRef &ptx) override;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -14,7 +14,7 @@
 #include <interfaces/wallet.h>
 #include <key.h>
 #include <key_io.h>
-#include <optional.h>
+
 #include <policy/mempool.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
@@ -944,7 +944,7 @@
     // If wallet doesn't have a chain (e.g wallet-tool), don't bother to update
     // txn.
     if (HaveChain()) {
-        Optional<int> block_height =
+        std::optional<int> block_height =
             chain().getBlockHeight(wtxIn.m_confirm.hashBlock);
         if (block_height) {
             // Update cached block height variable since it not stored in the
@@ -1772,8 +1772,9 @@
  * transactions for.
  */
 CWallet::ScanResult CWallet::ScanForWalletTransactions(
-    const BlockHash &start_block, int start_height, Optional<int> max_height,
-    const WalletRescanReserver &reserver, bool fUpdate) {
+    const BlockHash &start_block, int start_height,
+    std::optional<int> max_height, const WalletRescanReserver &reserver,
+    bool fUpdate) {
     int64_t nNow = GetTime();
     int64_t start_time = GetTimeMillis();
 
@@ -4408,14 +4409,14 @@
         WalletBatch batch(*walletInstance->database);
         CBlockLocator locator;
         if (batch.ReadBestBlock(locator)) {
-            if (const Optional<int> fork_height =
+            if (const std::optional<int> fork_height =
                     chain.findLocatorFork(locator)) {
                 rescan_height = *fork_height;
             }
         }
     }
 
-    const Optional<int> tip_height = chain.getHeight();
+    const std::optional<int> tip_height = chain.getHeight();
     if (tip_height) {
         walletInstance->m_last_block_processed =
             chain.getBlockHash(*tip_height);
@@ -4456,9 +4457,7 @@
 
         // No need to read and scan block if block was created before our wallet
         // birthday (as adjusted for block time variability)
-        // The way the 'time_first_key' is initialized is just a workaround for
-        // the gcc bug #47679 since version 4.6.0.
-        Optional<int64_t> time_first_key = MakeOptional(false, int64_t());
+        std::optional<int64_t> time_first_key;
         for (auto spk_man : walletInstance->GetAllScriptPubKeyMans()) {
             int64_t time = spk_man->GetTimeFirstKey();
             if (!time_first_key || time < *time_first_key) {
@@ -4466,7 +4465,7 @@
             }
         }
         if (time_first_key) {
-            if (Optional<int> first_block =
+            if (std::optional<int> first_block =
                     chain.findFirstBlockWithTimeAndHeight(
                         *time_first_key - TIMESTAMP_WINDOW, rescan_height,
                         nullptr)) {
diff --git a/test/lint/lint-boost-dependencies.sh b/test/lint/lint-boost-dependencies.sh
--- a/test/lint/lint-boost-dependencies.sh
+++ b/test/lint/lint-boost-dependencies.sh
@@ -23,7 +23,6 @@
     boost/multi_index/sequenced_index.hpp
     boost/multi_index_container.hpp
     boost/noncopyable.hpp
-    boost/optional.hpp
     boost/preprocessor/cat.hpp
     boost/preprocessor/stringize.hpp
     boost/range/iterator.hpp