diff --git a/ChangeLog b/ChangeLog
index 770bdd4e7..9d4db7814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-08  Robert Larice
+ * src/spicelib/devices/bsim3soi/b4soiinit.c ,
+ * src/spicelib/devices/bsim3soi_dd/b3soiddinit.c ,
+ * src/spicelib/devices/bsim3soi_fd/b3soifdinit.c ,
+ * src/spicelib/devices/bsim3soi_pd/b3soipdinit.c ,
+ * src/spicelib/devices/dio/dioinit.c ,
+ * src/spicelib/devices/hisim/hsm1init.c :
+    avoid function redeclaration (devices)
+
 2010-10-08  Robert Larice
  * src/include/sensgen.h ,
  * src/spicelib/analysis/cktsgen.c :
diff --git a/src/spicelib/devices/bsim3soi/b4soiinit.c b/src/spicelib/devices/bsim3soi/b4soiinit.c
index c4881a94f..e8af943d3 100644
--- a/src/spicelib/devices/bsim3soi/b4soiinit.c
+++ b/src/spicelib/devices/bsim3soi/b4soiinit.c
@@ -3,7 +3,6 @@
 #include "devdefs.h"
 
 #include "b4soiitf.h"
-#include "b4soiext.h"
 #include "b4soiinit.h"
 
 SPICEdev B4SOIinfo = {
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c
index 6aef3c394..ea03d65c6 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c
@@ -3,7 +3,6 @@
 #include "devdefs.h"
 
 #include "b3soidditf.h"
-#include "b3soiddext.h"
 #include "b3soiddinit.h"
 
 SPICEdev B3SOIDDinfo = {
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c b/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c
index ecf2f2ce2..d39dd2954 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c
@@ -3,7 +3,6 @@
 #include "devdefs.h"
 
 #include "b3soifditf.h"
-#include "b3soifdext.h"
 #include "b3soifdinit.h"
 
 SPICEdev B3SOIFDinfo = {
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c b/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c
index e80cfa8d9..51c9fc60d 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c
@@ -3,7 +3,6 @@
 #include "devdefs.h"
 
 #include "b3soipditf.h"
-#include "b3soipdext.h"
 #include "b3soipdinit.h"
 
 
diff --git a/src/spicelib/devices/dio/dioinit.c b/src/spicelib/devices/dio/dioinit.c
index a3150bac7..e849fb1db 100644
--- a/src/spicelib/devices/dio/dioinit.c
+++ b/src/spicelib/devices/dio/dioinit.c
@@ -5,7 +5,6 @@
 
 #include "diodefs.h"
 #include "dioitf.h"
-#include "dioext.h"
 #include "dioinit.h"
 
 
diff --git a/src/spicelib/devices/hisim/hsm1init.c b/src/spicelib/devices/hisim/hsm1init.c
index 3b3d9f76f..7ab83eb9d 100644
--- a/src/spicelib/devices/hisim/hsm1init.c
+++ b/src/spicelib/devices/hisim/hsm1init.c
@@ -4,7 +4,6 @@
 
 #include "hsm1def.h"
 #include "hsm1itf.h"
-#include "hsm1ext.h"
 #include "hsm1init.h"
 
 SPICEdev HSM1info = {