diff --git a/osquery/config/tests/test_utils.cpp b/osquery/config/tests/test_utils.cpp
index b2d4a53..a129b8f 100644
--- a/osquery/config/tests/test_utils.cpp
+++ b/osquery/config/tests/test_utils.cpp
@@ -14,7 +14,12 @@
 
 #include <gtest/gtest.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <cstdlib>
 
diff --git a/osquery/database/database.cpp b/osquery/database/database.cpp
index 66079a5..9385ccd 100644
--- a/osquery/database/database.cpp
+++ b/osquery/database/database.cpp
@@ -7,7 +7,12 @@
  */
 
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 #include <boost/property_tree/json_parser.hpp>
 
 #include <osquery/database.h>
diff --git a/osquery/dispatcher/scheduler.cpp b/osquery/dispatcher/scheduler.cpp
index 0906971..90c9472 100644
--- a/osquery/dispatcher/scheduler.cpp
+++ b/osquery/dispatcher/scheduler.cpp
@@ -10,7 +10,12 @@
 #include <ctime>
 
 #include <boost/format.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <osquery/config/config.h>
 #include <osquery/core.h>
diff --git a/osquery/experimental/events_stream/events_stream.cpp b/osquery/experimental/events_stream/events_stream.cpp
index 5c940f0..811332f 100644
--- a/osquery/experimental/events_stream/events_stream.cpp
+++ b/osquery/experimental/events_stream/events_stream.cpp
@@ -13,7 +13,12 @@
 #include <osquery/logger.h>
 #include <osquery/registry.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 namespace osquery {
 
diff --git a/osquery/experimental/events_stream/events_stream_registry.cpp b/osquery/experimental/events_stream/events_stream_registry.cpp
index 4a21c45..a52a1f4 100644
--- a/osquery/experimental/events_stream/events_stream_registry.cpp
+++ b/osquery/experimental/events_stream/events_stream_registry.cpp
@@ -8,7 +8,12 @@
 
 #include <osquery/experimental/events_stream/events_stream_registry.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <osquery/registry_factory.h>
 
diff --git a/osquery/experimental/tracing/linux/ebpf_tracepoint.cpp b/osquery/experimental/tracing/linux/ebpf_tracepoint.cpp
index 0285dd2..78ffaa3 100644
--- a/osquery/experimental/tracing/linux/ebpf_tracepoint.cpp
+++ b/osquery/experimental/tracing/linux/ebpf_tracepoint.cpp
@@ -15,7 +15,12 @@
 
 #include <osquery/logger.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <sys/ioctl.h>
 
diff --git a/osquery/numeric_monitoring/numeric_monitoring.cpp b/osquery/numeric_monitoring/numeric_monitoring.cpp
index faacc90..98edf14 100644
--- a/osquery/numeric_monitoring/numeric_monitoring.cpp
+++ b/osquery/numeric_monitoring/numeric_monitoring.cpp
@@ -8,7 +8,12 @@
 
 #include <unordered_map>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <osquery/dispatcher.h>
 #include <osquery/flags.h>
diff --git a/osquery/numeric_monitoring/pre_aggregation_cache.cpp b/osquery/numeric_monitoring/pre_aggregation_cache.cpp
index 5789837..c0d7f76 100644
--- a/osquery/numeric_monitoring/pre_aggregation_cache.cpp
+++ b/osquery/numeric_monitoring/pre_aggregation_cache.cpp
@@ -6,7 +6,12 @@
  *  the LICENSE file found in the root directory of this source tree.
  */
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <osquery/logger.h>
 #include "osquery/numeric_monitoring/pre_aggregation_cache.h"
diff --git a/osquery/profiler/posix/code_profiler.cpp b/osquery/profiler/posix/code_profiler.cpp
index a02df3a..0621132 100644
--- a/osquery/profiler/posix/code_profiler.cpp
+++ b/osquery/profiler/posix/code_profiler.cpp
@@ -21,7 +21,12 @@
 #include <sys/time.h>
 
 #include <boost/format.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <osquery/logger.h>
 #include <osquery/numeric_monitoring.h>
diff --git a/osquery/sdk/tests/registry_tests.cpp b/osquery/sdk/tests/registry_tests.cpp
index f799ede..434259d 100644
--- a/osquery/sdk/tests/registry_tests.cpp
+++ b/osquery/sdk/tests/registry_tests.cpp
@@ -10,7 +10,12 @@
 
 #include <gtest/gtest.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <unordered_set>
 #include <vector>
diff --git a/osquery/utils/conversions/tryto.cpp b/osquery/utils/conversions/tryto.cpp
index 0f3b5e3..9fb5fc4 100644
--- a/osquery/utils/conversions/tryto.cpp
+++ b/osquery/utils/conversions/tryto.cpp
@@ -10,7 +10,12 @@
 
 #include <unordered_map>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 namespace osquery {
 
diff --git a/osquery/utils/error/tests/error.cpp b/osquery/utils/error/tests/error.cpp
index 4af8024..dcf5bd7 100644
--- a/osquery/utils/error/tests/error.cpp
+++ b/osquery/utils/error/tests/error.cpp
@@ -9,7 +9,12 @@
 #include <gtest/gtest.h>
 
 #include <boost/algorithm/string.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <osquery/utils/error/error.h>
 
diff --git a/osquery/utils/system/linux/cpu.cpp b/osquery/utils/system/linux/cpu.cpp
index a7a2dee..f18769d 100644
--- a/osquery/utils/system/linux/cpu.cpp
+++ b/osquery/utils/system/linux/cpu.cpp
@@ -7,7 +7,12 @@
  */
 
 #include <boost/algorithm/string.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <osquery/utils/conversions/tryto.h>
 #include <osquery/utils/system/linux/cpu.h>
diff --git a/osquery/utils/system/linux/ebpf/ebpf.cpp b/osquery/utils/system/linux/ebpf/ebpf.cpp
index 7ed0874..add7aba 100644
--- a/osquery/utils/system/linux/ebpf/ebpf.cpp
+++ b/osquery/utils/system/linux/ebpf/ebpf.cpp
@@ -9,7 +9,12 @@
 #include <osquery/utils/system/linux/ebpf/ebpf.h>
 #include <osquery/utils/versioning/semantic.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <linux/version.h>
 #include <sys/utsname.h>
diff --git a/osquery/utils/system/linux/ebpf/map.cpp b/osquery/utils/system/linux/ebpf/map.cpp
index 3719a9a..3703eb4 100644
--- a/osquery/utils/system/linux/ebpf/map.cpp
+++ b/osquery/utils/system/linux/ebpf/map.cpp
@@ -9,7 +9,12 @@
 #include <osquery/utils/system/linux/ebpf/map.h>
 #include <osquery/utils/system/linux/ebpf/ebpf.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <cerrno>
 #include <cstring>
diff --git a/osquery/utils/system/linux/ebpf/perf_output_impl.h b/osquery/utils/system/linux/ebpf/perf_output_impl.h
index 4833057..d1b5fe6 100644
--- a/osquery/utils/system/linux/ebpf/perf_output_impl.h
+++ b/osquery/utils/system/linux/ebpf/perf_output_impl.h
@@ -15,7 +15,12 @@
 
 #include <osquery/logger.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <linux/hw_breakpoint.h>
 #include <linux/perf_event.h>
diff --git a/osquery/utils/system/linux/ebpf/program.cpp b/osquery/utils/system/linux/ebpf/program.cpp
index 886c4a6..0f8c2f4 100644
--- a/osquery/utils/system/linux/ebpf/program.cpp
+++ b/osquery/utils/system/linux/ebpf/program.cpp
@@ -9,7 +9,12 @@
 #include <osquery/utils/system/linux/ebpf/program.h>
 #include <osquery/utils/system/linux/ebpf/ebpf.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <linux/version.h>
 
diff --git a/osquery/utils/system/linux/perf_event/perf_event.cpp b/osquery/utils/system/linux/perf_event/perf_event.cpp
index 38f4786..57c60c6 100644
--- a/osquery/utils/system/linux/perf_event/perf_event.cpp
+++ b/osquery/utils/system/linux/perf_event/perf_event.cpp
@@ -10,7 +10,12 @@
 
 #include <osquery/utils/system/linux/perf_event/perf_event.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <linux/hw_breakpoint.h>
 #include <linux/perf_event.h>
diff --git a/osquery/utils/system/linux/tracing/native_event.cpp b/osquery/utils/system/linux/tracing/native_event.cpp
index 1ad0460..61838ed 100644
--- a/osquery/utils/system/linux/tracing/native_event.cpp
+++ b/osquery/utils/system/linux/tracing/native_event.cpp
@@ -13,7 +13,12 @@
 #include <osquery/logger.h>
 
 #include <boost/filesystem/path.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <fstream>
 
diff --git a/osquery/utils/versioning/semantic.cpp b/osquery/utils/versioning/semantic.cpp
index 8c10341..52528f5 100644
--- a/osquery/utils/versioning/semantic.cpp
+++ b/osquery/utils/versioning/semantic.cpp
@@ -8,7 +8,12 @@
 
 #include <osquery/utils/versioning/semantic.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 namespace osquery {
 
diff --git a/tests/integration/tables/helper.cpp b/tests/integration/tables/helper.cpp
index 7829253..c0f47c3 100644
--- a/tests/integration/tables/helper.cpp
+++ b/tests/integration/tables/helper.cpp
@@ -16,7 +16,12 @@
 
 #include <gtest/gtest.h>
 
-#include <boost/algorithm/string.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
+#include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 // TODO(5591) Remove this when addressed by Boost's ASIO config.
 // https://www.boost.org/doc/libs/1_67_0/boost/asio/detail/config.hpp
diff --git a/tests/integration/tables/process_envs.cpp b/tests/integration/tables/process_envs.cpp
index 4196137..b907cb7 100644
--- a/tests/integration/tables/process_envs.cpp
+++ b/tests/integration/tables/process_envs.cpp
@@ -13,7 +13,12 @@
 
 #include <osquery/utils/info/platform_type.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107400
+#include <boost/io/quoted.hpp>
+#else
 #include <boost/io/detail/quoted_manip.hpp>
+#endif
 
 #include <algorithm>
 #include <cstdlib>