--- a/src/SLStack.cc	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/SLStack.cc	Sun Aug 07 04:40:03 1994 +0000
@@ -128,7 +128,8 @@
 #include "token.h"
 typedef SLStack<token *> slstack_type_p_token;
 
-#include "tree.h"
+#include "tree-base.h"
+#include "tree-expr.h"
 typedef SLStack<tree_matrix *> slstack_type_p_tree_matrix;
 
 #include "unwind-prot.h"

--- a/src/Stack.cc	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/Stack.cc	Sun Aug 07 04:40:03 1994 +0000
@@ -54,7 +54,8 @@
 #include "token.h"
 typedef Stack<token *> stack_type_p_token;
 
-#include "tree.h"
+#include "tree-base.h"
+#include "tree-expr.h"
 typedef Stack<tree_matrix *> stack_type_p_tree_matrix;
 
 #include "unwind-prot.h"

--- a/src/lex.l	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/lex.l	Sun Aug 07 04:40:03 1994 +0000
@@ -53,7 +53,9 @@
 #include "symtab.h"
 #include "error.h"
 #include "utils.h"
-#include "tree.h"
+#include "tree-base.h"
+#include "tree-expr.h"
+#include "tree-cmd.h"
 #include "tree-misc.h"
 #include "tree-plot.h"
 #include "tree-const.h"

--- a/src/parse.y	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/parse.y	Sun Aug 07 04:40:03 1994 +0000
@@ -40,6 +40,9 @@
 
 #include "octave-hist.h"
 #include "user-prefs.h"
+#include "tree-base.h"
+#include "tree-expr.h"
+#include "tree-cmd.h"
 #include "tree-const.h"
 #include "tree-misc.h"
 #include "variables.h"
@@ -52,7 +55,6 @@
 #include "pager.h"
 #include "input.h"
 #include "utils.h"
-#include "tree.h"
 #include "lex.h"
 
 // Nonzero means we're in the middle of defining a function.

--- a/src/pt-cmd.cc	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/pt-cmd.cc	Sun Aug 07 04:40:03 1994 +0000
@@ -46,7 +46,7 @@
 #include "symtab.h"
 #include "error.h"
 #include "gripes.h"
-#include "tree.h"
+#include "tree-base.h"
 #include "tree-expr.h"
 #include "tree-cmd.h"
 #include "tree-misc.h"

--- a/src/pt-exp-base.cc	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/pt-exp-base.cc	Sun Aug 07 04:40:03 1994 +0000
@@ -45,7 +45,7 @@
 #include "help.h"
 #include "error.h"
 #include "pager.h"
-#include "tree.h"
+#include "tree-base.h"
 #include "tree-expr.h"
 #include "tree-misc.h"
 #include "tree-const.h"

--- a/src/pt-misc.cc	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/pt-misc.cc	Sun Aug 07 04:40:03 1994 +0000
@@ -37,9 +37,10 @@
 #include <iostream.h>
 
 #include "error.h"
-#include "tree.h"
+#include "tree-base.h"
+#include "tree-expr.h"
+#include "tree-cmd.h"
 #include "tree-misc.h"
-#include "tree-expr.h"
 #include "tree-const.h"
 #include "user-prefs.h"
 #include "oct-obj.h"

--- a/src/pt-plot.cc	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/pt-plot.cc	Sun Aug 07 04:40:03 1994 +0000
@@ -41,12 +41,14 @@
 #include "procstream.h"
 
 #include "user-prefs.h"
+#include "tree-base.h"
+#include "tree-expr.h"
+#include "tree-cmd.h"
 #include "tree-const.h"
 #include "tree-plot.h"
 #include "help.h"
 #include "error.h"
 #include "utils.h"
-#include "tree.h"
 #include "defun.h"
 
 extern "C"

--- a/src/pt-plot.h	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/pt-plot.h	Sun Aug 07 04:40:03 1994 +0000
@@ -41,7 +41,8 @@
 
 #include <SLList.h>
 
-#include "tree.h"
+#include "tree-cmd.h"
+#include "tree-expr.h"
 
 class
 tree_plot_command : public tree_command

--- a/src/symtab.cc	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/symtab.cc	Sun Aug 07 04:40:03 1994 +0000
@@ -21,8 +21,6 @@
 
 */
 
-// Don't even think about moving the tree.h include to symtab.h...
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -35,7 +33,8 @@
 #include "error.h"
 #include "variables.h"
 #include "utils.h"
-#include "tree.h"
+#include "tree-base.h"
+#include "tree-expr.h"
 #include "tree-const.h"
 
 /*

--- a/src/variables.cc	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/variables.cc	Sun Aug 07 04:40:03 1994 +0000
@@ -39,6 +39,8 @@
 #include "octave-hist.h"
 #include "unwind-prot.h"
 #include "user-prefs.h"
+#include "tree-base.h"
+#include "tree-expr.h"
 #include "tree-const.h"
 #include "variables.h"
 #include "statdefs.h"
@@ -56,7 +58,6 @@
 #include "defun.h"
 #include "input.h"
 #include "parse.h"
-#include "tree.h"
 #include "help.h"
 #include "lex.h"
 
@@ -1739,6 +1740,9 @@
   return retval;
 }
 
+// XXX FIXME XXX -- this should take a list of regular expressions
+// naming the variables to look for.
+
 static Octave_object
 do_who (int argc, char **argv, int nargout)
 {
@@ -1749,6 +1753,8 @@
   int show_variables = 1;
   int show_verbose = 0;
 
+  char *my_name = argv[0];
+
   if (argc > 1)
     {
       show_functions = 0;
@@ -1777,7 +1783,7 @@
 	       || strcmp (*argv, "-v") == 0)
 	show_variables++;
       else
-	warning ("who: unrecognized option `%s'", *argv);
+	warning ("%s: unrecognized option `%s'", my_name, *argv);
     }
 
 // If the user specified -l and nothing else, show variables.  If