From 54529b8457c62156bd22b0d7406a659fffd3a3d8 Mon Sep 17 00:00:00 2001
From: Peter Shugalev <peter@shugalev.com>
Date: Mon, 29 Jan 2024 08:48:13 +0100
Subject: [PATCH] Fix patrial rebase

---
 src/wallet/coincontrol.h                    | 2 ++
 src/wallet/test/createtransaction_tests.cpp | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
index 93fe0458b5..1a8690c556 100644
--- a/src/wallet/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -6,6 +6,8 @@
 #define BITCOIN_WALLET_COINCONTROL_H
 
 #include "primitives/transaction.h"
+#include "script/standard.h"
+#include <optional>
 
 enum class CoinType
 {
diff --git a/src/wallet/test/createtransaction_tests.cpp b/src/wallet/test/createtransaction_tests.cpp
index 7922eac2d8..b527362ff3 100644
--- a/src/wallet/test/createtransaction_tests.cpp
+++ b/src/wallet/test/createtransaction_tests.cpp
@@ -320,7 +320,6 @@ BOOST_FIXTURE_TEST_SUITE(createtransaction_tests, WalletTestingSetup)
         vTxouts.at(0)._mockupDepthInMainChain = 0;
 
         CCoinControl coinControl;
-        coinControl.fAllowUnconfirmedIsSet = true;
         coinControl.fAllowUnconfirmed = false;
 
         {
@@ -428,7 +427,6 @@ BOOST_FIXTURE_TEST_SUITE(createtransaction_tests, WalletTestingSetup)
         vTxouts.at(0)._mockupDepthInMainChain = 0;
 
         CCoinControl coinControl;
-        coinControl.fAllowUnconfirmedIsSet = true;
         coinControl.fAllowUnconfirmed = false;
 
         {