diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 3653cd59..7dda95e5 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -7,6 +7,7 @@
 project boost/test 
     : source-location ../src
     : requirements <link>shared:<define>BOOST_TEST_DYN_LINK=1
+                   <include>../../../
                    <toolset>msvc:<asynch-exceptions>on
                    <toolset>borland:<cxxflags>-w-8080
                    # Disable Warning about boost::noncopyable not being exported
@@ -104,7 +105,7 @@ alias included : : : :
                    <toolset>msvc:<asynch-exceptions>on
        ;
 
-boost-install boost_prg_exec_monitor 
-              boost_test_exec_monitor
-              boost_unit_test_framework ;
-          
\ No newline at end of file
+#boost-install boost_prg_exec_monitor 
+#              boost_test_exec_monitor
+#              boost_unit_test_framework ;
+          
diff --git a/example/unit_test_example_10.cpp b/example/unit_test_example_10.cpp
index bbc07e53..b07aa267 100644
--- a/example/unit_test_example_10.cpp
+++ b/example/unit_test_example_10.cpp
@@ -19,7 +19,7 @@ using boost::math::fpc::percent_tolerance;
 // STL
 #include <functional>
 #include <iostream>
-#include <iomanip>
+#include <boost/detail/iomanip.hpp>
 #include <memory>
 #include <stdexcept>
 
diff --git a/include/boost/test/impl/exception_safety.ipp b/include/boost/test/impl/exception_safety.ipp
index 43944417..2dc06dcf 100644
--- a/include/boost/test/impl/exception_safety.ipp
+++ b/include/boost/test/impl/exception_safety.ipp
@@ -43,7 +43,8 @@
 #include <vector>
 #include <cstdlib>
 #include <map>
-#include <iomanip>
+#include <ios>
+#include <boost/detail/iomanip.hpp>
 #include <cctype>
 #include <boost/limits.hpp>
 
@@ -401,7 +402,7 @@ inline void
 format_location( wrap_stringstream& formatter, execution_path_point const& /*p*/, unsigned indent )
 {
     if( indent )
-        formatter << std::left << std::setw( indent ) << "";
+        formatter << std::left << boost::detail::setw( indent ) << "";
 
 // !! ?? optional   if( p.m_file_name )
 //        formatter << p.m_file_name << '(' << p.m_line_num << "): ";
diff --git a/include/boost/test/impl/plain_report_formatter.ipp b/include/boost/test/impl/plain_report_formatter.ipp
index e47f2eeb..1c57d33d 100644
--- a/include/boost/test/impl/plain_report_formatter.ipp
+++ b/include/boost/test/impl/plain_report_formatter.ipp
@@ -26,7 +26,7 @@
 #include <boost/test/detail/unit_test_parameters.hpp>
 
 // STL
-#include <iomanip>
+#include <boost/detail/iomanip.hpp>
 #include <boost/config/no_tr1/cmath.hpp>
 #include <iostream>
 
@@ -64,7 +64,7 @@ print_stat_value( std::ostream& ostr, counter_t v, counter_t indent, counter_t t
                   const_string name, const_string res )
 {
     if( v > 0 ) {
-        ostr << std::setw( indent ) << ""
+        ostr << boost::detail::setw( indent ) << ""
              << v << ' ' << name << ( v != 1 ? "s" : "" );
         if( total > 0 )
             ostr << " out of " << total;
@@ -114,7 +114,7 @@ plain_report_formatter::test_unit_report_start( test_unit const& tu, std::ostrea
     else
         descr = "failed";
 
-    ostr << std::setw( m_indent ) << ""
+    ostr << boost::detail::setw( m_indent ) << ""
          << "Test " << (tu.p_type == tut_case ? "case " : "suite " ) << quote() << tu.p_name << ' ' << descr;
 
     if( tr.p_skipped ) {
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 2c9b40bd..52ccb01b 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -17,6 +17,7 @@ rule test-btl-lib ( test-rule : test-name : lib-name ? : pattern_file * : source
               # Activating -pedantic finds more gotchas
               # Unfortunately, this warns about the use of "long long" in gcc's own stdlib
               # So deactivate those warnings again
+              <include>../../../
               <toolset>gcc:<cxxflags>-pedantic
               <toolset>gcc:<cxxflags>-Wno-long-long
               <toolset>borland:<cxxflags>-w-8080
diff --git a/test/basic_cstring_test.cpp b/test/basic_cstring_test.cpp
index 501813e8..b1150969 100644
--- a/test/basic_cstring_test.cpp
+++ b/test/basic_cstring_test.cpp
@@ -38,7 +38,7 @@ using utf::const_string;
 // STL
 #include <cctype>
 #include <ctime>
-#include <iomanip>
+#include <boost/detail/iomanip.hpp>
 #include <iostream>
 #include <stdexcept>
 
@@ -391,13 +391,13 @@ BOOST_TEST_CASE_TEMPLATE_FUNCTION( io_test, CharT )
 
     tt::output_test_stream ostr;
 
-    ostr << std::setw( 6 ) << bcs1;
+    ostr << boost::detail::setw( 6 ) << bcs1;
     BOOST_CHECK( ostr.is_equal( "  test" ) );
 
-    ostr << std::setw( 3 ) << bcs1;
+    ostr << boost::detail::setw( 3 ) << bcs1;
     BOOST_CHECK( ostr.is_equal( "test" ) );
 
-    ostr << std::setw( 5 ) << std::setiosflags( std::ios::left ) << bcs1;
+    ostr << boost::detail::setw( 5 ) << boost::detail::setiosflags( std::ios::left ) << bcs1;
     BOOST_CHECK( ostr.is_equal( "test " ) );
 }
 
diff --git a/test/output_test_stream_test.cpp b/test/output_test_stream_test.cpp
index 6cedae9f..a0d75488 100644
--- a/test/output_test_stream_test.cpp
+++ b/test/output_test_stream_test.cpp
@@ -19,7 +19,7 @@
 using boost::test_tools::output_test_stream;
 
 // STL
-#include <iomanip>
+#include <boost/detail/iomanip.hpp>
 
 //____________________________________________________________________________//
 
@@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE( test_is_equal )
     output << '\0';
     BOOST_CHECK( output.is_equal( boost::unit_test::const_string( "", 1 ) ) );
 
-    output << std::setw( 10 ) << "qwerty" << '\n';
+    output << boost::detail::setw( 10 ) << "qwerty" << '\n';
     BOOST_CHECK( output.is_equal( "    qwerty\n" ) );
 
     std::string s( "test string" );
diff --git a/test/test_tools_test.cpp b/test/test_tools_test.cpp
index 89ef55f1..68a6d1ed 100644
--- a/test/test_tools_test.cpp
+++ b/test/test_tools_test.cpp
@@ -29,7 +29,7 @@
 
 // STL
 #include <iostream>
-#include <iomanip>
+#include <boost/detail/iomanip.hpp>
 
 #ifdef BOOST_MSVC
 # pragma warning(push)
@@ -525,7 +525,7 @@ TEST_CASE( test_BOOST_TEST_MESSAGE )
     BOOST_TEST_MESSAGE( "0x14" );
 #endif
 
-    BOOST_TEST_MESSAGE( std::setw( 4 ) << 20 );
+    BOOST_TEST_MESSAGE( boost::detail::setw( 4 ) << 20 );
 }
 
 //____________________________________________________________________________//