--- a/liboctave/DAE.h
+++ b/liboctave/DAE.h
@@ -23,54 +23,38 @@
 #if !defined (octave_DAE_h)
 #define octave_DAE_h 1
 
-#if defined (__GNUG__)
-#pragma interface
-#endif
-
 #include "DAEFunc.h"
-#include "base-de.h"
+#include "base-dae.h"
 
 class
-DAE : public base_diff_eqn, public DAEFunc
+DAE : public base_diff_alg_eqn, public DAEFunc
 {
 public:
 
   DAE (void)
-    : base_diff_eqn (), DAEFunc (), xdot () { }
+    : base_diff_alg_eqn (), DAEFunc () { }
 
   DAE (const ColumnVector& xx, double tt, DAEFunc& f)
-    : base_diff_eqn (xx, tt), DAEFunc (f), xdot (x.capacity (), 0.0) { }
+    : base_diff_alg_eqn (xx, tt), DAEFunc (f) { }
 
   DAE (const ColumnVector& xx, const ColumnVector& xxdot,
-       double tt, DAEFunc& f);
+       double tt, DAEFunc& f)
+    : base_diff_alg_eqn (xx, xxdot, tt), DAEFunc (f) { }
 
   DAE (const DAE& a)
-    : base_diff_eqn (a), DAEFunc (a), xdot (a.xdot) { }
+    : base_diff_alg_eqn (a), DAEFunc (a){ }
 
   DAE& operator = (const DAE& a)
     {
       if (this != &a)
 	{
-	  base_diff_eqn::operator = (a);
+	  base_diff_alg_eqn::operator = (a);
 	  DAEFunc::operator = (a);
-
-	  xdot = a.xdot;
 	}
       return *this;
     }
 
   ~DAE (void) { }
-
-  ColumnVector state_derivative (void) { return xdot; }
-
-  void initialize (const ColumnVector& xx, double tt);
-
-  void initialize (const ColumnVector& xx, const ColumnVector& xxdot,
-		   double tt);
-
-protected:
-
-  ColumnVector xdot;
 };
 
 #endif