diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdb83c64e..c009f2f66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ else()
 endif()
 
 if (WIN32)
-  target_link_libraries(boost_process PUBLIC ntdll)
+  target_link_libraries(boost_process PUBLIC ntdll shell32 Advapi32 user32)
 endif()
 
 if(BUILD_SHARED_LIBS)
diff --git a/build/Jamfile b/build/Jamfile
index 1a1c34511..2166181cb 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -40,11 +40,23 @@ alias process_sources
      shell.cpp
    ;
 
+if [ os.name ] = NT
+{
+  lib shell32 ;
+  lib Advapi32 ;
+  lib Ntdll ;
+  lib user32 ;
+}
+
 lib boost_process
    : process_sources
    : requirements <define>BOOST_PROCESS_SOURCE=1
      <link>shared:<define>BOOST_PROCESS_DYN_LINK=1
      <boost.process.fs>boost:<library>/boost//filesystem
+     <target-os>windows:<library>shell32
+     <target-os>windows:<library>user32
+     <target-os>windows:<library>Ntdll
+     <target-os>windows:<library>Advapi32
    : usage-requirements
      <link>shared:<define>BOOST_PROCESS_DYN_LINK=1
      <boost.process.fs>boost:<library>/boost//filesystem
diff --git a/test/v2/Jamfile.jam b/test/v2/Jamfile.jam
index fcaa81303..58baacf0f 100644
--- a/test/v2/Jamfile.jam
+++ b/test/v2/Jamfile.jam
@@ -43,15 +43,10 @@ exe target : target.cpp :
                   <target-os>windows:<source>Ntdll
     ;
 
-
 lib test_impl : test_impl.cpp filesystem /boost//process :
         <define>BOOST_PROCESS_V2_SEPARATE_COMPILATION=1
         <define>BOOST_TEST_IGNORE_SIGCHLD=1
         <link>static
-        <target-os>windows:<source>shell32
-        <target-os>windows:<source>user32
-        <target-os>windows:<source>Ntdll
-        <target-os>windows:<source>Advapi32
         ;
 
 test-suite standalone :