net: narrow include scope after moving to netaddress

Net functionality is no longer needed for CAddress/CAddrman/etc. now that
CNetAddr/CService/CSubNet are dumb storage classes.

src/activemasternode.cpp

@@ -11,8 +11,8 @@
 #include "masternodeconfig.h"
 #include "masternodeman.h"
 #include "messagesigner.h"
+#include "netbase.h"
 #include "protocol.h"
-#include "spork.h"
 
 //
 // Bootup the Masternode, look for a 10000 PIVX input and register on the network

src/addrman.h

@@ -7,7 +7,7 @@
 #ifndef BITCOIN_ADDRMAN_H
 #define BITCOIN_ADDRMAN_H
 
-#include "netbase.h"
+#include "netaddress.h"
 #include "protocol.h"
 #include "random.h"
 #include "sync.h"

src/init.cpp

@@ -32,6 +32,7 @@
 #include "masternodeman.h"
 #include "messagesigner.h"
 #include "miner.h"
+#include "netbase.h"
 #include "net.h"
 #include "rpc/server.h"
 #include "script/standard.h"

src/masternode.cpp

@@ -10,6 +10,7 @@
 #include "masternode-payments.h"
 #include "masternode-sync.h"
 #include "masternodeman.h"
+#include "netbase.h"
 #include "sync.h"
 #include "util.h"
 #include "wallet/wallet.h"

src/masternodeman.cpp

@@ -11,6 +11,7 @@
 #include "masternode-sync.h"
 #include "masternode.h"
 #include "messagesigner.h"
+#include "netbase.h"
 #include "spork.h"
 #include "swifttx.h"
 #include "util.h"

src/net.cpp

@@ -19,6 +19,7 @@
 #include "main.h"
 #include "miner.h"
 #include "primitives/transaction.h"
+#include "netbase.h"
 #include "scheduler.h"
 
 #ifdef WIN32

src/net.h

@@ -13,7 +13,7 @@
 #include "hash.h"
 #include "limitedmap.h"
 #include "mruset.h"
-#include "netbase.h"
+#include "netaddress.h"
 #include "protocol.h"
 #include "random.h"
 #include "streams.h"

src/protocol.h

@@ -12,7 +12,7 @@
 #ifndef BITCOIN_PROTOCOL_H
 #define BITCOIN_PROTOCOL_H
 
-#include "netbase.h"
+#include "netaddress.h"
 #include "serialize.h"
 #include "uint256.h"
 #include "version.h"

src/qt/optionsmodel.cpp

@@ -17,6 +17,7 @@
 #include "init.h"
 #include "main.h"
 #include "net.h"
+#include "netbase.h"
 #include "txdb.h" // for -dbcache defaults
 #include "util.h"
 

src/qt/rpcconsole.cpp

@@ -13,7 +13,7 @@
 #include "peertablemodel.h"
 
 #include "chainparams.h"
-#include "main.h"
+#include "netbase.h"
 #include "rpc/client.h"
 #include "rpc/server.h"
 #include "util.h"

src/rpc/masternode.cpp

@@ -7,18 +7,17 @@
 #include "db.h"
 #include "init.h"
 #include "main.h"
-#include "masternode-budget.h"
 #include "masternode-payments.h"
 #include "masternode-sync.h"
 #include "masternodeconfig.h"
 #include "masternodeman.h"
+#include "netbase.h"
 #include "rpc/server.h"
 #include "utilmoneystr.h"
 
 #include <univalue.h>
 
 #include <boost/tokenizer.hpp>
-#include <fstream>
 
 UniValue listmasternodes(const UniValue& params, bool fHelp)
 {

src/test/addrman_tests.cpp

@@ -9,6 +9,7 @@
 #include <crypto/common.h> // for ReadLE64
 
 #include "hash.h"
+#include "netbase.h"
 #include "random.h"
 
 class CAddrManTest : public CAddrMan

src/test/net_tests.cpp

@@ -6,6 +6,7 @@
 #include "chainparams.h"
 #include "hash.h"
 #include "net.h"
+#include "netbase.h"
 #include "serialize.h"
 #include "streams.h"
 

src/timedata.cpp

@@ -7,7 +7,7 @@
 
 #include "chainparams.h"
 #include "guiinterface.h"
-#include "netbase.h"
+#include "netaddress.h"
 #include "sync.h"
 #include "util.h"
 #include "utilstrencodings.h"

src/wallet/rpcwallet.cpp

@@ -12,7 +12,6 @@
 #include "init.h"
 #include "key_io.h"
 #include "net.h"
-#include "netbase.h"
 #include "rpc/server.h"
 #include "timedata.h"
 #include "util.h"