diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 26834e5f928..ea4b6d49139 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-31  Jeffrey Yasskin  <jyasskin@google.com>
+
+        * libsupc++/exception_ptr.h: Forward-declare std::type_info.
+        * libsupc++/nested_exception.h (__throw_with_nested): Remove a
+	redundant default argument from std::__throw_with_nested.
+
 2011-03-31  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR libstdc++/48382
diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h
index ef826f6bad0..26117cd5d09 100644
--- a/libstdc++-v3/libsupc++/exception_ptr.h
+++ b/libstdc++-v3/libsupc++/exception_ptr.h
@@ -137,7 +137,7 @@ namespace std
       operator==(const exception_ptr&, const exception_ptr&) throw() 
       __attribute__ ((__pure__));
 
-      const type_info*
+      const class type_info*
       __cxa_exception_type() const throw() __attribute__ ((__pure__));
     };
 
diff --git a/libstdc++-v3/libsupc++/nested_exception.h b/libstdc++-v3/libsupc++/nested_exception.h
index 6a4f04e2e07..d4804bbedc5 100644
--- a/libstdc++-v3/libsupc++/nested_exception.h
+++ b/libstdc++-v3/libsupc++/nested_exception.h
@@ -117,7 +117,7 @@ namespace std
   // with a type that has an accessible nested_exception base.
   template<typename _Ex>
     inline void
-    __throw_with_nested(_Ex&& __ex, const nested_exception* = 0)
+    __throw_with_nested(_Ex&& __ex, const nested_exception*)
     { throw __ex; }
 
   template<typename _Ex>