cleanup/fix includes: (#1214)

- some were not used, some were included twice, some were in the wrong place, some were missing (but it compiled because some were in the wrong place)
- organized a bit better, grouped dash specific includes in original bitcoin files, should save some time solving conflicts when/if merging patches later

src/governance-classes.cpp

@@ -4,26 +4,16 @@
 
 //#define ENABLE_DASH_DEBUG
 
-#include "governance-classes.h"
-
 #include "core_io.h"
-#include "main.h"
+#include "governance-classes.h"
 #include "init.h"
-#include "chainparams.h"
+#include "main.h"
+#include "utilstrencodings.h"
 
-#include "consensus/consensus.h"
-#include "consensus/merkle.h"
-#include "consensus/validation.h"
-
-#include "governance.h"
-#include "masternode.h"
-#include <boost/lexical_cast.hpp>
-#include <univalue.h>
-
-#include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 
+#include <univalue.h>
 
 // DECLARE GLOBAL VARIABLES FOR GOVERNANCE CLASSES
 CGovernanceTriggerManager triggerman;

src/governance-classes.h

@@ -6,19 +6,13 @@
 
 //#define ENABLE_DASH_DEBUG
 
-#include "util.h"
-#include "main.h"
-#include "sync.h"
-#include "net.h"
-#include "key.h"
-#include "util.h"
 #include "base58.h"
-#include "masternode.h"
-#include <boost/lexical_cast.hpp>
-#include <boost/shared_ptr.hpp>
-#include "init.h"
 #include "governance.h"
+#include "key.h"
+#include "script/standard.h"
+#include "util.h"
 
+#include <boost/shared_ptr.hpp>
 
 class CSuperblock;
 class CGovernanceTrigger;

src/governance-exceptions.h

@@ -6,8 +6,9 @@
 #define GOVERNANCE_EXCEPTIONS_H
 
 #include <exception>
-#include <string>
 #include <iostream>
+#include <sstream>
+#include <string>
 
 enum governance_exception_type_enum_t {
     /// Default value, normally indicates no exception condition occurred

src/governance-object.cpp

@@ -3,23 +3,14 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "core_io.h"
-#include "main.h"
-#include "init.h"
-
-#include "flat-database.h"
+#include "darksend.h"
 #include "governance.h"
+#include "governance-classes.h"
 #include "governance-object.h"
 #include "governance-vote.h"
-#include "governance-classes.h"
-#include "masternode.h"
-#include "governance.h"
-#include "darksend.h"
 #include "masternodeman.h"
-#include "masternode-sync.h"
-#include "netfulfilledman.h"
 #include "util.h"
-#include "addrman.h"
-#include <boost/lexical_cast.hpp>
+
 #include <univalue.h>
 
 CGovernanceObject::CGovernanceObject()

src/governance-object.h

@@ -7,27 +7,16 @@
 
 //#define ENABLE_DASH_DEBUG
 
-#include "util.h"
-#include "main.h"
-#include "sync.h"
-#include "net.h"
-#include "key.h"
-#include "util.h"
-#include "base58.h"
-#include "masternode.h"
+#include "cachemultimap.h"
 #include "governance-exceptions.h"
 #include "governance-vote.h"
 #include "governance-votedb.h"
-#include "masternodeman.h"
-#include <boost/lexical_cast.hpp>
-#include "init.h"
-#include <univalue.h>
-#include "utilstrencodings.h"
-#include "cachemap.h"
-#include "cachemultimap.h"
+#include "key.h"
+#include "net.h"
+#include "sync.h"
+#include "util.h"
 
-#include <stdio.h>
-#include <string.h>
+#include <univalue.h>
 
 class CGovernanceManager;
 class CGovernanceTriggerManager;

src/governance-vote.cpp

@@ -2,23 +2,13 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "core_io.h"
-#include "main.h"
-#include "init.h"
-
-#include "flat-database.h"
-#include "governance.h"
-#include "masternode.h"
-#include "governance.h"
 #include "darksend.h"
+#include "governance-vote.h"
 #include "masternodeman.h"
-#include "masternode-sync.h"
 #include "util.h"
-#include "addrman.h"
+
 #include <boost/lexical_cast.hpp>
 
-
-
 std::string CGovernanceVoting::ConvertOutcomeToString(vote_outcome_enum_t nOutcome)
 {
     switch(nOutcome)

src/governance-vote.h

@@ -5,15 +5,10 @@
 #ifndef GOVERNANCE_VOTE_H
 #define GOVERNANCE_VOTE_H
 
-#include "main.h"
-#include "sync.h"
-#include "net.h"
 #include "key.h"
-#include "util.h"
-#include "base58.h"
-#include "masternode.h"
+#include "primitives/transaction.h"
+
 #include <boost/lexical_cast.hpp>
-#include "init.h"
 
 using namespace std;
 

src/governance.cpp

@@ -2,25 +2,17 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "core_io.h"
-#include "main.h"
-#include "init.h"
-
-#include "flat-database.h"
+#include "darksend.h"
 #include "governance.h"
 #include "governance-object.h"
 #include "governance-vote.h"
 #include "governance-classes.h"
+#include "main.h"
 #include "masternode.h"
-#include "governance.h"
-#include "darksend.h"
-#include "masternodeman.h"
 #include "masternode-sync.h"
+#include "masternodeman.h"
 #include "netfulfilledman.h"
 #include "util.h"
-#include "addrman.h"
-#include <boost/lexical_cast.hpp>
-#include <univalue.h>
 
 CGovernanceManager governance;
 

src/governance.h

@@ -7,28 +7,16 @@
 
 //#define ENABLE_DASH_DEBUG
 
-#include "util.h"
-#include "main.h"
-#include "sync.h"
-#include "net.h"
-#include "key.h"
-#include "util.h"
-#include "base58.h"
-#include "governance-object.h"
-#include "masternode.h"
-#include "governance-exceptions.h"
-#include "governance-vote.h"
-#include "governance-votedb.h"
-#include "masternodeman.h"
-#include <boost/lexical_cast.hpp>
-#include "init.h"
-#include <univalue.h>
-#include "utilstrencodings.h"
 #include "cachemap.h"
 #include "cachemultimap.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "chain.h"
+#include "governance-exceptions.h"
+#include "governance-object.h"
+#include "governance-vote.h"
+#include "net.h"
+#include "sync.h"
+#include "timedata.h"
+#include "util.h"
 
 class CGovernanceManager;
 class CGovernanceTriggerManager;

src/init.cpp

@@ -34,25 +34,31 @@
 #include "torcontrol.h"
 #include "ui_interface.h"
 #include "util.h"
-#include "activemasternode.h"
-#include "instantx.h"
-#include "darksend.h"
-#include "masternode-payments.h"
-#include "masternode-sync.h"
-#include "masternodeman.h"
-#include "masternodeconfig.h"
-#include "flat-database.h"
-#include "governance.h"
-#include "spork.h"
 #include "utilmoneystr.h"
 #include "utilstrencodings.h"
 #include "validationinterface.h"
 #ifdef ENABLE_WALLET
-#include "keepass.h"
 #include "wallet/db.h"
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
 #endif
+
+#include "activemasternode.h"
+#include "darksend.h"
+#include "dsnotificationinterface.h"
+#include "flat-database.h"
+#include "governance.h"
+#include "instantx.h"
+#ifdef ENABLE_WALLET
+#include "keepass.h"
+#endif
+#include "masternode-payments.h"
+#include "masternode-sync.h"
+#include "masternodeman.h"
+#include "masternodeconfig.h"
+#include "netfulfilledman.h"
+#include "spork.h"
+
 #include <stdint.h>
 #include <stdio.h>
 
@@ -75,8 +81,6 @@
 #include "zmq/zmqnotificationinterface.h"
 #endif
 
-#include "dsnotificationinterface.h"
-
 using namespace std;
 
 #ifdef ENABLE_WALLET

src/instantx.cpp

@@ -2,19 +2,19 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "consensus/validation.h"
-#include "sync.h"
-#include "net.h"
-#include "key.h"
-#include "util.h"
-#include "base58.h"
-#include "protocol.h"
-#include "instantx.h"
+
 #include "activemasternode.h"
 #include "darksend.h"
+#include "instantx.h"
+#include "key.h"
 #include "masternode-sync.h"
 #include "masternodeman.h"
+#include "net.h"
+#include "protocol.h"
 #include "spork.h"
+#include "sync.h"
+#include "util.h"
+#include "consensus/validation.h"
 
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/lexical_cast.hpp>

src/instantx.h

@@ -4,12 +4,8 @@
 #ifndef INSTANTX_H
 #define INSTANTX_H
 
-#include "sync.h"
 #include "net.h"
-#include "key.h"
-#include "util.h"
-#include "base58.h"
-#include "main.h"
+#include "primitives/transaction.h"
 
 class CTransaction;
 class CTxLockVote;

src/main.cpp

@@ -17,12 +17,6 @@
 #include "consensus/validation.h"
 #include "hash.h"
 #include "init.h"
-#include "instantx.h"
-#include "darksend.h"
-#include "governance.h"
-#include "masternode-payments.h"
-#include "masternode-sync.h"
-#include "masternodeman.h"
 #include "merkleblock.h"
 #include "net.h"
 #include "policy/policy.h"
@@ -44,6 +38,13 @@
 #include "validationinterface.h"
 #include "versionbits.h"
 
+#include "darksend.h"
+#include "governance.h"
+#include "instantx.h"
+#include "masternode-payments.h"
+#include "masternode-sync.h"
+#include "masternodeman.h"
+
 #include <sstream>
 
 #include <boost/algorithm/string/replace.hpp>

src/masternode-payments.cpp

@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "activemasternode.h"
-#include "addrman.h"
 #include "darksend.h"
 #include "governance-classes.h"
 #include "masternode-payments.h"

src/masternodeman.cpp

@@ -2,19 +2,15 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "masternodeman.h"
 #include "activemasternode.h"
+#include "addrman.h"
 #include "darksend.h"
 #include "governance.h"
-#include "masternode.h"
 #include "masternode-payments.h"
 #include "masternode-sync.h"
+#include "masternodeman.h"
 #include "netfulfilledman.h"
 #include "util.h"
-#include "addrman.h"
-#include "spork.h"
-#include <boost/lexical_cast.hpp>
-#include <boost/filesystem.hpp>
 
 /** Masternode manager */
 CMasternodeMan mnodeman;

src/net.cpp

@@ -19,11 +19,12 @@
 #include "primitives/transaction.h"
 #include "scheduler.h"
 #include "ui_interface.h"
-#include "darksend.h"
-#include "instantx.h"
 #include "wallet/wallet.h"
 #include "utilstrencodings.h"
 
+#include "darksend.h"
+#include "instantx.h"
+
 #ifdef WIN32
 #include <string.h>
 #else

src/qt/clientmodel.cpp

@@ -13,13 +13,14 @@
 #include "chainparams.h"
 #include "checkpoints.h"
 #include "clientversion.h"
-#include "darksend.h"
 #include "net.h"
 #include "txmempool.h"
 #include "ui_interface.h"
+#include "util.h"
+
+#include "darksend.h"
 #include "masternodeman.h"
 #include "masternode-sync.h"
-#include "util.h"
 
 #include <stdint.h>
 

src/qt/coincontroldialog.cpp

@@ -15,11 +15,13 @@
 #include "walletmodel.h"
 
 #include "coincontrol.h"
-#include "darksend.h"
 #include "init.h"
 #include "main.h" // For minRelayTxFee
 #include "wallet/wallet.h"
 
+#include "darksend.h"
+#include "instantx.h"
+
 #include <boost/assign/list_of.hpp> // for 'map_list_of()'
 
 #include <QApplication>

src/qt/masternodelist.cpp

@@ -1,16 +1,16 @@
 #include "masternodelist.h"
 #include "ui_masternodelist.h"
 
-#include "sync.h"
-#include "clientmodel.h"
-#include "walletmodel.h"
 #include "activemasternode.h"
+#include "clientmodel.h"
+#include "init.h"
+#include "guiutil.h"
 #include "masternode-sync.h"
 #include "masternodeconfig.h"
 #include "masternodeman.h"
+#include "sync.h"
 #include "wallet/wallet.h"
-#include "init.h"
-#include "guiutil.h"
+#include "walletmodel.h"
 
 #include <QTimer>
 #include <QMessageBox>

src/qt/optionsdialog.cpp

@@ -12,7 +12,6 @@
 #include "bitcoinunits.h"
 #include "guiutil.h"
 #include "optionsmodel.h"
-#include "darksend.h"
 
 #include "main.h" // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS
 #include "netbase.h"
@@ -22,6 +21,8 @@
 #include "wallet/wallet.h" // for CWallet::GetRequiredFee()
 #endif
 
+#include "darksend.h"
+
 #include <boost/thread.hpp>
 
 #include <QDataWidgetMapper>

src/qt/optionsmodel.cpp

@@ -13,7 +13,6 @@
 #include "guiutil.h"
 
 #include "amount.h"
-#include "darksend.h"
 #include "init.h"
 #include "main.h" // For DEFAULT_SCRIPTCHECK_THREADS
 #include "net.h"
@@ -22,6 +21,10 @@
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
+#endif
+
+#include "darksend.h"
+#ifdef ENABLE_WALLET
 #include "masternodeconfig.h"
 #endif
 

src/qt/overviewpage.cpp

@@ -8,17 +8,19 @@
 
 #include "bitcoinunits.h"
 #include "clientmodel.h"
-#include "darksend.h"
-#include "darksendconfig.h"
 #include "guiconstants.h"
 #include "guiutil.h"
+#include "init.h"
 #include "optionsmodel.h"
 #include "platformstyle.h"
 #include "transactionfilterproxy.h"
 #include "transactiontablemodel.h"
 #include "utilitydialog.h"
 #include "walletmodel.h"
-#include "init.h"
+
+#include "darksend.h"
+#include "instantx.h"
+#include "darksendconfig.h"
 #include "masternode-sync.h"
 
 #include <QAbstractItemDelegate>

src/qt/transactiondesc.cpp

@@ -19,6 +19,8 @@
 #include "wallet/db.h"
 #include "wallet/wallet.h"
 
+#include "instantx.h"
+
 #include <stdint.h>
 #include <string>
 

src/qt/transactionrecord.cpp

@@ -9,9 +9,10 @@
 #include "consensus/consensus.h"
 #include "main.h"
 #include "timedata.h"
+#include "wallet/wallet.h"
+
 #include "darksend.h"
 #include "instantx.h"
-#include "wallet/wallet.h"
 
 #include <stdint.h>
 

src/qt/walletmodel.cpp

@@ -13,15 +13,17 @@
 #include "transactiontablemodel.h"
 
 #include "base58.h"
-#include "darksend.h"
 #include "keystore.h"
 #include "main.h"
 #include "sync.h"
 #include "ui_interface.h"
-#include "spork.h"
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h" // for BackupWallet
 
+#include "darksend.h"
+#include "instantx.h"
+#include "spork.h"
+
 #include <stdint.h>
 
 #include <QDebug>

src/qt/walletmodel.h

@@ -8,7 +8,6 @@
 #include "paymentrequestplus.h"
 #include "walletmodeltransaction.h"
 
-#include "instantx.h"
 #include "wallet/wallet.h"
 #include "support/allocators/secure.h"
 

src/rpcgovernance.cpp

@@ -4,30 +4,23 @@
 
 //#define ENABLE_DASH_DEBUG
 
-#include "util.h"
-#include "main.h"
-#include "db.h"
-#include "init.h"
 #include "activemasternode.h"
 #include "darksend.h"
 #include "governance.h"
+#include "governance-vote.h"
+#include "governance-classes.h"
+#include "init.h"
+#include "main.h"
 #include "masternode.h"
-#include "masternode-payments.h"
 #include "masternode-sync.h"
 #include "masternodeconfig.h"
 #include "masternodeman.h"
 #include "rpcserver.h"
+#include "util.h"
 #include "utilmoneystr.h"
-#include "governance-vote.h"
-#include "governance-classes.h"
+
 #include <boost/lexical_cast.hpp>
 
-#include <fstream>
-#include <iostream>
-#include <sstream>
-
-using namespace std;
-
 UniValue gobject(const UniValue& params, bool fHelp)
 {
     std::string strCommand;

src/rpcmasternode.cpp

@@ -2,17 +2,16 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "main.h"
-#include "db.h"
-#include "init.h"
 #include "activemasternode.h"
 #include "darksend.h"
-#include "governance.h"
+#include "init.h"
+#include "main.h"
 #include "masternode-payments.h"
 #include "masternode-sync.h"
 #include "masternodeconfig.h"
 #include "masternodeman.h"
 #include "rpcserver.h"
+#include "util.h"
 #include "utilmoneystr.h"
 
 #include <fstream>

src/wallet/wallet.cpp

@@ -12,25 +12,26 @@
 #include "coincontrol.h"
 #include "consensus/consensus.h"
 #include "consensus/validation.h"
-#include "darksend.h"
 #include "key.h"
 #include "keystore.h"
 #include "main.h"
 #include "net.h"
-#include "governance.h"
-#include "keepass.h"
-#include "instantx.h"
 #include "policy/policy.h"
 #include "primitives/block.h"
 #include "primitives/transaction.h"
 #include "script/script.h"
 #include "script/sign.h"
-#include "spork.h"
 #include "timedata.h"
 #include "txmempool.h"
 #include "util.h"
 #include "utilmoneystr.h"
 
+#include "darksend.h"
+#include "governance.h"
+#include "instantx.h"
+#include "keepass.h"
+#include "spork.h"
+
 #include <assert.h>
 
 #include <boost/algorithm/string/replace.hpp>