diff --git a/include/boost/exception/detail/object_hex_dump.hpp b/include/boost/exception/detail/object_hex_dump.hpp
index dc38b4a..ccf1bac 100644
--- a/include/boost/exception/detail/object_hex_dump.hpp
+++ b/include/boost/exception/detail/object_hex_dump.hpp
@@ -13,7 +13,7 @@
 #endif
 
 #include <boost/exception/detail/type_info.hpp>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
 #include <ios>
 #include <string>
 #include <sstream>
@@ -36,9 +36,9 @@ boost
             s.fill('0');
             s.width(2);
             unsigned char const * b=reinterpret_cast<unsigned char const *>(&x);
-            s << boost::detail::setw(2) << std::hex << (unsigned int)*b;
+            s << std::setw(2) << std::hex << (unsigned int)*b;
             for( unsigned char const * e=b+n; ++b!=e; )
-                s << " " << boost::detail::setw(2) << std::hex << (unsigned int)*b;
+                s << " " << std::setw(2) << std::hex << (unsigned int)*b;
             return s.str();
             }
         }
diff --git a/test/cloning_test.cpp b/test/cloning_test.cpp
index 58e66f3..33602c9 100644
--- a/test/cloning_test.cpp
+++ b/test/cloning_test.cpp
@@ -27,10 +27,6 @@ may_throw_on_copy
         if( throw_ )
             throw T();
         }
-    
-    #if defined(__PATHSCALE__)
-    ~may_throw_on_copy() throw() {}
-    #endif
 
     bool throw_;
     };
@@ -63,9 +59,6 @@ struct
 derives_std_exception:
     std::exception
     {
-    #if defined(__PATHSCALE__)
-    ~derives_std_exception() throw() {}
-    #endif
     };
 
 struct
@@ -84,19 +77,12 @@ derives_std_boost_exception:
         {
         return wh_;
         }
-    
-    #if defined(__PATHSCALE__)
-    ~derives_std_boost_exception() throw() {}
-    #endif
     };
 
 struct
 derives_boost_exception:
     boost::exception
     {
-    #if defined(__PATHSCALE__)
-    ~derives_boost_exception() throw() {}
-    #endif
     };
 
 template <class T>
diff --git a/test/diagnostic_information_test.cpp b/test/diagnostic_information_test.cpp
index 8000a74..8ced6e3 100644
--- a/test/diagnostic_information_test.cpp
+++ b/test/diagnostic_information_test.cpp
@@ -30,10 +30,6 @@ error1:
     std::exception,
     boost::exception
     {
-    #if defined(__PATHSCALE__)
-    ~error1() throw() {}
-    #endif
-
     char const *
     what() const throw()
         {
@@ -45,9 +41,6 @@ struct
 error2:
     boost::exception
     {
-    #if defined(__PATHSCALE__)
-    ~error2() throw() {}
-    #endif
     };
 
 struct
@@ -59,9 +52,6 @@ error3:
         {
         return "error3";
         }
-    #if defined(__PATHSCALE__)
-    ~error3() throw() {}
-    #endif
     };
 
 struct
@@ -74,9 +64,6 @@ error4:
         {
         return diagnostic_information_what(*this);
         }
-    #if defined(__PATHSCALE__)
-    ~error4() throw() {}
-    #endif
     };
 
 void
diff --git a/test/errinfos_test.cpp b/test/errinfos_test.cpp
index 1331cb4..bf3ad5f 100644
--- a/test/errinfos_test.cpp
+++ b/test/errinfos_test.cpp
@@ -22,9 +22,6 @@ test_exception:
     virtual boost::exception,
     virtual std::exception
     {
-    #if defined(__PATHSCALE__)
-    ~test_exception() throw() {}
-    #endif
     };
 
 int
diff --git a/test/no_exceptions_test.cpp b/test/no_exceptions_test.cpp
index a6737e1..2609be6 100644
--- a/test/no_exceptions_test.cpp
+++ b/test/no_exceptions_test.cpp
@@ -21,9 +21,6 @@ my_exception:
         {
         return "my_exception";
         }
-    #if defined(__PATHSCALE__)
-    ~my_exception() throw() {}
-    #endif
     };
 
 typedef boost::error_info<struct my_tag,int> my_int;
diff --git a/test/throw_exception_test.cpp b/test/throw_exception_test.cpp
index 56fdc67..37ecef9 100644
--- a/test/throw_exception_test.cpp
+++ b/test/throw_exception_test.cpp
@@ -15,9 +15,6 @@ struct
 exception1:
     std::exception
     {
-    #if defined(__PATHSCALE__)
-    ~exception1() throw() {}
-    #endif
     };
 
 struct
@@ -25,9 +22,6 @@ exception2:
     std::exception,
     boost::exception
     {
-    #if defined(__PATHSCALE__)
-    ~exception2() throw() {}
-    #endif
     };
 
 void
@@ -46,7 +40,7 @@ boost_throw_exception_test()
         int const * line=boost::get_error_info<boost::throw_line>(x);
         BOOST_TEST( file && *file );
         BOOST_TEST( function && *function );
-        BOOST_TEST( line && *line==38 );
+        BOOST_TEST( line && *line==32 );
         }
     catch(
     ... )
@@ -67,7 +61,7 @@ boost_throw_exception_test()
         int const * data=boost::get_error_info<test_data>(x);
         BOOST_TEST( file && *file );
         BOOST_TEST( function && *function );
-        BOOST_TEST( line && *line==58 );
+        BOOST_TEST( line && *line==52 );
         BOOST_TEST( data && *data==42 );
         }
     catch(