diff --git a/src/maths/cmaths/Makefile.am b/src/maths/cmaths/Makefile.am
index b9795ae61..7e537b462 100644
--- a/src/maths/cmaths/Makefile.am
+++ b/src/maths/cmaths/Makefile.am
@@ -14,6 +14,6 @@ libcmaths_a_SOURCES = \
 
 
 
-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/maths/poly
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/cmaths/cmath1.c b/src/maths/cmaths/cmath1.c
index 54415a0b9..48655adf2 100644
--- a/src/maths/cmaths/cmath1.c
+++ b/src/maths/cmaths/cmath1.c
@@ -16,11 +16,10 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  *
  */
 
-#include "ngspice.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
-#include "dvec.h"
-#include "ftecmath.h"
+#include <ngspice.h>
+#include <cpdefs.h>
+#include <dvec.h>
+
 #include "cmath1.h"
 
 
diff --git a/src/maths/cmaths/cmath2.c b/src/maths/cmaths/cmath2.c
index a0c4cd323..90911463a 100644
--- a/src/maths/cmaths/cmath2.c
+++ b/src/maths/cmaths/cmath2.c
@@ -15,11 +15,11 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  *  and return a char * that is cast to complex or double.
  */
 
-#include "ngspice.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
-#include "dvec.h"
-#include "ftecmath.h"
+#include <ngspice.h>
+#include <cpdefs.h>
+#include <ftedefs.h>
+#include <dvec.h>
+
 #include "cmath2.h"
 
 static double *
diff --git a/src/maths/cmaths/cmath3.c b/src/maths/cmaths/cmath3.c
index 1cd3aa0ad..37e246e5c 100644
--- a/src/maths/cmaths/cmath3.c
+++ b/src/maths/cmaths/cmath3.c
@@ -15,11 +15,10 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  *  and return a char * that is cast to complex or double.
  */
 
-#include "ngspice.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
-#include "dvec.h"
-#include "ftecmath.h"
+#include <ngspice.h>
+#include <cpdefs.h>
+#include <dvec.h>
+
 #include "cmath3.h"
 
 
diff --git a/src/maths/cmaths/cmath4.c b/src/maths/cmaths/cmath4.c
index ad7d1dfd8..90b84c239 100644
--- a/src/maths/cmaths/cmath4.c
+++ b/src/maths/cmaths/cmath4.c
@@ -18,11 +18,15 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include <ngspice.h>
 #include <plot.h>
 #include <complex.h>
-#include <cpextern.h>
-#include <fteext.h>
+#include <cpdefs.h>
+//#include <fteext.h>
 
-#include "cmath4.h"
+#include <interpolate.h>
+#include <polyfit.h>
+#include <polyeval.h>
+#include <polyderiv.h>
 
+#include "cmath4.h"
 
 void *
 cx_and(void *data1, void *data2, short int datatype1, short int datatype2, int length)