diff --git a/example/example_io.cpp b/example/example_io.cpp
index 1b63194..1c15672 100644
--- a/example/example_io.cpp
+++ b/example/example_io.cpp
@@ -150,7 +150,7 @@ void
 dump_file_info( boost::exception const & x )
     {
     if( boost::shared_ptr<std::string const> fn = boost::get_error_info<file_name_info>(x) )
-        std::cout << "Source file name: " << *fn << "\n";
+        std::cout << "File name: " << *fn << "\n";
     }
 
 void
diff --git a/include/boost/exception/detail/type_info.hpp b/include/boost/exception/detail/type_info.hpp
index e752d42..1e928fd 100644
--- a/include/boost/exception/detail/type_info.hpp
+++ b/include/boost/exception/detail/type_info.hpp
@@ -8,6 +8,9 @@
 
 #include <boost/detail/sp_typeinfo.hpp>
 #include <boost/current_function.hpp>
+#ifndef BOOST_NO_TYPEID
+#include <boost/type.hpp>
+#endif
 
 namespace
 boost
@@ -20,7 +23,7 @@ boost
 #ifdef BOOST_NO_TYPEID
         return BOOST_CURRENT_FUNCTION;
 #else
-        return typeid(T).name();
+        return typeid(type<T>).name();
 #endif
         }
 
diff --git a/include/boost/throw_exception.hpp b/include/boost/throw_exception.hpp
index 94536d3..018eb2a 100644
--- a/include/boost/throw_exception.hpp
+++ b/include/boost/throw_exception.hpp
@@ -24,10 +24,6 @@
 #include <boost/detail/workaround.hpp>
 #include <exception>
 
-#if !defined( BOOST_EXCEPTION_DISABLE )
-#define BOOST_EXCEPTION_DISABLE
-#endif
-
 #if !defined( BOOST_EXCEPTION_DISABLE ) && defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, < 0x590 )
 # define BOOST_EXCEPTION_DISABLE
 #endif