--- a/src/file-io.cc
+++ b/src/file-io.cc
@@ -36,7 +36,7 @@
 #include <strstream.h>
 #include <ctype.h>
 
-#include "Matrix.h"
+#include "dMatrix.h"
 
 #include "statdefs.h"
 #include "file-io.h"

--- a/src/tc-extras.cc
+++ b/src/tc-extras.cc
@@ -32,6 +32,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "EIG.h"
+
 #include "unwind-prot.h"
 #include "tree-const.h"
 #include "user-prefs.h"

--- a/src/tree.h.old
+++ b/src/tree.h.old
@@ -24,6 +24,10 @@
 #if !defined (octave_tree_h)
 #define octave_tree_h 1
 
+#if defined (__GNUG__)
+#pragma interface
+#endif
+
 #include <stdio.h>
 
 class ostrstream;
@@ -829,140 +833,6 @@
   tree_word_list *word_list;
 };
 
-class
-tree_plot_command : public tree_command
-{
- public:
-  tree_plot_command (void);
-  tree_plot_command (tree_subplot_list *plt, int nd);
-  tree_plot_command (tree_subplot_list *plt, tree_plot_limits *rng, int nd);
-
-  ~tree_plot_command (void);
-
-  tree_constant eval (int print);
-
- private:
-  int ndim;
-  tree_plot_limits *range;
-  tree_subplot_list *plot_list;
-};
-
-class
-tree_subplot_list : public tree
-{
- public:
-  tree_subplot_list (void);
-  tree_subplot_list (tree *data);
-  tree_subplot_list (tree_subplot_list *t);
-  tree_subplot_list (tree_subplot_using *u, tree *t, tree_subplot_style *s);
-
-  ~tree_subplot_list (void);
-
-  tree_subplot_list *set_data (tree *data);
-
-  tree_subplot_list *chain (tree_subplot_list *t);
-
-  tree_subplot_list *reverse (void);
-
-  tree_subplot_list *next_elem (void);
-
-  tree_constant eval (int print);
-//  tree_constant *eval (int print, int nargout);
-
-  int print (int ndim, ostrstream& plot_buf);
-
- private:
-  tree *plot_data;
-  tree_subplot_using *using;
-  tree *title;
-  tree_subplot_style *style;
-  tree_subplot_list *next;
-};
-
-class
-tree_plot_limits : public tree
-{
- public:
-  tree_plot_limits (void);
-  tree_plot_limits (tree_plot_range *xlim);
-  tree_plot_limits (tree_plot_range *xlim, tree_plot_range *ylim);
-  tree_plot_limits (tree_plot_range *xlim, tree_plot_range *ylim,
-		    tree_plot_range *zlim);
-
-  ~tree_plot_limits (void);
-
-  tree_constant eval (int print);
-
-  void print (int print, ostrstream& plot_buf);
-
- private:
-  tree_plot_range *x_range;
-  tree_plot_range *y_range;
-  tree_plot_range *z_range;
-};
-
-class
-tree_plot_range : public tree
-{
- public:
-  tree_plot_range (void);
-  tree_plot_range (tree *l, tree *u);
-
-  ~tree_plot_range (void);
-
-  tree_constant eval (int print);
-
-  void print (ostrstream& plot_buf);
-
- private:
-  tree *lower;
-  tree *upper;
-};
-
-class
-tree_subplot_using : public tree
-{
- public:
-  tree_subplot_using (void);
-  tree_subplot_using (tree *fmt);
-
-  ~tree_subplot_using (void);
-
-  tree_subplot_using *set_format (tree *fmt);
-
-  tree_subplot_using *add_qualifier (tree *t);
-
-  tree_constant eval (int print);
-
-  int print (int ndim, int n_max, ostrstream& plot_buf);
-
- private:
-  int qualifier_count;
-  tree *x[4];
-  tree *scanf_fmt;
-};
-
-class
-tree_subplot_style : public tree
-{
- public:
-  tree_subplot_style (void);
-  tree_subplot_style (char *s);
-  tree_subplot_style (char *s, tree *lt);
-  tree_subplot_style (char *s, tree *lt, tree *pt);
-
-  ~tree_subplot_style (void);
-
-  tree_constant eval (int print);
-
-  int print (ostrstream& plot_buf);
-
- private:
-  char *style;
-  tree *linetype;
-  tree *pointtype;
-};
-
 #endif
 
 /*