diff --git a/console/executor.cpp b/console/executor.cpp
index 98fae362..ad9cca07 100644
--- a/console/executor.cpp
+++ b/console/executor.cpp
@@ -23,8 +23,6 @@
 #include <csignal>
 #include <future>
 #include <mutex>
-#include <boost/format.hpp>
-#include <bitcoin/server.hpp>
 
 namespace libbitcoin {
 namespace server {
diff --git a/console/executor.hpp b/console/executor.hpp
index c4b46d34..1ac2354b 100644
--- a/console/executor.hpp
+++ b/console/executor.hpp
@@ -22,7 +22,10 @@
 #include <atomic>
 #include <future>
 #include <unordered_map>
+
+// Must pull in any base boost configuration before including boost.
 #include <bitcoin/server.hpp>
+#include <boost/format.hpp>
 
 // This class is just an ad-hoc user interface wrapper on the node.
 // It will be factored and cleaned up for final release.
diff --git a/console/executor_commands.cpp b/console/executor_commands.cpp
index 5e8695d9..0de00e7c 100644
--- a/console/executor_commands.cpp
+++ b/console/executor_commands.cpp
@@ -19,9 +19,6 @@
 #include "executor.hpp"
 #include "localize.hpp"
 
-#include <boost/format.hpp>
-#include <bitcoin/server.hpp>
-
 namespace libbitcoin {
 namespace server {
 
diff --git a/console/executor_dumps.cpp b/console/executor_dumps.cpp
index 70409af8..d38f8923 100644
--- a/console/executor_dumps.cpp
+++ b/console/executor_dumps.cpp
@@ -19,9 +19,6 @@
 #include "executor.hpp"
 #include "localize.hpp"
 
-#include <boost/format.hpp>
-#include <bitcoin/server.hpp>
-
 namespace libbitcoin {
 namespace server {
 
diff --git a/console/executor_logging.cpp b/console/executor_logging.cpp
index a9bde399..5461bfa2 100644
--- a/console/executor_logging.cpp
+++ b/console/executor_logging.cpp
@@ -20,8 +20,6 @@
 #include "localize.hpp"
 
 #include <unordered_map>
-#include <boost/format.hpp>
-#include <bitcoin/server.hpp>
 
 namespace libbitcoin {
 namespace server {
diff --git a/console/executor_options.cpp b/console/executor_options.cpp
index 1b4074f1..e7c3b0c6 100644
--- a/console/executor_options.cpp
+++ b/console/executor_options.cpp
@@ -20,8 +20,6 @@
 #include "localize.hpp"
 
 #include <unordered_map>
-#include <boost/format.hpp>
-#include <bitcoin/server.hpp>
 
 namespace libbitcoin {
 namespace server {
diff --git a/console/executor_scans.cpp b/console/executor_scans.cpp
index 5a2c98e6..22149a92 100644
--- a/console/executor_scans.cpp
+++ b/console/executor_scans.cpp
@@ -21,8 +21,6 @@
 
 #include <algorithm>
 #include <map>
-#include <boost/format.hpp>
-#include <bitcoin/server.hpp>
 
 namespace libbitcoin {
 namespace server {
diff --git a/console/executor_store.cpp b/console/executor_store.cpp
index 6e123038..eedf684b 100644
--- a/console/executor_store.cpp
+++ b/console/executor_store.cpp
@@ -19,9 +19,6 @@
 #include "executor.hpp"
 #include "localize.hpp"
 
-#include <boost/format.hpp>
-#include <bitcoin/server.hpp>
-
 namespace libbitcoin {
 namespace server {
 
diff --git a/console/executor_test_reader.cpp b/console/executor_test_reader.cpp
index 8eebf329..e685368d 100644
--- a/console/executor_test_reader.cpp
+++ b/console/executor_test_reader.cpp
@@ -19,10 +19,6 @@
 #include "executor.hpp"
 #include "localize.hpp"
 
-////#include <set>
-#include <boost/format.hpp>
-#include <bitcoin/server.hpp>
-
 namespace libbitcoin {
 namespace server {
 
diff --git a/console/executor_test_writer.cpp b/console/executor_test_writer.cpp
index 30998d30..a0debf11 100644
--- a/console/executor_test_writer.cpp
+++ b/console/executor_test_writer.cpp
@@ -19,9 +19,6 @@
 #include "executor.hpp"
 #include "localize.hpp"
 
-////#include <boost/format.hpp>
-#include <bitcoin/server.hpp>
-
 namespace libbitcoin {
 namespace server {