diff --git a/src/addrman.h b/src/addrman.h
index 7adc70b07..58ca4c6dd 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_ADDRMAN_H
 #define BITCOIN_ADDRMAN_H
 
-#include "netbase.h"
+#include "netaddress.h"
 #include "protocol.h"
 #include "random.h"
 #include "sync.h"
diff --git a/src/init.cpp b/src/init.cpp
index f0addb332..51ea115df 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -22,6 +22,7 @@
 #include "key.h"
 #include "main.h"
 #include "miner.h"
+#include "netbase.h"
 #include "net.h"
 #include "policy/policy.h"
 #include "rpc/server.h"
diff --git a/src/net.cpp b/src/net.cpp
index 864f5e2ef..f5bb63d2f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -17,6 +17,7 @@
 #include "crypto/sha256.h"
 #include "hash.h"
 #include "primitives/transaction.h"
+#include "netbase.h"
 #include "scheduler.h"
 #include "ui_interface.h"
 #include "utilstrencodings.h"
diff --git a/src/net.h b/src/net.h
index ff72b3107..11ea221b4 100644
--- a/src/net.h
+++ b/src/net.h
@@ -10,7 +10,7 @@
 #include "bloom.h"
 #include "compat.h"
 #include "limitedmap.h"
-#include "netbase.h"
+#include "netaddress.h"
 #include "protocol.h"
 #include "random.h"
 #include "streams.h"
diff --git a/src/protocol.h b/src/protocol.h
index a72813e95..f26c07153 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -10,7 +10,7 @@
 #ifndef BITCOIN_PROTOCOL_H
 #define BITCOIN_PROTOCOL_H
 
-#include "netbase.h"
+#include "netaddress.h"
 #include "serialize.h"
 #include "uint256.h"
 #include "version.h"
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index d71e22809..66d028eea 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -15,6 +15,7 @@
 #include "init.h"
 #include "main.h" // For DEFAULT_SCRIPTCHECK_THREADS
 #include "net.h"
+#include "netbase.h"
 #include "txdb.h" // for -dbcache defaults
 #include "intro.h" 
 
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 1a6b203d0..8e1da5b92 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -16,6 +16,7 @@
 #include "bantablemodel.h"
 
 #include "chainparams.h"
+#include "netbase.h"
 #include "rpc/server.h"
 #include "rpc/client.h"
 #include "util.h"
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index b84d00856..5f150e481 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -7,6 +7,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include "hash.h"
+#include "netbase.h"
 #include "random.h"
 
 using namespace std;
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index cdc4a05d8..53a74e4a3 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -9,6 +9,7 @@
 #include "serialize.h"
 #include "streams.h"
 #include "net.h"
+#include "netbase.h"
 #include "chainparams.h"
 
 using namespace std;
diff --git a/src/timedata.cpp b/src/timedata.cpp
index 4d2f8d1e3..6b9c088c8 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -8,7 +8,7 @@
 
 #include "timedata.h"
 
-#include "netbase.h"
+#include "netaddress.h"
 #include "sync.h"
 #include "ui_interface.h"
 #include "util.h"
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 35098dcb2..ecebf44cb 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -1,5 +1,6 @@
 #include "torcontrol.h"
 #include "utilstrencodings.h"
+#include "netbase.h"
 #include "net.h"
 #include "util.h"
 #include "crypto/hmac_sha256.h"
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index c84cf3ae2..cfe2a68fa 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -10,7 +10,6 @@
 #include "init.h"
 #include "main.h"
 #include "net.h"
-#include "netbase.h"
 #include "rpc/server.h"
 #include "timedata.h"
 #include "util.h"