From f56de12cdd6c60f9ea121109a71589f13e692be8 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 20 Mar 2019 10:10:43 -0400
Subject: [PATCH] Remove all but one circular dep: coinselection <-> wallet

---
 src/asset.cpp                           | 4 ----
 src/asset.h                             | 2 --
 src/rpc/rawtransaction.cpp              | 3 ---
 test/lint/lint-circular-dependencies.sh | 1 +
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/asset.cpp b/src/asset.cpp
index 5c7f47df35ee4..9831c7ea5c040 100644
--- a/src/asset.cpp
+++ b/src/asset.cpp
@@ -1,9 +1,5 @@
 
 #include <asset.h>
-#include <assetsdir.h>
-#include <core_io.h>
-#include <policy/policy.h>
-
 
 CAmountMap& operator+=(CAmountMap& a, const CAmountMap& b)
 {
diff --git a/src/asset.h b/src/asset.h
index eaf1063b0b698..381df84c4f11a 100644
--- a/src/asset.h
+++ b/src/asset.h
@@ -2,9 +2,7 @@
 #ifndef BITCOIN_ASSET_H
 #define BITCOIN_ASSET_H
 
-#include <stdint.h>
 #include <uint256.h>
-#include <stdlib.h>
 
 #include <amount.h>
 #include <serialize.h>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index e0fcb314d4bef..f228b648b6563 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -33,9 +33,6 @@
 #include <blind.h>
 #include <issuance.h>
 #include <rpc/util.h>
-#ifdef ENABLE_WALLET
-#include <wallet/rpcwallet.h>
-#endif
 
 #include <future>
 #include <stdint.h>
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
index 3972baed1d496..5c643751ace15 100755
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -40,6 +40,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/signverifymessagedialog -> qt/addressbookpage"
     "qt/guiutil -> qt/walletmodel -> qt/optionsmodel -> qt/intro -> qt/guiutil"
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/sendcoinsdialog -> qt/sendcoinsentry -> qt/addressbookpage"
+    "wallet/coinselection -> wallet/wallet -> wallet/coinselection"
 )
 
 EXIT_CODE=0