extern char *cp_func_name (const char *full_name);
-extern char *cp_remove_params (const char *demangled_name);
+extern gdb::unique_xmalloc_ptr<char> cp_remove_params
+ (const char *demanged_name);
extern struct symbol **make_symbol_overload_list (const char *,
const char *);