diff --git a/src/db.cpp b/src/db.cpp
index b3ce00a04f..0e5522298b 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -5,6 +5,7 @@
 #include "headers.h"
 #include "db.h"
 #include "net.h"
+#include <boost/filesystem/fstream.hpp>
 
 using namespace std;
 using namespace boost;
diff --git a/src/headers.h b/src/headers.h
index a242c9c15e..9e81e27d1d 100644
--- a/src/headers.h
+++ b/src/headers.h
@@ -57,18 +57,6 @@
 #include <map>
 
 #include <boost/foreach.hpp>
-#include <boost/array.hpp>
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/thread.hpp>
-#include <boost/interprocess/sync/file_lock.hpp>
-#include <boost/interprocess/sync/interprocess_mutex.hpp>
-#include <boost/interprocess/sync/interprocess_recursive_mutex.hpp>
-#include <boost/program_options/detail/config_file.hpp>
-#include <boost/program_options/parsers.hpp>
 
 #ifdef __WXMSW__
 #include <windows.h>
diff --git a/src/init.cpp b/src/init.cpp
index a94ea9b7b7..73f4e207cd 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -7,6 +7,8 @@
 #include "net.h"
 #include "init.h"
 #include "strlcpy.h"
+#include <boost/filesystem/fstream.hpp>
+#include <boost/interprocess/sync/file_lock.hpp>
 
 using namespace std;
 using namespace boost;
diff --git a/src/main.cpp b/src/main.cpp
index 18f36eb3a4..0ecbeafd93 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,6 +6,7 @@
 #include "net.h"
 #include "init.h"
 #include "cryptopp/sha.h"
+#include <boost/filesystem/fstream.hpp>
 
 using namespace std;
 using namespace boost;
diff --git a/src/rpc.cpp b/src/rpc.cpp
index 8731b6d57e..b05a13e23b 100644
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -11,8 +11,10 @@
 #include <boost/asio.hpp>
 #include <boost/iostreams/concepts.hpp>
 #include <boost/iostreams/stream.hpp>
+#include <boost/algorithm/string.hpp>
 #ifdef USE_SSL
 #include <boost/asio/ssl.hpp> 
+#include <boost/filesystem/fstream.hpp>
 typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream;
 #endif
 #include "json/json_spirit_reader_template.h"
diff --git a/src/ui.cpp b/src/ui.cpp
index 6e28435a35..f24449cccb 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -3,6 +3,10 @@
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 
 #include "headers.h"
+#include "init.h"
+#include "strlcpy.h"
+#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem/convenience.hpp>
 #ifdef _MSC_VER
 #include <crtdbg.h>
 #endif
diff --git a/src/util.cpp b/src/util.cpp
index 1b6ba016af..32f4b27fd6 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -3,6 +3,12 @@
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 #include "headers.h"
 #include "strlcpy.h"
+#include <boost/program_options/detail/config_file.hpp>
+#include <boost/program_options/parsers.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/interprocess/sync/interprocess_mutex.hpp>
+#include <boost/interprocess/sync/interprocess_recursive_mutex.hpp>
+#include <boost/foreach.hpp>
 
 using namespace std;
 using namespace boost;
diff --git a/src/util.h b/src/util.h
index e4bf0fb10d..3244595164 100644
--- a/src/util.h
+++ b/src/util.h
@@ -15,7 +15,6 @@
 #include <vector>
 #include <string>
 
-#include <boost/foreach.hpp>
 #include <boost/thread.hpp>
 #include <boost/interprocess/sync/interprocess_recursive_mutex.hpp>
 #include <boost/date_time/gregorian/gregorian_types.hpp>