--- a/src/help.h
+++ b/src/help.h
@@ -26,22 +26,28 @@
 
 class ostrstream;
 
-typedef struct help_list
+#include <string>
+
+class string_vector;
+
+// XXX FIXME XXX -- should probably use string, not char*.
+
+struct help_list
 {
   char *name;
   char *help;
 };
 
-extern char **names (help_list *l, int& count);
+extern string_vector names (help_list *l, int& count);
 extern help_list *operator_help (void);
 extern help_list *keyword_help (void);
 
+extern void print_usage (const string& nm, int just_usage = 0);
+
 extern int help_from_list (ostrstream& output_buf,
-			   const help_list *list, const char *string,
+			   const help_list *list, const string& nm,
 			   int usage);
 
-extern void print_usage (const char *s, int just_usage = 0);
-
 #endif
 
 /*