diff --git a/ChangeLog b/ChangeLog
index 37811e95a..6df9763b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-09  Robert Larice
+ * src/spicelib/devices/bsim4/b4set.c ,
+ * src/spicelib/devices/bsim4/b4temp.c ,
+ * src/spicelib/devices/bsim4/bsim4def.h ,
+ * src/spicelib/devices/bsim4v2/b4v2set.c ,
+ * src/spicelib/devices/bsim4v2/b4v2temp.c ,
+ * src/spicelib/devices/bsim4v2/bsim4v2def.h ,
+ * src/spicelib/devices/bsim4v3/b4v3set.c ,
+ * src/spicelib/devices/bsim4v3/b4v3temp.c ,
+ * src/spicelib/devices/bsim4v3/bsim4v3def.h ,
+ * src/spicelib/devices/bsim4v4/b4v4set.c ,
+ * src/spicelib/devices/bsim4v4/b4v4temp.c ,
+ * src/spicelib/devices/bsim4v4/bsim4v4def.h ,
+ * src/spicelib/devices/bsim4v5/b4v5set.c ,
+ * src/spicelib/devices/bsim4v5/b4v5temp.c ,
+ * src/spicelib/devices/bsim4v5/bsim4v5def.h :
+    BSIM*Geo() prototypes  -->  include files
+
 2010-10-09  Robert Larice
  * src/frontend/measure.c ,
  * src/frontend/numparam/mystring.c ,
diff --git a/src/spicelib/devices/bsim4/b4set.c b/src/spicelib/devices/bsim4/b4set.c
index d23f3eff1..f66cbc6af 100644
--- a/src/spicelib/devices/bsim4/b4set.c
+++ b/src/spicelib/devices/bsim4/b4set.c
@@ -44,11 +44,6 @@ int nthreads;
 #define PI 3.141592654
 #define Charge_q 1.60219e-19
 
-int
-BSIM4PAeffGeo(double, int, int, double, double, double, double, double *, double *, double *, double *);
-int
-BSIM4RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
-
 int
 BSIM4setup(
 SMPmatrix *matrix,
diff --git a/src/spicelib/devices/bsim4/b4temp.c b/src/spicelib/devices/bsim4/b4temp.c
index b07a6508b..1c8340102 100644
--- a/src/spicelib/devices/bsim4/b4temp.c
+++ b/src/spicelib/devices/bsim4/b4temp.c
@@ -50,11 +50,6 @@
     }
 
 
-int
-BSIM4PAeffGeo(double, int, int, double, double, double, double, double *, double *, double *, double *);
-int
-BSIM4RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
-
 int
 BSIM4DioIjthVjmEval(double Nvtm, double Ijth, double Isb, double XExpBV, double *Vjm)
 {
diff --git a/src/spicelib/devices/bsim4/bsim4def.h b/src/spicelib/devices/bsim4/bsim4def.h
index c2b58c335..605356a47 100644
--- a/src/spicelib/devices/bsim4/bsim4def.h
+++ b/src/spicelib/devices/bsim4/bsim4def.h
@@ -3561,5 +3561,8 @@ extern void BSIM4evaluate(double,double,double,BSIM4instance*,BSIM4model*,
         double*, double*, double*, double*, CKTcircuit*);
 extern int BSIM4debug(BSIM4model*, BSIM4instance*, CKTcircuit*, int);
 extern int BSIM4checkModel(BSIM4model*, BSIM4instance*, CKTcircuit*);
+extern int BSIM4PAeffGeo(double, int, int, double, double, double, double, double *, double *, double *, double *);
+extern int BSIM4RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
+
 
 #endif /*BSIM4*/
diff --git a/src/spicelib/devices/bsim4v2/b4v2set.c b/src/spicelib/devices/bsim4v2/b4v2set.c
index f004cc32d..e0ff31757 100644
--- a/src/spicelib/devices/bsim4v2/b4v2set.c
+++ b/src/spicelib/devices/bsim4v2/b4v2set.c
@@ -30,8 +30,6 @@
 #define PI 3.141592654
 #define Charge_q 1.60219e-19
 
-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(
diff --git a/src/spicelib/devices/bsim4v2/b4v2temp.c b/src/spicelib/devices/bsim4v2/b4v2temp.c
index 9fb607d57..c025f92ab 100644
--- a/src/spicelib/devices/bsim4v2/b4v2temp.c
+++ b/src/spicelib/devices/bsim4v2/b4v2temp.c
@@ -29,11 +29,6 @@
 #define EXP_THRESHOLD 34.0
 #define Charge_q 1.60219e-19
 
-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
-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(
diff --git a/src/spicelib/devices/bsim4v2/bsim4v2def.h b/src/spicelib/devices/bsim4v2/bsim4v2def.h
index aa29e9edc..09eae1e7a 100644
--- a/src/spicelib/devices/bsim4v2/bsim4v2def.h
+++ b/src/spicelib/devices/bsim4v2/bsim4v2def.h
@@ -2655,5 +2655,7 @@ extern void BSIM4v2evaluate(double,double,double,BSIM4v2instance*,BSIM4v2model*,
         double*, double*, double*, double*, CKTcircuit*);
 extern int BSIM4v2debug(BSIM4v2model*, BSIM4v2instance*, CKTcircuit*, int);
 extern int BSIM4v2checkModel(BSIM4v2model*, BSIM4v2instance*, CKTcircuit*);
+extern int BSIM4v2RdseffGeo(double nf, int geo, int rgeo, int minSD, double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG, int Type,double *Rtot);
+extern int BSIM4v2PAeffGeo(double nf, int geo, int minSD, double Weffcj, double DMCG, double DMCI, double DMDG, double *Ps, double *Pd, double *As, double *Ad);
 
 #endif /*BSIM4v2*/
diff --git a/src/spicelib/devices/bsim4v3/b4v3set.c b/src/spicelib/devices/bsim4v3/b4v3set.c
index db4be0ac6..d38cd2927 100644
--- a/src/spicelib/devices/bsim4v3/b4v3set.c
+++ b/src/spicelib/devices/bsim4v3/b4v3set.c
@@ -29,8 +29,6 @@
 #define PI 3.141592654
 #define Charge_q 1.60219e-19
 
-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(
diff --git a/src/spicelib/devices/bsim4v3/b4v3temp.c b/src/spicelib/devices/bsim4v3/b4v3temp.c
index a7a5c7e2b..0fe09e6bd 100644
--- a/src/spicelib/devices/bsim4v3/b4v3temp.c
+++ b/src/spicelib/devices/bsim4v3/b4v3temp.c
@@ -21,10 +21,6 @@
 #include "const.h"
 #include "sperror.h"
 
-int
-BSIM4v3PAeffGeo(double, int, int, double, double, double, double, double *, double *, double *, double *);
-int
-BSIM4v3RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 #define Kb 1.3806226e-23
 #define KboQ 8.617087e-5 
diff --git a/src/spicelib/devices/bsim4v3/bsim4v3def.h b/src/spicelib/devices/bsim4v3/bsim4v3def.h
index 02a5e2023..3c65891ae 100644
--- a/src/spicelib/devices/bsim4v3/bsim4v3def.h
+++ b/src/spicelib/devices/bsim4v3/bsim4v3def.h
@@ -2808,5 +2808,7 @@ extern void BSIM4v3evaluate(double,double,double,BSIM4v3instance*,BSIM4v3model*,
         double*, double*, double*, double*, CKTcircuit*);
 extern int BSIM4v3debug(BSIM4v3model*, BSIM4v3instance*, CKTcircuit*, int);
 extern int BSIM4v3checkModel(BSIM4v3model*, BSIM4v3instance*, CKTcircuit*);
+extern int BSIM4v3PAeffGeo(double, int, int, double, double, double, double, double *, double *, double *, double *);
+extern int BSIM4v3RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 #endif /*BSIM4v3*/
diff --git a/src/spicelib/devices/bsim4v4/b4v4set.c b/src/spicelib/devices/bsim4v4/b4v4set.c
index ffe183208..a2be67c09 100644
--- a/src/spicelib/devices/bsim4v4/b4v4set.c
+++ b/src/spicelib/devices/bsim4v4/b4v4set.c
@@ -32,10 +32,6 @@
 #define PI 3.141592654
 #define Charge_q 1.60219e-19
 
-int
-BSIM4v4PAeffGeo(double, int, int, double, double, double, double, double *, double *, double *, double *);
-int
-BSIM4v4RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 int
 BSIM4v4setup(
diff --git a/src/spicelib/devices/bsim4v4/b4v4temp.c b/src/spicelib/devices/bsim4v4/b4v4temp.c
index fb2e81b5f..968ab3948 100644
--- a/src/spicelib/devices/bsim4v4/b4v4temp.c
+++ b/src/spicelib/devices/bsim4v4/b4v4temp.c
@@ -42,10 +42,6 @@
     }
 
 
-int
-BSIM4v4PAeffGeo(double, int, int, double, double, double, double, double *, double *, double *, double *);
-int
-BSIM4v4RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 int
 BSIM4v4DioIjthVjmEval(
diff --git a/src/spicelib/devices/bsim4v4/bsim4v4def.h b/src/spicelib/devices/bsim4v4/bsim4v4def.h
index 65d4cae29..9e21f2878 100644
--- a/src/spicelib/devices/bsim4v4/bsim4v4def.h
+++ b/src/spicelib/devices/bsim4v4/bsim4v4def.h
@@ -2912,5 +2912,7 @@ extern void BSIM4v4evaluate(double,double,double,BSIM4v4instance*,BSIM4v4model*,
         double*, double*, double*, double*, CKTcircuit*);
 extern int BSIM4v4debug(BSIM4v4model*, BSIM4v4instance*, CKTcircuit*, int);
 extern int BSIM4v4checkModel(BSIM4v4model*, BSIM4v4instance*, CKTcircuit*);
+extern int BSIM4v4PAeffGeo(double, int, int, double, double, double, double, double *, double *, double *, double *);
+extern int BSIM4v4RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 #endif /*BSIM4v4*/
diff --git a/src/spicelib/devices/bsim4v5/b4v5set.c b/src/spicelib/devices/bsim4v5/b4v5set.c
index 7c633893a..e5bbef270 100644
--- a/src/spicelib/devices/bsim4v5/b4v5set.c
+++ b/src/spicelib/devices/bsim4v5/b4v5set.c
@@ -32,8 +32,6 @@
 #define PI 3.141592654
 #define Charge_q 1.60219e-19
 
-int
-BSIM4v5RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 int
 BSIM4v5setup(
diff --git a/src/spicelib/devices/bsim4v5/b4v5temp.c b/src/spicelib/devices/bsim4v5/b4v5temp.c
index e2cfd7660..e3645288d 100644
--- a/src/spicelib/devices/bsim4v5/b4v5temp.c
+++ b/src/spicelib/devices/bsim4v5/b4v5temp.c
@@ -43,10 +43,6 @@
     }
 
 
-int
-BSIM4v5PAeffGeo(double, int, int, double, double, double, double, double *, double *, double *, double *);
-int
-BSIM4v5RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 int
 BSIM4v5DioIjthVjmEval(
diff --git a/src/spicelib/devices/bsim4v5/bsim4v5def.h b/src/spicelib/devices/bsim4v5/bsim4v5def.h
index 3d8fa4223..c4f5c8986 100644
--- a/src/spicelib/devices/bsim4v5/bsim4v5def.h
+++ b/src/spicelib/devices/bsim4v5/bsim4v5def.h
@@ -3170,5 +3170,7 @@ extern void BSIM4v5evaluate(double,double,double,BSIM4v5instance*,BSIM4v5model*,
         double*, double*, double*, double*, CKTcircuit*);
 extern int BSIM4v5debug(BSIM4v5model*, BSIM4v5instance*, CKTcircuit*, int);
 extern int BSIM4v5checkModel(BSIM4v5model*, BSIM4v5instance*, CKTcircuit*);
+extern int BSIM4v5PAeffGeo(double, int, int, double, double, double, double, double *, double *, double *, double *);
+extern int BSIM4v5RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 #endif /*BSIM4v5*/