diff --git a/src/spicelib/devices/vccs/vccsask.c b/src/spicelib/devices/vccs/vccsask.c
index 4749074d8..2a5b369a4 100644
--- a/src/spicelib/devices/vccs/vccsask.c
+++ b/src/spicelib/devices/vccs/vccsask.c
@@ -15,7 +15,6 @@ Author: 1987 Thomas L. Quarles
 #include "vccsdefs.h"
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 /* ARGSUSED */
 int
diff --git a/src/spicelib/devices/vccs/vccsdefs.h b/src/spicelib/devices/vccs/vccsdefs.h
index 9faed4161..238c2e545 100644
--- a/src/spicelib/devices/vccs/vccsdefs.h
+++ b/src/spicelib/devices/vccs/vccsdefs.h
@@ -86,4 +86,6 @@ typedef struct sVCCSmodel {       /* model structure for a source */
 
 /* model questions */
 
+#include "vccsext.h"
+
 #endif /*VCCS*/
diff --git a/src/spicelib/devices/vccs/vccsdel.c b/src/spicelib/devices/vccs/vccsdel.c
index aaba2e38e..819ca4e19 100644
--- a/src/spicelib/devices/vccs/vccsdel.c
+++ b/src/spicelib/devices/vccs/vccsdel.c
@@ -9,7 +9,6 @@ Author: 1985 Thomas L. Quarles
 #include "vccsdefs.h"
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 
 int
diff --git a/src/spicelib/devices/vccs/vccsdest.c b/src/spicelib/devices/vccs/vccsdest.c
index ce63e869a..0afae6d74 100644
--- a/src/spicelib/devices/vccs/vccsdest.c
+++ b/src/spicelib/devices/vccs/vccsdest.c
@@ -8,7 +8,6 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include "vccsdefs.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 
 void
diff --git a/src/spicelib/devices/vccs/vccsload.c b/src/spicelib/devices/vccs/vccsload.c
index 15e85f4cc..a647d4f1a 100644
--- a/src/spicelib/devices/vccs/vccsload.c
+++ b/src/spicelib/devices/vccs/vccsload.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
 #include "vccsdefs.h"
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 
 /*ARGSUSED*/
diff --git a/src/spicelib/devices/vccs/vccsmdel.c b/src/spicelib/devices/vccs/vccsmdel.c
index 48a5aab71..613dadf97 100644
--- a/src/spicelib/devices/vccs/vccsmdel.c
+++ b/src/spicelib/devices/vccs/vccsmdel.c
@@ -9,7 +9,6 @@ Author: 1985 Thomas L. Quarles
 #include "vccsdefs.h"
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 
 int
diff --git a/src/spicelib/devices/vccs/vccspar.c b/src/spicelib/devices/vccs/vccspar.c
index 81c7a9c9b..7f7b51a76 100644
--- a/src/spicelib/devices/vccs/vccspar.c
+++ b/src/spicelib/devices/vccs/vccspar.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
 #include "vccsdefs.h"
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 
 /* ARGSUSED */
diff --git a/src/spicelib/devices/vccs/vccspzld.c b/src/spicelib/devices/vccs/vccspzld.c
index e27d3cbb4..02a9c63ff 100644
--- a/src/spicelib/devices/vccs/vccspzld.c
+++ b/src/spicelib/devices/vccs/vccspzld.c
@@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/sperror.h"
 #include "vccsdefs.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 
 /*ARGSUSED*/
diff --git a/src/spicelib/devices/vccs/vccssacl.c b/src/spicelib/devices/vccs/vccssacl.c
index f6c7eb1c0..3889fbb82 100644
--- a/src/spicelib/devices/vccs/vccssacl.c
+++ b/src/spicelib/devices/vccs/vccssacl.c
@@ -15,7 +15,6 @@ Author: 1985 Thomas L. Quarles
 #include "vccsdefs.h"
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 
 int
diff --git a/src/spicelib/devices/vccs/vccsset.c b/src/spicelib/devices/vccs/vccsset.c
index 7c179397a..16e951218 100644
--- a/src/spicelib/devices/vccs/vccsset.c
+++ b/src/spicelib/devices/vccs/vccsset.c
@@ -15,7 +15,6 @@ Author: 1985 Thomas L. Quarles
 #include "vccsdefs.h"
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 
 /*ARGSUSED*/
diff --git a/src/spicelib/devices/vccs/vccssld.c b/src/spicelib/devices/vccs/vccssld.c
index 65b86c3ea..c177628ed 100644
--- a/src/spicelib/devices/vccs/vccssld.c
+++ b/src/spicelib/devices/vccs/vccssld.c
@@ -15,7 +15,6 @@ Author: 1985 Thomas L. Quarles
 #include "vccsdefs.h"
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 
 int
diff --git a/src/spicelib/devices/vccs/vccssprt.c b/src/spicelib/devices/vccs/vccssprt.c
index 939bac3b8..eeab21cfa 100644
--- a/src/spicelib/devices/vccs/vccssprt.c
+++ b/src/spicelib/devices/vccs/vccssprt.c
@@ -15,7 +15,6 @@ Author: 1985 Thomas L. Quarles
 #include "vccsdefs.h"
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 
 void
diff --git a/src/spicelib/devices/vccs/vccssset.c b/src/spicelib/devices/vccs/vccssset.c
index cd9ed9e68..84c261bc0 100644
--- a/src/spicelib/devices/vccs/vccssset.c
+++ b/src/spicelib/devices/vccs/vccssset.c
@@ -15,7 +15,6 @@ Author: 1985 Thomas L. Quarles
 #include "vccsdefs.h"
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
-#include "vccsext.h"
 
 
 int