diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0614d03be0..5b93fac654 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -466,6 +466,8 @@ set(BOOST_MODULE_LIBS
     ratio
     rational
     regex
+    scope
+    scope_exit
     serialization
     smart_ptr
     spirit
diff --git a/nano/core_test/websocket.cpp b/nano/core_test/websocket.cpp
index 6cf553d3e7..90991493d3 100644
--- a/nano/core_test/websocket.cpp
+++ b/nano/core_test/websocket.cpp
@@ -12,6 +12,7 @@
 
 #include <gtest/gtest.h>
 
+#include <boost/format.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
 #include <chrono>
diff --git a/nano/lib/config.cpp b/nano/lib/config.cpp
index df922fcc07..4dda3dcf15 100644
--- a/nano/lib/config.cpp
+++ b/nano/lib/config.cpp
@@ -6,6 +6,7 @@
 
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/numeric/conversion/cast.hpp>
 
 #include <valgrind/valgrind.h>
 
diff --git a/nano/nano_wallet/entry.cpp b/nano/nano_wallet/entry.cpp
index 6a3eac399d..4f149aa51d 100644
--- a/nano/nano_wallet/entry.cpp
+++ b/nano/nano_wallet/entry.cpp
@@ -18,6 +18,7 @@
 #include <nano/rpc/rpc.hpp>
 #include <nano/secure/working.hpp>
 
+#include <boost/format.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/program_options.hpp>
 #include <boost/property_tree/json_parser.hpp>
diff --git a/nano/node/distributed_work.cpp b/nano/node/distributed_work.cpp
index 56312d7cc7..1404c06526 100644
--- a/nano/node/distributed_work.cpp
+++ b/nano/node/distributed_work.cpp
@@ -4,6 +4,7 @@
 #include <nano/node/websocket.hpp>
 
 #include <boost/algorithm/string/erase.hpp>
+#include <boost/format.hpp>
 
 std::shared_ptr<request_type> nano::distributed_work::peer_request::get_prepared_json_request (std::string const & request_string_a) const
 {
diff --git a/nano/node/ipc/ipc_server.cpp b/nano/node/ipc/ipc_server.cpp
index bdd1eac708..ce711cb392 100644
--- a/nano/node/ipc/ipc_server.cpp
+++ b/nano/node/ipc/ipc_server.cpp
@@ -14,6 +14,7 @@
 #include <nano/node/json_handler.hpp>
 #include <nano/node/node.hpp>
 
+#include <boost/array.hpp>
 #include <boost/endian/conversion.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
diff --git a/nano/node/node.cpp b/nano/node/node.cpp
index 229d17ce16..b3d5955511 100644
--- a/nano/node/node.cpp
+++ b/nano/node/node.cpp
@@ -37,6 +37,7 @@
 #include <nano/store/component.hpp>
 #include <nano/store/rocksdb/rocksdb.hpp>
 
+#include <boost/format.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
 #include <algorithm>
diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp
index a13926989d..309290dc1d 100644
--- a/nano/rpc_test/rpc.cpp
+++ b/nano/rpc_test/rpc.cpp
@@ -30,6 +30,7 @@
 
 #include <gtest/gtest.h>
 
+#include <boost/format.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
 #include <algorithm>
diff --git a/nano/test_common/system.cpp b/nano/test_common/system.cpp
index 66af123ae8..15aed96141 100644
--- a/nano/test_common/system.cpp
+++ b/nano/test_common/system.cpp
@@ -10,6 +10,7 @@
 #include <nano/test_common/testutil.hpp>
 
 #include <boost/asio.hpp>
+#include <boost/format.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
 #include <cstdlib>
diff --git a/submodules/boost b/submodules/boost
index b6928ae5c9..65c1319bb9 160000
--- a/submodules/boost
+++ b/submodules/boost
@@ -1 +1 @@
-Subproject commit b6928ae5c92e21a04bbe17a558e6e066dbe632f6
+Subproject commit 65c1319bb92fe7a9a4abd588eff5818d9c2bccf9