diff --git a/ChangeLog b/ChangeLog
index ac0d4d811..a84e61df9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-08  Robert Larice
+ * src/frontend/evaluate.c ,
+ * src/frontend/parse.c ,
+ * src/include/fteext.h :
+    collect some cx_*() prototypes in "cmath2.h"
+
 2010-10-08  Robert Larice
  * src/main.c :
     remove winmessage() prototype, there is no such thing (hopefully)
diff --git a/src/frontend/evaluate.c b/src/frontend/evaluate.c
index 51c82d090..2f1ac3a1c 100644
--- a/src/frontend/evaluate.c
+++ b/src/frontend/evaluate.c
@@ -16,6 +16,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include <dvec.h>
 
 #include "evaluate.h"
+#include "../maths/cmaths/cmath2.h"
 
 #include "sim.h"  /* To get SV_VOLTAGE definition */
 
diff --git a/src/frontend/parse.c b/src/frontend/parse.c
index 234b91e4d..970cf155e 100644
--- a/src/frontend/parse.c
+++ b/src/frontend/parse.c
@@ -18,6 +18,7 @@ $Id$
 #include "evaluate.h"
 #include "parse.h"
 
+#include "../maths/cmaths/cmath2.h"
 
 /* static declarations */
 static bool checkvalid(struct pnode *pn);
diff --git a/src/include/fteext.h b/src/include/fteext.h
index 2661e84f5..006b03bed 100644
--- a/src/include/fteext.h
+++ b/src/include/fteext.h
@@ -88,31 +88,6 @@ extern void *cx_sqrt(void *, short int , int , int *, short int *);
 extern void *cx_sin(void *, short int , int , int *, short int *);
 extern void *cx_cos(void *, short int , int , int *, short int *);
 
-/* cmath2.c */
-
-extern void *cx_tan(void *, short int , int , int *, short int *);
-extern void *cx_atan(void *, short int , int , int *, short int *);
-extern void *cx_norm(void *, short int , int , int *, short int *);
-extern void *cx_uminus(void *, short int , int , int *, short int *);
-extern void *cx_rnd(void *, short int , int , int *, short int *);
-extern void *cx_sunif(void *, short int , int , int *, short int *);
-extern void *cx_sgauss(void *, short int , int , int *, short int *);
-extern void *cx_mean(void *, short int , int , int *, short int *);
-extern void *cx_avg(void *, short int , int , int *, short int *);
-extern void *cx_length(void *, short int , int , int *, short int *);
-extern void *cx_vector(void *, short int , int , int *, short int *);
-extern void *cx_unitvec(void *, short int , int , int *, short int *);
- 
-/* Routoure JM : somme useful functions */
-extern void *cx_min(void *, short int , int , int *, short int *);
-extern void *cx_max(void *, short int , int , int *, short int *);
-extern void *cx_d(void *, short int , int , int *, short int *);
-
-extern void *cx_plus(void *, void *, short int , short int , int);
-extern void *cx_minus(void *, void *, short int , short int , int);
-extern void *cx_times(void *, void *, short int , short int , int);
-extern void *cx_mod(void *, void *, short int , short int , int);
-
 /* cmath3.c */
 
 extern void *cx_divide(void *, void *, short int , short int , int);