From 6b3507244e352c7e5f916e221445cecab1e64e80 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Tue, 15 May 2018 09:38:02 +0200
Subject: [PATCH] Merge #13234: Break circular dependency: chain -> pow ->
 chain

5b35b92 Break circular dependency: chain -> pow -> chain (Ben Woosley)

Pull request description:

  chain.h does not actually depend on the methods defined in pow.h, just its
  include of consensus/params.h, which is standalone and can be included instead.

  Confirmed by inspection and successful build.

Tree-SHA512: fd2a182aad72c62ca54c9ac028d8f3f4416e4d0a5b8ed0a23fb52496d9291a6eeed5252f5e8b8ef4e47ca28bea3d2ed6ff3c41ddb92d102af02a895c9787100c
---
 src/chain.h                       | 2 +-
 src/test/blockencodings_tests.cpp | 1 +
 src/test/test_dash.cpp            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/chain.h b/src/chain.h
index ba96632fb9..243487e476 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -7,8 +7,8 @@
 #define BITCOIN_CHAIN_H
 
 #include <arith_uint256.h>
+#include <consensus/params.h>
 #include <primitives/block.h>
-#include <pow.h>
 #include <tinyformat.h>
 #include <uint256.h>
 
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
index f56da31f60..e3aea82cb9 100644
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -5,6 +5,7 @@
 #include <blockencodings.h>
 #include <consensus/merkle.h>
 #include <chainparams.h>
+#include <pow.h>
 #include <random.h>
 
 #include <test/test_dash.h>
diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index 3300cf59ba..e1ec9cc832 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -11,6 +11,7 @@
 #include <validation.h>
 #include <miner.h>
 #include <net_processing.h>
+#include <pow.h>
 #include <ui_interface.h>
 #include <streams.h>
 #include <rpc/server.h>