diff --git a/src/init.cpp b/src/init.cpp
index a0b9f89f2..28f6e08f9 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -10,7 +10,6 @@
 #include "init.h"
 
 #include "addrman.h"
-#include "db.h"
 #include "checkpoints.h"
 #include "main.h"
 #include "miner.h"
@@ -20,6 +19,7 @@
 #include "ui_interface.h"
 #include "util.h"
 #ifdef ENABLE_WALLET
+#include "db.h"
 #include "wallet.h"
 #include "walletdb.h"
 #endif
diff --git a/src/miner.cpp b/src/miner.cpp
index edfbbf573..21a9fa256 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -8,8 +8,9 @@
 #include "core.h"
 #include "main.h"
 #include "net.h"
+#ifdef ENABLE_WALLET
 #include "wallet.h"
-
+#endif
 //////////////////////////////////////////////////////////////////////////////
 //
 // BitcoinMiner
diff --git a/src/net.cpp b/src/net.cpp
index 6ae749c65..ab39be60b 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -12,7 +12,6 @@
 #include "addrman.h"
 #include "chainparams.h"
 #include "core.h"
-#include "db.h"
 #include "ui_interface.h"
 
 #ifdef WIN32
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index b81433120..1a8462fde 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -5,13 +5,14 @@
 
 #include "rpcserver.h"
 #include "chainparams.h"
-#include "db.h"
 #include "init.h"
 #include "net.h"
 #include "main.h"
 #include "miner.h"
+#ifdef ENABLE_WALLET
+#include "db.h"
 #include "wallet.h"
-
+#endif
 #include <stdint.h>
 
 #include "json/json_spirit_utils.h"
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index ea6abb7e9..8e3091d55 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -4,7 +4,6 @@
 #include "miner.h"
 #include "uint256.h"
 #include "util.h"
-#include "wallet.h"
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index a4592fe80..667bdfb62 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -2,12 +2,12 @@
 
 
 
-#include "db.h"
 #include "main.h"
 #include "txdb.h"
 #include "ui_interface.h"
 #include "util.h"
 #ifdef ENABLE_WALLET
+#include "db.h"
 #include "wallet.h"
 #endif