diff --git a/src/daemon/command_line_args.h b/src/daemon/command_line_args.h
index 798c34b6..e3afea9c 100644
--- a/src/daemon/command_line_args.h
+++ b/src/daemon/command_line_args.h
@@ -31,7 +31,6 @@
 
 #include "common/command_line.h"
 #include "cryptonote_config.h"
-#include <boost/program_options.hpp>
 
 namespace daemon_args
 {
diff --git a/src/daemon/core.h b/src/daemon/core.h
index c3d84454..971d9c49 100644
--- a/src/daemon/core.h
+++ b/src/daemon/core.h
@@ -32,8 +32,6 @@
 #include "cryptonote_core/cryptonote_core.h"
 #include "cryptonote_protocol/cryptonote_protocol_handler.h"
 #include "misc_log_ex.h"
-#include <stdexcept>
-#include <boost/program_options.hpp>
 #include "daemon/command_line_args.h"
 
 namespace daemonize
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index 8a1f08c1..eda1caa4 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -28,6 +28,9 @@
 //
 // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
 
+#include <memory>
+#include <stdexcept>
+#include "misc_log_ex.h"
 #include "daemon/daemon.h"
 
 #include "common/util.h"
@@ -36,15 +39,12 @@
 #include "daemon/protocol.h"
 #include "daemon/rpc.h"
 #include "daemon/command_server.h"
-#include "misc_log_ex.h"
 #include "version.h"
 #include "../../contrib/epee/include/syncobj.h"
 
 using namespace epee;
 
-#include <boost/program_options.hpp>
 #include <functional>
-#include <memory>
 
 unsigned int epee::g_test_dbg_lock_sleep = 0;
 
diff --git a/src/daemon/daemon.h b/src/daemon/daemon.h
index 8ed2a2f0..d2bac9d4 100644
--- a/src/daemon/daemon.h
+++ b/src/daemon/daemon.h
@@ -27,8 +27,6 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #pragma once
-
-#include <memory>
 #include <boost/program_options.hpp>
 
 namespace daemonize {
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index 68e37526..1de55a68 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -40,7 +40,6 @@
 #include "misc_log_ex.h"
 #include "p2p/net_node.h"
 #include "rpc/core_rpc_server.h"
-#include <boost/program_options.hpp>
 #include "daemon/command_line_args.h"
 #include "blockchain_db/db_types.h"
 
diff --git a/src/daemon/p2p.h b/src/daemon/p2p.h
index e1a4d38e..7e91ef08 100644
--- a/src/daemon/p2p.h
+++ b/src/daemon/p2p.h
@@ -31,11 +31,8 @@
 #pragma once
 
 #include "cryptonote_protocol/cryptonote_protocol_handler.h"
-#include "daemon/protocol.h"
-#include "misc_log_ex.h"
 #include "p2p/net_node.h"
-#include <stdexcept>
-#include <boost/program_options.hpp>
+#include "daemon/protocol.h"
 
 namespace daemonize
 {
diff --git a/src/daemon/protocol.h b/src/daemon/protocol.h
index 2fc20d77..db94c1f3 100644
--- a/src/daemon/protocol.h
+++ b/src/daemon/protocol.h
@@ -30,12 +30,6 @@
 
 #pragma once
 
-#include "cryptonote_protocol/cryptonote_protocol_handler.h"
-#include "misc_log_ex.h"
-#include "p2p/net_node.h"
-#include <stdexcept>
-#include <boost/program_options.hpp>
-
 namespace daemonize
 {
 
diff --git a/src/daemon/rpc.h b/src/daemon/rpc.h
index c809c45c..b342153f 100644
--- a/src/daemon/rpc.h
+++ b/src/daemon/rpc.h
@@ -30,12 +30,7 @@
 
 #pragma once
 
-#include "daemon/core.h"
-#include "daemon/p2p.h"
-#include "misc_log_ex.h"
 #include "rpc/core_rpc_server.h"
-#include <boost/program_options.hpp>
-#include <stdexcept>
 
 namespace daemonize
 {