-#include <typeinfo>
-#include <ctype.h>
-#include "virtual-methods.hh"
+#include <cctype>
+using namespace std;
+#include "virtual-methods.hh"
-const char *
-demangle_classname (std::type_info const &t)
+char const *
+demangle_classname (type_info const &t)
{
char const *s = t.name ();
while (isdigit (*s))