diff --git a/Jamroot b/Jamroot
index e7fa9f7a01..fbe952a763 100644
--- a/Jamroot
+++ b/Jamroot
@@ -128,7 +128,6 @@ import sequence ;
 import xsltproc ;
 import set ;
 import path ;
-import link ;
 
 path-constant BOOST_ROOT : . ;
 constant BOOST_VERSION : 1.55.0 ;
@@ -136,29 +135,6 @@ constant BOOST_JAMROOT_MODULE : $(__name__) ;
 
 boostcpp.set-version $(BOOST_VERSION) ;
 
-	
-local all-headers =
-    [ MATCH .*libs/(.*)/include/boost : [ glob libs/*/include/boost ] ] ;
-
-for dir in $(all-headers)
-{
-    link-directory $(dir)-headers : libs/$(dir)/include/boost : <location>. ;
-}
-
-local numeric-headers =
-   [ MATCH .*libs/numeric/(.*)/include/boost : [ glob libs/*/*/include/boost ] ] ;
-
-for dir in $(numeric-headers)
-{
-    link-directory numeric-$(dir)-headers : libs/numeric/$(dir)/include/boost : <location>. ;
-}
-
-BOOST_MODULARLAYOUT = $(all-headers) $(numeric-headers) ;
-if $(BOOST_MODULARLAYOUT)
-{
-    echo modularized layout build ;
-}
-
 project boost
     : requirements <include>.
       # Disable auto-linking for all targets here, primarily because it caused
@@ -234,7 +210,7 @@ for local l in $(all-libraries)
     }
 }
 
-alias headers : $(all-headers)-headers numeric-$(numeric-headers)-headers : : : <include>.  ;
+alias headers : : : : <include>. ;
 explicit headers ;
 
 # Make project ids of all libraries known.
diff --git a/libs/geometry b/libs/geometry
index ec9e78e85f..2e7cf8c0c4 160000
--- a/libs/geometry
+++ b/libs/geometry
@@ -1 +1 @@
-Subproject commit ec9e78e85faaa3395f48e8ef3e895808d699f93c
+Subproject commit 2e7cf8c0c4d933655e1bda9f9e1eba12d6a016c6
diff --git a/libs/numeric/odeint b/libs/numeric/odeint
index b94f86ba1b..1f1bcfac67 160000
--- a/libs/numeric/odeint
+++ b/libs/numeric/odeint
@@ -1 +1 @@
-Subproject commit b94f86ba1b2c96932c34457d0604da88686c5688
+Subproject commit 1f1bcfac672f5a0e422e24a365090f4927e3089a
diff --git a/libs/parameter b/libs/parameter
index 4e26b448e9..a07961f561 160000
--- a/libs/parameter
+++ b/libs/parameter
@@ -1 +1 @@
-Subproject commit 4e26b448e984b81b16acdce90b9c9fd9c9e4c38b
+Subproject commit a07961f56138511153e77d40b2172a13db6c3ac5
diff --git a/libs/python b/libs/python
index 3480aee9e7..52201f0cba 160000
--- a/libs/python
+++ b/libs/python
@@ -1 +1 @@
-Subproject commit 3480aee9e7d8d443eb3922f847183b11fa194de5
+Subproject commit 52201f0cba94312d15f9f00b6003b3fc69da2f20
diff --git a/libs/signals2 b/libs/signals2
index 4ac1d73a61..868d5799d6 160000
--- a/libs/signals2
+++ b/libs/signals2
@@ -1 +1 @@
-Subproject commit 4ac1d73a61dce064d5aaac4f46538ff81135f9be
+Subproject commit 868d5799d664a55da79a9762292882418cbce278
diff --git a/libs/spirit b/libs/spirit
index 0cc6fc4033..eac0534b8b 160000
--- a/libs/spirit
+++ b/libs/spirit
@@ -1 +1 @@
-Subproject commit 0cc6fc4033b637b30f86e2178788d84c441b0067
+Subproject commit eac0534b8bf8413e0c3bb4de564a7aa3661dab00
diff --git a/libs/units b/libs/units
index bd8a2fe5d5..cab84c6ede 160000
--- a/libs/units
+++ b/libs/units
@@ -1 +1 @@
-Subproject commit bd8a2fe5d51d4955b68644d72e915c6540cd7d81
+Subproject commit cab84c6ede9cb260e75b61534b03e778e94b7ac4
diff --git a/tools/Jamfile.v2 b/tools/Jamfile.v2
index 86cbbefdd1..d7fab287a8 100644
--- a/tools/Jamfile.v2
+++ b/tools/Jamfile.v2
@@ -12,9 +12,6 @@ project
     :
     requirements
     <link>static
-    <implicit-dependency>/boost//headers 
-    : 
-    usage-requirements <implicit-dependency>/boost//headers 
     ;
 
 use-project /boost/regression : regression/build ;
diff --git a/tools/regression/build/Jamroot.jam b/tools/regression/build/Jamroot.jam
index 61eae71210..398bee5e52 100644
--- a/tools/regression/build/Jamroot.jam
+++ b/tools/regression/build/Jamroot.jam
@@ -37,7 +37,7 @@ obj tiny_xml
     :
     <define>BOOST_ALL_NO_LIB=1
     <define>_CRT_SECURE_NO_WARNINGS
-    <implicit-dependency>/boost//headers
+    <use>/boost//headers
     :
     release
     ;
@@ -51,7 +51,7 @@ exe process_jam_log
     :
     <define>BOOST_ALL_NO_LIB=1
     <define>_CRT_SECURE_NO_WARNINGS
-    <implicit-dependency>/boost//headers
+    <use>/boost//headers
     :
     release
     ;
@@ -64,7 +64,7 @@ exe compiler_status
     /boost/filesystem//boost_filesystem/<link>static
     :
     <define>BOOST_ALL_NO_LIB=1
-    <implicit-dependency>/boost//headers
+    <use>/boost//headers
     :
     release
     ;
@@ -77,7 +77,7 @@ exe library_status
     /boost/filesystem//boost_filesystem/<link>static
     :
     <define>BOOST_ALL_NO_LIB=1
-    <implicit-dependency>/boost//headers
+    <use>/boost//headers
     :
     release
     ;
@@ -94,7 +94,7 @@ exe boost_report
     /boost//iostreams/<link>static
     :
     <define>BOOST_ALL_NO_LIB=1
-    <implicit-dependency>/boost//headers
+    <use>/boost//headers
     :
     release
     ;