diff --git a/src/frontend/aspice.c b/src/frontend/aspice.c
index 6f38bc220..cc851ffcc 100644
--- a/src/frontend/aspice.c
+++ b/src/frontend/aspice.c
@@ -413,16 +413,16 @@ com_rspice(wordlist *wl)
 #else
 
 void
-com_aspice(wl)
-    wordlist *wl;
+com_aspice(
+    wordlist *wl)
 {
 	fprintf(cp_err, "Asynchronous spice jobs are not available.\n");
 	return;
 }
 
 void
-com_jobs(wl)
-    wordlist *wl;
+com_jobs(
+    wordlist *wl)
 {
 	fprintf(cp_err, "Asynchronous spice jobs are not available.\n");
 	return;
@@ -435,8 +435,8 @@ ft_checkkids( )
 }
 
 void
-com_rspice(wl)
-    wordlist *wl;
+com_rspice(
+    wordlist *wl)
 {
 	fprintf(cp_err, "Remote spice jobs are not available.\n");
 	return;
diff --git a/src/frontend/hpgl.c b/src/frontend/hpgl.c
index 0fa294514..d2c2bc004 100644
--- a/src/frontend/hpgl.c
+++ b/src/frontend/hpgl.c
@@ -110,8 +110,8 @@ int GL_Init()
 }
 
 /* devdep initially contains name of output file */
-int GL_NewViewport(graph)
-GRAPH *graph;
+int GL_NewViewport(
+GRAPH *graph)
 {
 /*    double scaleps, scalex, scaley; */
 
@@ -195,8 +195,8 @@ int GL_Clear()
     return 0;
 }
 
-int GL_DrawLine(x1, y1, x2, y2)
-int x1, y1, x2, y2;
+int GL_DrawLine(
+int x1, int y1, int x2, int y2)
 {
 
     /* note: this is not extendible to more than one graph
@@ -222,9 +222,9 @@ int x1, y1, x2, y2;
 }
 
 /* ARGSUSED */
-int GL_Arc(x0, y0, r, theta1, theta2)
-int x0, y0, r;
-double theta1, theta2;
+int GL_Arc(
+int x0, int y0, int r,
+double theta1, double theta2)
 {
     double x1, y1;
     double angle1, angle2;
@@ -247,9 +247,9 @@ double theta1, theta2;
     return 0;
 }
 
-int GL_Text(text, x, y)
-char *text;
-int x, y;
+int GL_Text(
+char *text,
+int x, int y)
 {
 
 /*    int savedlstyle; */
@@ -268,8 +268,8 @@ int x, y;
 }
 
 int
-GL_SetLinestyle(linestyleid)
-int linestyleid;
+GL_SetLinestyle(
+int linestyleid)
 {
 
     /* special case
@@ -293,8 +293,8 @@ int linestyleid;
 }
 
 /* ARGSUSED */
-int GL_SetColor(colorid)
-int colorid;
+int GL_SetColor(
+int colorid)
 {
 /*va: unused:    static int flag = 0;*/        /* A hack */
 
diff --git a/src/frontend/parser/lexical.c b/src/frontend/parser/lexical.c
index 8504fdc02..8845989e7 100644
--- a/src/frontend/parser/lexical.c
+++ b/src/frontend/parser/lexical.c
@@ -86,9 +86,9 @@ static int numeofs = 0;
 /* CDHW Debug function */
 
 static void
-pwlist_echo(wlist, name)   /*CDHW used to perform function of set echo */
-    wordlist *wlist;
-    char *name;
+pwlist_echo(   /*CDHW used to perform function of set echo */
+    wordlist *wlist,
+    char *name)
 {
     wordlist *wl;
 
diff --git a/src/maths/deriv/tanderiv.c b/src/maths/deriv/tanderiv.c
index fec1f78b4..6fae788ee 100644
--- a/src/maths/deriv/tanderiv.c
+++ b/src/maths/deriv/tanderiv.c
@@ -13,8 +13,8 @@ Author: 1989 Jaijeet S. Roychowdhury
  * function of three variables p, q, and r.
  */
 
-void TanDeriv(new, old)
-Dderivs *new, *old;
+void TanDeriv(
+Dderivs *new, Dderivs *old)
 {
 
 Dderivs temp;
diff --git a/src/misc/string.c b/src/misc/string.c
index 91ef88841..e3ad9c59d 100644
--- a/src/misc/string.c
+++ b/src/misc/string.c
@@ -139,9 +139,9 @@ strtolower(char *str)
  */
  
 int
-cinprefix(p, s, n)
-register char *p, *s;
-register int n;
+cinprefix(
+register char *p, register char *s,
+register int n)
 {
   if (!p || !s) return( 0 );
  
@@ -165,8 +165,8 @@ register int n;
  */
  
  int
-cimatch(p, s)
-register char *p, *s;
+cimatch(
+register char *p, register char *s)
 {
   register int n = 0;
  
diff --git a/src/spicelib/analysis/cktncdump.c b/src/spicelib/analysis/cktncdump.c
index 8fdc9a0d4..b7f9482d7 100644
--- a/src/spicelib/analysis/cktncdump.c
+++ b/src/spicelib/analysis/cktncdump.c
@@ -8,8 +8,8 @@ Author: 1999 Alan Gillespie
 #include "suffix.h"
 
 void
-CKTncDump(ckt) 
-    CKTcircuit *ckt;
+CKTncDump(
+    CKTcircuit *ckt)
 {
   CKTnode *node;
   double new, old, tol;
diff --git a/src/spicelib/devices/asrc/asrcset.c b/src/spicelib/devices/asrc/asrcset.c
index bb6378612..fdbd9fa68 100644
--- a/src/spicelib/devices/asrc/asrcset.c
+++ b/src/spicelib/devices/asrc/asrcset.c
@@ -138,9 +138,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,((CKTnode*)(second))->number))\
 }
 
 int
-ASRCunsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+ASRCunsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
     ASRCmodel *model;
     ASRCinstance *here;
diff --git a/src/spicelib/devices/bjt/bjtsetup.c b/src/spicelib/devices/bjt/bjtsetup.c
index f92859ab8..b85afd905 100644
--- a/src/spicelib/devices/bjt/bjtsetup.c
+++ b/src/spicelib/devices/bjt/bjtsetup.c
@@ -262,9 +262,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }
 
 int
-BJTunsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+BJTunsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
     BJTmodel *model;
     BJTinstance *here;
diff --git a/src/spicelib/devices/bsim2/b2set.c b/src/spicelib/devices/bsim2/b2set.c
index 17f0dc1f1..a71a0af84 100644
--- a/src/spicelib/devices/bsim2/b2set.c
+++ b/src/spicelib/devices/bsim2/b2set.c
@@ -570,9 +570,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }  
 
 int
-B2unsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+B2unsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
     B2model *model;
     B2instance *here;
diff --git a/src/spicelib/devices/bsim3/b3acld.c b/src/spicelib/devices/bsim3/b3acld.c
index cf829fec7..47df960e0 100644
--- a/src/spicelib/devices/bsim3/b3acld.c
+++ b/src/spicelib/devices/bsim3/b3acld.c
@@ -16,9 +16,9 @@
 
 
 int
-BSIM3acLoad(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM3acLoad(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM3model *model = (BSIM3model*)inModel;
 BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3/b3ask.c b/src/spicelib/devices/bsim3/b3ask.c
index df01a3449..b5c1e1907 100644
--- a/src/spicelib/devices/bsim3/b3ask.c
+++ b/src/spicelib/devices/bsim3/b3ask.c
@@ -17,12 +17,12 @@
 #include "suffix.h"
 
 int
-BSIM3ask(ckt,inst,which,value,select)
-CKTcircuit *ckt;
-GENinstance *inst;
-int which;
-IFvalue *value;
-IFvalue *select;
+BSIM3ask(
+CKTcircuit *ckt,
+GENinstance *inst,
+int which,
+IFvalue *value,
+IFvalue *select)
 {
 BSIM3instance *here = (BSIM3instance*)inst;
 
diff --git a/src/spicelib/devices/bsim3/b3check.c b/src/spicelib/devices/bsim3/b3check.c
index 71be7adf6..517e1edff 100644
--- a/src/spicelib/devices/bsim3/b3check.c
+++ b/src/spicelib/devices/bsim3/b3check.c
@@ -20,10 +20,10 @@
 #include "suffix.h"
 
 int
-BSIM3checkModel(model, here, ckt)
-BSIM3model *model;
-BSIM3instance *here;
-CKTcircuit *ckt;
+BSIM3checkModel(
+BSIM3model *model,
+BSIM3instance *here,
+CKTcircuit *ckt)
 {
 struct bsim3SizeDependParam *pParam;
 int Fatal_Flag = 0;
diff --git a/src/spicelib/devices/bsim3/b3cvtest.c b/src/spicelib/devices/bsim3/b3cvtest.c
index a5500b14e..c83b6c40a 100644
--- a/src/spicelib/devices/bsim3/b3cvtest.c
+++ b/src/spicelib/devices/bsim3/b3cvtest.c
@@ -19,9 +19,9 @@
 
 
 int
-BSIM3convTest(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM3convTest(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM3model *model = (BSIM3model*)inModel;
 BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3/b3del.c b/src/spicelib/devices/bsim3/b3del.c
index 718c75569..be63891c5 100644
--- a/src/spicelib/devices/bsim3/b3del.c
+++ b/src/spicelib/devices/bsim3/b3del.c
@@ -17,10 +17,10 @@
 
 
 int
-BSIM3delete(inModel,name,inInst)
-GENmodel *inModel;
-IFuid name;
-GENinstance **inInst;
+BSIM3delete(
+GENmodel *inModel,
+IFuid name,
+GENinstance **inInst)
 {
 BSIM3instance **fast = (BSIM3instance**)inInst;
 BSIM3model *model = (BSIM3model*)inModel;
diff --git a/src/spicelib/devices/bsim3/b3dest.c b/src/spicelib/devices/bsim3/b3dest.c
index b14d1eab6..06ea39ac3 100644
--- a/src/spicelib/devices/bsim3/b3dest.c
+++ b/src/spicelib/devices/bsim3/b3dest.c
@@ -13,8 +13,8 @@
 #include "suffix.h"
 
 void
-BSIM3destroy(inModel)
-GENmodel **inModel;
+BSIM3destroy(
+GENmodel **inModel)
 {
 BSIM3model **model = (BSIM3model**)inModel;
 BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3/b3getic.c b/src/spicelib/devices/bsim3/b3getic.c
index 76108e7c8..02b251367 100644
--- a/src/spicelib/devices/bsim3/b3getic.c
+++ b/src/spicelib/devices/bsim3/b3getic.c
@@ -16,9 +16,9 @@
 
 
 int
-BSIM3getic(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM3getic(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM3model *model = (BSIM3model*)inModel;
 BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3/b3ld.c b/src/spicelib/devices/bsim3/b3ld.c
index 03b0eaa15..844f11303 100644
--- a/src/spicelib/devices/bsim3/b3ld.c
+++ b/src/spicelib/devices/bsim3/b3ld.c
@@ -33,9 +33,9 @@
 
 
 int
-BSIM3load(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM3load(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM3model *model = (BSIM3model*)inModel;
 BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3/b3mask.c b/src/spicelib/devices/bsim3/b3mask.c
index e8a96485c..324689dc8 100644
--- a/src/spicelib/devices/bsim3/b3mask.c
+++ b/src/spicelib/devices/bsim3/b3mask.c
@@ -17,11 +17,11 @@
 #include "suffix.h"
 
 int
-BSIM3mAsk(ckt,inst,which,value)
-CKTcircuit *ckt;
-GENmodel *inst;
-int which;
-IFvalue *value;
+BSIM3mAsk(
+CKTcircuit *ckt,
+GENmodel *inst,
+int which,
+IFvalue *value)
 {
     BSIM3model *model = (BSIM3model *)inst;
     switch(which) 
diff --git a/src/spicelib/devices/bsim3/b3mdel.c b/src/spicelib/devices/bsim3/b3mdel.c
index 0523f8a69..6d91c47ba 100644
--- a/src/spicelib/devices/bsim3/b3mdel.c
+++ b/src/spicelib/devices/bsim3/b3mdel.c
@@ -14,10 +14,10 @@
 #include "suffix.h"
 
 int
-BSIM3mDelete(inModel,modname,kill)
-GENmodel **inModel;
-IFuid modname;
-GENmodel *kill;
+BSIM3mDelete(
+GENmodel **inModel,
+IFuid modname,
+GENmodel *kill)
 {
 BSIM3model **model = (BSIM3model**)inModel;
 BSIM3model *modfast = (BSIM3model*)kill;
diff --git a/src/spicelib/devices/bsim3/b3mpar.c b/src/spicelib/devices/bsim3/b3mpar.c
index 8526317c0..0df11537a 100644
--- a/src/spicelib/devices/bsim3/b3mpar.c
+++ b/src/spicelib/devices/bsim3/b3mpar.c
@@ -16,10 +16,10 @@
 
 
 int
-BSIM3mParam(param,value,inMod)
-int param;
-IFvalue *value;
-GENmodel *inMod;
+BSIM3mParam(
+int param,
+IFvalue *value,
+GENmodel *inMod)
 {
     BSIM3model *mod = (BSIM3model*)inMod;
     switch(param)
diff --git a/src/spicelib/devices/bsim3/b3noi.c b/src/spicelib/devices/bsim3/b3noi.c
index 226858d83..4a5f4bfe3 100644
--- a/src/spicelib/devices/bsim3/b3noi.c
+++ b/src/spicelib/devices/bsim3/b3noi.c
@@ -58,10 +58,11 @@ extern double Nintegrate();
 
 
 double
-StrongInversionNoiseEval(Vds, model, here, freq, temp)
-double Vds, freq, temp;
-BSIM3model *model;
-BSIM3instance *here;
+StrongInversionNoiseEval(
+double Vds,
+BSIM3model *model,
+BSIM3instance *here,
+double freq, double temp)
 {
 struct bsim3SizeDependParam *pParam;
 double cd, esat, DelClm, EffFreq, N0, Nl, Leff, Leffsq;
@@ -102,12 +103,12 @@ double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, Ssi;
 }
 
 int
-BSIM3noise (mode, operation, inModel, ckt, data, OnDens)
-int mode, operation;
-GENmodel *inModel;
-CKTcircuit *ckt;
-Ndata *data;
-double *OnDens;
+BSIM3noise (
+int mode, int operation,
+GENmodel *inModel,
+CKTcircuit *ckt,
+Ndata *data,
+double *OnDens)
 {
 BSIM3model *model = (BSIM3model *)inModel;
 BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3/b3par.c b/src/spicelib/devices/bsim3/b3par.c
index 123959bd6..dc170e7f4 100644
--- a/src/spicelib/devices/bsim3/b3par.c
+++ b/src/spicelib/devices/bsim3/b3par.c
@@ -16,7 +16,11 @@
 #include "fteext.h"
 
 int
-BSIM3param (int param, IFvalue *value, GENinstance *inst, IFvalue *select)
+BSIM3param (
+int param,
+IFvalue *value,
+GENinstance *inst,
+IFvalue *select)
 {
     double scale;
 
diff --git a/src/spicelib/devices/bsim3/b3pzld.c b/src/spicelib/devices/bsim3/b3pzld.c
index 08ba37fec..96ae7123d 100644
--- a/src/spicelib/devices/bsim3/b3pzld.c
+++ b/src/spicelib/devices/bsim3/b3pzld.c
@@ -16,10 +16,10 @@
 #include "suffix.h"
 
 int
-BSIM3pzLoad(inModel,ckt,s)
-GENmodel *inModel;
-CKTcircuit *ckt;
-SPcomplex *s;
+BSIM3pzLoad(
+GENmodel *inModel,
+CKTcircuit *ckt,
+SPcomplex *s)
 {
 BSIM3model *model = (BSIM3model*)inModel;
 BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3/b3set.c b/src/spicelib/devices/bsim3/b3set.c
index 2d1d51b25..c23bbd79c 100644
--- a/src/spicelib/devices/bsim3/b3set.c
+++ b/src/spicelib/devices/bsim3/b3set.c
@@ -27,11 +27,11 @@
 #define Meter2Micron 1.0e6
 
 int
-BSIM3setup(matrix,inModel,ckt,states)
-SMPmatrix *matrix;
-GENmodel *inModel;
-CKTcircuit *ckt;
-int *states;
+BSIM3setup(
+SMPmatrix *matrix,
+GENmodel *inModel,
+CKTcircuit *ckt,
+int *states)
 {
 BSIM3model *model = (BSIM3model*)inModel;
 BSIM3instance *here;
@@ -983,9 +983,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }
 
 int
-BSIM3unsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+BSIM3unsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
     BSIM3model *model;
     BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3/b3temp.c b/src/spicelib/devices/bsim3/b3temp.c
index acf7583ee..f2676027f 100644
--- a/src/spicelib/devices/bsim3/b3temp.c
+++ b/src/spicelib/devices/bsim3/b3temp.c
@@ -31,9 +31,9 @@
 
 /* ARGSUSED */
 int
-BSIM3temp(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM3temp(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM3model *model = (BSIM3model*) inModel;
 BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3/b3trunc.c b/src/spicelib/devices/bsim3/b3trunc.c
index 5fc0054bf..73aec8e28 100644
--- a/src/spicelib/devices/bsim3/b3trunc.c
+++ b/src/spicelib/devices/bsim3/b3trunc.c
@@ -16,10 +16,10 @@
 
 
 int
-BSIM3trunc(inModel,ckt,timeStep)
-GENmodel *inModel;
-CKTcircuit *ckt;
-double *timeStep;
+BSIM3trunc(
+GENmodel *inModel,
+CKTcircuit *ckt,
+double *timeStep)
 {
 BSIM3model *model = (BSIM3model*)inModel;
 BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3soi/b4soiacld.c b/src/spicelib/devices/bsim3soi/b4soiacld.c
index 974c9f7a4..fa512d91b 100644
--- a/src/spicelib/devices/bsim3soi/b4soiacld.c
+++ b/src/spicelib/devices/bsim3soi/b4soiacld.c
@@ -19,7 +19,9 @@
 
 
 int
-B4SOIacLoad(GENmodel *inModel, CKTcircuit *ckt)
+B4SOIacLoad(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 register B4SOImodel *model = (B4SOImodel*)inModel;
 register B4SOIinstance *here;
diff --git a/src/spicelib/devices/bsim3soi/b4soiask.c b/src/spicelib/devices/bsim3soi/b4soiask.c
index 593d50944..ab705b8c4 100644
--- a/src/spicelib/devices/bsim3soi/b4soiask.c
+++ b/src/spicelib/devices/bsim3soi/b4soiask.c
@@ -20,7 +20,12 @@
 #include "suffix.h"
 
 int
-B4SOIask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *select)
+B4SOIask(
+CKTcircuit *ckt,
+GENinstance *inst,
+int which,
+IFvalue *value,
+IFvalue *select)
 {
 B4SOIinstance *here = (B4SOIinstance*)inst;
 
diff --git a/src/spicelib/devices/bsim3soi/b4soicheck.c b/src/spicelib/devices/bsim3soi/b4soicheck.c
index ee08c87fe..3573927c3 100644
--- a/src/spicelib/devices/bsim3soi/b4soicheck.c
+++ b/src/spicelib/devices/bsim3soi/b4soicheck.c
@@ -21,7 +21,10 @@
 #include "suffix.h"
 
 int
-B4SOIcheckModel(B4SOImodel *model, B4SOIinstance *here, CKTcircuit *ckt)
+B4SOIcheckModel(
+B4SOImodel *model,
+B4SOIinstance *here,
+CKTcircuit *ckt)
 {
 struct b4soiSizeDependParam *pParam;
 int Fatal_Flag = 0;
diff --git a/src/spicelib/devices/bsim3soi/b4soicvtest.c b/src/spicelib/devices/bsim3soi/b4soicvtest.c
index da01f5222..21bc2a95a 100644
--- a/src/spicelib/devices/bsim3soi/b4soicvtest.c
+++ b/src/spicelib/devices/bsim3soi/b4soicvtest.c
@@ -22,7 +22,9 @@
 
 
 int
-B4SOIconvTest(GENmodel *inModel, CKTcircuit *ckt)
+B4SOIconvTest(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 register B4SOImodel *model = (B4SOImodel*)inModel;
 register B4SOIinstance *here;
diff --git a/src/spicelib/devices/bsim3soi/b4soidel.c b/src/spicelib/devices/bsim3soi/b4soidel.c
index 3aada4228..46d499c58 100644
--- a/src/spicelib/devices/bsim3soi/b4soidel.c
+++ b/src/spicelib/devices/bsim3soi/b4soidel.c
@@ -19,7 +19,10 @@
 
 
 int
-B4SOIdelete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B4SOIdelete(
+GENmodel *inModel,
+IFuid name,
+GENinstance **inInst)
 {
 B4SOIinstance **fast = (B4SOIinstance**)inInst;
 B4SOImodel *model = (B4SOImodel*)inModel;
diff --git a/src/spicelib/devices/bsim3soi/b4soidest.c b/src/spicelib/devices/bsim3soi/b4soidest.c
index 71608622e..78d860de9 100644
--- a/src/spicelib/devices/bsim3soi/b4soidest.c
+++ b/src/spicelib/devices/bsim3soi/b4soidest.c
@@ -16,7 +16,8 @@
 #include "suffix.h"
 
 void
-B4SOIdestroy(GENmodel **inModel)
+B4SOIdestroy(
+GENmodel **inModel)
 {
 B4SOImodel **model = (B4SOImodel**)inModel;
 B4SOIinstance *here;
diff --git a/src/spicelib/devices/bsim3soi/b4soigetic.c b/src/spicelib/devices/bsim3soi/b4soigetic.c
index d5473f8f9..2f9bd459b 100644
--- a/src/spicelib/devices/bsim3soi/b4soigetic.c
+++ b/src/spicelib/devices/bsim3soi/b4soigetic.c
@@ -19,7 +19,9 @@
 
 
 int
-B4SOIgetic(GENmodel *inModel, CKTcircuit *ckt)
+B4SOIgetic(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 B4SOImodel *model = (B4SOImodel*)inModel;
 B4SOIinstance *here;
diff --git a/src/spicelib/devices/bsim3soi/b4soild.c b/src/spicelib/devices/bsim3soi/b4soild.c
index 95754a34f..b06b9a101 100644
--- a/src/spicelib/devices/bsim3soi/b4soild.c
+++ b/src/spicelib/devices/bsim3soi/b4soild.c
@@ -62,7 +62,11 @@
      */
 
 double
-B4SOIlimit(double vnew, double vold, double limit, int *check)
+B4SOIlimit(
+double vnew,
+double vold,
+double limit,
+int *check)
 {
     double T0, T1;
 
@@ -88,7 +92,9 @@ B4SOIlimit(double vnew, double vold, double limit, int *check)
 
 
 int
-B4SOIload(GENmodel *inModel, CKTcircuit *ckt)
+B4SOIload(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 register B4SOImodel *model = (B4SOImodel*)inModel;
 register B4SOIinstance *here;
diff --git a/src/spicelib/devices/bsim3soi/b4soimask.c b/src/spicelib/devices/bsim3soi/b4soimask.c
index 87ec2ea19..3ff132af9 100644
--- a/src/spicelib/devices/bsim3soi/b4soimask.c
+++ b/src/spicelib/devices/bsim3soi/b4soimask.c
@@ -20,7 +20,11 @@
 #include "suffix.h"
 
 int
-B4SOImAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
+B4SOImAsk(
+CKTcircuit *ckt,
+GENmodel *inst,
+int which,
+IFvalue *value)
 {
     B4SOImodel *model = (B4SOImodel *)inst;
     switch(which) 
diff --git a/src/spicelib/devices/bsim3soi/b4soimdel.c b/src/spicelib/devices/bsim3soi/b4soimdel.c
index b480744e2..b880e328f 100644
--- a/src/spicelib/devices/bsim3soi/b4soimdel.c
+++ b/src/spicelib/devices/bsim3soi/b4soimdel.c
@@ -17,7 +17,10 @@
 #include "suffix.h"
 
 int
-B4SOImDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
+B4SOImDelete(
+GENmodel **inModel,
+IFuid modname,
+GENmodel *kill)
 {
 B4SOImodel **model = (B4SOImodel**)inModel;
 B4SOImodel *modfast = (B4SOImodel*)kill;
diff --git a/src/spicelib/devices/bsim3soi/b4soimpar.c b/src/spicelib/devices/bsim3soi/b4soimpar.c
index 618a60ab8..a0e01d5c1 100644
--- a/src/spicelib/devices/bsim3soi/b4soimpar.c
+++ b/src/spicelib/devices/bsim3soi/b4soimpar.c
@@ -19,7 +19,10 @@
 
 
 int
-B4SOImParam(int param, IFvalue *value, GENmodel *inMod)
+B4SOImParam(
+int param,
+IFvalue *value,
+GENmodel *inMod)
 {
     B4SOImodel *mod = (B4SOImodel*)inMod;
     switch(param)
diff --git a/src/spicelib/devices/bsim3soi/b4soinoi.c b/src/spicelib/devices/bsim3soi/b4soinoi.c
index f7b26371b..106cedf8b 100644
--- a/src/spicelib/devices/bsim3soi/b4soinoi.c
+++ b/src/spicelib/devices/bsim3soi/b4soinoi.c
@@ -47,7 +47,12 @@ extern void   NevalSrc();
 extern double Nintegrate();
 
 double
-B4SOIEval1ovFNoise(double vds, B4SOImodel *model, B4SOIinstance *here, double freq, double temp)
+B4SOIEval1ovFNoise(
+double vds,
+B4SOImodel *model,
+B4SOIinstance *here,
+double freq,
+double temp)
 {
 struct b4soiSizeDependParam *pParam;
 double cd, esat, DelClm, EffFreq, N0, Nl;
@@ -93,8 +98,12 @@ double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, Ssi;
 }
 
 int
-B4SOInoise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, 
-            Ndata *data, double *OnDens)
+B4SOInoise (
+int mode, int operation,
+GENmodel *inModel,
+CKTcircuit *ckt,
+Ndata *data,
+double *OnDens)
 {
 register B4SOImodel *model = (B4SOImodel *)inModel;
 register B4SOIinstance *here;
diff --git a/src/spicelib/devices/bsim3soi/b4soipar.c b/src/spicelib/devices/bsim3soi/b4soipar.c
index 16c46540f..80800d54b 100644
--- a/src/spicelib/devices/bsim3soi/b4soipar.c
+++ b/src/spicelib/devices/bsim3soi/b4soipar.c
@@ -18,7 +18,11 @@
 #include "suffix.h"
 
 int
-B4SOIparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
+B4SOIparam(
+int param,
+IFvalue *value,
+GENinstance *inst,
+IFvalue *select)
 {
     B4SOIinstance *here = (B4SOIinstance*)inst;
     switch(param) 
diff --git a/src/spicelib/devices/bsim3soi/b4soipzld.c b/src/spicelib/devices/bsim3soi/b4soipzld.c
index b1848ac3a..55ffb25be 100644
--- a/src/spicelib/devices/bsim3soi/b4soipzld.c
+++ b/src/spicelib/devices/bsim3soi/b4soipzld.c
@@ -19,7 +19,10 @@
 #include "suffix.h"
 
 int
-B4SOIpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
+B4SOIpzLoad(
+GENmodel *inModel,
+CKTcircuit *ckt,
+SPcomplex *s)
 {
 register B4SOImodel *model = (B4SOImodel*)inModel;
 register B4SOIinstance *here;
diff --git a/src/spicelib/devices/bsim3soi/b4soiset.c b/src/spicelib/devices/bsim3soi/b4soiset.c
index 2cfd15ac2..935953ed0 100644
--- a/src/spicelib/devices/bsim3soi/b4soiset.c
+++ b/src/spicelib/devices/bsim3soi/b4soiset.c
@@ -30,7 +30,11 @@
 double epsrox, toxe, epssub; 
 
 int
-B4SOIsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
+B4SOIsetup(
+SMPmatrix *matrix,
+GENmodel *inModel,
+CKTcircuit *ckt,
+int *states)
 {
 register B4SOImodel *model = (B4SOImodel*)inModel;
 register B4SOIinstance *here;
diff --git a/src/spicelib/devices/bsim3soi/b4soitemp.c b/src/spicelib/devices/bsim3soi/b4soitemp.c
index 6f071e922..be5b792d1 100644
--- a/src/spicelib/devices/bsim3soi/b4soitemp.c
+++ b/src/spicelib/devices/bsim3soi/b4soitemp.c
@@ -46,7 +46,9 @@
 
 /* ARGSUSED */
 int
-B4SOItemp(GENmodel *inModel, CKTcircuit *ckt)
+B4SOItemp(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 register B4SOImodel *model = (B4SOImodel*) inModel;
 register B4SOIinstance *here;
diff --git a/src/spicelib/devices/bsim3soi/b4soitrunc.c b/src/spicelib/devices/bsim3soi/b4soitrunc.c
index 6ec4b7d3d..f857229b6 100644
--- a/src/spicelib/devices/bsim3soi/b4soitrunc.c
+++ b/src/spicelib/devices/bsim3soi/b4soitrunc.c
@@ -19,7 +19,10 @@
 
 
 int
-B4SOItrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
+B4SOItrunc(
+GENmodel *inModel,
+CKTcircuit *ckt,
+double *timeStep)
 {
 register B4SOImodel *model = (B4SOImodel*)inModel;
 register B4SOIinstance *here;
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdset.c b/src/spicelib/devices/bsim3soi_pd/b3soipdset.c
index 7cbde36ef..61d8fc493 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdset.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdset.c
@@ -1453,9 +1453,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }  
 
 int
-B3SOIPDunsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+B3SOIPDunsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
     B3SOIPDmodel *model;
     B3SOIPDinstance *here;
diff --git a/src/spicelib/devices/bsim3v0/b3v0mask.c b/src/spicelib/devices/bsim3v0/b3v0mask.c
index 51fee7e41..25d0d1c27 100644
--- a/src/spicelib/devices/bsim3v0/b3v0mask.c
+++ b/src/spicelib/devices/bsim3v0/b3v0mask.c
@@ -13,11 +13,11 @@ File: b3v0mask.c
 #include "suffix.h"
 
 int
-BSIM3v0mAsk(ckt,inst,which,value)
-CKTcircuit *ckt;
-GENmodel *inst;
-int which;
-IFvalue *value;
+BSIM3v0mAsk(
+CKTcircuit *ckt,
+GENmodel *inst,
+int which,
+IFvalue *value)
 {
     BSIM3v0model *model = (BSIM3v0model *)inst;
     switch(which) 
diff --git a/src/spicelib/devices/bsim3v32/b3v32set.c b/src/spicelib/devices/bsim3v32/b3v32set.c
index 9bb015bff..c0d6f97d1 100644
--- a/src/spicelib/devices/bsim3v32/b3v32set.c
+++ b/src/spicelib/devices/bsim3v32/b3v32set.c
@@ -1059,9 +1059,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }
 
 int
-BSIM3v32unsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+BSIM3v32unsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
     BSIM3v32model *model;
     BSIM3v32instance *here;
diff --git a/src/spicelib/devices/bsim4/b4acld.c b/src/spicelib/devices/bsim4/b4acld.c
index 29f1007fb..3151a58ed 100644
--- a/src/spicelib/devices/bsim4/b4acld.c
+++ b/src/spicelib/devices/bsim4/b4acld.c
@@ -19,7 +19,9 @@
 
 
 int
-BSIM4acLoad(GENmodel *inModel, CKTcircuit *ckt)
+BSIM4acLoad(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4ask.c b/src/spicelib/devices/bsim4/b4ask.c
index 0135d294d..3b93ee172 100644
--- a/src/spicelib/devices/bsim4/b4ask.c
+++ b/src/spicelib/devices/bsim4/b4ask.c
@@ -23,7 +23,12 @@
 #include "suffix.h"
 
 int
-BSIM4ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *select)
+BSIM4ask(
+CKTcircuit *ckt,
+GENinstance *inst,
+int which,
+IFvalue *value,
+IFvalue *select)
 {
 BSIM4instance *here = (BSIM4instance*)inst;
 
diff --git a/src/spicelib/devices/bsim4/b4check.c b/src/spicelib/devices/bsim4/b4check.c
index bf3444241..1a0b78401 100644
--- a/src/spicelib/devices/bsim4/b4check.c
+++ b/src/spicelib/devices/bsim4/b4check.c
@@ -29,7 +29,10 @@
 #include "suffix.h"
 
 int
-BSIM4checkModel(BSIM4model *model, BSIM4instance *here, CKTcircuit *ckt)
+BSIM4checkModel(
+BSIM4model *model,
+BSIM4instance *here,
+CKTcircuit *ckt)
 {
 struct bsim4SizeDependParam *pParam;
 int Fatal_Flag = 0;
diff --git a/src/spicelib/devices/bsim4/b4cvtest.c b/src/spicelib/devices/bsim4/b4cvtest.c
index a81aca0d3..f5432bf04 100644
--- a/src/spicelib/devices/bsim4/b4cvtest.c
+++ b/src/spicelib/devices/bsim4/b4cvtest.c
@@ -24,7 +24,9 @@
 
 
 int
-BSIM4convTest(GENmodel *inModel, CKTcircuit *ckt)
+BSIM4convTest(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4del.c b/src/spicelib/devices/bsim4/b4del.c
index 6a29b1ac8..f529c13f7 100644
--- a/src/spicelib/devices/bsim4/b4del.c
+++ b/src/spicelib/devices/bsim4/b4del.c
@@ -18,7 +18,10 @@
 
 
 int
-BSIM4delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM4delete(
+GENmodel *inModel,
+IFuid name,
+GENinstance **inInst)
 {
 BSIM4instance **fast = (BSIM4instance**)inInst;
 BSIM4model *model = (BSIM4model*)inModel;
diff --git a/src/spicelib/devices/bsim4/b4dest.c b/src/spicelib/devices/bsim4/b4dest.c
index b728fef46..87488d390 100644
--- a/src/spicelib/devices/bsim4/b4dest.c
+++ b/src/spicelib/devices/bsim4/b4dest.c
@@ -15,7 +15,8 @@
 #include "suffix.h"
 
 void
-BSIM4destroy(GENmodel **inModel)
+BSIM4destroy(
+GENmodel **inModel)
 {
 BSIM4model **model = (BSIM4model**)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4getic.c b/src/spicelib/devices/bsim4/b4getic.c
index 9ae43ca55..8f192995c 100644
--- a/src/spicelib/devices/bsim4/b4getic.c
+++ b/src/spicelib/devices/bsim4/b4getic.c
@@ -18,7 +18,9 @@
 
 
 int
-BSIM4getic(GENmodel *inModel, CKTcircuit *ckt)
+BSIM4getic(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4ld.c b/src/spicelib/devices/bsim4/b4ld.c
index ba9ca3a4e..9b388a854 100644
--- a/src/spicelib/devices/bsim4/b4ld.c
+++ b/src/spicelib/devices/bsim4/b4ld.c
@@ -61,7 +61,9 @@
 int BSIM4polyDepletion(double phi, double ngate,double epsgate, double coxe, double Vgs, double *Vgs_eff, double *dVgs_eff_dVg);
 
 int
-BSIM4load(GENmodel *inModel, CKTcircuit *ckt)
+BSIM4load(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4mask.c b/src/spicelib/devices/bsim4/b4mask.c
index 880a0dfae..fdb7f48e6 100644
--- a/src/spicelib/devices/bsim4/b4mask.c
+++ b/src/spicelib/devices/bsim4/b4mask.c
@@ -27,7 +27,11 @@
 #include "suffix.h"
 
 int
-BSIM4mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
+BSIM4mAsk(
+CKTcircuit *ckt,
+GENmodel *inst,
+int which,
+IFvalue *value)
 {
     BSIM4model *model = (BSIM4model *)inst;
     switch(which) 
diff --git a/src/spicelib/devices/bsim4/b4mdel.c b/src/spicelib/devices/bsim4/b4mdel.c
index eb31a77f2..dd18c43d4 100644
--- a/src/spicelib/devices/bsim4/b4mdel.c
+++ b/src/spicelib/devices/bsim4/b4mdel.c
@@ -16,7 +16,10 @@
 #include "suffix.h"
 
 int
-BSIM4mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
+BSIM4mDelete(
+GENmodel **inModel,
+IFuid modname, 
+GENmodel *kill)
 {
 BSIM4model **model = (BSIM4model**)inModel;
 BSIM4model *modfast = (BSIM4model*)kill;
diff --git a/src/spicelib/devices/bsim4/b4mpar.c b/src/spicelib/devices/bsim4/b4mpar.c
index 5553027d0..792e50739 100644
--- a/src/spicelib/devices/bsim4/b4mpar.c
+++ b/src/spicelib/devices/bsim4/b4mpar.c
@@ -28,7 +28,10 @@
 #include "const.h"
 
 int
-BSIM4mParam(int param, IFvalue *value, GENmodel *inMod)
+BSIM4mParam(
+int param,
+IFvalue *value,
+GENmodel *inMod)
 {
     BSIM4model *mod = (BSIM4model*)inMod;
     switch(param)
diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c
index c0dbc4ea4..a91ba5907 100644
--- a/src/spicelib/devices/bsim4/b4noi.c
+++ b/src/spicelib/devices/bsim4/b4noi.c
@@ -78,7 +78,13 @@ double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, Ssi;
 
 
 int
-BSIM4noise(int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, Ndata *data, double *OnDens)
+BSIM4noise(
+int mode,
+int operation,
+GENmodel *inModel,
+CKTcircuit *ckt,
+Ndata *data,
+double *OnDens)
 {
 BSIM4model *model = (BSIM4model *)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4par.c b/src/spicelib/devices/bsim4/b4par.c
index 231b90733..bb2569a4b 100644
--- a/src/spicelib/devices/bsim4/b4par.c
+++ b/src/spicelib/devices/bsim4/b4par.c
@@ -22,7 +22,11 @@
 #include "fteext.h"
 
 int
-BSIM4param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
+BSIM4param(
+int param,
+IFvalue *value,
+GENinstance *inst,
+IFvalue *select)
 {
     double scale;
 
diff --git a/src/spicelib/devices/bsim4/b4pzld.c b/src/spicelib/devices/bsim4/b4pzld.c
index 95c806fcb..64eae5ee6 100644
--- a/src/spicelib/devices/bsim4/b4pzld.c
+++ b/src/spicelib/devices/bsim4/b4pzld.c
@@ -19,7 +19,10 @@
 #include "suffix.h"
 
 int
-BSIM4pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
+BSIM4pzLoad(
+GENmodel *inModel,
+CKTcircuit *ckt,
+SPcomplex *s)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4set.c b/src/spicelib/devices/bsim4/b4set.c
index 04b758964..9c0a2bed5 100644
--- a/src/spicelib/devices/bsim4/b4set.c
+++ b/src/spicelib/devices/bsim4/b4set.c
@@ -44,7 +44,11 @@ int
 BSIM4RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 int
-BSIM4setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
+BSIM4setup(
+SMPmatrix *matrix,
+GENmodel *inModel,
+CKTcircuit *ckt,
+int *states)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4temp.c b/src/spicelib/devices/bsim4/b4temp.c
index 44b0d9021..b07a6508b 100644
--- a/src/spicelib/devices/bsim4/b4temp.c
+++ b/src/spicelib/devices/bsim4/b4temp.c
@@ -70,7 +70,9 @@ return 0;
 
 
 int
-BSIM4temp(GENmodel *inModel, CKTcircuit *ckt)
+BSIM4temp(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4model *model = (BSIM4model*) inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4trunc.c b/src/spicelib/devices/bsim4/b4trunc.c
index 7074b799b..60dbe0354 100644
--- a/src/spicelib/devices/bsim4/b4trunc.c
+++ b/src/spicelib/devices/bsim4/b4trunc.c
@@ -18,7 +18,10 @@
 
 
 int
-BSIM4trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
+BSIM4trunc(
+GENmodel *inModel,
+CKTcircuit *ckt,
+double *timeStep)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4v2/b4v2acld.c b/src/spicelib/devices/bsim4v2/b4v2acld.c
index 2f80db592..162ed0fa1 100644
--- a/src/spicelib/devices/bsim4v2/b4v2acld.c
+++ b/src/spicelib/devices/bsim4v2/b4v2acld.c
@@ -18,9 +18,9 @@
 
 
 int
-BSIM4v2acLoad(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v2acLoad(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v2model *model = (BSIM4v2model*)inModel;
 BSIM4v2instance *here;
diff --git a/src/spicelib/devices/bsim4v2/b4v2ask.c b/src/spicelib/devices/bsim4v2/b4v2ask.c
index 19d333684..828c11441 100644
--- a/src/spicelib/devices/bsim4v2/b4v2ask.c
+++ b/src/spicelib/devices/bsim4v2/b4v2ask.c
@@ -21,12 +21,12 @@
 
 
 int
-BSIM4v2ask(ckt,inst,which,value,select)
-CKTcircuit *ckt;
-GENinstance *inst;
-int which;
-IFvalue *value;
-IFvalue *select;
+BSIM4v2ask(
+CKTcircuit *ckt,
+GENinstance *inst,
+int which,
+IFvalue *value,
+IFvalue *select)
 {
 BSIM4v2instance *here = (BSIM4v2instance*)inst;
 
diff --git a/src/spicelib/devices/bsim4v2/b4v2check.c b/src/spicelib/devices/bsim4v2/b4v2check.c
index 9a25f50b1..4d8cf8734 100644
--- a/src/spicelib/devices/bsim4v2/b4v2check.c
+++ b/src/spicelib/devices/bsim4v2/b4v2check.c
@@ -21,10 +21,10 @@
 #include "devdefs.h"
 
 int
-BSIM4v2checkModel(model, here, ckt)
-BSIM4v2model *model;
-BSIM4v2instance *here;
-CKTcircuit *ckt;
+BSIM4v2checkModel(
+BSIM4v2model *model,
+BSIM4v2instance *here,
+CKTcircuit *ckt)
 {
 struct bsim4SizeDependParam *pParam;
 int Fatal_Flag = 0;
diff --git a/src/spicelib/devices/bsim4v2/b4v2cvtest.c b/src/spicelib/devices/bsim4v2/b4v2cvtest.c
index 018bc273a..f3b25d2da 100644
--- a/src/spicelib/devices/bsim4v2/b4v2cvtest.c
+++ b/src/spicelib/devices/bsim4v2/b4v2cvtest.c
@@ -23,9 +23,9 @@
 
 
 int
-BSIM4v2convTest(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v2convTest(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v2model *model = (BSIM4v2model*)inModel;
 BSIM4v2instance *here;
diff --git a/src/spicelib/devices/bsim4v2/b4v2del.c b/src/spicelib/devices/bsim4v2/b4v2del.c
index b2e148bcd..02d63732e 100644
--- a/src/spicelib/devices/bsim4v2/b4v2del.c
+++ b/src/spicelib/devices/bsim4v2/b4v2del.c
@@ -16,10 +16,10 @@
 
 
 int
-BSIM4v2delete(inModel,name,inInst)
-GENmodel *inModel;
-IFuid name;
-GENinstance **inInst;
+BSIM4v2delete(
+GENmodel *inModel,
+IFuid name,
+GENinstance **inInst)
 {
 BSIM4v2instance **fast = (BSIM4v2instance**)inInst;
 BSIM4v2model *model = (BSIM4v2model*)inModel;
diff --git a/src/spicelib/devices/bsim4v2/b4v2dest.c b/src/spicelib/devices/bsim4v2/b4v2dest.c
index 8e7024f68..fd4f9ea5c 100644
--- a/src/spicelib/devices/bsim4v2/b4v2dest.c
+++ b/src/spicelib/devices/bsim4v2/b4v2dest.c
@@ -13,8 +13,8 @@
 #include "bsim4v2def.h"
 
 void
-BSIM4v2destroy(inModel)
-GENmodel **inModel;
+BSIM4v2destroy(
+GENmodel **inModel)
 {
 BSIM4v2model **model = (BSIM4v2model**)inModel;
 BSIM4v2instance *here;
diff --git a/src/spicelib/devices/bsim4v2/b4v2geo.c b/src/spicelib/devices/bsim4v2/b4v2geo.c
index d2da18413..8f5ac2015 100644
--- a/src/spicelib/devices/bsim4v2/b4v2geo.c
+++ b/src/spicelib/devices/bsim4v2/b4v2geo.c
@@ -25,9 +25,10 @@ BSIM4v2RdsEndSha(double, double, double, double, double, double, int, int, doubl
  */
 
 int
-BSIM4v2NumFingerDiff(nf, minSD, nuIntD, nuEndD, nuIntS, nuEndS)
-int minSD;
-double nf, *nuIntD, *nuEndD, *nuIntS, *nuEndS;
+BSIM4v2NumFingerDiff(
+double nf,
+int minSD,
+double *nuIntD, double *nuEndD, double *nuIntS, double *nuEndS)
 {
 int NF;
         NF = (int)nf;
@@ -54,10 +55,11 @@ return 0;
 
 
 int
-BSIM4v2PAeffGeo(nf, geo, minSD, Weffcj, DMCG, DMCI, DMDG, Ps, Pd, As, Ad)
-int geo, minSD; 
-double Weffcj, DMCG, DMCI, DMDG;
-double nf, *Ps, *Pd, *As, *Ad;
+BSIM4v2PAeffGeo(
+double nf,
+int geo, int minSD,
+double Weffcj, double DMCG, double DMCI, double DMDG,
+double *Ps, double *Pd, double *As, double *Ad)
 {
 double T0, T1, T2;
 double ADiso, ADsha, ADmer, ASiso, ASsha, ASmer;
@@ -154,10 +156,12 @@ return 0;
 
 
 int
-BSIM4v2RdseffGeo(nf, geo, rgeo, minSD, Weffcj, Rsh, DMCG, DMCI, DMDG, Type, Rtot)
-int geo, rgeo, minSD, Type;
-double nf, Weffcj, Rsh, DMCG, DMCI, DMDG;
-double *Rtot;
+BSIM4v2RdseffGeo(
+double nf,
+int geo, int rgeo, int minSD,
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+int Type,
+double *Rtot)
 {
 double Rint=0.0, Rend = 0.0;
 double nuIntD = 0.0, nuEndD = 0.0, nuIntS = 0.0, nuEndS = 0.0;
@@ -272,10 +276,11 @@ return 0;
 
 
 int
-BSIM4v2RdsEndIso(Weffcj, Rsh, DMCG, DMCI, DMDG, nuEnd, rgeo, Type, Rend)
-double Weffcj, Rsh, DMCG, DMCI, DMDG;
-int rgeo, Type;
-double nuEnd, *Rend;
+BSIM4v2RdsEndIso(
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+double nuEnd,
+int rgeo, int Type,
+double *Rend)
 {	
 	if (Type == 1)
 	{   switch(rgeo)
@@ -330,10 +335,11 @@ return 0;
 
 
 int
-BSIM4v2RdsEndSha(Weffcj, Rsh, DMCG, DMCI, DMDG, nuEnd, rgeo, Type, Rend)
-double Weffcj, Rsh, DMCG, DMCI, DMDG;
-int rgeo, Type;
-double nuEnd, *Rend;
+BSIM4v2RdsEndSha(
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+double nuEnd,
+int rgeo, int Type,
+double *Rend)
 {
         if (Type == 1)
         {   switch(rgeo)
diff --git a/src/spicelib/devices/bsim4v2/b4v2getic.c b/src/spicelib/devices/bsim4v2/b4v2getic.c
index 4efdbf133..3cf412bc5 100644
--- a/src/spicelib/devices/bsim4v2/b4v2getic.c
+++ b/src/spicelib/devices/bsim4v2/b4v2getic.c
@@ -16,9 +16,9 @@
 
 
 int
-BSIM4v2getic(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v2getic(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v2model *model = (BSIM4v2model*)inModel;
 BSIM4v2instance *here;
diff --git a/src/spicelib/devices/bsim4v2/b4v2ld.c b/src/spicelib/devices/bsim4v2/b4v2ld.c
index ba47f8865..7fb93ba51 100644
--- a/src/spicelib/devices/bsim4v2/b4v2ld.c
+++ b/src/spicelib/devices/bsim4v2/b4v2ld.c
@@ -31,9 +31,9 @@
 int BSIM4v2polyDepletion(double phi, double ngate,double coxe, double Vgs, double *Vgs_eff, double *dVgs_eff_dVg);
 
 int
-BSIM4v2load(inModel,ckt)
-GENmodel *inModel;
-register CKTcircuit *ckt;
+BSIM4v2load(
+GENmodel *inModel,
+register CKTcircuit *ckt)
 {
 register BSIM4v2model *model = (BSIM4v2model*)inModel;
 register BSIM4v2instance *here;
diff --git a/src/spicelib/devices/bsim4v2/b4v2mask.c b/src/spicelib/devices/bsim4v2/b4v2mask.c
index beec51162..3f9e6930c 100644
--- a/src/spicelib/devices/bsim4v2/b4v2mask.c
+++ b/src/spicelib/devices/bsim4v2/b4v2mask.c
@@ -19,11 +19,11 @@
 
 
 int
-BSIM4v2mAsk(ckt,inst,which,value)
-CKTcircuit *ckt;
-GENmodel *inst;
-int which;
-IFvalue *value;
+BSIM4v2mAsk(
+CKTcircuit *ckt,
+GENmodel *inst,
+int which,
+IFvalue *value)
 {
     BSIM4v2model *model = (BSIM4v2model *)inst;
     switch(which) 
diff --git a/src/spicelib/devices/bsim4v2/b4v2mdel.c b/src/spicelib/devices/bsim4v2/b4v2mdel.c
index 5fd4f6a86..5a27a3b48 100644
--- a/src/spicelib/devices/bsim4v2/b4v2mdel.c
+++ b/src/spicelib/devices/bsim4v2/b4v2mdel.c
@@ -15,10 +15,10 @@
 
 
 int
-BSIM4v2mDelete(inModel,modname,kill)
-GENmodel **inModel;
-IFuid modname;
-GENmodel *kill;
+BSIM4v2mDelete(
+GENmodel **inModel,
+IFuid modname,
+GENmodel *kill)
 {
 BSIM4v2model **model = (BSIM4v2model**)inModel;
 BSIM4v2model *modfast = (BSIM4v2model*)kill;
diff --git a/src/spicelib/devices/bsim4v2/b4v2mpar.c b/src/spicelib/devices/bsim4v2/b4v2mpar.c
index 9d34f6267..f72778d3a 100644
--- a/src/spicelib/devices/bsim4v2/b4v2mpar.c
+++ b/src/spicelib/devices/bsim4v2/b4v2mpar.c
@@ -18,10 +18,10 @@
 #include "const.h"
 
 int
-BSIM4v2mParam(param,value,inMod)
-int param;
-IFvalue *value;
-GENmodel *inMod;
+BSIM4v2mParam(
+int param,
+IFvalue *value,
+GENmodel *inMod)
 {
     BSIM4v2model *mod = (BSIM4v2model*)inMod;
     switch(param)
diff --git a/src/spicelib/devices/bsim4v2/b4v2noi.c b/src/spicelib/devices/bsim4v2/b4v2noi.c
index 6c1dfabbc..909f72bbd 100644
--- a/src/spicelib/devices/bsim4v2/b4v2noi.c
+++ b/src/spicelib/devices/bsim4v2/b4v2noi.c
@@ -28,10 +28,11 @@ extern double Nintegrate();
  */
 
 double
-BSIM4v2Eval1ovFNoise(Vds, model, here, freq, temp)
-double Vds, freq, temp;
-BSIM4v2model *model;
-BSIM4v2instance *here;
+BSIM4v2Eval1ovFNoise(
+double Vds,
+BSIM4v2model *model,
+BSIM4v2instance *here,
+double freq, double temp)
 {
 struct bsim4SizeDependParam *pParam;
 double cd, esat, DelClm, EffFreq, N0, Nl;
@@ -71,12 +72,12 @@ double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, Ssi;
 
 
 int
-BSIM4v2noise (mode, operation, inModel, ckt, data, OnDens)
-int mode, operation;
-GENmodel *inModel;
-CKTcircuit *ckt;
-Ndata *data;
-double *OnDens;
+BSIM4v2noise (
+int mode, int operation,
+GENmodel *inModel,
+CKTcircuit *ckt,
+Ndata *data,
+double *OnDens)
 {
 BSIM4v2model *model = (BSIM4v2model *)inModel;
 BSIM4v2instance *here;
diff --git a/src/spicelib/devices/bsim4v2/b4v2par.c b/src/spicelib/devices/bsim4v2/b4v2par.c
index 5af3ebf86..9fdb32163 100644
--- a/src/spicelib/devices/bsim4v2/b4v2par.c
+++ b/src/spicelib/devices/bsim4v2/b4v2par.c
@@ -15,11 +15,11 @@
 #include "fteext.h"
 
 int
-BSIM4v2param(param,value,inst,select)
-int param;
-IFvalue *value;
-GENinstance *inst;
-IFvalue *select;
+BSIM4v2param(
+int param,
+IFvalue *value,
+GENinstance *inst,
+IFvalue *select)
 {
     double scale;
 
diff --git a/src/spicelib/devices/bsim4v2/b4v2pzld.c b/src/spicelib/devices/bsim4v2/b4v2pzld.c
index 638f4daa4..572c47efd 100644
--- a/src/spicelib/devices/bsim4v2/b4v2pzld.c
+++ b/src/spicelib/devices/bsim4v2/b4v2pzld.c
@@ -17,10 +17,10 @@
 #include "bsim4v2def.h"
 
 int
-BSIM4v2pzLoad(inModel,ckt,s)
-GENmodel *inModel;
-CKTcircuit *ckt;
-SPcomplex *s;
+BSIM4v2pzLoad(
+GENmodel *inModel,
+CKTcircuit *ckt,
+SPcomplex *s)
 {
 BSIM4v2model *model = (BSIM4v2model*)inModel;
 BSIM4v2instance *here;
diff --git a/src/spicelib/devices/bsim4v2/b4v2set.c b/src/spicelib/devices/bsim4v2/b4v2set.c
index 1829d4e1e..aa7912086 100644
--- a/src/spicelib/devices/bsim4v2/b4v2set.c
+++ b/src/spicelib/devices/bsim4v2/b4v2set.c
@@ -34,11 +34,11 @@ int
 BSIM4v2RdseffGeo(double nf, int geo, int rgeo, int minSD, double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG, int Type,double *Rtot);
 
 int
-BSIM4v2setup(matrix,inModel,ckt,states)
-SMPmatrix *matrix;
-GENmodel *inModel;
-CKTcircuit *ckt;
-int *states;
+BSIM4v2setup(
+SMPmatrix *matrix,
+GENmodel *inModel,
+CKTcircuit *ckt,
+int *states)
 {
 BSIM4v2model *model = (BSIM4v2model*)inModel;
 BSIM4v2instance *here;
@@ -1652,9 +1652,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }  
 
 int
-BSIM4v2unsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+BSIM4v2unsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
 
     BSIM4v2model *model;
diff --git a/src/spicelib/devices/bsim4v2/b4v2temp.c b/src/spicelib/devices/bsim4v2/b4v2temp.c
index 75740396a..9fb607d57 100644
--- a/src/spicelib/devices/bsim4v2/b4v2temp.c
+++ b/src/spicelib/devices/bsim4v2/b4v2temp.c
@@ -36,9 +36,9 @@ int
 BSIM4v2PAeffGeo(double nf, int geo, int minSD, double Weffcj, double DMCG, double DMCI, double DMDG, double *Ps, double *Pd, double *As, double *Ad);
 
 int
-BSIM4v2DioIjthVjmEval(Nvtm, Ijth, Isb, XExpBV, Vjm)
-double Nvtm, Ijth, Isb, XExpBV;
-double *Vjm;
+BSIM4v2DioIjthVjmEval(
+double Nvtm, double Ijth, double Isb, double XExpBV,
+double *Vjm)
 {
 double Tb, Tc, EVjmovNv;
 
@@ -52,9 +52,9 @@ return 0;
 
 
 int
-BSIM4v2temp(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v2temp(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v2model *model = (BSIM4v2model*) inModel;
 BSIM4v2instance *here;
diff --git a/src/spicelib/devices/bsim4v2/b4v2trunc.c b/src/spicelib/devices/bsim4v2/b4v2trunc.c
index a3f713a80..62975cfbe 100644
--- a/src/spicelib/devices/bsim4v2/b4v2trunc.c
+++ b/src/spicelib/devices/bsim4v2/b4v2trunc.c
@@ -17,10 +17,10 @@
 
 
 int
-BSIM4v2trunc(inModel,ckt,timeStep)
-GENmodel *inModel;
-CKTcircuit *ckt;
-double *timeStep;
+BSIM4v2trunc(
+GENmodel *inModel,
+CKTcircuit *ckt,
+double *timeStep)
 {
 BSIM4v2model *model = (BSIM4v2model*)inModel;
 BSIM4v2instance *here;
diff --git a/src/spicelib/devices/bsim4v3/b4v3acld.c b/src/spicelib/devices/bsim4v3/b4v3acld.c
index 1263a7412..a9e35c449 100644
--- a/src/spicelib/devices/bsim4v3/b4v3acld.c
+++ b/src/spicelib/devices/bsim4v3/b4v3acld.c
@@ -16,9 +16,9 @@
 
 
 int
-BSIM4v3acLoad(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v3acLoad(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v3model *model = (BSIM4v3model*)inModel;
 BSIM4v3instance *here;
diff --git a/src/spicelib/devices/bsim4v3/b4v3ask.c b/src/spicelib/devices/bsim4v3/b4v3ask.c
index 7c074c610..445987edb 100644
--- a/src/spicelib/devices/bsim4v3/b4v3ask.c
+++ b/src/spicelib/devices/bsim4v3/b4v3ask.c
@@ -21,12 +21,12 @@
 #include "sperror.h"
 
 int
-BSIM4v3ask(ckt,inst,which,value,select)
-CKTcircuit *ckt;
-GENinstance *inst;
-int which;
-IFvalue *value;
-IFvalue *select;
+BSIM4v3ask(
+CKTcircuit *ckt,
+GENinstance *inst,
+int which,
+IFvalue *value,
+IFvalue *select)
 {
 BSIM4v3instance *here = (BSIM4v3instance*)inst;
 
diff --git a/src/spicelib/devices/bsim4v3/b4v3check.c b/src/spicelib/devices/bsim4v3/b4v3check.c
index 976e526cc..b3234c422 100644
--- a/src/spicelib/devices/bsim4v3/b4v3check.c
+++ b/src/spicelib/devices/bsim4v3/b4v3check.c
@@ -23,10 +23,10 @@
 #include "devdefs.h"
 
 int
-BSIM4v3checkModel(model, here, ckt)
-BSIM4v3model *model;
-BSIM4v3instance *here;
-CKTcircuit *ckt;
+BSIM4v3checkModel(
+BSIM4v3model *model,
+BSIM4v3instance *here,
+CKTcircuit *ckt)
 {
 struct bsim4v3SizeDependParam *pParam;
 int Fatal_Flag = 0;
diff --git a/src/spicelib/devices/bsim4v3/b4v3cvtest.c b/src/spicelib/devices/bsim4v3/b4v3cvtest.c
index 99eb0c1c2..2e8333a8f 100644
--- a/src/spicelib/devices/bsim4v3/b4v3cvtest.c
+++ b/src/spicelib/devices/bsim4v3/b4v3cvtest.c
@@ -23,9 +23,9 @@
 
 
 int
-BSIM4v3convTest(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v3convTest(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v3model *model = (BSIM4v3model*)inModel;
 BSIM4v3instance *here;
diff --git a/src/spicelib/devices/bsim4v3/b4v3del.c b/src/spicelib/devices/bsim4v3/b4v3del.c
index 913b354db..623bd58bc 100644
--- a/src/spicelib/devices/bsim4v3/b4v3del.c
+++ b/src/spicelib/devices/bsim4v3/b4v3del.c
@@ -16,10 +16,10 @@
 
 
 int
-BSIM4v3delete(inModel,name,inInst)
-GENmodel *inModel;
-IFuid name;
-GENinstance **inInst;
+BSIM4v3delete(
+GENmodel *inModel,
+IFuid name,
+GENinstance **inInst)
 {
 BSIM4v3instance **fast = (BSIM4v3instance**)inInst;
 BSIM4v3model *model = (BSIM4v3model*)inModel;
diff --git a/src/spicelib/devices/bsim4v3/b4v3dest.c b/src/spicelib/devices/bsim4v3/b4v3dest.c
index 45505b031..50adb7bd0 100644
--- a/src/spicelib/devices/bsim4v3/b4v3dest.c
+++ b/src/spicelib/devices/bsim4v3/b4v3dest.c
@@ -13,8 +13,8 @@
 #include "bsim4v3def.h"
 
 void
-BSIM4v3destroy(inModel)
-GENmodel **inModel;
+BSIM4v3destroy(
+GENmodel **inModel)
 {
 BSIM4v3model **model = (BSIM4v3model**)inModel;
 BSIM4v3instance *here;
diff --git a/src/spicelib/devices/bsim4v3/b4v3geo.c b/src/spicelib/devices/bsim4v3/b4v3geo.c
index 910b592c9..6370e8fe5 100644
--- a/src/spicelib/devices/bsim4v3/b4v3geo.c
+++ b/src/spicelib/devices/bsim4v3/b4v3geo.c
@@ -25,9 +25,10 @@ BSIM4v3RdsEndSha(double, double, double, double, double, double, int, int, doubl
  */
 
 int
-BSIM4v3NumFingerDiff(nf, minSD, nuIntD, nuEndD, nuIntS, nuEndS)
-int minSD;
-double nf, *nuIntD, *nuEndD, *nuIntS, *nuEndS;
+BSIM4v3NumFingerDiff(
+double nf,
+int minSD,
+double *nuIntD, double *nuEndD, double *nuIntS, double *nuEndS)
 {
 int NF;
         NF = (int)nf;
@@ -54,10 +55,11 @@ return 0;
 
 
 int
-BSIM4v3PAeffGeo(nf, geo, minSD, Weffcj, DMCG, DMCI, DMDG, Ps, Pd, As, Ad)
-int geo, minSD; 
-double Weffcj, DMCG, DMCI, DMDG;
-double nf, *Ps, *Pd, *As, *Ad;
+BSIM4v3PAeffGeo(
+double nf,
+int geo, int minSD,
+double Weffcj, double DMCG, double DMCI, double DMDG,
+double *Ps, double *Pd, double *As, double *Ad)
 {
 double T0, T1, T2;
 double ADiso, ADsha, ADmer, ASiso, ASsha, ASmer;
@@ -154,10 +156,12 @@ return 0;
 
 
 int
-BSIM4v3RdseffGeo(nf, geo, rgeo, minSD, Weffcj, Rsh, DMCG, DMCI, DMDG, Type, Rtot)
-int geo, rgeo, minSD, Type;
-double nf, Weffcj, Rsh, DMCG, DMCI, DMDG;
-double *Rtot;
+BSIM4v3RdseffGeo(
+double nf,
+int geo, int rgeo, int minSD,
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+int Type,
+double *Rtot)
 {
 double Rint=0.0, Rend = 0.0;
 double nuIntD = 0.0, nuEndD = 0.0, nuIntS = 0.0, nuEndS = 0.0;
@@ -272,10 +276,11 @@ return 0;
 
 
 int
-BSIM4v3RdsEndIso(Weffcj, Rsh, DMCG, DMCI, DMDG, nuEnd, rgeo, Type, Rend)
-double Weffcj, Rsh, DMCG, DMCI, DMDG;
-int rgeo, Type;
-double nuEnd, *Rend;
+BSIM4v3RdsEndIso(
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+double nuEnd,
+int rgeo, int Type,
+double *Rend)
 {	
 	if (Type == 1)
 	{   switch(rgeo)
@@ -330,10 +335,11 @@ return 0;
 
 
 int
-BSIM4v3RdsEndSha(Weffcj, Rsh, DMCG, DMCI, DMDG, nuEnd, rgeo, Type, Rend)
-double Weffcj, Rsh, DMCG, DMCI, DMDG;
-int rgeo, Type;
-double nuEnd, *Rend;
+BSIM4v3RdsEndSha(
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+double nuEnd,
+int rgeo, int Type,
+double *Rend)
 {
         if (Type == 1)
         {   switch(rgeo)
diff --git a/src/spicelib/devices/bsim4v3/b4v3getic.c b/src/spicelib/devices/bsim4v3/b4v3getic.c
index 3a948059d..e09e389bc 100644
--- a/src/spicelib/devices/bsim4v3/b4v3getic.c
+++ b/src/spicelib/devices/bsim4v3/b4v3getic.c
@@ -16,9 +16,9 @@
 
 
 int
-BSIM4v3getic(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v3getic(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v3model *model = (BSIM4v3model*)inModel;
 BSIM4v3instance *here;
diff --git a/src/spicelib/devices/bsim4v3/b4v3ld.c b/src/spicelib/devices/bsim4v3/b4v3ld.c
index ac0107d38..56d6924af 100644
--- a/src/spicelib/devices/bsim4v3/b4v3ld.c
+++ b/src/spicelib/devices/bsim4v3/b4v3ld.c
@@ -34,9 +34,9 @@
 int BSIM4v3polyDepletion(double phi, double ngate,double coxe, double Vgs, double *Vgs_eff, double *dVgs_eff_dVg);
 
 int
-BSIM4v3load(inModel,ckt)
-GENmodel *inModel;
-register CKTcircuit *ckt;
+BSIM4v3load(
+GENmodel *inModel,
+register CKTcircuit *ckt)
 {
 register BSIM4v3model *model = (BSIM4v3model*)inModel;
 register BSIM4v3instance *here;
diff --git a/src/spicelib/devices/bsim4v3/b4v3mask.c b/src/spicelib/devices/bsim4v3/b4v3mask.c
index bb6bd4c0f..2d9c850d3 100644
--- a/src/spicelib/devices/bsim4v3/b4v3mask.c
+++ b/src/spicelib/devices/bsim4v3/b4v3mask.c
@@ -22,11 +22,11 @@
 #include "sperror.h"
 
 int
-BSIM4v3mAsk(ckt,inst,which,value)
-CKTcircuit *ckt;
-GENmodel *inst;
-int which;
-IFvalue *value;
+BSIM4v3mAsk(
+CKTcircuit *ckt,
+GENmodel *inst,
+int which,
+IFvalue *value)
 {
     BSIM4v3model *model = (BSIM4v3model *)inst;
     switch(which) 
diff --git a/src/spicelib/devices/bsim4v3/b4v3mdel.c b/src/spicelib/devices/bsim4v3/b4v3mdel.c
index 0bf14ab51..179e4ccf4 100644
--- a/src/spicelib/devices/bsim4v3/b4v3mdel.c
+++ b/src/spicelib/devices/bsim4v3/b4v3mdel.c
@@ -14,10 +14,10 @@
 #include "sperror.h"
 
 int
-BSIM4v3mDelete(inModel,modname,kill)
-GENmodel **inModel;
-IFuid modname;
-GENmodel *kill;
+BSIM4v3mDelete(
+GENmodel **inModel,
+IFuid modname,
+GENmodel *kill)
 {
 BSIM4v3model **model = (BSIM4v3model**)inModel;
 BSIM4v3model *modfast = (BSIM4v3model*)kill;
diff --git a/src/spicelib/devices/bsim4v3/b4v3mpar.c b/src/spicelib/devices/bsim4v3/b4v3mpar.c
index e53ef1ac2..ba1f96e92 100644
--- a/src/spicelib/devices/bsim4v3/b4v3mpar.c
+++ b/src/spicelib/devices/bsim4v3/b4v3mpar.c
@@ -20,10 +20,10 @@
 #include "const.h"
 
 int
-BSIM4v3mParam(param,value,inMod)
-int param;
-IFvalue *value;
-GENmodel *inMod;
+BSIM4v3mParam(
+int param,
+IFvalue *value,
+GENmodel *inMod)
 {
     BSIM4v3model *mod = (BSIM4v3model*)inMod;
     switch(param)
diff --git a/src/spicelib/devices/bsim4v3/b4v3noi.c b/src/spicelib/devices/bsim4v3/b4v3noi.c
index 8358c995c..9efaeb29f 100644
--- a/src/spicelib/devices/bsim4v3/b4v3noi.c
+++ b/src/spicelib/devices/bsim4v3/b4v3noi.c
@@ -30,10 +30,11 @@ extern double Nintegrate();
  */
 
 static double
-BSIM4v3Eval1ovFNoise(Vds, model, here, freq, temp)
-double Vds, freq, temp;
-BSIM4v3model *model;
-BSIM4v3instance *here;
+BSIM4v3Eval1ovFNoise(
+double Vds,
+BSIM4v3model *model,
+BSIM4v3instance *here,
+double freq, double temp)
 {
 struct bsim4v3SizeDependParam *pParam;
 double cd, esat, DelClm, EffFreq, N0, Nl;
@@ -73,12 +74,12 @@ double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, Ssi;
 
 
 int
-BSIM4v3noise (mode, operation, inModel, ckt, data, OnDens)
-int mode, operation;
-GENmodel *inModel;
-CKTcircuit *ckt;
-Ndata *data;
-double *OnDens;
+BSIM4v3noise (
+int mode, int operation,
+GENmodel *inModel,
+CKTcircuit *ckt,
+Ndata *data,
+double *OnDens)
 {
 BSIM4v3model *model = (BSIM4v3model *)inModel;
 BSIM4v3instance *here;
diff --git a/src/spicelib/devices/bsim4v3/b4v3par.c b/src/spicelib/devices/bsim4v3/b4v3par.c
index e2004bfdf..ceb218927 100644
--- a/src/spicelib/devices/bsim4v3/b4v3par.c
+++ b/src/spicelib/devices/bsim4v3/b4v3par.c
@@ -18,11 +18,11 @@
 #include "fteext.h"
 
 int
-BSIM4v3param(param,value,inst,select)
-int param;
-IFvalue *value;
-GENinstance *inst;
-IFvalue *select;
+BSIM4v3param(
+int param,
+IFvalue *value,
+GENinstance *inst,
+IFvalue *select)
 {
     double scale;
 
diff --git a/src/spicelib/devices/bsim4v3/b4v3pzld.c b/src/spicelib/devices/bsim4v3/b4v3pzld.c
index b551cf333..09d1a5360 100644
--- a/src/spicelib/devices/bsim4v3/b4v3pzld.c
+++ b/src/spicelib/devices/bsim4v3/b4v3pzld.c
@@ -16,10 +16,10 @@
 #include "bsim4v3def.h"
 
 int
-BSIM4v3pzLoad(inModel,ckt,s)
-GENmodel *inModel;
-CKTcircuit *ckt;
-SPcomplex *s;
+BSIM4v3pzLoad(
+GENmodel *inModel,
+CKTcircuit *ckt,
+SPcomplex *s)
 {
 BSIM4v3model *model = (BSIM4v3model*)inModel;
 BSIM4v3instance *here;
diff --git a/src/spicelib/devices/bsim4v3/b4v3set.c b/src/spicelib/devices/bsim4v3/b4v3set.c
index 857cf4cfe..33bdcec5d 100644
--- a/src/spicelib/devices/bsim4v3/b4v3set.c
+++ b/src/spicelib/devices/bsim4v3/b4v3set.c
@@ -33,11 +33,11 @@ int
 BSIM4v3RdseffGeo(double nf, int geo, int rgeo, int minSD, double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG, int Type,double *Rtot);
 
 int
-BSIM4v3setup(matrix,inModel,ckt,states)
-SMPmatrix *matrix;
-GENmodel *inModel;
-CKTcircuit *ckt;
-int *states;
+BSIM4v3setup(
+SMPmatrix *matrix,
+GENmodel *inModel,
+CKTcircuit *ckt,
+int *states)
 {
 BSIM4v3model *model = (BSIM4v3model*)inModel;
 BSIM4v3instance *here;
@@ -1732,9 +1732,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }  
 
 int
-BSIM4v3unsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+BSIM4v3unsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
 #ifndef HAS_BATCHSIM
     BSIM4v3model *model;
diff --git a/src/spicelib/devices/bsim4v3/b4v3temp.c b/src/spicelib/devices/bsim4v3/b4v3temp.c
index 4b85a4aa8..a7a5c7e2b 100644
--- a/src/spicelib/devices/bsim4v3/b4v3temp.c
+++ b/src/spicelib/devices/bsim4v3/b4v3temp.c
@@ -38,9 +38,9 @@ BSIM4v3RdseffGeo(double, int, int, int, double, double, double, double, double,
 #define DELTA  1.0E-9
 
 int
-BSIM4v3DioIjthVjmEval(Nvtm, Ijth, Isb, XExpBV, Vjm)
-double Nvtm, Ijth, Isb, XExpBV;
-double *Vjm;
+BSIM4v3DioIjthVjmEval(
+double Nvtm, double Ijth, double Isb, double XExpBV,
+double *Vjm)
 {
 double Tb, Tc, EVjmovNv;
 
@@ -54,9 +54,9 @@ return 0;
 
 
 int
-BSIM4v3temp(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v3temp(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v3model *model = (BSIM4v3model*) inModel;
 BSIM4v3instance *here;
diff --git a/src/spicelib/devices/bsim4v3/b4v3trunc.c b/src/spicelib/devices/bsim4v3/b4v3trunc.c
index f9226207a..8d9897104 100644
--- a/src/spicelib/devices/bsim4v3/b4v3trunc.c
+++ b/src/spicelib/devices/bsim4v3/b4v3trunc.c
@@ -17,10 +17,10 @@
 
 
 int
-BSIM4v3trunc(inModel,ckt,timeStep)
-GENmodel *inModel;
-CKTcircuit *ckt;
-double *timeStep;
+BSIM4v3trunc(
+GENmodel *inModel,
+CKTcircuit *ckt,
+double *timeStep)
 {
 BSIM4v3model *model = (BSIM4v3model*)inModel;
 BSIM4v3instance *here;
diff --git a/src/spicelib/devices/bsim4v4/b4v4acld.c b/src/spicelib/devices/bsim4v4/b4v4acld.c
index 33e8217af..7bb2aeccd 100644
--- a/src/spicelib/devices/bsim4v4/b4v4acld.c
+++ b/src/spicelib/devices/bsim4v4/b4v4acld.c
@@ -17,9 +17,9 @@
 
 
 int
-BSIM4v4acLoad(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v4acLoad(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v4model *model = (BSIM4v4model*)inModel;
 BSIM4v4instance *here;
diff --git a/src/spicelib/devices/bsim4v4/b4v4ask.c b/src/spicelib/devices/bsim4v4/b4v4ask.c
index 89d121600..a5dd20d2f 100644
--- a/src/spicelib/devices/bsim4v4/b4v4ask.c
+++ b/src/spicelib/devices/bsim4v4/b4v4ask.c
@@ -20,12 +20,12 @@
 #include "suffix.h"
 
 int
-BSIM4v4ask(ckt,inst,which,value,select)
-CKTcircuit *ckt;
-GENinstance *inst;
-int which;
-IFvalue *value;
-IFvalue *select;
+BSIM4v4ask(
+CKTcircuit *ckt,
+GENinstance *inst,
+int which,
+IFvalue *value,
+IFvalue *select)
 {
 BSIM4v4instance *here = (BSIM4v4instance*)inst;
 
diff --git a/src/spicelib/devices/bsim4v4/b4v4check.c b/src/spicelib/devices/bsim4v4/b4v4check.c
index 50c8b692d..7ce424855 100644
--- a/src/spicelib/devices/bsim4v4/b4v4check.c
+++ b/src/spicelib/devices/bsim4v4/b4v4check.c
@@ -23,10 +23,10 @@
 #include "suffix.h"
 
 int
-BSIM4v4checkModel(model, here, ckt)
-BSIM4v4model *model;
-BSIM4v4instance *here;
-CKTcircuit *ckt;
+BSIM4v4checkModel(
+BSIM4v4model *model,
+BSIM4v4instance *here,
+CKTcircuit *ckt)
 {
 struct bsim4SizeDependParam *pParam;
 int Fatal_Flag = 0;
diff --git a/src/spicelib/devices/bsim4v4/b4v4cvtest.c b/src/spicelib/devices/bsim4v4/b4v4cvtest.c
index 9c05309db..8df460a88 100644
--- a/src/spicelib/devices/bsim4v4/b4v4cvtest.c
+++ b/src/spicelib/devices/bsim4v4/b4v4cvtest.c
@@ -22,9 +22,9 @@
 
 
 int
-BSIM4v4convTest(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v4convTest(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v4model *model = (BSIM4v4model*)inModel;
 BSIM4v4instance *here;
diff --git a/src/spicelib/devices/bsim4v4/b4v4del.c b/src/spicelib/devices/bsim4v4/b4v4del.c
index 032988feb..53d9cd7dd 100644
--- a/src/spicelib/devices/bsim4v4/b4v4del.c
+++ b/src/spicelib/devices/bsim4v4/b4v4del.c
@@ -16,10 +16,10 @@
 
 
 int
-BSIM4v4delete(inModel,name,inInst)
-GENmodel *inModel;
-IFuid name;
-GENinstance **inInst;
+BSIM4v4delete(
+GENmodel *inModel,
+IFuid name,
+GENinstance **inInst)
 {
 BSIM4v4instance **fast = (BSIM4v4instance**)inInst;
 BSIM4v4model *model = (BSIM4v4model*)inModel;
diff --git a/src/spicelib/devices/bsim4v4/b4v4dest.c b/src/spicelib/devices/bsim4v4/b4v4dest.c
index 028d78c14..ece3e9203 100644
--- a/src/spicelib/devices/bsim4v4/b4v4dest.c
+++ b/src/spicelib/devices/bsim4v4/b4v4dest.c
@@ -13,8 +13,8 @@
 #include "suffix.h"
 
 void
-BSIM4v4destroy(inModel)
-GENmodel **inModel;
+BSIM4v4destroy(
+GENmodel **inModel)
 {
 BSIM4v4model **model = (BSIM4v4model**)inModel;
 BSIM4v4instance *here;
diff --git a/src/spicelib/devices/bsim4v4/b4v4geo.c b/src/spicelib/devices/bsim4v4/b4v4geo.c
index 50cf19297..770cb0cd4 100644
--- a/src/spicelib/devices/bsim4v4/b4v4geo.c
+++ b/src/spicelib/devices/bsim4v4/b4v4geo.c
@@ -23,9 +23,10 @@ int
 BSIM4v4RdsEndSha(double, double, double, double, double, double, int, int, double *);
 
 int
-BSIM4v4NumFingerDiff(nf, minSD, nuIntD, nuEndD, nuIntS, nuEndS)
-int minSD;
-double nf, *nuIntD, *nuEndD, *nuIntS, *nuEndS;
+BSIM4v4NumFingerDiff(
+double nf,
+int minSD,
+double *nuIntD, double *nuEndD, double *nuIntS, double *nuEndS)
 {
 int NF;
         NF = (int)nf;
@@ -52,10 +53,11 @@ return 0;
 
 
 int
-BSIM4v4PAeffGeo(nf, geo, minSD, Weffcj, DMCG, DMCI, DMDG, Ps, Pd, As, Ad)
-int geo, minSD; 
-double Weffcj, DMCG, DMCI, DMDG;
-double nf, *Ps, *Pd, *As, *Ad;
+BSIM4v4PAeffGeo(
+double nf,
+int geo, int minSD,
+double Weffcj, double DMCG, double DMCI, double DMDG,
+double *Ps, double *Pd, double *As, double *Ad)
 {
 double T0, T1, T2;
 double ADiso, ADsha, ADmer, ASiso, ASsha, ASmer;
@@ -152,10 +154,12 @@ return 0;
 
 
 int
-BSIM4v4RdseffGeo(nf, geo, rgeo, minSD, Weffcj, Rsh, DMCG, DMCI, DMDG, Type, Rtot)
-int geo, rgeo, minSD, Type;
-double nf, Weffcj, Rsh, DMCG, DMCI, DMDG;
-double *Rtot;
+BSIM4v4RdseffGeo(
+double nf,
+int geo, int rgeo, int minSD,
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+int Type,
+double *Rtot)
 {
 double Rint=0.0, Rend = 0.0;
 double nuIntD = 0.0, nuEndD = 0.0, nuIntS = 0.0, nuEndS = 0.0;
@@ -270,10 +274,11 @@ return 0;
 
 
 int
-BSIM4v4RdsEndIso(Weffcj, Rsh, DMCG, DMCI, DMDG, nuEnd, rgeo, Type, Rend)
-double Weffcj, Rsh, DMCG, DMCI, DMDG;
-int rgeo, Type;
-double nuEnd, *Rend;
+BSIM4v4RdsEndIso(
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+double nuEnd,
+int rgeo, int Type,
+double *Rend)
 {	
 	if (Type == 1)
 	{   switch(rgeo)
@@ -328,10 +333,11 @@ return 0;
 
 
 int
-BSIM4v4RdsEndSha(Weffcj, Rsh, DMCG, DMCI, DMDG, nuEnd, rgeo, Type, Rend)
-double Weffcj, Rsh, DMCG, DMCI, DMDG;
-int rgeo, Type;
-double nuEnd, *Rend;
+BSIM4v4RdsEndSha(
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+double nuEnd,
+int rgeo, int Type,
+double *Rend)
 {
         if (Type == 1)
         {   switch(rgeo)
diff --git a/src/spicelib/devices/bsim4v4/b4v4getic.c b/src/spicelib/devices/bsim4v4/b4v4getic.c
index a516d034a..8c3d8a887 100644
--- a/src/spicelib/devices/bsim4v4/b4v4getic.c
+++ b/src/spicelib/devices/bsim4v4/b4v4getic.c
@@ -16,9 +16,9 @@
 
 
 int
-BSIM4v4getic(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v4getic(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v4model *model = (BSIM4v4model*)inModel;
 BSIM4v4instance *here;
diff --git a/src/spicelib/devices/bsim4v4/b4v4ld.c b/src/spicelib/devices/bsim4v4/b4v4ld.c
index dcca83268..afc7027b5 100644
--- a/src/spicelib/devices/bsim4v4/b4v4ld.c
+++ b/src/spicelib/devices/bsim4v4/b4v4ld.c
@@ -51,9 +51,9 @@
 int BSIM4v4polyDepletion(double phi, double ngate,double coxe, double Vgs, double *Vgs_eff, double *dVgs_eff_dVg);
 
 int
-BSIM4v4load(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v4load(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v4model *model = (BSIM4v4model*)inModel;
 BSIM4v4instance *here;
diff --git a/src/spicelib/devices/bsim4v4/b4v4mask.c b/src/spicelib/devices/bsim4v4/b4v4mask.c
index 9cf936eb2..f4811539b 100644
--- a/src/spicelib/devices/bsim4v4/b4v4mask.c
+++ b/src/spicelib/devices/bsim4v4/b4v4mask.c
@@ -22,11 +22,11 @@
 #include "suffix.h"
 
 int
-BSIM4v4mAsk(ckt,inst,which,value)
-CKTcircuit *ckt;
-GENmodel *inst;
-int which;
-IFvalue *value;
+BSIM4v4mAsk(
+CKTcircuit *ckt,
+GENmodel *inst,
+int which,
+IFvalue *value)
 {
     BSIM4v4model *model = (BSIM4v4model *)inst;
     switch(which) 
diff --git a/src/spicelib/devices/bsim4v4/b4v4mdel.c b/src/spicelib/devices/bsim4v4/b4v4mdel.c
index c3e323e3e..352840de5 100644
--- a/src/spicelib/devices/bsim4v4/b4v4mdel.c
+++ b/src/spicelib/devices/bsim4v4/b4v4mdel.c
@@ -14,10 +14,10 @@
 #include "suffix.h"
 
 int
-BSIM4v4mDelete(inModel,modname,kill)
-GENmodel **inModel;
-IFuid modname;
-GENmodel *kill;
+BSIM4v4mDelete(
+GENmodel **inModel,
+IFuid modname,
+GENmodel *kill)
 {
 BSIM4v4model **model = (BSIM4v4model**)inModel;
 BSIM4v4model *modfast = (BSIM4v4model*)kill;
diff --git a/src/spicelib/devices/bsim4v4/b4v4mpar.c b/src/spicelib/devices/bsim4v4/b4v4mpar.c
index 8ee3895aa..10d6a8bab 100644
--- a/src/spicelib/devices/bsim4v4/b4v4mpar.c
+++ b/src/spicelib/devices/bsim4v4/b4v4mpar.c
@@ -20,10 +20,10 @@
 #include "suffix.h"
 
 int
-BSIM4v4mParam(param,value,inMod)
-int param;
-IFvalue *value;
-GENmodel *inMod;
+BSIM4v4mParam(
+int param,
+IFvalue *value,
+GENmodel *inMod)
 {
     BSIM4v4model *mod = (BSIM4v4model*)inMod;
     switch(param)
diff --git a/src/spicelib/devices/bsim4v4/b4v4noi.c b/src/spicelib/devices/bsim4v4/b4v4noi.c
index 50732b5ab..5b841e56f 100644
--- a/src/spicelib/devices/bsim4v4/b4v4noi.c
+++ b/src/spicelib/devices/bsim4v4/b4v4noi.c
@@ -32,10 +32,11 @@ extern double Nintegrate();
  */
 
 static double
-BSIM4v4Eval1ovFNoise(Vds, model, here, freq, temp)
-double Vds, freq, temp;
-BSIM4v4model *model;
-BSIM4v4instance *here;
+BSIM4v4Eval1ovFNoise(
+double Vds,
+BSIM4v4model *model,
+BSIM4v4instance *here,
+double freq, double temp)
 {
 struct bsim4SizeDependParam *pParam;
 double cd, esat, DelClm, EffFreq, N0, Nl, Leff, Leffsq;
@@ -75,12 +76,12 @@ double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, Ssi;
 
 
 int
-BSIM4v4noise (mode, operation, inModel, ckt, data, OnDens)
-int mode, operation;
-GENmodel *inModel;
-CKTcircuit *ckt;
-Ndata *data;
-double *OnDens;
+BSIM4v4noise (
+int mode, int operation,
+GENmodel *inModel,
+CKTcircuit *ckt,
+Ndata *data,
+double *OnDens)
 {
 BSIM4v4model *model = (BSIM4v4model *)inModel;
 BSIM4v4instance *here;
diff --git a/src/spicelib/devices/bsim4v4/b4v4par.c b/src/spicelib/devices/bsim4v4/b4v4par.c
index a3566bc2b..332b0140b 100644
--- a/src/spicelib/devices/bsim4v4/b4v4par.c
+++ b/src/spicelib/devices/bsim4v4/b4v4par.c
@@ -19,11 +19,11 @@
 #include "fteext.h"
 
 int
-BSIM4v4param(param,value,inst,select)
-int param;
-IFvalue *value;
-GENinstance *inst;
-IFvalue *select;
+BSIM4v4param(
+int param,
+IFvalue *value,
+GENinstance *inst,
+IFvalue *select)
 {
     double scale;
 
diff --git a/src/spicelib/devices/bsim4v4/b4v4pzld.c b/src/spicelib/devices/bsim4v4/b4v4pzld.c
index 2501f51ea..a5674c19d 100644
--- a/src/spicelib/devices/bsim4v4/b4v4pzld.c
+++ b/src/spicelib/devices/bsim4v4/b4v4pzld.c
@@ -17,10 +17,10 @@
 #include "suffix.h"
 
 int
-BSIM4v4pzLoad(inModel,ckt,s)
-GENmodel *inModel;
-CKTcircuit *ckt;
-SPcomplex *s;
+BSIM4v4pzLoad(
+GENmodel *inModel,
+CKTcircuit *ckt,
+SPcomplex *s)
 {
 BSIM4v4model *model = (BSIM4v4model*)inModel;
 BSIM4v4instance *here;
diff --git a/src/spicelib/devices/bsim4v4/b4v4set.c b/src/spicelib/devices/bsim4v4/b4v4set.c
index 0a7eb2e76..e6ffa6cb6 100644
--- a/src/spicelib/devices/bsim4v4/b4v4set.c
+++ b/src/spicelib/devices/bsim4v4/b4v4set.c
@@ -38,11 +38,11 @@ int
 BSIM4v4RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 int
-BSIM4v4setup(matrix,inModel,ckt,states)
-SMPmatrix *matrix;
-GENmodel *inModel;
-CKTcircuit *ckt;
-int *states;
+BSIM4v4setup(
+SMPmatrix *matrix,
+GENmodel *inModel,
+CKTcircuit *ckt,
+int *states)
 {
 BSIM4v4model *model = (BSIM4v4model*)inModel;
 BSIM4v4instance *here;
@@ -1882,9 +1882,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }  
 
 int
-BSIM4v4unsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+BSIM4v4unsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
 
     BSIM4v4model *model;
diff --git a/src/spicelib/devices/bsim4v4/b4v4temp.c b/src/spicelib/devices/bsim4v4/b4v4temp.c
index 73042a5fd..fb2e81b5f 100644
--- a/src/spicelib/devices/bsim4v4/b4v4temp.c
+++ b/src/spicelib/devices/bsim4v4/b4v4temp.c
@@ -48,9 +48,9 @@ int
 BSIM4v4RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 int
-BSIM4v4DioIjthVjmEval(Nvtm, Ijth, Isb, XExpBV, Vjm)
-double Nvtm, Ijth, Isb, XExpBV;
-double *Vjm;
+BSIM4v4DioIjthVjmEval(
+double Nvtm, double Ijth, double Isb, double XExpBV,
+double *Vjm)
 {
 double Tb, Tc, EVjmovNv;
 
@@ -64,9 +64,9 @@ return 0;
 
 
 int
-BSIM4v4temp(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v4temp(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v4model *model = (BSIM4v4model*) inModel;
 BSIM4v4instance *here;
diff --git a/src/spicelib/devices/bsim4v4/b4v4trunc.c b/src/spicelib/devices/bsim4v4/b4v4trunc.c
index 898428f78..a38313292 100644
--- a/src/spicelib/devices/bsim4v4/b4v4trunc.c
+++ b/src/spicelib/devices/bsim4v4/b4v4trunc.c
@@ -15,10 +15,10 @@
 #include "suffix.h"
 
 int
-BSIM4v4trunc(inModel,ckt,timeStep)
-GENmodel *inModel;
-CKTcircuit *ckt;
-double *timeStep;
+BSIM4v4trunc(
+GENmodel *inModel,
+CKTcircuit *ckt,
+double *timeStep)
 {
 BSIM4v4model *model = (BSIM4v4model*)inModel;
 BSIM4v4instance *here;
diff --git a/src/spicelib/devices/bsim4v5/b4v5acld.c b/src/spicelib/devices/bsim4v5/b4v5acld.c
index 78d510a3b..6debe64dc 100644
--- a/src/spicelib/devices/bsim4v5/b4v5acld.c
+++ b/src/spicelib/devices/bsim4v5/b4v5acld.c
@@ -17,9 +17,9 @@
 
 
 int
-BSIM4v5acLoad(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v5acLoad(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v5model *model = (BSIM4v5model*)inModel;
 BSIM4v5instance *here;
diff --git a/src/spicelib/devices/bsim4v5/b4v5ask.c b/src/spicelib/devices/bsim4v5/b4v5ask.c
index 3f942e480..06e646e46 100644
--- a/src/spicelib/devices/bsim4v5/b4v5ask.c
+++ b/src/spicelib/devices/bsim4v5/b4v5ask.c
@@ -21,12 +21,12 @@
 #include "suffix.h"
 
 int
-BSIM4v5ask(ckt,inst,which,value,select)
-CKTcircuit *ckt;
-GENinstance *inst;
-int which;
-IFvalue *value;
-IFvalue *select;
+BSIM4v5ask(
+CKTcircuit *ckt,
+GENinstance *inst,
+int which,
+IFvalue *value,
+IFvalue *select)
 {
 BSIM4v5instance *here = (BSIM4v5instance*)inst;
 
diff --git a/src/spicelib/devices/bsim4v5/b4v5check.c b/src/spicelib/devices/bsim4v5/b4v5check.c
index 2bf9e4130..731800772 100644
--- a/src/spicelib/devices/bsim4v5/b4v5check.c
+++ b/src/spicelib/devices/bsim4v5/b4v5check.c
@@ -24,10 +24,10 @@
 #include "suffix.h"
 
 int
-BSIM4v5checkModel(model, here, ckt)
-BSIM4v5model *model;
-BSIM4v5instance *here;
-CKTcircuit *ckt;
+BSIM4v5checkModel(
+BSIM4v5model *model,
+BSIM4v5instance *here,
+CKTcircuit *ckt)
 {
 struct bsim4v5SizeDependParam *pParam;
 int Fatal_Flag = 0;
diff --git a/src/spicelib/devices/bsim4v5/b4v5cvtest.c b/src/spicelib/devices/bsim4v5/b4v5cvtest.c
index 811d738c1..aa28eadb5 100644
--- a/src/spicelib/devices/bsim4v5/b4v5cvtest.c
+++ b/src/spicelib/devices/bsim4v5/b4v5cvtest.c
@@ -22,9 +22,9 @@
 
 
 int
-BSIM4v5convTest(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v5convTest(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v5model *model = (BSIM4v5model*)inModel;
 BSIM4v5instance *here;
diff --git a/src/spicelib/devices/bsim4v5/b4v5del.c b/src/spicelib/devices/bsim4v5/b4v5del.c
index 419930c6f..30bc7552c 100644
--- a/src/spicelib/devices/bsim4v5/b4v5del.c
+++ b/src/spicelib/devices/bsim4v5/b4v5del.c
@@ -16,10 +16,10 @@
 
 
 int
-BSIM4v5delete(inModel,name,inInst)
-GENmodel *inModel;
-IFuid name;
-GENinstance **inInst;
+BSIM4v5delete(
+GENmodel *inModel,
+IFuid name,
+GENinstance **inInst)
 {
 BSIM4v5instance **fast = (BSIM4v5instance**)inInst;
 BSIM4v5model *model = (BSIM4v5model*)inModel;
diff --git a/src/spicelib/devices/bsim4v5/b4v5dest.c b/src/spicelib/devices/bsim4v5/b4v5dest.c
index e978fd872..a4aa2fe45 100644
--- a/src/spicelib/devices/bsim4v5/b4v5dest.c
+++ b/src/spicelib/devices/bsim4v5/b4v5dest.c
@@ -13,8 +13,8 @@
 #include "suffix.h"
 
 void
-BSIM4v5destroy(inModel)
-GENmodel **inModel;
+BSIM4v5destroy(
+GENmodel **inModel)
 {
 BSIM4v5model **model = (BSIM4v5model**)inModel;
 BSIM4v5instance *here;
diff --git a/src/spicelib/devices/bsim4v5/b4v5geo.c b/src/spicelib/devices/bsim4v5/b4v5geo.c
index fc21dd082..39c6f5bde 100644
--- a/src/spicelib/devices/bsim4v5/b4v5geo.c
+++ b/src/spicelib/devices/bsim4v5/b4v5geo.c
@@ -23,9 +23,10 @@ int
 BSIM4v5RdsEndSha(double, double, double, double, double, double, int, int, double *);
 
 int
-BSIM4v5NumFingerDiff(nf, minSD, nuIntD, nuEndD, nuIntS, nuEndS)
-int minSD;
-double nf, *nuIntD, *nuEndD, *nuIntS, *nuEndS;
+BSIM4v5NumFingerDiff(
+double nf,
+int minSD,
+double *nuIntD, double *nuEndD, double *nuIntS, double *nuEndS)
 {
 int NF;
         NF = (int)nf;
@@ -52,10 +53,11 @@ return 0;
 
 
 int
-BSIM4v5PAeffGeo(nf, geo, minSD, Weffcj, DMCG, DMCI, DMDG, Ps, Pd, As, Ad)
-int geo, minSD; 
-double Weffcj, DMCG, DMCI, DMDG;
-double nf, *Ps, *Pd, *As, *Ad;
+BSIM4v5PAeffGeo(
+double nf,
+int geo, int minSD,
+double Weffcj, double DMCG, double DMCI, double DMDG,
+double *Ps, double *Pd, double *As, double *Ad)
 {
 double T0, T1, T2;
 double ADiso, ADsha, ADmer, ASiso, ASsha, ASmer;
@@ -152,10 +154,12 @@ return 0;
 
 
 int
-BSIM4v5RdseffGeo(nf, geo, rgeo, minSD, Weffcj, Rsh, DMCG, DMCI, DMDG, Type, Rtot)
-int geo, rgeo, minSD, Type;
-double nf, Weffcj, Rsh, DMCG, DMCI, DMDG;
-double *Rtot;
+BSIM4v5RdseffGeo(
+double nf,
+int geo, int rgeo, int minSD,
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+int Type,
+double *Rtot)
 {
 double Rint=0.0, Rend = 0.0;
 double nuIntD = 0.0, nuEndD = 0.0, nuIntS = 0.0, nuEndS = 0.0;
@@ -270,10 +274,11 @@ return 0;
 
 
 int
-BSIM4v5RdsEndIso(Weffcj, Rsh, DMCG, DMCI, DMDG, nuEnd, rgeo, Type, Rend)
-double Weffcj, Rsh, DMCG, DMCI, DMDG;
-int rgeo, Type;
-double nuEnd, *Rend;
+BSIM4v5RdsEndIso(
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+double nuEnd,
+int rgeo, int Type,
+double *Rend)
 {	
 	if (Type == 1)
 	{   switch(rgeo)
@@ -328,10 +333,11 @@ return 0;
 
 
 int
-BSIM4v5RdsEndSha(Weffcj, Rsh, DMCG, DMCI, DMDG, nuEnd, rgeo, Type, Rend)
-double Weffcj, Rsh, DMCG, DMCI, DMDG;
-int rgeo, Type;
-double nuEnd, *Rend;
+BSIM4v5RdsEndSha(
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
+double nuEnd,
+int rgeo, int Type,
+double *Rend)
 {
         if (Type == 1)
         {   switch(rgeo)
diff --git a/src/spicelib/devices/bsim4v5/b4v5getic.c b/src/spicelib/devices/bsim4v5/b4v5getic.c
index 08360a66a..9b107bb37 100644
--- a/src/spicelib/devices/bsim4v5/b4v5getic.c
+++ b/src/spicelib/devices/bsim4v5/b4v5getic.c
@@ -16,9 +16,9 @@
 
 
 int
-BSIM4v5getic(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v5getic(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v5model *model = (BSIM4v5model*)inModel;
 BSIM4v5instance *here;
diff --git a/src/spicelib/devices/bsim4v5/b4v5ld.c b/src/spicelib/devices/bsim4v5/b4v5ld.c
index e86498d7a..20b9af5d2 100644
--- a/src/spicelib/devices/bsim4v5/b4v5ld.c
+++ b/src/spicelib/devices/bsim4v5/b4v5ld.c
@@ -53,9 +53,9 @@
 int BSIM4v5polyDepletion(double phi, double ngate,double coxe, double Vgs, double *Vgs_eff, double *dVgs_eff_dVg);
 
 int
-BSIM4v5load(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v5load(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v5model *model = (BSIM4v5model*)inModel;
 BSIM4v5instance *here;
diff --git a/src/spicelib/devices/bsim4v5/b4v5mask.c b/src/spicelib/devices/bsim4v5/b4v5mask.c
index 9676a67f2..704cbd7af 100644
--- a/src/spicelib/devices/bsim4v5/b4v5mask.c
+++ b/src/spicelib/devices/bsim4v5/b4v5mask.c
@@ -23,11 +23,11 @@
 #include "suffix.h"
 
 int
-BSIM4v5mAsk(ckt,inst,which,value)
-CKTcircuit *ckt;
-GENmodel *inst;
-int which;
-IFvalue *value;
+BSIM4v5mAsk(
+CKTcircuit *ckt,
+GENmodel *inst,
+int which,
+IFvalue *value)
 {
     BSIM4v5model *model = (BSIM4v5model *)inst;
     switch(which) 
diff --git a/src/spicelib/devices/bsim4v5/b4v5mdel.c b/src/spicelib/devices/bsim4v5/b4v5mdel.c
index 548bab7ce..182b7e4d4 100644
--- a/src/spicelib/devices/bsim4v5/b4v5mdel.c
+++ b/src/spicelib/devices/bsim4v5/b4v5mdel.c
@@ -14,10 +14,10 @@
 #include "suffix.h"
 
 int
-BSIM4v5mDelete(inModel,modname,kill)
-GENmodel **inModel;
-IFuid modname;
-GENmodel *kill;
+BSIM4v5mDelete(
+GENmodel **inModel,
+IFuid modname,
+GENmodel *kill)
 {
 BSIM4v5model **model = (BSIM4v5model**)inModel;
 BSIM4v5model *modfast = (BSIM4v5model*)kill;
diff --git a/src/spicelib/devices/bsim4v5/b4v5mpar.c b/src/spicelib/devices/bsim4v5/b4v5mpar.c
index e98992dc3..aa0d3d635 100644
--- a/src/spicelib/devices/bsim4v5/b4v5mpar.c
+++ b/src/spicelib/devices/bsim4v5/b4v5mpar.c
@@ -22,10 +22,10 @@
 #include "const.h"
 
 int
-BSIM4v5mParam(param,value,inMod)
-int param;
-IFvalue *value;
-GENmodel *inMod;
+BSIM4v5mParam(
+int param,
+IFvalue *value,
+GENmodel *inMod)
 {
     BSIM4v5model *mod = (BSIM4v5model*)inMod;
     switch(param)
diff --git a/src/spicelib/devices/bsim4v5/b4v5noi.c b/src/spicelib/devices/bsim4v5/b4v5noi.c
index 75ac16c85..6a6b79a23 100644
--- a/src/spicelib/devices/bsim4v5/b4v5noi.c
+++ b/src/spicelib/devices/bsim4v5/b4v5noi.c
@@ -33,10 +33,11 @@ extern double Nintegrate();
  */
 
 static double
-BSIM4v5Eval1ovFNoise(Vds, model, here, freq, temp)
-double Vds, freq, temp;
-BSIM4v5model *model;
-BSIM4v5instance *here;
+BSIM4v5Eval1ovFNoise(
+double Vds,
+BSIM4v5model *model,
+BSIM4v5instance *here,
+double freq, double temp)
 {
 struct bsim4v5SizeDependParam *pParam;
 double cd, esat, DelClm, EffFreq, N0, Nl, Leff, Leffsq;
@@ -77,12 +78,12 @@ double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, Ssi;
 
 
 int
-BSIM4v5noise (mode, operation, inModel, ckt, data, OnDens)
-int mode, operation;
-GENmodel *inModel;
-CKTcircuit *ckt;
-Ndata *data;
-double *OnDens;
+BSIM4v5noise (
+int mode, int operation,
+GENmodel *inModel,
+CKTcircuit *ckt,
+Ndata *data,
+double *OnDens)
 {
 BSIM4v5model *model = (BSIM4v5model *)inModel;
 BSIM4v5instance *here;
diff --git a/src/spicelib/devices/bsim4v5/b4v5par.c b/src/spicelib/devices/bsim4v5/b4v5par.c
index f2f0c68b4..92f202973 100644
--- a/src/spicelib/devices/bsim4v5/b4v5par.c
+++ b/src/spicelib/devices/bsim4v5/b4v5par.c
@@ -20,11 +20,11 @@
 #include "fteext.h"
 
 int
-BSIM4v5param(param,value,inst,select)
-int param;
-IFvalue *value;
-GENinstance *inst;
-IFvalue *select;
+BSIM4v5param(
+int param,
+IFvalue *value,
+GENinstance *inst,
+IFvalue *select)
 {
     double scale;
 
diff --git a/src/spicelib/devices/bsim4v5/b4v5pzld.c b/src/spicelib/devices/bsim4v5/b4v5pzld.c
index 4122337c9..53e8fe1e5 100644
--- a/src/spicelib/devices/bsim4v5/b4v5pzld.c
+++ b/src/spicelib/devices/bsim4v5/b4v5pzld.c
@@ -17,10 +17,10 @@
 #include "suffix.h"
 
 int
-BSIM4v5pzLoad(inModel,ckt,s)
-GENmodel *inModel;
-CKTcircuit *ckt;
-SPcomplex *s;
+BSIM4v5pzLoad(
+GENmodel *inModel,
+CKTcircuit *ckt,
+SPcomplex *s)
 {
 BSIM4v5model *model = (BSIM4v5model*)inModel;
 BSIM4v5instance *here;
diff --git a/src/spicelib/devices/bsim4v5/b4v5set.c b/src/spicelib/devices/bsim4v5/b4v5set.c
index f8e48fb29..764e5f35b 100644
--- a/src/spicelib/devices/bsim4v5/b4v5set.c
+++ b/src/spicelib/devices/bsim4v5/b4v5set.c
@@ -36,11 +36,11 @@ int
 BSIM4v5RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 int
-BSIM4v5setup(matrix,inModel,ckt,states)
-SMPmatrix *matrix;
-GENmodel *inModel;
-CKTcircuit *ckt;
-int *states;
+BSIM4v5setup(
+SMPmatrix *matrix,
+GENmodel *inModel,
+CKTcircuit *ckt,
+int *states)
 {
 BSIM4v5model *model = (BSIM4v5model*)inModel;
 BSIM4v5instance *here;
@@ -2043,9 +2043,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }  
 
 int
-BSIM4v5unsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+BSIM4v5unsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
 #ifndef HAS_BATCHSIM
     BSIM4v5model *model;
diff --git a/src/spicelib/devices/bsim4v5/b4v5temp.c b/src/spicelib/devices/bsim4v5/b4v5temp.c
index 4123a3106..e2cfd7660 100644
--- a/src/spicelib/devices/bsim4v5/b4v5temp.c
+++ b/src/spicelib/devices/bsim4v5/b4v5temp.c
@@ -49,9 +49,9 @@ int
 BSIM4v5RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 int
-BSIM4v5DioIjthVjmEval(Nvtm, Ijth, Isb, XExpBV, Vjm)
-double Nvtm, Ijth, Isb, XExpBV;
-double *Vjm;
+BSIM4v5DioIjthVjmEval(
+double Nvtm, double Ijth, double Isb, double XExpBV,
+double *Vjm)
 {
 double Tb, Tc, EVjmovNv;
 
@@ -65,9 +65,9 @@ return 0;
 
 
 int
-BSIM4v5temp(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4v5temp(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 BSIM4v5model *model = (BSIM4v5model*) inModel;
 BSIM4v5instance *here;
diff --git a/src/spicelib/devices/bsim4v5/b4v5trunc.c b/src/spicelib/devices/bsim4v5/b4v5trunc.c
index 0432987a2..7bcc75435 100644
--- a/src/spicelib/devices/bsim4v5/b4v5trunc.c
+++ b/src/spicelib/devices/bsim4v5/b4v5trunc.c
@@ -16,10 +16,10 @@
 
 
 int
-BSIM4v5trunc(inModel,ckt,timeStep)
-GENmodel *inModel;
-CKTcircuit *ckt;
-double *timeStep;
+BSIM4v5trunc(
+GENmodel *inModel,
+CKTcircuit *ckt,
+double *timeStep)
 {
 BSIM4v5model *model = (BSIM4v5model*)inModel;
 BSIM4v5instance *here;
diff --git a/src/spicelib/devices/dio/diosetup.c b/src/spicelib/devices/dio/diosetup.c
index bbe34b94f..57b45de25 100644
--- a/src/spicelib/devices/dio/diosetup.c
+++ b/src/spicelib/devices/dio/diosetup.c
@@ -164,9 +164,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }
 
 int
-DIOunsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+DIOunsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
     DIOmodel *model;
     DIOinstance *here;
diff --git a/src/spicelib/devices/hfet2/hfet2temp.c b/src/spicelib/devices/hfet2/hfet2temp.c
index 5adabd463..006eb62e3 100644
--- a/src/spicelib/devices/hfet2/hfet2temp.c
+++ b/src/spicelib/devices/hfet2/hfet2temp.c
@@ -12,9 +12,9 @@ Modified: Paolo Nenzi
 #include "suffix.h"
 
 
-int HFET2temp(inModel, ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+int HFET2temp(
+GENmodel *inModel,
+CKTcircuit *ckt)
 {
 
   HFET2instance *here;
diff --git a/src/spicelib/devices/hfet2/hfet2trunc.c b/src/spicelib/devices/hfet2/hfet2trunc.c
index c063ad175..dc54508a9 100644
--- a/src/spicelib/devices/hfet2/hfet2trunc.c
+++ b/src/spicelib/devices/hfet2/hfet2trunc.c
@@ -7,10 +7,10 @@
 #include "suffix.h"
 
 
-int HFET2trunc(inModel, ckt, tiHFET2tep)
-GENmodel *inModel;
-CKTcircuit *ckt;
-double *tiHFET2tep;
+int HFET2trunc(
+GENmodel *inModel,
+CKTcircuit *ckt,
+double *tiHFET2tep)
 {
 
   HFET2model *model = (HFET2model*)inModel;
diff --git a/src/spicelib/devices/jfet2/psmodel.c b/src/spicelib/devices/jfet2/psmodel.c
index 9becb7ecc..ee06d69fc 100644
--- a/src/spicelib/devices/jfet2/psmodel.c
+++ b/src/spicelib/devices/jfet2/psmodel.c
@@ -39,18 +39,18 @@
 /*-----------
 | dc current and conductance calculation */
 double
-PSids(ckt, model, here, vgs, vgd, igs, igd, ggs, ggd, Gm, Gds)
-cref *ckt;
-modl *model;
-inst *here;
-double vgs;
-double vgd;
-double *igs;
-double *igd;
-double *ggs;
-double *ggd;
-double *Gm;
-double *Gds;
+PSids(
+cref *ckt,
+modl *model,
+inst *here,
+double vgs,
+double vgd,
+double *igs,
+double *igd,
+double *ggs,
+double *ggd,
+double *Gm,
+double *Gds)
 {
 #define FX  -10.0 /* not too small else fatal rounding error in (rpt-a_rpt) */
 #define MX  40.0  /* maximum exponential argument */
diff --git a/src/spicelib/devices/mes/mesload.c b/src/spicelib/devices/mes/mesload.c
index d35f2a395..0c22cf848 100644
--- a/src/spicelib/devices/mes/mesload.c
+++ b/src/spicelib/devices/mes/mesload.c
@@ -462,8 +462,8 @@ load:
 
 /* function qggnew  - private, used by MESload*/
 static double 
-qggnew(vgs,vgd,phib,vcap,vto,cgs,cgd,cgsnew,cgdnew)
-    double vgs,vgd,phib,vcap,vto,cgs,cgd,*cgsnew,*cgdnew;
+qggnew(
+    double vgs, double vgd, double phib, double vcap, double vto, double cgs, double cgd, double *cgsnew, double *cgdnew)
 {
     double veroot,veff1,veff2,del,vnroot,vnew1,vnew3,vmax,ext;
     double qroot,qggval,par1,cfact,cplus,cminus;
diff --git a/src/spicelib/devices/mos9/mos9dist.c b/src/spicelib/devices/mos9/mos9dist.c
index ffaf4b5ef..e2e350733 100644
--- a/src/spicelib/devices/mos9/mos9dist.c
+++ b/src/spicelib/devices/mos9/mos9dist.c
@@ -12,10 +12,10 @@ Modified: Alan Gillespie
 #include "suffix.h"
 
 int
-MOS9disto(mode,genmodel,ckt)
- GENmodel *genmodel;
- CKTcircuit *ckt;
- int mode;
+MOS9disto(
+ int mode,
+ GENmodel *genmodel,
+ CKTcircuit *ckt)
 
 /* assuming here that ckt->CKTomega has been initialised to 
  * the correct value
diff --git a/src/spicelib/devices/mos9/mos9trun.c b/src/spicelib/devices/mos9/mos9trun.c
index 0355aa43d..3d3521ff4 100644
--- a/src/spicelib/devices/mos9/mos9trun.c
+++ b/src/spicelib/devices/mos9/mos9trun.c
@@ -11,10 +11,10 @@ Modified: Alan Gillespie
 #include "suffix.h"
 
 int
-MOS9trunc(inModel,ckt,timeStep)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
-    double *timeStep;
+MOS9trunc(
+    GENmodel *inModel,
+    CKTcircuit *ckt,
+    double *timeStep)
 {
     MOS9model *model = (MOS9model *)inModel;
     MOS9instance *here;
diff --git a/src/spicelib/devices/vbic/vbicsetup.c b/src/spicelib/devices/vbic/vbicsetup.c
index 4d22cddbc..0dcebefc8 100644
--- a/src/spicelib/devices/vbic/vbicsetup.c
+++ b/src/spicelib/devices/vbic/vbicsetup.c
@@ -533,9 +533,9 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }
 
 int
-VBICunsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+VBICunsetup(
+    GENmodel *inModel,
+    CKTcircuit *ckt)
 {
     VBICmodel *model;
     VBICinstance *here;
diff --git a/src/spicelib/devices/vbic/vbictemp.c b/src/spicelib/devices/vbic/vbictemp.c
index 54078991d..6f2359579 100644
--- a/src/spicelib/devices/vbic/vbictemp.c
+++ b/src/spicelib/devices/vbic/vbictemp.c
@@ -234,8 +234,7 @@ VBICtemp(GENmodel *inModel, CKTcircuit *ckt)
     return(OK);
 }
 
-int vbic_4T_it_cf_t(p,pnom,TAMB)
-double *p, *pnom, *TAMB;
+int vbic_4T_it_cf_t(double *p, double *pnom, double *TAMB)
 {
         double Tini, Tdev, Vtv, rT, dT, xvar1;
         double xvar2, xvar3, xvar4, xvar5, xvar6, psiio;
diff --git a/src/spicelib/parser/inp2p.c b/src/spicelib/parser/inp2p.c
index 9c09f2b0f..86c6c81a6 100644
--- a/src/spicelib/parser/inp2p.c
+++ b/src/spicelib/parser/inp2p.c
@@ -13,10 +13,10 @@ Author: 1992 Charles Hough
 #include "inp.h"
 
 void
-INP2P(ckt,tab,current)
-    void *ckt;
-    INPtables *tab;
-    card *current;
+INP2P(
+    void *ckt,
+    INPtables *tab,
+    card *current)
 
 {
 
diff --git a/src/spicelib/parser/inp2y.c b/src/spicelib/parser/inp2y.c
index e9408d606..7867e0e32 100644
--- a/src/spicelib/parser/inp2y.c
+++ b/src/spicelib/parser/inp2y.c
@@ -13,10 +13,10 @@ Author: 1992 Charles Hough
 #include "inp.h"
 
 void
-INP2Y(ckt,tab,current)
-    void *ckt;
-    INPtables *tab;
-    card *current;
+INP2Y(
+    void *ckt,
+    INPtables *tab,
+    card *current)
 
 {
 /* parse a txl card */
diff --git a/src/spicelib/parser/inpdoopt.c b/src/spicelib/parser/inpdoopt.c
index 774e5ecdb..b0aeda7bb 100644
--- a/src/spicelib/parser/inpdoopt.c
+++ b/src/spicelib/parser/inpdoopt.c
@@ -18,11 +18,11 @@ Modified: 2000 AlansFixes
 
 
 void
-INPdoOpts(ckt,anal,optCard,tab)
-    void *ckt;
-    void *anal;
-    card *optCard;
-    INPtables *tab;
+INPdoOpts(
+    void *ckt,
+    void *anal,
+    card *optCard,
+    INPtables *tab)
 {
     char *line;
     char *token;