From dbb077b7d66addd1740085b1742791207feefd4d Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Mon, 19 Jan 2026 15:20:25 -0500
Subject: [PATCH 1/2] Standardize root folder sources include paths.

---
 include/bitcoin/node/events.hpp | 1 -
 src/block_arena.cpp             | 2 +-
 src/block_memory.cpp            | 1 +
 src/configuration.cpp           | 1 +
 src/error.cpp                   | 2 +-
 src/settings.cpp                | 1 +
 6 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/bitcoin/node/events.hpp b/include/bitcoin/node/events.hpp
index c92566173..f586663ea 100644
--- a/include/bitcoin/node/events.hpp
+++ b/include/bitcoin/node/events.hpp
@@ -19,7 +19,6 @@
 #ifndef LIBBITCOIN_NODE_EVENTS_HPP
 #define LIBBITCOIN_NODE_EVENTS_HPP
 
-#include <bitcoin/system.hpp>
 #include <bitcoin/node/error.hpp>
 
 namespace libbitcoin {
diff --git a/src/block_arena.cpp b/src/block_arena.cpp
index 4ec68c801..f1fda06ea 100644
--- a/src/block_arena.cpp
+++ b/src/block_arena.cpp
@@ -19,7 +19,7 @@
 #include <bitcoin/node/block_arena.hpp>
 
 #include <algorithm>
-#include <bitcoin/system.hpp>
+#include <bitcoin/node/define.hpp>
 
 namespace libbitcoin {
 namespace node {
diff --git a/src/block_memory.cpp b/src/block_memory.cpp
index 4ca8249d6..276a6404c 100644
--- a/src/block_memory.cpp
+++ b/src/block_memory.cpp
@@ -19,6 +19,7 @@
 #include <bitcoin/node/block_memory.hpp>
 
 #include <atomic>
+#include <bitcoin/node/define.hpp>
 
 namespace libbitcoin {
 namespace node {
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 9b602b6d2..8d0736232 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -18,6 +18,7 @@
  */
 #include <bitcoin/node/configuration.hpp>
 
+#include <bitcoin/node/define.hpp>
 #include <bitcoin/node/settings.hpp>
 
 namespace libbitcoin {
diff --git a/src/error.cpp b/src/error.cpp
index 10e189464..000c9b2c5 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -18,7 +18,7 @@
  */
 #include <bitcoin/node/error.hpp>
 
-#include <bitcoin/system.hpp>
+#include <bitcoin/node/define.hpp>
 
 namespace libbitcoin {
 namespace node {
diff --git a/src/settings.cpp b/src/settings.cpp
index 4431e7635..8f14138fe 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <filesystem>
+#include <bitcoin/node/define.hpp>
 
 using namespace bc::system;
 using namespace bc::network;

From eee1d149b3f0f4205ab66fd57a96727c1909ae7a Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Mon, 19 Jan 2026 18:09:35 -0500
Subject: [PATCH 2/2] Move include/bitcoin/ssl to include/bitcoin/network/ssl.

---
 builds/msvc/vs2022/libbitcoin-network.import.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builds/msvc/vs2022/libbitcoin-network.import.props b/builds/msvc/vs2022/libbitcoin-network.import.props
index 2f5c4fee0..fda00c043 100644
--- a/builds/msvc/vs2022/libbitcoin-network.import.props
+++ b/builds/msvc/vs2022/libbitcoin-network.import.props
@@ -30,7 +30,7 @@
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <!-- Prevent boost from seeing ssl includes when ssl is deselected  (requires external headers). -->
-      <AdditionalIncludeDirectories Condition="'$(Option-ssl)' == 'true'">$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Option-ssl)' == 'true'">$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\network\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-network)' == 'static' Or '$(Linkage-libbitcoin-network)' == 'ltcg'">BCT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-ssl)' == 'true'">WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>