diff --git a/build/Jamfile b/build/Jamfile
index 2166181cb..d5346eb8e 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -43,9 +43,10 @@ alias process_sources
 if [ os.name ] = NT
 {
   lib shell32 ;
-  lib Advapi32 ;
-  lib Ntdll ;
+  lib advapi32 ;
+  lib ntdll ;
   lib user32 ;
+  explicit shell32 advapi32 ntdll user32 ;
 }
 
 lib boost_process
@@ -55,11 +56,10 @@ lib boost_process
      <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
+     <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
   ;
 
-boost-install boost_process ;
\ No newline at end of file
+boost-install boost_process ;
diff --git a/doc/Jamfile.jam b/doc/Jamfile.jam
index 9700609ce..ad9e3949c 100644
--- a/doc/Jamfile.jam
+++ b/doc/Jamfile.jam
@@ -63,7 +63,6 @@ doxygen reference_v2
     \"BOOST_PROCESS_V2_END_NAMESPACE= } } }\" \\
     BOOST_PROCESS_V2_NAMESPACE=boost::process::v2 \\
     BOOST_PROCESS_V2_DECL \\
-    BOOST_PROCESS_V2_SOURCE \\
     BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(x,y)=deduced \\
     BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(X)=Token \\
     BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN_TYPE(E)=DEFAULT_TYPE \\
diff --git a/include/boost/process/v2/detail/config.hpp b/include/boost/process/v2/detail/config.hpp
index a928f1e63..40fe2e087 100644
--- a/include/boost/process/v2/detail/config.hpp
+++ b/include/boost/process/v2/detail/config.hpp
@@ -154,8 +154,8 @@ namespace filesystem = boost::filesystem;
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_PROCESS_V2_DYN_LINK)
-#if defined(BOOST_PROCESS_V2_SOURCE)
+#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_PROCESS_DYN_LINK)
+#if defined(BOOST_PROCESS_SOURCE)
 #define BOOST_PROCESS_V2_DECL BOOST_SYMBOL_EXPORT
 #else
 #define BOOST_PROCESS_V2_DECL BOOST_SYMBOL_IMPORT