diff --git a/Jamroot b/Jamroot
index 890f87c..3055a81 100644
--- a/Jamroot
+++ b/Jamroot
@@ -128,6 +128,7 @@ import sequence ;
 import xsltproc ;
 import set ;
 import path ;
+import link ;
 
 path-constant BOOST_ROOT : . ;
 constant BOOST_VERSION : 1.54.0 ;
@@ -135,6 +136,23 @@ 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>. ;
+}
+
+
 project boost
     : requirements <include>.
       # Disable auto-linking for all targets here, primarily because it caused
@@ -210,7 +228,7 @@ for local l in $(all-libraries)
     }
 }
 
-alias headers : : : : <include>. ;
+alias headers : $(all-headers)-headers numeric-$(numeric-headers)-headers : : : <include>.  ;
 explicit headers ;
 
 # Make project ids of all libraries known.
diff --git a/Jamroot.jam b/Jamroot.jam
deleted file mode 100644
index c801925..0000000
--- a/Jamroot.jam
+++ /dev/null
@@ -1,9 +0,0 @@
-
-import modules ;
-
-local boost = [ modules.peek : BOOST ] ;
-
-project sandbox : requirements <include>$(boost) ;
-
-# This seems to prevent some Boost.Build errors that otherwise occur :-(
-use-project /boost : $(boost) ;
diff --git a/libs/assign b/libs/assign
index 57ec5d1..e36bf9c 160000
--- a/libs/assign
+++ b/libs/assign
@@ -1 +1 @@
-Subproject commit 57ec5d1534810090649b18c88e66a46f48cdcf1c
+Subproject commit e36bf9cfa856f887a51d91e6913d52cc4074b926-dirty
diff --git a/tools/build b/tools/build
--- a/tools/build
+++ b/tools/build
@@ -1 +1 @@
-Subproject commit 02f8b2a3883ba4ff23566265bf355f97702eacbe
+Subproject commit 02f8b2a3883ba4ff23566265bf355f97702eacbe-dirty