From 60c8bac77c6612b84e3496b2227a01058d720ecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Sun, 5 Jul 2015 14:30:07 +0200
Subject: Includes: Cleanup around net main and wallet

-Move from .h to .cpp: in main, net and wallet
-Remove unnecessary #include "main.h"
-Cleanup some wallet files includes
---
 src/wallet/wallet.cpp      | 4 ++++
 src/wallet/wallet.h        | 4 ----
 src/wallet/wallet_ismine.h | 1 -
 src/wallet/walletdb.cpp    | 2 +-
 src/wallet/walletdb.h      | 1 -
 5 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/wallet')

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 5a52d931dc..58b9ccc078 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -11,9 +11,13 @@
 #include "coincontrol.h"
 #include "consensus/consensus.h"
 #include "consensus/validation.h"
+#include "key.h"
+#include "keystore.h"
 #include "main.h"
 #include "net.h"
 #include "policy/policy.h"
+#include "primitives/block.h"
+#include "primitives/transaction.h"
 #include "script/script.h"
 #include "script/sign.h"
 #include "timedata.h"
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index de3232e56f..ae007e4673 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -7,10 +7,6 @@
 #define BITCOIN_WALLET_WALLET_H
 
 #include "amount.h"
-#include "key.h"
-#include "keystore.h"
-#include "primitives/block.h"
-#include "primitives/transaction.h"
 #include "streams.h"
 #include "tinyformat.h"
 #include "ui_interface.h"
diff --git a/src/wallet/wallet_ismine.h b/src/wallet/wallet_ismine.h
index 9619410e77..7846565f8d 100644
--- a/src/wallet/wallet_ismine.h
+++ b/src/wallet/wallet_ismine.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_WALLET_WALLET_ISMINE_H
 #define BITCOIN_WALLET_WALLET_ISMINE_H
 
-#include "key.h"
 #include "script/standard.h"
 
 #include <stdint.h>
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index f777926e72..c1eb184581 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -7,7 +7,7 @@
 
 #include "base58.h"
 #include "consensus/validation.h"
-#include "main.h"
+#include "main.h" // For CheckTransaction
 #include "protocol.h"
 #include "serialize.h"
 #include "sync.h"
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index bc1a104b5b..270f826aed 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -9,7 +9,6 @@
 #include "amount.h"
 #include "wallet/db.h"
 #include "key.h"
-#include "keystore.h"
 
 #include <list>
 #include <stdint.h>
-- 
cgit v1.2.3