diff --git a/Jamfile b/Jamfile
index 4ff03b82..d5a9e729 100644
--- a/Jamfile
+++ b/Jamfile
@@ -4,7 +4,7 @@ subproject libs/python ;
 SEARCH on <module@>python.jam = $(BOOST_BUILD_PATH) ;
 include <module@>python.jam ;
 
-local bpl-ldflags ;
+local bpl-linkflags ;
 
 if $(UNIX) && ( $(OS) = AIX )
 {
diff --git a/test/bienstman4.cpp b/test/bienstman4.cpp
index ef1c94c5..324af85a 100644
--- a/test/bienstman4.cpp
+++ b/test/bienstman4.cpp
@@ -8,6 +8,7 @@
 #include <boost/python/def.hpp>
 #include <boost/python/class.hpp>
 #include <boost/python/implicit.hpp>
+#include <boost/mpl/list.hpp>
 
 struct Type1 {};
 
@@ -18,7 +19,7 @@ struct Expression {void add(Term const&) {} };
 BOOST_PYTHON_MODULE_INIT(bienstman4_ext)
 {
   using namespace boost::python;
-  using boost::mpl::type_list;
+  using boost::mpl::list;
 
   implicitly_convertible<Type1,Term>();
 
diff --git a/test/bienstman5.cpp b/test/bienstman5.cpp
index 983b7804..007d12a9 100644
--- a/test/bienstman5.cpp
+++ b/test/bienstman5.cpp
@@ -7,7 +7,7 @@
 #include <boost/python/module_init.hpp>
 #include <boost/python/def.hpp>
 #include <boost/python/class.hpp>
-#include <boost/mpl/type_list.hpp>
+#include <boost/mpl/list.hpp>
 
 #include <complex>