--- a/liboctave/DAEFunc.h
+++ b/liboctave/DAEFunc.h
@@ -31,10 +31,6 @@
 class Matrix;
 class ColumnVector;
 
-#ifndef Vector
-#define Vector ColumnVector
-#endif
-
 #if !defined (octave_DAEFunc_typedefs)
 #define octave_DAEFunc_typedefs 1
 
@@ -50,32 +46,63 @@
       Matrix *dfdx;
     };
 
-  typedef Vector (*DAERHSFunc) (const Vector& x,
-				const Vector& xdot, double); 
+  typedef ColumnVector (*DAERHSFunc) (const ColumnVector& x,
+				      const ColumnVector& xdot, double); 
+
+  typedef DAEJac (*DAEJacFunc) (const ColumnVector& x,
+				const ColumnVector& xdot, double);
+
+  DAEFunc (void)
+    {
+      fun = 0;
+      jac = 0;
+    }
 
-  typedef DAEJac (*DAEJacFunc) (const Vector& x,
-				const Vector& xdot, double);
+  DAEFunc (DAERHSFunc f)
+    {
+      fun = f;
+      jac = 0;
+    }
 
-  DAEFunc (void);
-  DAEFunc (DAERHSFunc f);
-  DAEFunc (DAERHSFunc f, DAEJacFunc j);
+  DAEFunc (DAERHSFunc f, DAEJacFunc j)
+    {
+      fun = f;
+      jac = j;
+    }
 
-  DAEFunc (const DAEFunc& a);
+  DAEFunc (const DAEFunc& a)
+    {
+      fun = a.fun;
+      jac = a.jac;
+    }
 
-  DAEFunc& operator = (const DAEFunc& a);
+  DAEFunc& operator = (const DAEFunc& a)
+    {
+      fun = a.fun;
+      jac = a.jac;
 
-  DAERHSFunc function (void) const;
+      return *this;
+    }
 
-  DAEFunc& set_function (DAERHSFunc f);
+  DAERHSFunc function (void) const { return fun; }
+
+  DAEFunc& set_function (DAERHSFunc f)
+    {
+      fun = f;
+      return *this;
+    }
 
-  DAEJacFunc jacobian_function (void) const;
+  DAEJacFunc jacobian_function (void) const { return jac; }
 
-  DAEFunc& set_jacobian_function (DAEJacFunc f);
+  DAEFunc& set_jacobian_function (DAEJacFunc j)
+    {
+      jac = j;
+      return *this;
+    }
 
 protected:
 
   DAERHSFunc fun;
-
   DAEJacFunc jac;
 };