diff --git a/cmake/tpls/DyninstBoost.cmake b/cmake/tpls/DyninstBoost.cmake
index 3f102e44f9..9ae3d43b5e 100644
--- a/cmake/tpls/DyninstBoost.cmake
+++ b/cmake/tpls/DyninstBoost.cmake
@@ -56,7 +56,9 @@ if(NOT TARGET Dyninst::Boost)
   target_include_directories(Dyninst::Boost SYSTEM INTERFACE ${Boost_INCLUDE_DIRS})
   target_compile_definitions(Dyninst::Boost
                              INTERFACE BOOST_MULTI_INDEX_DISABLE_SERIALIZATION)
+endif()
 
+if(NOT TARGET Dyninst::Boost_headers)
   # Just the headers (effectively a simplified Boost::headers target)
   add_library(Dyninst::Boost_headers INTERFACE IMPORTED)
   target_include_directories(Dyninst::Boost_headers SYSTEM
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 669659e44c..f0fcc7fbed 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_guard(GLOBAL)
 
 include(DyninstLibrary)
+include(DyninstBoost)
 
 configure_file(${PROJECT_SOURCE_DIR}/cmake/dyninstversion.h.in
                ${CMAKE_CURRENT_SOURCE_DIR}/h/dyninstversion.h)
@@ -165,7 +166,7 @@ dyninst_library(
   PRIVATE_HEADER_FILES ${_private_headers}
   SOURCE_FILES ${_sources}
   DEFINES COMMON_LIB
-  PUBLIC_DEPS Dyninst::TBB Dyninst::Boost
+  PUBLIC_DEPS Dyninst::TBB Dyninst::Boost Boost::thread Boost::filesystem
   PRIVATE_DEPS Dyninst::LibIberty OpenMP::OpenMP_CXX Dyninst::Valgrind Threads::Threads
 )
 # cmake-format: on
diff --git a/dwarf/CMakeLists.txt b/dwarf/CMakeLists.txt
index 45df283e9e..743504f888 100644
--- a/dwarf/CMakeLists.txt
+++ b/dwarf/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_guard(GLOBAL)
 
 include(DyninstLibrary)
+include(DyninstBoost)
 
 if(NOT DYNINST_OS_UNIX)
   if(NOT TARGET dynDwarf)
diff --git a/dyninstAPI/CMakeLists.txt b/dyninstAPI/CMakeLists.txt
index a94120a665..d20498cc8b 100644
--- a/dyninstAPI/CMakeLists.txt
+++ b/dyninstAPI/CMakeLists.txt
@@ -7,6 +7,7 @@ if(LIGHTWEIGHT_SYMTAB)
 endif()
 
 include(DyninstLibrary)
+include(DyninstBoost)
 
 set(_public_headers
     h/BPatch_addressSpace.h
diff --git a/elf/CMakeLists.txt b/elf/CMakeLists.txt
index 34c0bc5774..82dce4a588 100644
--- a/elf/CMakeLists.txt
+++ b/elf/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_guard(GLOBAL)
 
 include(DyninstLibrary)
+include(DyninstBoost)
 
 if(NOT DYNINST_OS_UNIX)
   if(NOT TARGET dynElf)
diff --git a/instructionAPI/CMakeLists.txt b/instructionAPI/CMakeLists.txt
index bb9cf9c574..1a400e1035 100644
--- a/instructionAPI/CMakeLists.txt
+++ b/instructionAPI/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_guard(GLOBAL)
 
 include(DyninstLibrary)
+include(DyninstBoost)
 
 set(_sources
     src/debug.C
diff --git a/parseAPI/CMakeLists.txt b/parseAPI/CMakeLists.txt
index 89428cdaea..c4e4aedfb1 100644
--- a/parseAPI/CMakeLists.txt
+++ b/parseAPI/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_guard(GLOBAL)
 
 include(DyninstLibrary)
+include(DyninstBoost)
 
 set(SRC_LIST
     src/ParserDetails.C
diff --git a/proccontrol/CMakeLists.txt b/proccontrol/CMakeLists.txt
index 56c6cad903..225eb4680f 100644
--- a/proccontrol/CMakeLists.txt
+++ b/proccontrol/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_guard(GLOBAL)
 
 include(DyninstLibrary)
+include(DyninstBoost)
 
 set(_public_headers
     h/Decoder.h
diff --git a/stackwalk/CMakeLists.txt b/stackwalk/CMakeLists.txt
index 1b0f3d15fc..12d6ddbff0 100644
--- a/stackwalk/CMakeLists.txt
+++ b/stackwalk/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_guard(GLOBAL)
 
 include(DyninstLibrary)
+include(DyninstBoost)
 
 set(_public_headers
     h/basetypes.h