diff --git a/ChangeLog b/ChangeLog
index ee6ce6ac9..d1a41b945 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2010-10-15  Robert Larice
+ * src/frontend/com_measure2.c ,
+ * src/frontend/com_sysinfo.c ,
+ * src/frontend/control.c ,
+ * src/frontend/plotting/x11.c ,
+ * src/frontend/subckt.c ,
+ * src/maths/cmaths/cmath2.c ,
+ * src/spicelib/analysis/cktsens.c ,
+ * src/spicelib/analysis/distoan.c ,
+ * src/spicelib/analysis/dloadfns.c ,
+ * src/spicelib/devices/bsim3/b3noi.c ,
+ * src/spicelib/devices/bsim3soi/b4soild.c ,
+ * src/spicelib/devices/bsim3soi/b4soinoi.c ,
+ * src/spicelib/devices/bsim3soi_dd/b3soiddld.c ,
+ * src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c ,
+ * src/spicelib/devices/bsim3soi_fd/b3soifdld.c ,
+ * src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c ,
+ * src/spicelib/devices/bsim3soi_pd/b3soipdld.c ,
+ * src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c ,
+ * src/spicelib/devices/bsim3v0/b3v0noi.c ,
+ * src/spicelib/devices/bsim3v1/b3v1noi.c ,
+ * src/spicelib/devices/bsim3v1a/b3v1anoi.c ,
+ * src/spicelib/devices/bsim3v1s/b3v1snoi.c ,
+ * src/spicelib/devices/bsim3v32/b3v32noi.c ,
+ * src/spicelib/devices/bsim4/b4geo.c ,
+ * src/spicelib/devices/bsim4/b4noi.c ,
+ * src/spicelib/devices/bsim4/b4temp.c ,
+ * src/spicelib/devices/bsim4v2/b4v2geo.c ,
+ * src/spicelib/devices/bsim4v2/b4v2noi.c ,
+ * src/spicelib/devices/bsim4v2/b4v2temp.c ,
+ * src/spicelib/devices/bsim4v3/b4v3geo.c ,
+ * src/spicelib/devices/bsim4v3/b4v3temp.c ,
+ * src/spicelib/devices/bsim4v4/b4v4geo.c ,
+ * src/spicelib/devices/bsim4v4/b4v4temp.c ,
+ * src/spicelib/devices/bsim4v5/b4v5geo.c ,
+ * src/spicelib/devices/bsim4v5/b4v5temp.c ,
+ * src/spicelib/devices/ltra/ltramisc.c :
+    declare some functions `static'
+
 2010-10-15  Robert Larice
  * src/include/cmproto.h :
    add prototypes for some functions --> "cmproto.h"
diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c
index 953cb5958..6b218ebd3 100644
--- a/src/frontend/com_measure2.c
+++ b/src/frontend/com_measure2.c
@@ -927,25 +927,25 @@ static void measure_integ(
 }
 
 /* still some more work to do.... */
-void measure_deriv(void) {
+static void measure_deriv(void) {
     // DERIVATIVE DERIV
    return;
 }
 
 // ERR Equations
-void measure_ERR(void) {
+static void measure_ERR(void) {
    return;
 }
 
-void measure_ERR1(void) {
+static void measure_ERR1(void) {
    return;
 }
 
-void measure_ERR2(void) {
+static void measure_ERR2(void) {
    return;
 }
 
-void measure_ERR3(void) {
+static void measure_ERR3(void) {
    return;
 }
 
diff --git a/src/frontend/com_sysinfo.c b/src/frontend/com_sysinfo.c
index 54dede1c0..2bb41bb53 100644
--- a/src/frontend/com_sysinfo.c
+++ b/src/frontend/com_sysinfo.c
@@ -173,7 +173,7 @@ static size_t get_sysmem(struct sys_memory *memall) {
 
 
 /* Return length of first line in a string */
-tInt getLineLength(const char *str) {
+static tInt getLineLength(const char *str) {
 	tInt length = strlen(str);
 	char c = str[0];
 	tInt index = 0;
@@ -187,7 +187,7 @@ tInt getLineLength(const char *str) {
 
 /* Checks if number 'match' is found in a vector 'set' of size 'size'
    Returns 1 if yes, otherwise, 0 */
-tInt searchInSet(const tInt *set, tInt size, tInt match) {
+static tInt searchInSet(const tInt *set, tInt size, tInt match) {
 	tInt index;
 	for(index = 0; index < size; index++) {
 		if(match == set[index]) {
diff --git a/src/frontend/control.c b/src/frontend/control.c
index beaa6a066..c62fdd5af 100644
--- a/src/frontend/control.c
+++ b/src/frontend/control.c
@@ -105,7 +105,7 @@ pwlist_echo(wordlist *wlist, char *name)   /*CDHW used to perform function of se
 
 /*CDHW Remove control structure and free the memory its hogging CDHW*/
 
-void ctl_free(struct control *ctrl) {
+static void ctl_free(struct control *ctrl) {
    if (!ctrl) return;
    wl_free(ctrl->co_cond); ctrl->co_cond = NULL;
    tfree(ctrl->co_foreachvar); ctrl->co_foreachvar = NULL;
diff --git a/src/frontend/plotting/x11.c b/src/frontend/plotting/x11.c
index aff0d46bc..2db881468 100644
--- a/src/frontend/plotting/x11.c
+++ b/src/frontend/plotting/x11.c
@@ -95,7 +95,7 @@ static void initcolors (GRAPH *graph);
 static void X_ScreentoData (GRAPH *graph, int x, int y, double *fx, double *fy);
 static void linear_arc(int x0, int y0, int radius, double theta, double delta_theta);
 
-int
+static int
 errorhandler(Display *display, XErrorEvent *errorev)
 {
     XGetErrorText(display, errorev->error_code, ErrorMessage, 1024);
diff --git a/src/frontend/subckt.c b/src/frontend/subckt.c
index 98df2efe4..7bd17772a 100644
--- a/src/frontend/subckt.c
+++ b/src/frontend/subckt.c
@@ -1403,7 +1403,7 @@ settrans(char *formal, char *actual, char *subname)
  *   the substring itself is required to be free of a '\0'
  */
 
-int
+static int
 eq_substr(const char* str, const char *end, const char *cstring)
 {
     while(str < end)
diff --git a/src/maths/cmaths/cmath2.c b/src/maths/cmaths/cmath2.c
index 62adbb43b..176c162ba 100644
--- a/src/maths/cmaths/cmath2.c
+++ b/src/maths/cmaths/cmath2.c
@@ -116,7 +116,7 @@ cx_atan(void *data, short int type, int length, int *newlength, short int *newty
 }
 
 
-double
+static double
 cx_max_local(void *data, short int type, int length)
 {
     double largest = 0.0;
diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c
index 2f3ec99dd..f326f7887 100644
--- a/src/spicelib/analysis/cktsens.c
+++ b/src/spicelib/analysis/cktsens.c
@@ -606,7 +606,7 @@ inc_freq(double freq, int type, double step_size)
 	return freq;
 }
 
-double
+static double
 next_freq(int type, double freq, double stepsize)
 {
 	double	s=0;
diff --git a/src/spicelib/analysis/distoan.c b/src/spicelib/analysis/distoan.c
index 93a5d8ae2..4015ee40a 100644
--- a/src/spicelib/analysis/distoan.c
+++ b/src/spicelib/analysis/distoan.c
@@ -9,7 +9,7 @@ Author: 1988 Jaijeet S Roychowdhury
 #include "sperror.h"
 
 
-void
+static void
 DISswap(double **a, double **b)
 {
 double *c;
@@ -19,7 +19,7 @@ c = *a;
 *b = c;
 }
 
-void
+static void
 DmemAlloc(double **a, int size)
 {
 *a = (double *) MALLOC( sizeof(double) * size + 1);
@@ -27,7 +27,7 @@ DmemAlloc(double **a, int size)
 
 
 
-void
+static void
 DstorAlloc(double ***header, int size)
 {
 *header = (double **) MALLOC( sizeof(double *)*size);
diff --git a/src/spicelib/analysis/dloadfns.c b/src/spicelib/analysis/dloadfns.c
index e404a214d..8447be775 100644
--- a/src/spicelib/analysis/dloadfns.c
+++ b/src/spicelib/analysis/dloadfns.c
@@ -19,7 +19,7 @@ Author: 1988 Jaijeet S Roychowdhury
  * for the imaginary sub functions, the v is replaced by an i
  *
  */
-double
+static double
 S2v2F1(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y)
            
                     		/* 5 arguments */
@@ -28,7 +28,7 @@ S2v2F1(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y)
 return(cxy*(r1h1x*r1h1y - i1h1x*i1h1y));
 }
 
-double
+static double
 S2i2F1(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y)
            
                                /* 5 arguments */
@@ -37,7 +37,7 @@ S2i2F1(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y)
 return(cxy*(r1h1x*i1h1y + i1h1x*r1h1y));
 }
 
-double
+static double
 S2v3F1(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y, double r2h11x, double i2h11x, double r2h11y, double i2h11y)
 
 			/* 9 arguments */
@@ -49,7 +49,7 @@ return(cxy*(r1h1x*r2h11y - i1h1x*i2h11y + r1h1y*r2h11x - i1h1y*
 }
 
 
-double
+static double
 S2i3F1(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y, double r2h11x, double i2h11x, double r2h11y, double i2h11y)
 
 			/* 9 arguments */
@@ -60,7 +60,7 @@ return(cxy*(r1h1x*i2h11y + i1h1x*r2h11y + r1h1y*i2h11x + i1h1y*
 			r2h11x));
 }
 
-double
+static double
 S2vF12(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y, double r1h2x, double i1h2x, double r1h2y, double i1h2y)
 
 				/* 9 arguments */
@@ -70,7 +70,7 @@ S2vF12(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y, doubl
 return(cxy*(r1h1x*r1h2y - i1h1x*i1h2y + r1h1y*r1h2x - i1h1y*i1h2x));
 }
 
-double
+static double
 S2iF12(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y, double r1h2x, double i1h2x, double r1h2y, double i1h2y)
 
 				/* 9 arguments */
@@ -80,7 +80,7 @@ S2iF12(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y, doubl
 return(cxy*(r1h1x*i1h2y + i1h1x*r1h2y + r1h1y*i1h2x + i1h1y*r1h2x));
 }
 
-double
+static double
 S2v2F12(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y, double r1h2x, double i1h2x, double r1h2y, double i1h2y, double r2h11x, double i2h11x, double r2h11y, double i2h11y, double h2f1f2x, double ih2f1f2x, double h2f1f2y, double ih2f1f2y)
 
 				/* 17 arguments */
@@ -97,7 +97,7 @@ return ( cxy * (
 		));
 }
 
-double
+static double
 S2i2F12(double cxy, double r1h1x, double i1h1x, double r1h1y, double i1h1y, double r1h2x, double i1h2x, double r1h2y, double i1h2y, double r2h11x, double i2h11x, double r2h11y, double i2h11y, double h2f1f2x, double ih2f1f2x, double h2f1f2y, double ih2f1f2y)
 
 				/* 17 arguments */
@@ -114,7 +114,7 @@ return ( cxy * (
 		));
 }
 
-double
+static double
 S3v3F1(double cxyz, double r1h1x, double i1h1x, double r1h1y, double i1h1y, double r1h1z, double i1h1z)
 
 				/* 7 arguments */
@@ -126,7 +126,7 @@ return( cxyz * (
 	       ));
 }
 
-double
+static double
 S3i3F1(double cxyz, double r1h1x, double i1h1x, double r1h1y, double i1h1y, double r1h1z, double i1h1z)
 
 				/* 7 arguments */
@@ -138,7 +138,7 @@ return( cxyz * (
 	       ));
 }
 
-double
+static double
 S3v2F12(double cxyz, double r1h1x, double i1h1x, double r1h1y, double i1h1y, double r1h1z, double i1h1z, double r1h2x, double i1h2x, double r1h2y, double i1h2y, double r1h2z, double i1h2z)
 
 				/* 13 arguments */
@@ -155,7 +155,7 @@ return ( cxyz * (
 		 ));
 }
 
-double
+static double
 S3i2F12(double cxyz, double r1h1x, double i1h1x, double r1h1y, double i1h1y, double r1h1z, double i1h1z, double r1h2x, double i1h2x, double r1h2y, double i1h2y, double r1h2z, double i1h2z)
 
 				/* 13 arguments */
diff --git a/src/spicelib/devices/bsim3/b3noi.c b/src/spicelib/devices/bsim3/b3noi.c
index 3cd5a146d..471700e94 100644
--- a/src/spicelib/devices/bsim3/b3noi.c
+++ b/src/spicelib/devices/bsim3/b3noi.c
@@ -55,7 +55,7 @@
  */
 
 
-double
+static double
 StrongInversionNoiseEval(
 double Vds,
 BSIM3model *model,
diff --git a/src/spicelib/devices/bsim3soi/b4soild.c b/src/spicelib/devices/bsim3soi/b4soild.c
index c76c72500..1207f15ef 100644
--- a/src/spicelib/devices/bsim3soi/b4soild.c
+++ b/src/spicelib/devices/bsim3soi/b4soild.c
@@ -70,7 +70,7 @@ extern int nthreads;
  *  limits the per-iteration change of any absolute voltage value
  */
 
-double
+static double
 B4SOIlimit(
     double vnew,
     double vold,
diff --git a/src/spicelib/devices/bsim3soi/b4soinoi.c b/src/spicelib/devices/bsim3soi/b4soinoi.c
index 7ee8c6397..fda12156f 100644
--- a/src/spicelib/devices/bsim3soi/b4soinoi.c
+++ b/src/spicelib/devices/bsim3soi/b4soinoi.c
@@ -46,7 +46,7 @@
 */
 
 
-double
+static double
 B4SOIEval1ovFNoise(
 double vds,
 B4SOImodel *model,
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c
index 919b62c82..f120799ab 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c
@@ -53,7 +53,7 @@ File: b3soiddld.c          98/5/01
      *  Smart Vbs guess.
      */
 
-double
+static double
 B3SOIDDSmartVbs(double New, double Old, B3SOIDDinstance *here, 
                 CKTcircuit *ckt, int *check)
 {
@@ -71,7 +71,7 @@ B3SOIDDSmartVbs(double New, double Old, B3SOIDDinstance *here,
      *  limits the per-iteration change of any absolute voltage value
      */
 
-double
+static double
 B3SOIDDlimit(double vnew, double vold, double limit, int *check)
 {
     double T0, T1;
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c
index 48a9096f5..c4f4f47bf 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c
@@ -46,7 +46,7 @@ Modofied by Paolo Nenzi 2002
  */
 
 
-double
+static double
 B3SOIDDStrongInversionNoiseEval(double vgs, double vds, B3SOIDDmodel *model, 
                                 B3SOIDDinstance *here, double freq, 
 				double temp)
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c
index ba408dc8f..29244e48c 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c
@@ -53,7 +53,7 @@ File: b3soifdld.c          98/5/01
      *  Smart Vbs guess.
      */
 
-double
+static double
 B3SOIFDSmartVbs(double New, double Old, B3SOIFDinstance *here, 
                 CKTcircuit *ckt, int *check)
 {
@@ -71,7 +71,7 @@ B3SOIFDSmartVbs(double New, double Old, B3SOIFDinstance *here,
      *  limits the per-iteration change of any absolute voltage value
      */
 
-double
+static double
 B3SOIFDlimit(double vnew, double vold, double limit, int *check)
 {
     double T0, T1;
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c
index ea504c91b..dd8368a62 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c
@@ -46,7 +46,7 @@ Modified by Paolo Nenzi 2002
  */
 
 
-double
+static double
 B3SOIFDStrongInversionNoiseEval(double vgs, double vds, B3SOIFDmodel *model, 
                                 B3SOIFDinstance *here, double freq, 
 				double temp)
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdld.c
index cd6a62f5b..97952aefe 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdld.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdld.c
@@ -64,7 +64,7 @@ Modified by Paolo Nenzi 2002
      *  limits the per-iteration change of any absolute voltage value
      */
 
-double
+static double
 B3SOIPDlimit(double vnew, double vold, double limit, int *check)
 {
     double T0, T1;
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
index 3e8ba1e90..e30b2d8b3 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
@@ -46,7 +46,7 @@ Modified by Paolo Nenzi 2002
  */
 
 
-double
+static double
 B3SOIPDStrongInversionNoiseEval(double vgs, double vds, B3SOIPDmodel *model, 
                                 B3SOIPDinstance *here, double freq, 
 				double temp)
diff --git a/src/spicelib/devices/bsim3v0/b3v0noi.c b/src/spicelib/devices/bsim3v0/b3v0noi.c
index d89645346..9a107d280 100644
--- a/src/spicelib/devices/bsim3v0/b3v0noi.c
+++ b/src/spicelib/devices/bsim3v0/b3v0noi.c
@@ -22,7 +22,7 @@ File:  b3v0noi.c
  */
 
 
-double
+static double
 StrongInversionNoiseEval3v0(double vgs, double vds, BSIM3v0model *model, 
                          BSIM3v0instance *here, double freq, double temp)
 {
diff --git a/src/spicelib/devices/bsim3v1/b3v1noi.c b/src/spicelib/devices/bsim3v1/b3v1noi.c
index 7d652b777..8938eb630 100644
--- a/src/spicelib/devices/bsim3v1/b3v1noi.c
+++ b/src/spicelib/devices/bsim3v1/b3v1noi.c
@@ -45,7 +45,7 @@
  */
 
 
-double
+static double
 StrongInversionNoiseEval_b3v1(double vgs, double vds, BSIM3v1model *model, 
                          BSIM3v1instance *here, double freq, double temp)
 {
diff --git a/src/spicelib/devices/bsim3v1a/b3v1anoi.c b/src/spicelib/devices/bsim3v1a/b3v1anoi.c
index 08821f4f5..5965cd446 100644
--- a/src/spicelib/devices/bsim3v1a/b3v1anoi.c
+++ b/src/spicelib/devices/bsim3v1a/b3v1anoi.c
@@ -23,7 +23,7 @@ File:  b3v1anoi.c
  */
 
 
-double
+static double
 StrongInversionNoiseEval_b3v1a(double vgs, double vds, BSIM3v1Amodel *model, 
                          BSIM3v1Ainstance *here, double freq, double temp)
 {
diff --git a/src/spicelib/devices/bsim3v1s/b3v1snoi.c b/src/spicelib/devices/bsim3v1s/b3v1snoi.c
index 66d97117c..86eef0020 100644
--- a/src/spicelib/devices/bsim3v1s/b3v1snoi.c
+++ b/src/spicelib/devices/bsim3v1s/b3v1snoi.c
@@ -40,7 +40,7 @@ File:  b3v1snoi.c
  */
 
 
-double
+static double
 StrongInversionNoiseEval_b3v1s(double vgs, double vds, BSIM3v1Smodel *model, 
                          BSIM3v1Sinstance *here, double freq, double temp)
 {
diff --git a/src/spicelib/devices/bsim3v32/b3v32noi.c b/src/spicelib/devices/bsim3v32/b3v32noi.c
index 118398deb..b617f32b4 100644
--- a/src/spicelib/devices/bsim3v32/b3v32noi.c
+++ b/src/spicelib/devices/bsim3v32/b3v32noi.c
@@ -61,7 +61,7 @@
  * JX: 1/f noise model is smoothed out 12/18/01.
  */
 
-double
+static double
 StrongInversionNoiseEvalNew(double Vds, BSIM3v32model *model,
 			    BSIM3v32instance *here, double freq, double temp)
 {
@@ -107,7 +107,7 @@ double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, Ssi;
  * follows
  */
 
-double
+static double
 StrongInversionNoiseEvalOld(double vgs, double vds, BSIM3v32model *model,
 			    BSIM3v32instance *here, double freq, double temp)
 {
diff --git a/src/spicelib/devices/bsim4/b4geo.c b/src/spicelib/devices/bsim4/b4geo.c
index 6a68fbe54..e770e8ce8 100644
--- a/src/spicelib/devices/bsim4/b4geo.c
+++ b/src/spicelib/devices/bsim4/b4geo.c
@@ -25,7 +25,7 @@ BSIM4RdsEndIso(double, double, double, double, double, double, int, int, double
 int
 BSIM4RdsEndSha(double, double, double, double, double, double, int, int, double *);
 
-int
+static int
 BSIM4NumFingerDiff(double nf, int minSD, double *nuIntD, double *nuEndD, double *nuIntS, double *nuEndS)
 {
 int NF;
diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c
index f83172a51..787f2550f 100644
--- a/src/spicelib/devices/bsim4/b4noi.c
+++ b/src/spicelib/devices/bsim4/b4noi.c
@@ -33,7 +33,7 @@
  * conversion into the SI unit system.
  */
 
-double
+static double
 Eval1ovFNoise(double Vds, BSIM4model *model, BSIM4instance *here, double freq, double temp)
 {
 struct bsim4SizeDependParam *pParam;
diff --git a/src/spicelib/devices/bsim4/b4temp.c b/src/spicelib/devices/bsim4/b4temp.c
index 1c8340102..63df154d0 100644
--- a/src/spicelib/devices/bsim4/b4temp.c
+++ b/src/spicelib/devices/bsim4/b4temp.c
@@ -50,7 +50,7 @@
     }
 
 
-int
+static int
 BSIM4DioIjthVjmEval(double Nvtm, double Ijth, double Isb, double XExpBV, double *Vjm)
 {
 double Tb, Tc, EVjmovNv;
diff --git a/src/spicelib/devices/bsim4v2/b4v2geo.c b/src/spicelib/devices/bsim4v2/b4v2geo.c
index da7a5eaec..f75e165b9 100644
--- a/src/spicelib/devices/bsim4v2/b4v2geo.c
+++ b/src/spicelib/devices/bsim4v2/b4v2geo.c
@@ -25,7 +25,7 @@ BSIM4v2RdsEndSha(double, double, double, double, double, double, int, int, doubl
  * for multi-fingers and varous GEO and RGEO options.
  */
 
-int
+static int
 BSIM4v2NumFingerDiff(
 double nf,
 int minSD,
diff --git a/src/spicelib/devices/bsim4v2/b4v2noi.c b/src/spicelib/devices/bsim4v2/b4v2noi.c
index e6cb37dbd..b8784791f 100644
--- a/src/spicelib/devices/bsim4v2/b4v2noi.c
+++ b/src/spicelib/devices/bsim4v2/b4v2noi.c
@@ -24,7 +24,7 @@
  * conversion into the SI unit system.
  */
 
-double
+static double
 BSIM4v2Eval1ovFNoise(
 double Vds,
 BSIM4v2model *model,
diff --git a/src/spicelib/devices/bsim4v2/b4v2temp.c b/src/spicelib/devices/bsim4v2/b4v2temp.c
index c025f92ab..93c45ef53 100644
--- a/src/spicelib/devices/bsim4v2/b4v2temp.c
+++ b/src/spicelib/devices/bsim4v2/b4v2temp.c
@@ -30,7 +30,7 @@
 #define Charge_q 1.60219e-19
 
 
-int
+static int
 BSIM4v2DioIjthVjmEval(
 double Nvtm, double Ijth, double Isb, double XExpBV,
 double *Vjm)
diff --git a/src/spicelib/devices/bsim4v3/b4v3geo.c b/src/spicelib/devices/bsim4v3/b4v3geo.c
index c4f2cb403..ca924a6a7 100644
--- a/src/spicelib/devices/bsim4v3/b4v3geo.c
+++ b/src/spicelib/devices/bsim4v3/b4v3geo.c
@@ -25,7 +25,7 @@ BSIM4v3RdsEndSha(double, double, double, double, double, double, int, int, doubl
  * for multi-fingers and varous GEO and RGEO options.
  */
 
-int
+static int
 BSIM4v3NumFingerDiff(
 double nf,
 int minSD,
diff --git a/src/spicelib/devices/bsim4v3/b4v3temp.c b/src/spicelib/devices/bsim4v3/b4v3temp.c
index 0fe09e6bd..f8a716bfa 100644
--- a/src/spicelib/devices/bsim4v3/b4v3temp.c
+++ b/src/spicelib/devices/bsim4v3/b4v3temp.c
@@ -33,7 +33,7 @@
 #define Charge_q 1.60219e-19
 #define DELTA  1.0E-9
 
-int
+static int
 BSIM4v3DioIjthVjmEval(
 double Nvtm, double Ijth, double Isb, double XExpBV,
 double *Vjm)
diff --git a/src/spicelib/devices/bsim4v4/b4v4geo.c b/src/spicelib/devices/bsim4v4/b4v4geo.c
index 6acb4539a..7b7eba05b 100644
--- a/src/spicelib/devices/bsim4v4/b4v4geo.c
+++ b/src/spicelib/devices/bsim4v4/b4v4geo.c
@@ -23,7 +23,7 @@ BSIM4v4RdsEndIso(double, double, double, double, double, double, int, int, doubl
 int
 BSIM4v4RdsEndSha(double, double, double, double, double, double, int, int, double *);
 
-int
+static int
 BSIM4v4NumFingerDiff(
 double nf,
 int minSD,
diff --git a/src/spicelib/devices/bsim4v4/b4v4temp.c b/src/spicelib/devices/bsim4v4/b4v4temp.c
index 968ab3948..47e351c74 100644
--- a/src/spicelib/devices/bsim4v4/b4v4temp.c
+++ b/src/spicelib/devices/bsim4v4/b4v4temp.c
@@ -43,7 +43,7 @@
 
 
 
-int
+static int
 BSIM4v4DioIjthVjmEval(
 double Nvtm, double Ijth, double Isb, double XExpBV,
 double *Vjm)
diff --git a/src/spicelib/devices/bsim4v5/b4v5geo.c b/src/spicelib/devices/bsim4v5/b4v5geo.c
index 1e5d2449f..300992d51 100644
--- a/src/spicelib/devices/bsim4v5/b4v5geo.c
+++ b/src/spicelib/devices/bsim4v5/b4v5geo.c
@@ -23,7 +23,7 @@ BSIM4v5RdsEndIso(double, double, double, double, double, double, int, int, doubl
 int
 BSIM4v5RdsEndSha(double, double, double, double, double, double, int, int, double *);
 
-int
+static int
 BSIM4v5NumFingerDiff(
 double nf,
 int minSD,
diff --git a/src/spicelib/devices/bsim4v5/b4v5temp.c b/src/spicelib/devices/bsim4v5/b4v5temp.c
index e3645288d..6a162f329 100644
--- a/src/spicelib/devices/bsim4v5/b4v5temp.c
+++ b/src/spicelib/devices/bsim4v5/b4v5temp.c
@@ -44,7 +44,7 @@
 
 
 
-int
+static int
 BSIM4v5DioIjthVjmEval(
 double Nvtm, double Ijth, double Isb, double XExpBV,
 double *Vjm)
diff --git a/src/spicelib/devices/ltra/ltramisc.c b/src/spicelib/devices/ltra/ltramisc.c
index 695dec15b..fadeacc48 100644
--- a/src/spicelib/devices/ltra/ltramisc.c
+++ b/src/spicelib/devices/ltra/ltramisc.c
@@ -111,7 +111,7 @@ LTRAlinInterp(double t, double t1, double t2, double *c1, double *c2)
  * respectively this is used only locally
  */
 
-double
+static double
 intlinfunc(double lolimit, double hilimit, double lovalue, double hivalue, double t1, double t2)
 {
   double width, m;
@@ -134,7 +134,7 @@ intlinfunc(double lolimit, double hilimit, double lovalue, double hivalue, doubl
  * locally
  */
 
-double
+static double
 twiceintlinfunc(double lolimit, double hilimit, double otherlolimit, double lovalue, double hivalue, double t1, double t2)
 {
   double width, m, dummy;
@@ -163,7 +163,7 @@ twiceintlinfunc(double lolimit, double hilimit, double otherlolimit, double lova
  * t1 and t2 respectively this is used only locally
  */
 
-double
+static double
 thriceintlinfunc(double lolimit, double hilimit, double secondlolimit, double thirdlolimit, double lovalue, double hivalue, double t1, double t2)
 {
   double width, m, dummy;
@@ -200,7 +200,7 @@ thriceintlinfunc(double lolimit, double hilimit, double secondlolimit, double th
  * 
  */
 
-double
+static double
 bessI0(double x)
 {
   double ax, ans;
@@ -221,7 +221,7 @@ bessI0(double x)
   return (ans);
 }
 
-double
+static double
 bessI1(double x)
 {
   double ax, ans;
@@ -243,7 +243,7 @@ bessI1(double x)
   return (x < 0.0 ? -ans : ans);
 }
 
-double
+static double
 bessI1xOverX(double x)
 {
   double ax, ans;