diff --git a/ChangeLog b/ChangeLog
index f25d46d72..db36f3607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-23  Robert Larice
+ * src/ciderlib/oned/onecont.c ,
+ * src/ciderlib/oned/onepoiss.c ,
+ * src/ciderlib/twod/twocont.c ,
+ * src/ciderlib/twod/twoncont.c ,
+ * src/ciderlib/twod/twopcont.c ,
+ * src/ciderlib/twod/twopoiss.c :
+    use the type SMPmatrix instead of char *
+    remove some redundant forward function declarations
+    remove some redundant nested function declarations
+
 2010-07-23  Robert Larice
  * src/ngmultidec.c ,
  * src/include/onedev.h ,
diff --git a/src/ciderlib/oned/onecont.c b/src/ciderlib/oned/onecont.c
index ba6717ad8..306843416 100644
--- a/src/ciderlib/oned/onecont.c
+++ b/src/ciderlib/oned/onecont.c
@@ -17,11 +17,6 @@ $Id$
 #include "../../maths/misc/bernoull.h"
 
 
-/* Forward Declarations */
-
-void  ONE_commonTerms( ONEdevice *, BOOLEAN, BOOLEAN, ONEtranInfo *);
-
-
 /* functions to setup and solve the continuity equations */
 /* Both continuity equations are solved */
 
@@ -29,7 +24,7 @@ void  ONE_commonTerms( ONEdevice *, BOOLEAN, BOOLEAN, ONEtranInfo *);
 void 
 ONE_jacBuild(ONEdevice *pDevice)
 {
-  char *matrix = pDevice->matrix;
+  SMPmatrix *matrix = pDevice->matrix;
   ONEelem *pElem;
   ONEnode *pNode;
   int index, eIndex;
diff --git a/src/ciderlib/oned/onepoiss.c b/src/ciderlib/oned/onepoiss.c
index cfc53bf7a..91c761e28 100644
--- a/src/ciderlib/oned/onepoiss.c
+++ b/src/ciderlib/oned/onepoiss.c
@@ -16,13 +16,10 @@ $Id$
 /* Functions to setup and solve the 1D poisson equation. */
 
 
-/* Forward Declarations */
-void ONEQcommonTerms(ONEdevice *pDevice);
-
 void
 ONEQjacBuild(ONEdevice *pDevice)
 {
-  char *matrix = pDevice->matrix;
+  SMPmatrix *matrix = pDevice->matrix;
   ONEelem *pElem;
   ONEnode *pNode, *pNode1;
   int index;
diff --git a/src/ciderlib/twod/twocont.c b/src/ciderlib/twod/twocont.c
index cb466da82..64c3c6bd9 100644
--- a/src/ciderlib/twod/twocont.c
+++ b/src/ciderlib/twod/twocont.c
@@ -32,8 +32,7 @@ $Id$
 void 
   TWO_jacBuild(TWOdevice *pDevice)
 {
-  char *matrix = pDevice->matrix;
-  double *spGetElement();
+  SMPmatrix *matrix = pDevice->matrix;
   TWOelem *pElem;
   TWOnode *pNode;
   TWOchannel *pCh;
@@ -304,7 +303,7 @@ void
   double ds;
   double dPsiT, dPsiB, dPsiL, dPsiR;
   double rhsN, rhsP;
-  double generation, TWOavalanche();
+  double generation;
   double nConc, pConc;
   double perTime = 0.0;
   
@@ -518,7 +517,6 @@ void
   int nextIndex;			/* index of node to find next element */
   double dx, dy, dxdy, dyOverDx, dxOverDy;
   double ds;
-  void spClear(), TWO_commonTerms();
   
   /* first compute the currents and derivatives */
   TWO_commonTerms( pDevice, FALSE, FALSE, NIL(TWOtranInfo) );
@@ -675,10 +673,9 @@ void
   double dx, dy, dxdy, dyOverDx, dxOverDy;
   double dPsiT, dPsiB, dPsiL, dPsiR;
   double rhsN, rhsP;
-  double generation, TWOavalanche();
+  double generation;
   double nConc, pConc;
   double perTime;
-  void TWO_commonTerms();
   
   /* first compute the currents */
   TWO_commonTerms( pDevice, TRUE, tranAnalysis, info );
diff --git a/src/ciderlib/twod/twoncont.c b/src/ciderlib/twod/twoncont.c
index 441603c83..bc8912e7a 100644
--- a/src/ciderlib/twod/twoncont.c
+++ b/src/ciderlib/twod/twoncont.c
@@ -33,7 +33,7 @@ $Id$
 void 
   TWONjacBuild(TWOdevice *pDevice)
 {
-  char *matrix = pDevice->matrix;
+  SMPmatrix *matrix = pDevice->matrix;
   TWOelem *pElem;
   TWOnode *pNode;
   TWOchannel *pCh;
diff --git a/src/ciderlib/twod/twopcont.c b/src/ciderlib/twod/twopcont.c
index 9461fe723..a33d1a18b 100644
--- a/src/ciderlib/twod/twopcont.c
+++ b/src/ciderlib/twod/twopcont.c
@@ -32,7 +32,7 @@ $Id$
 void 
   TWOPjacBuild(TWOdevice *pDevice)
 {
-  char *matrix = pDevice->matrix;
+  SMPmatrix *matrix = pDevice->matrix;
   TWOelem *pElem;
   TWOnode *pNode;
   TWOchannel *pCh;
diff --git a/src/ciderlib/twod/twopoiss.c b/src/ciderlib/twod/twopoiss.c
index 394421793..f8222955a 100644
--- a/src/ciderlib/twod/twopoiss.c
+++ b/src/ciderlib/twod/twopoiss.c
@@ -20,7 +20,7 @@ $Id$
 void 
 TWOQjacBuild(TWOdevice *pDevice)
 {
-  char *matrix = pDevice->matrix;
+  SMPmatrix *matrix = pDevice->matrix;
   TWOelem *pElem;
   TWOnode *pNode, *pNode1;
   int eIndex, nIndex;