diff --git a/src/spicelib/devices/cpl/cpldefs.h b/src/spicelib/devices/cpl/cpldefs.h
index e7d27a727..2e9b8fe2e 100644
--- a/src/spicelib/devices/cpl/cpldefs.h
+++ b/src/spicelib/devices/cpl/cpldefs.h
@@ -1,3 +1,8 @@
+/**********
+Copyright 1992 Regents of the University of California.  All rights
+reserved.
+**********/
+
 #ifndef CPL
 #define CPL
 
diff --git a/src/spicelib/devices/cpl/cpldel.c b/src/spicelib/devices/cpl/cpldel.c
index bcf4c02bd..ab3a454c1 100644
--- a/src/spicelib/devices/cpl/cpldel.c
+++ b/src/spicelib/devices/cpl/cpldel.c
@@ -12,10 +12,7 @@ Author: 1992 Charles Hough
 
 
 int
-CPLdelete(inModel,name,inst)
-    GENmodel *inModel;
-    IFuid name;
-    GENinstance **inst;
+CPLdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
 {
     CPLmodel *model = (CPLmodel *)inModel;
     CPLinstance **fast = (CPLinstance **)inst;
diff --git a/src/spicelib/devices/cpl/cpldest.c b/src/spicelib/devices/cpl/cpldest.c
index 1d9f123b0..2567bb2a1 100644
--- a/src/spicelib/devices/cpl/cpldest.c
+++ b/src/spicelib/devices/cpl/cpldest.c
@@ -9,8 +9,7 @@ Author: 1992 Charles Hough
 #include "suffix.h"
 
 void
-CPLdestroy(inModel)
-    GENmodel **inModel;
+CPLdestroy(GENmodel **inModel)
 {
     CPLmodel **model = (CPLmodel **)inModel;
     CPLinstance *here;
diff --git a/src/spicelib/devices/cpl/cplext.h b/src/spicelib/devices/cpl/cplext.h
index bc96eb61b..d546bffaf 100644
--- a/src/spicelib/devices/cpl/cplext.h
+++ b/src/spicelib/devices/cpl/cplext.h
@@ -1,4 +1,8 @@
-#ifdef __STDC__
+/**********
+Copyright 1992 Regents of the University of California.  All rights
+reserved.
+**********/
+
 /* extern int CPLaccept(CKTcircuit*,GENmodel*); */
 extern int CPLdelete(GENmodel*,IFuid,GENinstance**);
 extern void CPLdestroy(GENmodel**);
@@ -7,13 +11,3 @@ extern int CPLmDelete(GENmodel**,IFuid,GENmodel*);
 extern int CPLmParam(int,IFvalue*,GENmodel*);
 extern int CPLparam(int,IFvalue*,GENinstance*,IFvalue*);
 extern int CPLsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
-#else /* stdc */
-/* extern int CPLaccept(); */
-extern int CPLdelete();
-extern void CPLdestroy();
-extern int CPLload();
-extern int CPLmDelete();
-extern int CPLmParam();
-extern int CPLparam();
-extern int CPLsetup();
-#endif /* stdc */
diff --git a/src/spicelib/devices/cpl/cplinit.c b/src/spicelib/devices/cpl/cplinit.c
index e13aa1b9e..93cc2d6a7 100644
--- a/src/spicelib/devices/cpl/cplinit.c
+++ b/src/spicelib/devices/cpl/cplinit.c
@@ -40,8 +40,8 @@ SPICEdev CPLinfo = {
   },
 
  
-  DEVparam       : CPLmParam,
-  DEVmodParam    : NULL,
+  DEVparam       : CPLparam,
+  DEVmodParam    : CPLmParam,
   DEVload        : CPLload,
   DEVsetup       : CPLsetup,
   DEVunsetup     : NULL,
diff --git a/src/spicelib/devices/cpl/cplload.c b/src/spicelib/devices/cpl/cplload.c
index b37343447..4ac172845 100644
--- a/src/spicelib/devices/cpl/cplload.c
+++ b/src/spicelib/devices/cpl/cplload.c
@@ -28,9 +28,7 @@ static void copy_cp();
 
 /*ARGSUSED*/
 int
-CPLload(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+CPLload(GENmodel *inModel, CKTcircuit *ckt)
 {
     register CPLmodel *model = (CPLmodel *)inModel;
     register CPLinstance *here;
diff --git a/src/spicelib/devices/cpl/cplmdel.c b/src/spicelib/devices/cpl/cplmdel.c
index 176be0906..81a5735d7 100644
--- a/src/spicelib/devices/cpl/cplmdel.c
+++ b/src/spicelib/devices/cpl/cplmdel.c
@@ -12,10 +12,7 @@ Author: 1992 Charles Hough
 
 
 int
-CPLmDelete(inModel,modname,kill)
-    GENmodel **inModel;
-    IFuid modname;
-    GENmodel *kill;
+CPLmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
     CPLmodel **model = (CPLmodel **)inModel;
     CPLmodel *modfast = (CPLmodel *)kill;
diff --git a/src/spicelib/devices/cpl/cplmpar.c b/src/spicelib/devices/cpl/cplmpar.c
index 646b7213d..dab550a66 100644
--- a/src/spicelib/devices/cpl/cplmpar.c
+++ b/src/spicelib/devices/cpl/cplmpar.c
@@ -14,10 +14,7 @@ Author: 1992 Charles Hough
 
 
 int
-CPLmParam(param,value,inModel)
-    int param;
-    IFvalue *value;
-    GENmodel *inModel;
+CPLmParam(int param, IFvalue *value, GENmodel *inModel)
 {
     register CPLmodel *model = (CPLmodel *)inModel;
     switch(param) {
@@ -41,8 +38,8 @@ CPLmParam(param,value,inModel)
             model->length = value->rValue;
             model->lengthgiven = TRUE;
             break;
-		case CPL_MOD_R:
-			break;
+	case CPL_MOD_R:
+	    break;
         default:
             return(E_BADPARM);
     }
diff --git a/src/spicelib/devices/cpl/cplparam.c b/src/spicelib/devices/cpl/cplparam.c
index b4cf8e05e..834a4d00b 100644
--- a/src/spicelib/devices/cpl/cplparam.c
+++ b/src/spicelib/devices/cpl/cplparam.c
@@ -15,11 +15,7 @@ Author: 1992 Charles Hough
 
 /* ARGSUSED */
 int
-CPLparam(param,value,inst,select)
-    int param;
-    IFvalue *value;
-    GENinstance *inst;
-    IFvalue *select;
+CPLparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     CPLinstance *here = (CPLinstance *)inst;
     switch(param) {