diff --git a/test/ios_state_test.cpp b/test/ios_state_test.cpp
index 0900de9..1f7fa84 100644
--- a/test/ios_state_test.cpp
+++ b/test/ios_state_test.cpp
@@ -16,7 +16,7 @@
 #include <boost/io/ios_state.hpp>  // for boost::io::ios_flags_saver, etc.
 
 #include <cstddef>    // for std::size_t
-#include <boost/detail/iomanip.hpp>    // for boost::detail::setw
+#include <iomanip>    // for std::setw
 #include <ios>        // for std::ios_base, std::streamsize, etc.
 #include <iostream>   // for std::cout, etc.
 #include <istream>    // for std::istream
@@ -143,7 +143,7 @@ saver_tests_1
 {
     using std::locale;
     using std::ios_base;
-    using boost::detail::setw;
+    using std::setw;
 
     boost::io::ios_flags_saver const      ifls( output );
     boost::io::ios_precision_saver const  iprs( output );
@@ -168,8 +168,8 @@ saver_tests_1
     output.fill( '@' );
     output.precision( 9 );
     output << '\t' << test_string << '\n';
-    output << '\t' << boost::detail::setw( 10 ) << test_num1 << '\n';
-    output << '\t' << boost::detail::setw( 15 ) << test_num2 << '\n';
+    output << '\t' << setw( 10 ) << test_num1 << '\n';
+    output << '\t' << setw( 15 ) << test_num2 << '\n';
     output.imbue( loc );
     output << '\t' << test_bool << '\n';
 
diff --git a/test/ios_state_unit_test.cpp b/test/ios_state_unit_test.cpp
index 0d5969c..72ce7b5 100644
--- a/test/ios_state_unit_test.cpp
+++ b/test/ios_state_unit_test.cpp
@@ -13,7 +13,7 @@
 #include <boost/test/unit_test.hpp>  // for main, BOOST_CHECK, etc.
 
 #include <cstddef>   // for NULL
-#include <boost/detail/iomanip.hpp>   // for boost::detail::setiosflags, etc.
+#include <iomanip>   // for std::setiosflags, etc.
 #include <ios>       // for std::ios_base
 #include <iostream>  // for std::cout, std::cerr, etc.
 #include <istream>   // for std::iostream
@@ -77,7 +77,7 @@ ios_flags_saver_unit_test
         BOOST_CHECK_EQUAL( (ios_base::showbase | ios_base::internal),
          ss.flags() );
 
-        ss << boost::detail::setiosflags( ios_base::unitbuf );
+        ss << setiosflags( ios_base::unitbuf );
         BOOST_CHECK_EQUAL( (ios_base::showbase | ios_base::internal
          | ios_base::unitbuf), ss.flags() );
     }
@@ -102,7 +102,7 @@ ios_precision_saver_unit_test
 
         BOOST_CHECK_EQUAL( 6, ss.precision() );
 
-        ss << boost::detail::setprecision( 4 );
+        ss << setprecision( 4 );
         BOOST_CHECK_EQUAL( 4, ss.precision() );
     }
 
@@ -113,7 +113,7 @@ ios_precision_saver_unit_test
 
         BOOST_CHECK_EQUAL( 8, ss.precision() );
 
-        ss << boost::detail::setprecision( 10 );
+        ss << setprecision( 10 );
         BOOST_CHECK_EQUAL( 10, ss.precision() );
     }
 
@@ -137,7 +137,7 @@ ios_width_saver_unit_test
 
         BOOST_CHECK_EQUAL( 0, ss.width() );
 
-        ss << boost::detail::setw( 4 );
+        ss << setw( 4 );
         BOOST_CHECK_EQUAL( 4, ss.width() );
     }
 
@@ -148,7 +148,7 @@ ios_width_saver_unit_test
 
         BOOST_CHECK_EQUAL( 8, ss.width() );
 
-        ss << boost::detail::setw( 10 );
+        ss << setw( 10 );
         BOOST_CHECK_EQUAL( 10, ss.width() );
     }
 
@@ -507,7 +507,7 @@ ios_base_all_saver_unit_test
         BOOST_CHECK_EQUAL( 6, ss.precision() );
         BOOST_CHECK_EQUAL( 0, ss.width() );
 
-        ss << hex << unitbuf << boost::detail::setprecision( 5 ) << boost::detail::setw( 7 );
+        ss << hex << unitbuf << setprecision( 5 ) << setw( 7 );
         BOOST_CHECK_EQUAL( (ios_base::unitbuf | ios_base::hex
          | ios_base::skipws), ss.flags() );
         BOOST_CHECK_EQUAL( 5, ss.precision() );
@@ -560,10 +560,10 @@ ios_all_saver_unit_test
         ss << oct << showpos << noskipws;
         BOOST_CHECK_EQUAL( (ios_base::showpos | ios_base::oct), ss.flags() );
 
-        ss << boost::detail::setprecision( 3 );
+        ss << setprecision( 3 );
         BOOST_CHECK_EQUAL( 3, ss.precision() );
 
-        ss << boost::detail::setw( 9 );
+        ss << setw( 9 );
         BOOST_CHECK_EQUAL( 9, ss.width() );
 
         ss.setstate( ios_base::eofbit );
@@ -586,7 +586,7 @@ ios_all_saver_unit_test
         ss.rdbuf( cerr.rdbuf() );
         BOOST_CHECK_EQUAL( cerr.rdbuf(), ss.rdbuf() );
 
-        ss << boost::detail::setfill( 'x' );
+        ss << setfill( 'x' );
         BOOST_CHECK_EQUAL( 'x', ss.fill() );
 
         ss.imbue( locale(locale::classic(), new backward_bool_names) );