diff --git a/ChangeLog b/ChangeLog
index d91c2d9d9..31d39e667 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,75 @@
+2010-07-03  Robert Larice
+ * src/ciderlib/support/database.c ,
+ * src/ciderlib/support/logfile.c ,
+ * src/ciderlib/support/suprem.c ,
+ * src/ciderlib/support/suprmitf.c ,
+ * src/ciderlib/twod/twosetup.c ,
+ * src/spicelib/devices/nbjt/nbjtacld.c ,
+ * src/spicelib/devices/nbjt/nbjtask.c ,
+ * src/spicelib/devices/nbjt/nbjtdel.c ,
+ * src/spicelib/devices/nbjt/nbjtdest.c ,
+ * src/spicelib/devices/nbjt/nbjtdump.c ,
+ * src/spicelib/devices/nbjt/nbjtload.c ,
+ * src/spicelib/devices/nbjt/nbjtmdel.c ,
+ * src/spicelib/devices/nbjt/nbjtmpar.c ,
+ * src/spicelib/devices/nbjt/nbjtparm.c ,
+ * src/spicelib/devices/nbjt/nbjtpzld.c ,
+ * src/spicelib/devices/nbjt/nbjtset.c ,
+ * src/spicelib/devices/nbjt/nbjttemp.c ,
+ * src/spicelib/devices/nbjt/nbjttrun.c ,
+ * src/spicelib/devices/nbjt2/nbt2acld.c ,
+ * src/spicelib/devices/nbjt2/nbt2ask.c ,
+ * src/spicelib/devices/nbjt2/nbt2del.c ,
+ * src/spicelib/devices/nbjt2/nbt2dest.c ,
+ * src/spicelib/devices/nbjt2/nbt2dump.c ,
+ * src/spicelib/devices/nbjt2/nbt2load.c ,
+ * src/spicelib/devices/nbjt2/nbt2mdel.c ,
+ * src/spicelib/devices/nbjt2/nbt2mpar.c ,
+ * src/spicelib/devices/nbjt2/nbt2parm.c ,
+ * src/spicelib/devices/nbjt2/nbt2pzld.c ,
+ * src/spicelib/devices/nbjt2/nbt2set.c ,
+ * src/spicelib/devices/nbjt2/nbt2temp.c ,
+ * src/spicelib/devices/nbjt2/nbt2trun.c ,
+ * src/spicelib/devices/numd/numdacld.c ,
+ * src/spicelib/devices/numd/numdask.c ,
+ * src/spicelib/devices/numd/numddel.c ,
+ * src/spicelib/devices/numd/numddest.c ,
+ * src/spicelib/devices/numd/numddump.c ,
+ * src/spicelib/devices/numd/numdload.c ,
+ * src/spicelib/devices/numd/numdmdel.c ,
+ * src/spicelib/devices/numd/numdmpar.c ,
+ * src/spicelib/devices/numd/numdparm.c ,
+ * src/spicelib/devices/numd/numdpzld.c ,
+ * src/spicelib/devices/numd/numdtemp.c ,
+ * src/spicelib/devices/numd/numdtrun.c ,
+ * src/spicelib/devices/numd2/nud2acld.c ,
+ * src/spicelib/devices/numd2/nud2ask.c ,
+ * src/spicelib/devices/numd2/nud2del.c ,
+ * src/spicelib/devices/numd2/nud2dest.c ,
+ * src/spicelib/devices/numd2/nud2dump.c ,
+ * src/spicelib/devices/numd2/nud2load.c ,
+ * src/spicelib/devices/numd2/nud2mdel.c ,
+ * src/spicelib/devices/numd2/nud2mpar.c ,
+ * src/spicelib/devices/numd2/nud2parm.c ,
+ * src/spicelib/devices/numd2/nud2pzld.c ,
+ * src/spicelib/devices/numd2/nud2set.c ,
+ * src/spicelib/devices/numd2/nud2temp.c ,
+ * src/spicelib/devices/numd2/nud2trun.c ,
+ * src/spicelib/devices/numos/nummacld.c ,
+ * src/spicelib/devices/numos/nummask.c ,
+ * src/spicelib/devices/numos/nummdel.c ,
+ * src/spicelib/devices/numos/nummdest.c ,
+ * src/spicelib/devices/numos/nummdump.c ,
+ * src/spicelib/devices/numos/nummload.c ,
+ * src/spicelib/devices/numos/nummmdel.c ,
+ * src/spicelib/devices/numos/nummmpar.c ,
+ * src/spicelib/devices/numos/nummparm.c ,
+ * src/spicelib/devices/numos/nummpzld.c ,
+ * src/spicelib/devices/numos/nummset.c ,
+ * src/spicelib/devices/numos/nummtemp.c ,
+ * src/spicelib/devices/numos/nummtrun.c :
+        convert K&R function definitions to ansi style
+
 2010-07-03  Robert Larice
  * src/frontend/subckt.c :  drop unsued variable.
  * src/include/ngspice.h :  add a missing extern
diff --git a/src/ciderlib/support/database.c b/src/ciderlib/support/database.c
index 818e761c4..062755a27 100644
--- a/src/ciderlib/support/database.c
+++ b/src/ciderlib/support/database.c
@@ -8,7 +8,7 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 /* #include "ftedata.h" */
 
 struct plot *
-DBread( fileName )
+DBread( char *fileName )
 {
   struct plot *plot;
 
@@ -18,10 +18,7 @@ DBread( fileName )
 }
 
 double *
-DBgetData( plot, name, lengthWanted )
-struct plot *plot;
-char *name;
-int lengthWanted;
+DBgetData(struct plot *plot, char *name, int lengthWanted)
 {
   struct dvec *v;
   double *data;
@@ -50,8 +47,7 @@ int lengthWanted;
 }
 
 void
-DBfree( plot )
-struct plot *plot;
+DBfree(struct plot *plot)
 {
   struct dvec *v, *nextv;
   struct plot *pl, *nextpl;
diff --git a/src/ciderlib/support/logfile.c b/src/ciderlib/support/logfile.c
index 03fb5289c..a5ce0186c 100644
--- a/src/ciderlib/support/logfile.c
+++ b/src/ciderlib/support/logfile.c
@@ -9,9 +9,7 @@ static char *LogFileName = "cider.log";
 static int LogError = 0;
 
 void
-LOGmakeEntry(name, description)
-  char *name;
-  char *description;
+LOGmakeEntry(char *name, char *description)
 {
   int procStamp;
   FILE *fpLog;
diff --git a/src/ciderlib/support/suprem.c b/src/ciderlib/support/suprem.c
index 08ced9346..9fac7dde1 100644
--- a/src/ciderlib/support/suprem.c
+++ b/src/ciderlib/support/suprem.c
@@ -110,11 +110,7 @@ readAsciiData( char *fileName, int impType, DOPtable **ppTable )
 
 
 void
-readSupremData( fileName, fileType, impType, ppTable )
-char *fileName;
-int fileType;
-int impType;
-DOPtable **ppTable;
+readSupremData(char *fileName, int fileType, int impType, DOPtable **ppTable)
 {
 #define MAX_GRID 500
     float x[ MAX_GRID ], conc[ MAX_GRID ];
diff --git a/src/ciderlib/support/suprmitf.c b/src/ciderlib/support/suprmitf.c
index 077e61279..3ab79dcca 100644
--- a/src/ciderlib/support/suprmitf.c
+++ b/src/ciderlib/support/suprmitf.c
@@ -24,10 +24,7 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #define DEBUG	if (0)
 
 void
-SUPbinRead( inFile, x, conc, impId, numNod )
-char *inFile;
-float *x, *conc;
-int *impId, *numNod;
+SUPbinRead(char *inFile, float *x, float *conc, int *impId, int *numNod)
 {
   int idata, recordMark;
   int ldata;
@@ -223,10 +220,7 @@ int *impId, *numNod;
 }
 
 void
-SUPascRead( inFile, x, conc, impId, numNod )
-char *inFile;
-float *x, *conc;
-int *impId, *numNod;
+SUPascRead(char *inFile, float *x, float *conc, int *impId, int *numNod)
 {
   int idata;
   int i, j;
diff --git a/src/ciderlib/twod/twosetup.c b/src/ciderlib/twod/twosetup.c
index 05cf69453..7facbe33d 100644
--- a/src/ciderlib/twod/twosetup.c
+++ b/src/ciderlib/twod/twosetup.c
@@ -141,11 +141,8 @@ void TWOsetup(TWOdevice *pDevice)
 }
 
 /* Transfer BC info from card to nodes and edges. */
-static void TWOcopyBCinfo( pDevice, pElem, card, index )
-     TWOdevice *pDevice;
-     TWOelem *pElem;
-     BDRYcard *card;
-     int index;
+static void
+TWOcopyBCinfo(TWOdevice *pDevice, TWOelem *pElem, BDRYcard *card, int index )
 {
   TWOnode *pNode;
   TWOelem *pNElem;
diff --git a/src/spicelib/devices/nbjt/nbjtacld.c b/src/spicelib/devices/nbjt/nbjtacld.c
index 2a8403a02..11d502708 100644
--- a/src/spicelib/devices/nbjt/nbjtacld.c
+++ b/src/spicelib/devices/nbjt/nbjtacld.c
@@ -22,10 +22,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 extern int ONEacDebug;
 
 int
-NBJTacLoad(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-
+NBJTacLoad(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NBJTmodel *model = (NBJTmodel *) inModel;
   register NBJTinstance *inst;
diff --git a/src/spicelib/devices/nbjt/nbjtask.c b/src/spicelib/devices/nbjt/nbjtask.c
index b1ff689f6..898618684 100644
--- a/src/spicelib/devices/nbjt/nbjtask.c
+++ b/src/spicelib/devices/nbjt/nbjtask.c
@@ -18,12 +18,7 @@ extern int NBJTinitSmSig(NBJTinstance *);
 
 /* ARGSUSED */
 int
-NBJTask(ckt, inInst, which, value, select)
-  CKTcircuit *ckt;
-  GENinstance *inInst;
-  int which;
-  IFvalue *value;
-  IFvalue *select;
+NBJTask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue *select)
 {
   NBJTinstance *inst = (NBJTinstance *) inInst;
   switch (which) {
diff --git a/src/spicelib/devices/nbjt/nbjtdel.c b/src/spicelib/devices/nbjt/nbjtdel.c
index 92fd66567..6f5e4a10e 100644
--- a/src/spicelib/devices/nbjt/nbjtdel.c
+++ b/src/spicelib/devices/nbjt/nbjtdel.c
@@ -14,11 +14,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NBJTdelete(inModel, name, kill)
-  GENmodel *inModel;
-  IFuid name;
-  GENinstance **kill;
-
+NBJTdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
   NBJTmodel *model = (NBJTmodel *) inModel;
   NBJTinstance **fast = (NBJTinstance **) kill;
diff --git a/src/spicelib/devices/nbjt/nbjtdest.c b/src/spicelib/devices/nbjt/nbjtdest.c
index 211345e24..fccb8c689 100644
--- a/src/spicelib/devices/nbjt/nbjtdest.c
+++ b/src/spicelib/devices/nbjt/nbjtdest.c
@@ -15,9 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 void
-NBJTdestroy(inModel)
-  GENmodel **inModel;
-
+NBJTdestroy(GENmodel **inModel)
 {
 
   NBJTmodel **model = (NBJTmodel **) inModel;
diff --git a/src/spicelib/devices/nbjt/nbjtdump.c b/src/spicelib/devices/nbjt/nbjtdump.c
index 6f5d0f6d1..11e4b8273 100644
--- a/src/spicelib/devices/nbjt/nbjtdump.c
+++ b/src/spicelib/devices/nbjt/nbjtdump.c
@@ -26,9 +26,7 @@ static int state_numDC = 0;
 static int state_numTR = 0;
 
 void
-NBJTdump(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NBJTdump(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NBJTmodel *model = (NBJTmodel *) inModel;
   register NBJTinstance *inst;
@@ -92,10 +90,7 @@ NBJTdump(inModel, ckt)
 
 static
 void 
-NBJTputHeader(file, ckt, inst)
-  FILE *file;
-  CKTcircuit *ckt;
-  NBJTinstance *inst;
+NBJTputHeader(FILE *file, CKTcircuit *ckt, NBJTinstance *inst)
 {
   char *reference;
   double refVal = 0.0;
@@ -153,10 +148,7 @@ NBJTputHeader(file, ckt, inst)
 }
 
 void
-NBJTacct(inModel, ckt, file)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  FILE *file;
+NBJTacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
 {
   register NBJTmodel *model = (NBJTmodel *) inModel;
   register NBJTinstance *inst;
diff --git a/src/spicelib/devices/nbjt/nbjtload.c b/src/spicelib/devices/nbjt/nbjtload.c
index 8ace9af58..5d65b7391 100644
--- a/src/spicelib/devices/nbjt/nbjtload.c
+++ b/src/spicelib/devices/nbjt/nbjtload.c
@@ -29,9 +29,7 @@ extern int ONEacDebug;
 
 
 int
-NBJTload(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NBJTload(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NBJTmodel *model = (NBJTmodel *) inModel;
   register NBJTinstance *inst;
@@ -491,8 +489,7 @@ NBJTload(inModel, ckt)
 }
 
 int
-NBJTinitSmSig(inst)
-  NBJTinstance *inst;
+NBJTinitSmSig(NBJTinstance *inst)
 {
   SPcomplex yIeVce, yIeVbe;
   SPcomplex yIcVce, yIcVbe;
diff --git a/src/spicelib/devices/nbjt/nbjtmdel.c b/src/spicelib/devices/nbjt/nbjtmdel.c
index 5b2e52f4c..bdc71acb1 100644
--- a/src/spicelib/devices/nbjt/nbjtmdel.c
+++ b/src/spicelib/devices/nbjt/nbjtmdel.c
@@ -14,11 +14,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NBJTmDelete(inModel, modname, kill)
-  GENmodel **inModel;
-  IFuid modname;
-  GENmodel *kill;
-
+NBJTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
 
   NBJTmodel **model = (NBJTmodel **) inModel;
diff --git a/src/spicelib/devices/nbjt/nbjtmpar.c b/src/spicelib/devices/nbjt/nbjtmpar.c
index ac73fda90..a87cdca52 100644
--- a/src/spicelib/devices/nbjt/nbjtmpar.c
+++ b/src/spicelib/devices/nbjt/nbjtmpar.c
@@ -15,10 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NBJTmParam(param, value, inModel)
-  int param;
-  IFvalue *value;
-  GENmodel *inModel;
+NBJTmParam(int param, IFvalue *value, GENmodel *inModel)
 {
   switch (param) {
   case NBJT_MOD_NBJT:
diff --git a/src/spicelib/devices/nbjt/nbjtparm.c b/src/spicelib/devices/nbjt/nbjtparm.c
index f6e483e54..2c42c5d3f 100644
--- a/src/spicelib/devices/nbjt/nbjtparm.c
+++ b/src/spicelib/devices/nbjt/nbjtparm.c
@@ -15,11 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NBJTparam(param, value, inInst, select)
-  int param;
-  IFvalue *value;
-  GENinstance *inInst;
-  IFvalue *select;
+NBJTparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
 {
   register NBJTinstance *inst = (NBJTinstance *) inInst;
   switch (param) {
diff --git a/src/spicelib/devices/nbjt/nbjtpzld.c b/src/spicelib/devices/nbjt/nbjtpzld.c
index 848f4ebd6..cc318f067 100644
--- a/src/spicelib/devices/nbjt/nbjtpzld.c
+++ b/src/spicelib/devices/nbjt/nbjtpzld.c
@@ -21,11 +21,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 extern int ONEacDebug;
 
 int
-NBJTpzLoad(inModel, ckt, s)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  SPcomplex *s;
-
+NBJTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 {
   register NBJTmodel *model = (NBJTmodel *) inModel;
   register NBJTinstance *inst;
diff --git a/src/spicelib/devices/nbjt/nbjtset.c b/src/spicelib/devices/nbjt/nbjtset.c
index 1f0707170..924f99183 100644
--- a/src/spicelib/devices/nbjt/nbjtset.c
+++ b/src/spicelib/devices/nbjt/nbjtset.c
@@ -22,11 +22,7 @@ if (size && (!(var =(type *)calloc(1, (unsigned)(size)*sizeof(type))))) {\
 }
 
 int 
-NBJTsetup(matrix, inModel, ckt, states)
-  register SMPmatrix *matrix;
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  int *states;
+NBJTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
 /*
  * load the diode structure with those pointers needed later for fast matrix
  * loading
diff --git a/src/spicelib/devices/nbjt/nbjttemp.c b/src/spicelib/devices/nbjt/nbjttemp.c
index 55f177c56..94a714791 100644
--- a/src/spicelib/devices/nbjt/nbjttemp.c
+++ b/src/spicelib/devices/nbjt/nbjttemp.c
@@ -19,9 +19,7 @@ extern int ONEdcDebug;
 extern double LNorm;
 
 int 
-NBJTtemp(inModel, ckt)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
+NBJTtemp(GENmodel *inModel, CKTcircuit *ckt)
 /*
  * perform the temperature update to the bjt
  */
diff --git a/src/spicelib/devices/nbjt/nbjttrun.c b/src/spicelib/devices/nbjt/nbjttrun.c
index da6220a7f..ec848c5c7 100644
--- a/src/spicelib/devices/nbjt/nbjttrun.c
+++ b/src/spicelib/devices/nbjt/nbjttrun.c
@@ -18,11 +18,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 int
-NBJTtrunc(inModel, ckt, timeStep)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
-  double *timeStep;
-
+NBJTtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
 {
   register NBJTmodel *model = (NBJTmodel *) inModel;
   register NBJTinstance *inst;
diff --git a/src/spicelib/devices/nbjt2/nbt2acld.c b/src/spicelib/devices/nbjt2/nbt2acld.c
index 90946423a..3692963af 100644
--- a/src/spicelib/devices/nbjt2/nbt2acld.c
+++ b/src/spicelib/devices/nbjt2/nbt2acld.c
@@ -22,10 +22,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 extern int TWOacDebug;
 
 int
-NBJT2acLoad(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-
+NBJT2acLoad(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NBJT2model *model = (NBJT2model *) inModel;
   register NBJT2instance *inst;
diff --git a/src/spicelib/devices/nbjt2/nbt2ask.c b/src/spicelib/devices/nbjt2/nbt2ask.c
index 4c5012aef..e9aa90468 100644
--- a/src/spicelib/devices/nbjt2/nbt2ask.c
+++ b/src/spicelib/devices/nbjt2/nbt2ask.c
@@ -19,12 +19,7 @@ extern int NBJT2initSmSig(NBJT2instance *);
 
 /* ARGSUSED */
 int
-NBJT2ask(ckt, inInst, which, value, select)
-  CKTcircuit *ckt;
-  GENinstance *inInst;
-  int which;
-  IFvalue *value;
-  IFvalue *select;
+NBJT2ask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue *select)
 {
   NBJT2instance *inst = (NBJT2instance *) inInst;
   switch (which) {
diff --git a/src/spicelib/devices/nbjt2/nbt2del.c b/src/spicelib/devices/nbjt2/nbt2del.c
index 6659f7e1c..0b56ed135 100644
--- a/src/spicelib/devices/nbjt2/nbt2del.c
+++ b/src/spicelib/devices/nbjt2/nbt2del.c
@@ -14,11 +14,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NBJT2delete(inModel, name, kill)
-  GENmodel *inModel;
-  IFuid name;
-  GENinstance **kill;
-
+NBJT2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
 
   NBJT2model *model = (NBJT2model *) inModel;
diff --git a/src/spicelib/devices/nbjt2/nbt2dest.c b/src/spicelib/devices/nbjt2/nbt2dest.c
index 161318608..b845b3777 100644
--- a/src/spicelib/devices/nbjt2/nbt2dest.c
+++ b/src/spicelib/devices/nbjt2/nbt2dest.c
@@ -15,9 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 void
-NBJT2destroy(inModel)
-  GENmodel **inModel;
-
+NBJT2destroy(GENmodel **inModel)
 {
 
   NBJT2model **model = (NBJT2model **) inModel;
diff --git a/src/spicelib/devices/nbjt2/nbt2dump.c b/src/spicelib/devices/nbjt2/nbt2dump.c
index fb3fb704d..d80a22c11 100644
--- a/src/spicelib/devices/nbjt2/nbt2dump.c
+++ b/src/spicelib/devices/nbjt2/nbt2dump.c
@@ -27,9 +27,7 @@ static int state_numDC = 0;
 static int state_numTR = 0;
 
 void
-NBJT2dump(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NBJT2dump(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NBJT2model *model = (NBJT2model *) inModel;
   register NBJT2instance *inst;
@@ -93,10 +91,7 @@ NBJT2dump(inModel, ckt)
 
 static
 void 
-NBJT2putHeader(file, ckt, inst)
-  FILE *file;
-  CKTcircuit *ckt;
-  NBJT2instance *inst;
+NBJT2putHeader(FILE *file, CKTcircuit *ckt, NBJT2instance *inst)
 {
   char *reference;
   double refVal = 0.0;
@@ -154,10 +149,7 @@ NBJT2putHeader(file, ckt, inst)
 }
 
 void
-NBJT2acct(inModel, ckt, file)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  FILE *file;
+NBJT2acct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
 {
   register NBJT2model *model = (NBJT2model *) inModel;
   register NBJT2instance *inst;
diff --git a/src/spicelib/devices/nbjt2/nbt2load.c b/src/spicelib/devices/nbjt2/nbt2load.c
index 996ee1de8..998999d55 100644
--- a/src/spicelib/devices/nbjt2/nbt2load.c
+++ b/src/spicelib/devices/nbjt2/nbt2load.c
@@ -31,9 +31,7 @@ extern int TWOacDebug;
 
 
 int
-NBJT2load(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NBJT2load(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NBJT2model *model = (NBJT2model *) inModel;
   register NBJT2instance *inst;
@@ -482,8 +480,7 @@ NBJT2load(inModel, ckt)
 }
 
 int
-NBJT2initSmSig(inst)
-  NBJT2instance *inst;
+NBJT2initSmSig(NBJT2instance *inst)
 {
   SPcomplex yIeVce, yIeVbe;
   SPcomplex yIcVce, yIcVbe;
diff --git a/src/spicelib/devices/nbjt2/nbt2mdel.c b/src/spicelib/devices/nbjt2/nbt2mdel.c
index 51b9c439a..15ecba3d0 100644
--- a/src/spicelib/devices/nbjt2/nbt2mdel.c
+++ b/src/spicelib/devices/nbjt2/nbt2mdel.c
@@ -14,11 +14,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NBJT2mDelete(inModel, modname, kill)
-  GENmodel **inModel;
-  IFuid modname;
-  GENmodel *kill;
-
+NBJT2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
 
   NBJT2model **model = (NBJT2model **) inModel;
diff --git a/src/spicelib/devices/nbjt2/nbt2mpar.c b/src/spicelib/devices/nbjt2/nbt2mpar.c
index 9bc8f9806..ff85a62d0 100644
--- a/src/spicelib/devices/nbjt2/nbt2mpar.c
+++ b/src/spicelib/devices/nbjt2/nbt2mpar.c
@@ -15,10 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NBJT2mParam(param, value, inModel)
-  int param;
-  IFvalue *value;
-  GENmodel *inModel;
+NBJT2mParam(int param, IFvalue *value, GENmodel *inModel)
 {
   switch (param) {
   case NBJT2_MOD_NBJT:
diff --git a/src/spicelib/devices/nbjt2/nbt2parm.c b/src/spicelib/devices/nbjt2/nbt2parm.c
index df952b25e..dfd04cc91 100644
--- a/src/spicelib/devices/nbjt2/nbt2parm.c
+++ b/src/spicelib/devices/nbjt2/nbt2parm.c
@@ -15,11 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NBJT2param(param, value, inInst, select)
-  int param;
-  IFvalue *value;
-  GENinstance *inInst;
-  IFvalue *select;
+NBJT2param(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
 {
   register NBJT2instance *inst = (NBJT2instance *) inInst;
   switch (param) {
diff --git a/src/spicelib/devices/nbjt2/nbt2pzld.c b/src/spicelib/devices/nbjt2/nbt2pzld.c
index 982c198e8..114d13d07 100644
--- a/src/spicelib/devices/nbjt2/nbt2pzld.c
+++ b/src/spicelib/devices/nbjt2/nbt2pzld.c
@@ -17,10 +17,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 extern int TWOacDebug;
 
 int
-NBJT2pzLoad(inModel, ckt, s)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  SPcomplex *s;
+NBJT2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 {
   register NBJT2model *model = (NBJT2model *) inModel;
   register NBJT2instance *inst;
diff --git a/src/spicelib/devices/nbjt2/nbt2set.c b/src/spicelib/devices/nbjt2/nbt2set.c
index d0b18d5c6..f9c474546 100644
--- a/src/spicelib/devices/nbjt2/nbt2set.c
+++ b/src/spicelib/devices/nbjt2/nbt2set.c
@@ -25,11 +25,7 @@ if (size && (!(var =(type *)calloc(1, (unsigned)(size)*sizeof(type))))) {\
 }
 
 int 
-NBJT2setup(matrix, inModel, ckt, states)
-  register SMPmatrix *matrix;
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  int *states;
+NBJT2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
 /*
  * load the structure with those pointers needed later for fast matrix
  * loading
diff --git a/src/spicelib/devices/nbjt2/nbt2temp.c b/src/spicelib/devices/nbjt2/nbt2temp.c
index 8371e013e..921c4270b 100644
--- a/src/spicelib/devices/nbjt2/nbt2temp.c
+++ b/src/spicelib/devices/nbjt2/nbt2temp.c
@@ -18,9 +18,7 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 #define NIL(type)   ((type *)0)
 
 int
-NBJT2temp(inModel, ckt)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
+NBJT2temp(GENmodel *inModel, CKTcircuit *ckt)
 /*
  * perform the temperature update
  */
diff --git a/src/spicelib/devices/nbjt2/nbt2trun.c b/src/spicelib/devices/nbjt2/nbt2trun.c
index c02e4dbfa..142771b4e 100644
--- a/src/spicelib/devices/nbjt2/nbt2trun.c
+++ b/src/spicelib/devices/nbjt2/nbt2trun.c
@@ -19,11 +19,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 int
-NBJT2trunc(inModel, ckt, timeStep)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
-  double *timeStep;
-
+NBJT2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
 {
   register NBJT2model *model = (NBJT2model *) inModel;
   register NBJT2instance *inst;
diff --git a/src/spicelib/devices/numd/numdacld.c b/src/spicelib/devices/numd/numdacld.c
index 2e86b62fc..d6bc4445f 100644
--- a/src/spicelib/devices/numd/numdacld.c
+++ b/src/spicelib/devices/numd/numdacld.c
@@ -22,9 +22,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 extern int ONEacDebug; 
 
 int
-NUMDacLoad(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NUMDacLoad(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NUMDmodel *model = (NUMDmodel *) inModel;
   register NUMDinstance *inst;
diff --git a/src/spicelib/devices/numd/numdask.c b/src/spicelib/devices/numd/numdask.c
index d470b1347..3f774dd43 100644
--- a/src/spicelib/devices/numd/numdask.c
+++ b/src/spicelib/devices/numd/numdask.c
@@ -20,12 +20,7 @@ extern int NUMDinitSmSig(NUMDinstance *);
 
 /* ARGSUSED */
 int
-NUMDask(ckt, inInst, which, value, select)
-  CKTcircuit *ckt;
-  GENinstance *inInst;
-  int which;
-  IFvalue *value;
-  IFvalue *select;
+NUMDask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue *select)
 {
   NUMDinstance *inst = (NUMDinstance *) inInst;
 
diff --git a/src/spicelib/devices/numd/numddel.c b/src/spicelib/devices/numd/numddel.c
index 6e52942ba..540985c91 100644
--- a/src/spicelib/devices/numd/numddel.c
+++ b/src/spicelib/devices/numd/numddel.c
@@ -9,11 +9,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMDdelete(inModel, name, kill)
-  GENmodel *inModel;
-  IFuid name;
-  GENinstance **kill;
-
+NUMDdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
 
   NUMDmodel *model = (NUMDmodel *) inModel;
diff --git a/src/spicelib/devices/numd/numddest.c b/src/spicelib/devices/numd/numddest.c
index 38637dd41..a7d93f0f8 100644
--- a/src/spicelib/devices/numd/numddest.c
+++ b/src/spicelib/devices/numd/numddest.c
@@ -15,8 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 void
-NUMDdestroy(inModel)
-  GENmodel **inModel;
+NUMDdestroy(GENmodel **inModel)
 {
 
   NUMDmodel **model = (NUMDmodel **) inModel;
diff --git a/src/spicelib/devices/numd/numddump.c b/src/spicelib/devices/numd/numddump.c
index 731c9d34f..e3ada8dbd 100644
--- a/src/spicelib/devices/numd/numddump.c
+++ b/src/spicelib/devices/numd/numddump.c
@@ -26,9 +26,7 @@ static int state_numDC = 0;
 static int state_numTR = 0;
 
 void
-NUMDdump(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NUMDdump(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NUMDmodel *model = (NUMDmodel *) inModel;
   register NUMDinstance *inst;
@@ -92,10 +90,7 @@ NUMDdump(inModel, ckt)
 
 static
 void 
-NUMDputHeader(file, ckt, inst)
-  FILE *file;
-  CKTcircuit *ckt;
-  NUMDinstance *inst;
+NUMDputHeader(FILE *file, CKTcircuit *ckt, NUMDinstance *inst)
 {
   char *reference;
   double refVal = 0.0;
@@ -140,10 +135,7 @@ NUMDputHeader(file, ckt, inst)
 }
 
 void
-NUMDacct(inModel, ckt, file)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  FILE *file;
+NUMDacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
 {
   register NUMDmodel *model = (NUMDmodel *) inModel;
   register NUMDinstance *inst;
diff --git a/src/spicelib/devices/numd/numdload.c b/src/spicelib/devices/numd/numdload.c
index 04065d3c6..1cb0970f5 100644
--- a/src/spicelib/devices/numd/numdload.c
+++ b/src/spicelib/devices/numd/numdload.c
@@ -27,9 +27,7 @@ extern int ONEacDebug;
 
 
 int
-NUMDload(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NUMDload(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NUMDmodel *model = (NUMDmodel *) inModel;
   register NUMDinstance *inst;
@@ -377,8 +375,7 @@ NUMDload(inModel, ckt)
 }
 
 int
-NUMDinitSmSig(inst)
-  NUMDinstance *inst;
+NUMDinitSmSig(NUMDinstance *inst)
 {
   SPcomplex yd;
   double omega = inst->NUMDmodPtr->NUMDmethods->METHomega;
diff --git a/src/spicelib/devices/numd/numdmdel.c b/src/spicelib/devices/numd/numdmdel.c
index 685f94e0e..09c063178 100644
--- a/src/spicelib/devices/numd/numdmdel.c
+++ b/src/spicelib/devices/numd/numdmdel.c
@@ -9,10 +9,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMDmDelete(inModel, modname, kill)
-  GENmodel **inModel;
-  IFuid modname;
-  GENmodel *kill;
+NUMDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
 
   NUMDmodel **model = (NUMDmodel **) inModel;
diff --git a/src/spicelib/devices/numd/numdmpar.c b/src/spicelib/devices/numd/numdmpar.c
index be5ad11ae..b6ba5741f 100644
--- a/src/spicelib/devices/numd/numdmpar.c
+++ b/src/spicelib/devices/numd/numdmpar.c
@@ -15,10 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMDmParam(param, value, inModel)
-  int param;
-  IFvalue *value;
-  GENmodel *inModel;
+NUMDmParam(int param, IFvalue *value, GENmodel *inModel)
 {
   switch (param) {
   case NUMD_MOD_NUMD:
diff --git a/src/spicelib/devices/numd/numdparm.c b/src/spicelib/devices/numd/numdparm.c
index 85534a489..25ea6c91b 100644
--- a/src/spicelib/devices/numd/numdparm.c
+++ b/src/spicelib/devices/numd/numdparm.c
@@ -11,11 +11,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMDparam(param, value, inInst, select)
-  int param;
-  IFvalue *value;
-  GENinstance *inInst;
-  IFvalue *select;
+NUMDparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
 {
   NUMDinstance *inst = (NUMDinstance *) inInst;
   switch (param) {
diff --git a/src/spicelib/devices/numd/numdpzld.c b/src/spicelib/devices/numd/numdpzld.c
index e07934505..d6ef159f1 100644
--- a/src/spicelib/devices/numd/numdpzld.c
+++ b/src/spicelib/devices/numd/numdpzld.c
@@ -16,10 +16,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 extern int ONEacDebug;
 
 int
-NUMDpzLoad(inModel, ckt, s)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
-  SPcomplex *s;
+NUMDpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 {
   register NUMDmodel *model = (NUMDmodel *) inModel;
   register NUMDinstance *inst;
diff --git a/src/spicelib/devices/numd/numdtemp.c b/src/spicelib/devices/numd/numdtemp.c
index 7be0bdd15..96cbf7fd9 100644
--- a/src/spicelib/devices/numd/numdtemp.c
+++ b/src/spicelib/devices/numd/numdtemp.c
@@ -17,9 +17,7 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 #define NIL(type)   ((type *)0)
 
 int 
-NUMDtemp(inModel, ckt)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
+NUMDtemp(GENmodel *inModel, CKTcircuit *ckt)
 /*
  * perform the temperature update to the diode
  */
diff --git a/src/spicelib/devices/numd/numdtrun.c b/src/spicelib/devices/numd/numdtrun.c
index 6a29028ae..f0b1fddc1 100644
--- a/src/spicelib/devices/numd/numdtrun.c
+++ b/src/spicelib/devices/numd/numdtrun.c
@@ -14,11 +14,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 int
-NUMDtrunc(inModel, ckt, timeStep)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
-  double *timeStep;
-
+NUMDtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
 {
   register NUMDmodel *model = (NUMDmodel *) inModel;
   register NUMDinstance *inst;
diff --git a/src/spicelib/devices/numd2/nud2acld.c b/src/spicelib/devices/numd2/nud2acld.c
index 0e4e11da1..9752be985 100644
--- a/src/spicelib/devices/numd2/nud2acld.c
+++ b/src/spicelib/devices/numd2/nud2acld.c
@@ -23,9 +23,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 extern int TWOacDebug;
 
 int
-NUMD2acLoad(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NUMD2acLoad(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NUMD2model *model = (NUMD2model *) inModel;
   register NUMD2instance *inst;
diff --git a/src/spicelib/devices/numd2/nud2ask.c b/src/spicelib/devices/numd2/nud2ask.c
index 024c0a7ff..b7f94823d 100644
--- a/src/spicelib/devices/numd2/nud2ask.c
+++ b/src/spicelib/devices/numd2/nud2ask.c
@@ -19,12 +19,7 @@ extern int NUMD2initSmSig(NUMD2instance *);
 
 /* ARGSUSED */
 int
-NUMD2ask(ckt, inInst, which, value, select)
-  CKTcircuit *ckt;
-  GENinstance *inInst;
-  int which;
-  IFvalue *value;
-  IFvalue *select;
+NUMD2ask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue *select)
 {
   NUMD2instance *inst = (NUMD2instance *) inInst;
   switch (which) {
diff --git a/src/spicelib/devices/numd2/nud2del.c b/src/spicelib/devices/numd2/nud2del.c
index ffe80dd57..bb7641d3f 100644
--- a/src/spicelib/devices/numd2/nud2del.c
+++ b/src/spicelib/devices/numd2/nud2del.c
@@ -9,10 +9,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMD2delete(inModel, name, kill)
-  GENmodel *inModel;
-  IFuid name;
-  GENinstance **kill;
+NUMD2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
   NUMD2model *model = (NUMD2model *) inModel;
   NUMD2instance **fast = (NUMD2instance **) kill;
diff --git a/src/spicelib/devices/numd2/nud2dest.c b/src/spicelib/devices/numd2/nud2dest.c
index e84d9e387..14389e4fd 100644
--- a/src/spicelib/devices/numd2/nud2dest.c
+++ b/src/spicelib/devices/numd2/nud2dest.c
@@ -16,8 +16,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 void
-NUMD2destroy(inModel)
-  GENmodel **inModel;
+NUMD2destroy(GENmodel **inModel)
 {
 
   NUMD2model **model = (NUMD2model **) inModel;
diff --git a/src/spicelib/devices/numd2/nud2dump.c b/src/spicelib/devices/numd2/nud2dump.c
index 89ea652ff..66cdf3c12 100644
--- a/src/spicelib/devices/numd2/nud2dump.c
+++ b/src/spicelib/devices/numd2/nud2dump.c
@@ -27,9 +27,7 @@ static int state_numDC = 0;
 static int state_numTR = 0;
 
 void
-NUMD2dump(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NUMD2dump(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NUMD2model *model = (NUMD2model *) inModel;
   register NUMD2instance *inst;
@@ -93,10 +91,7 @@ NUMD2dump(inModel, ckt)
 
 static
 void 
-NUMD2putHeader(file, ckt, inst)
-  FILE *file;
-  CKTcircuit *ckt;
-  NUMD2instance *inst;
+NUMD2putHeader(FILE *file, CKTcircuit *ckt, NUMD2instance *inst)
 {
   char *reference;
   double refVal = 0.0;
@@ -141,10 +136,7 @@ NUMD2putHeader(file, ckt, inst)
 }
 
 void
-NUMD2acct(inModel, ckt, file)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  FILE *file;
+NUMD2acct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
 {
   register NUMD2model *model = (NUMD2model *) inModel;
   register NUMD2instance *inst;
diff --git a/src/spicelib/devices/numd2/nud2load.c b/src/spicelib/devices/numd2/nud2load.c
index febbd015d..1161547d4 100644
--- a/src/spicelib/devices/numd2/nud2load.c
+++ b/src/spicelib/devices/numd2/nud2load.c
@@ -30,10 +30,7 @@ extern int TWOtranDebug;
 extern int TWOacDebug;
 
 int
-NUMD2load(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-
+NUMD2load(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NUMD2model *model = (NUMD2model *) inModel;
   register NUMD2instance *inst;
@@ -392,8 +389,7 @@ NUMD2load(inModel, ckt)
 }
 
 int
-NUMD2initSmSig(inst)
-  NUMD2instance *inst;
+NUMD2initSmSig(NUMD2instance *inst)
 {
   SPcomplex yd;
   double omega = inst->NUMD2modPtr->NUMD2methods->METHomega;
diff --git a/src/spicelib/devices/numd2/nud2mdel.c b/src/spicelib/devices/numd2/nud2mdel.c
index 16030df67..1a3cbfbeb 100644
--- a/src/spicelib/devices/numd2/nud2mdel.c
+++ b/src/spicelib/devices/numd2/nud2mdel.c
@@ -9,11 +9,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMD2mDelete(inModel, modname, kill)
-  GENmodel **inModel;
-  IFuid modname;
-  GENmodel *kill;
-
+NUMD2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
   NUMD2model **model = (NUMD2model **) inModel;
   NUMD2model *modfast = (NUMD2model *) kill;
diff --git a/src/spicelib/devices/numd2/nud2mpar.c b/src/spicelib/devices/numd2/nud2mpar.c
index c782a5901..b3f275067 100644
--- a/src/spicelib/devices/numd2/nud2mpar.c
+++ b/src/spicelib/devices/numd2/nud2mpar.c
@@ -15,10 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMD2mParam(param, value, inModel)
-  int param;
-  IFvalue *value;
-  GENmodel *inModel;
+NUMD2mParam(int param, IFvalue *value, GENmodel *inModel)
 {
   switch (param) {
   case NUMD2_MOD_NUMD:
diff --git a/src/spicelib/devices/numd2/nud2parm.c b/src/spicelib/devices/numd2/nud2parm.c
index 367d9a0f7..f3a11c62e 100644
--- a/src/spicelib/devices/numd2/nud2parm.c
+++ b/src/spicelib/devices/numd2/nud2parm.c
@@ -11,11 +11,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMD2param(param, value, inInst, select)
-  int param;
-  IFvalue *value;
-  GENinstance *inInst;
-  IFvalue *select;
+NUMD2param(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
 {
   NUMD2instance *inst = (NUMD2instance *) inInst;
   switch (param) {
diff --git a/src/spicelib/devices/numd2/nud2pzld.c b/src/spicelib/devices/numd2/nud2pzld.c
index e30f4bafe..31c0e5716 100644
--- a/src/spicelib/devices/numd2/nud2pzld.c
+++ b/src/spicelib/devices/numd2/nud2pzld.c
@@ -17,10 +17,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 extern int TWOacDebug;
 
 int
-NUMD2pzLoad(inModel, ckt, s)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
-  SPcomplex *s;
+NUMD2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 {
   register NUMD2model *model = (NUMD2model *) inModel;
   register NUMD2instance *inst;
diff --git a/src/spicelib/devices/numd2/nud2set.c b/src/spicelib/devices/numd2/nud2set.c
index d88d26e0f..4fb7ff951 100644
--- a/src/spicelib/devices/numd2/nud2set.c
+++ b/src/spicelib/devices/numd2/nud2set.c
@@ -25,11 +25,7 @@ if (size && (!(var =(type *)calloc(1, (unsigned)(size)*sizeof(type))))) {\
 }
 
 int
-NUMD2setup(matrix, inModel, ckt, states)
-  register SMPmatrix *matrix;
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  int *states;
+NUMD2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
 /*
  * load the structure with those pointers needed later for fast matrix
  * loading
diff --git a/src/spicelib/devices/numd2/nud2temp.c b/src/spicelib/devices/numd2/nud2temp.c
index 351a0ce58..a5bc19e97 100644
--- a/src/spicelib/devices/numd2/nud2temp.c
+++ b/src/spicelib/devices/numd2/nud2temp.c
@@ -18,9 +18,7 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 #define NIL(type)   ((type *)0)
 
 int
-NUMD2temp(inModel, ckt)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
+NUMD2temp(GENmodel *inModel, CKTcircuit *ckt)
 /*
  * perform the temperature update
  */
diff --git a/src/spicelib/devices/numd2/nud2trun.c b/src/spicelib/devices/numd2/nud2trun.c
index 34806faeb..1b97157fe 100644
--- a/src/spicelib/devices/numd2/nud2trun.c
+++ b/src/spicelib/devices/numd2/nud2trun.c
@@ -13,10 +13,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "cidersupt.h"
 
 int
-NUMD2trunc(inModel, ckt, timeStep)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
-  double *timeStep;
+NUMD2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
 {
   register NUMD2model *model = (NUMD2model *) inModel;
   register NUMD2instance *inst;
diff --git a/src/spicelib/devices/numos/nummacld.c b/src/spicelib/devices/numos/nummacld.c
index 8e6c33ba5..61c3332a5 100644
--- a/src/spicelib/devices/numos/nummacld.c
+++ b/src/spicelib/devices/numos/nummacld.c
@@ -22,9 +22,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 extern int TWOacDebug;
 
 int
-NUMOSacLoad(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NUMOSacLoad(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NUMOSmodel *model = (NUMOSmodel *) inModel;
   register NUMOSinstance *inst;
diff --git a/src/spicelib/devices/numos/nummask.c b/src/spicelib/devices/numos/nummask.c
index b5471ea7a..e9d25ca38 100644
--- a/src/spicelib/devices/numos/nummask.c
+++ b/src/spicelib/devices/numos/nummask.c
@@ -17,12 +17,7 @@ extern int NUMOSinitSmSig(NUMOSinstance *);
 
 /* ARGSUSED */
 int
-NUMOSask(ckt, inInst, which, value, select)
-  CKTcircuit *ckt;
-  GENinstance *inInst;
-  int which;
-  IFvalue *value;
-  IFvalue *select;
+NUMOSask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue *select)
 {
   NUMOSinstance *inst = (NUMOSinstance *) inInst;
   switch (which) {
diff --git a/src/spicelib/devices/numos/nummdel.c b/src/spicelib/devices/numos/nummdel.c
index 82e8be22b..76dda0b7f 100644
--- a/src/spicelib/devices/numos/nummdel.c
+++ b/src/spicelib/devices/numos/nummdel.c
@@ -14,11 +14,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMOSdelete(inModel, name, kill)
-  GENmodel *inModel;
-  IFuid name;
-  GENinstance **kill;
-
+NUMOSdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
 
   NUMOSmodel *model = (NUMOSmodel *) inModel;
diff --git a/src/spicelib/devices/numos/nummdest.c b/src/spicelib/devices/numos/nummdest.c
index 248af2737..b95a18b2a 100644
--- a/src/spicelib/devices/numos/nummdest.c
+++ b/src/spicelib/devices/numos/nummdest.c
@@ -15,9 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 void
-NUMOSdestroy(inModel)
-  GENmodel **inModel;
-
+NUMOSdestroy(GENmodel **inModel)
 {
 
   NUMOSmodel **model = (NUMOSmodel **) inModel;
diff --git a/src/spicelib/devices/numos/nummdump.c b/src/spicelib/devices/numos/nummdump.c
index d78d205f9..a0c8df532 100644
--- a/src/spicelib/devices/numos/nummdump.c
+++ b/src/spicelib/devices/numos/nummdump.c
@@ -27,9 +27,7 @@ static int state_numDC = 0;
 static int state_numTR = 0;
 
 void
-NUMOSdump(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NUMOSdump(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NUMOSmodel *model = (NUMOSmodel *) inModel;
   register NUMOSinstance *inst;
@@ -93,10 +91,7 @@ NUMOSdump(inModel, ckt)
 
 static
 void
-NUMOSputHeader(file, ckt, inst)
-  FILE *file;
-  CKTcircuit *ckt;
-  NUMOSinstance *inst;
+NUMOSputHeader(FILE *file, CKTcircuit *ckt, NUMOSinstance *inst)
 {
   char *reference;
   double refVal = 0.0;
@@ -155,10 +150,7 @@ NUMOSputHeader(file, ckt, inst)
 }
 
 void
-NUMOSacct(inModel, ckt, file)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  FILE *file;
+NUMOSacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
 {
   register NUMOSmodel *model = (NUMOSmodel *) inModel;
   register NUMOSinstance *inst;
diff --git a/src/spicelib/devices/numos/nummload.c b/src/spicelib/devices/numos/nummload.c
index ffa574237..2e54b3d74 100644
--- a/src/spicelib/devices/numos/nummload.c
+++ b/src/spicelib/devices/numos/nummload.c
@@ -31,9 +31,7 @@ extern int TWOacDebug;
 int NUMOSinitSmSig(NUMOSinstance *inst);
 
 int
-NUMOSload(inModel, ckt)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
+NUMOSload(GENmodel *inModel, CKTcircuit *ckt)
 {
   register NUMOSmodel *model = (NUMOSmodel *) inModel;
   register NUMOSinstance *inst;
@@ -599,8 +597,7 @@ NUMOSload(inModel, ckt)
 }
 
 int
-NUMOSinitSmSig(inst)
-  NUMOSinstance *inst;
+NUMOSinitSmSig(NUMOSinstance *inst)
 {
   struct mosAdmittances yAc;
   double omega = inst->NUMOSmodPtr->NUMOSmethods->METHomega;
diff --git a/src/spicelib/devices/numos/nummmdel.c b/src/spicelib/devices/numos/nummmdel.c
index 6d029af74..fcff72ffb 100644
--- a/src/spicelib/devices/numos/nummmdel.c
+++ b/src/spicelib/devices/numos/nummmdel.c
@@ -14,11 +14,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMOSmDelete(inModel, modname, kill)
-  GENmodel **inModel;
-  IFuid modname;
-  GENmodel *kill;
-
+NUMOSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
 
   NUMOSmodel **model = (NUMOSmodel **) inModel;
diff --git a/src/spicelib/devices/numos/nummmpar.c b/src/spicelib/devices/numos/nummmpar.c
index a1fd26872..6be6d35e1 100644
--- a/src/spicelib/devices/numos/nummmpar.c
+++ b/src/spicelib/devices/numos/nummmpar.c
@@ -15,10 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMOSmParam(param, value, inModel)
-  int param;
-  IFvalue *value;
-  GENmodel *inModel;
+NUMOSmParam(int param, IFvalue *value, GENmodel *inModel)
 {
   switch (param) {
   case NUMOS_MOD_NUMOS:
diff --git a/src/spicelib/devices/numos/nummparm.c b/src/spicelib/devices/numos/nummparm.c
index 24675eec7..c758a6e8c 100644
--- a/src/spicelib/devices/numos/nummparm.c
+++ b/src/spicelib/devices/numos/nummparm.c
@@ -15,11 +15,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "suffix.h"
 
 int
-NUMOSparam(param, value, inInst, select)
-  int param;
-  IFvalue *value;
-  GENinstance *inInst;
-  IFvalue *select;
+NUMOSparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
 {
   register NUMOSinstance *inst = (NUMOSinstance *) inInst;
   switch (param) {
diff --git a/src/spicelib/devices/numos/nummpzld.c b/src/spicelib/devices/numos/nummpzld.c
index bb5de01d5..b3d8930dd 100644
--- a/src/spicelib/devices/numos/nummpzld.c
+++ b/src/spicelib/devices/numos/nummpzld.c
@@ -18,11 +18,7 @@ extern int TWOacDebug;
 
 
 int
-NUMOSpzLoad(inModel, ckt, s)
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  SPcomplex *s;
-
+NUMOSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 {
   register NUMOSmodel *model = (NUMOSmodel *) inModel;
   register NUMOSinstance *inst;
diff --git a/src/spicelib/devices/numos/nummset.c b/src/spicelib/devices/numos/nummset.c
index adec70e0d..83bf59711 100644
--- a/src/spicelib/devices/numos/nummset.c
+++ b/src/spicelib/devices/numos/nummset.c
@@ -25,11 +25,7 @@ if (size && (!(var =(type *)calloc(1, (unsigned)(size)*sizeof(type))))) {\
 }
 
 int
-NUMOSsetup(matrix, inModel, ckt, states)
-  register SMPmatrix *matrix;
-  GENmodel *inModel;
-  CKTcircuit *ckt;
-  int *states;
+NUMOSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
 /*
  * load the structure with those pointers needed later for fast matrix
  * loading
diff --git a/src/spicelib/devices/numos/nummtemp.c b/src/spicelib/devices/numos/nummtemp.c
index 4c5349749..4df3eb234 100644
--- a/src/spicelib/devices/numos/nummtemp.c
+++ b/src/spicelib/devices/numos/nummtemp.c
@@ -18,9 +18,7 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #define NIL(type)   ((type *)0)
 
 int
-NUMOStemp(inModel, ckt)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
+NUMOStemp(GENmodel *inModel, CKTcircuit *ckt)
 /*
  * perform the temperature update
  */
diff --git a/src/spicelib/devices/numos/nummtrun.c b/src/spicelib/devices/numos/nummtrun.c
index eb37aa6ee..bf48f32dd 100644
--- a/src/spicelib/devices/numos/nummtrun.c
+++ b/src/spicelib/devices/numos/nummtrun.c
@@ -19,10 +19,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 int
-NUMOStrunc(inModel, ckt, timeStep)
-  GENmodel *inModel;
-  register CKTcircuit *ckt;
-  double *timeStep;
+NUMOStrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
 {
   register NUMOSmodel *model = (NUMOSmodel *) inModel;
   register NUMOSinstance *inst;