diff --git a/ChangeLog b/ChangeLog
index fce72b2c4..ca35929dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+2010-07-24  Robert Larice
+ * src/include/cktdefs.h ,
+ * src/include/devdefs.h ,
+ * src/spicelib/analysis/acan.c ,
+ * src/spicelib/analysis/cktdest.c ,
+ * src/spicelib/analysis/cktdisto.c ,
+ * src/spicelib/analysis/cktdump.c ,
+ * src/spicelib/analysis/cktfbran.c ,
+ * src/spicelib/analysis/cktfndm.c ,
+ * src/spicelib/analysis/ckti2nod.c ,
+ * src/spicelib/analysis/cktic.c ,
+ * src/spicelib/analysis/cktload.c ,
+ * src/spicelib/analysis/cktmask.c ,
+ * src/spicelib/analysis/cktmcrt.c ,
+ * src/spicelib/analysis/cktmpar.c ,
+ * src/spicelib/analysis/cktnoise.c ,
+ * src/spicelib/analysis/cktop.c ,
+ * src/spicelib/analysis/cktparam.c ,
+ * src/spicelib/analysis/cktpartn.c ,
+ * src/spicelib/analysis/cktpmnam.c ,
+ * src/spicelib/analysis/cktpname.c ,
+ * src/spicelib/analysis/cktpzld.c ,
+ * src/spicelib/analysis/cktpzset.c ,
+ * src/spicelib/analysis/cktsens.c ,
+ * src/spicelib/analysis/cktsetup.c ,
+ * src/spicelib/analysis/cktsgen.c ,
+ * src/spicelib/analysis/ckttemp.c ,
+ * src/spicelib/analysis/ckttroub.c ,
+ * src/spicelib/analysis/ckttrunc.c ,
+ * src/spicelib/analysis/ckttyplk.c ,
+ * src/spicelib/analysis/dctrcurv.c ,
+ * src/spicelib/devices/cktfinddev.c ,
+ * src/unsupported/cktsenup.c ,
+ * src/unsupported/cktsnld.c ,
+ * src/unsupported/cktsnprt.c ,
+ * src/unsupported/cktsnset.c ,
+ * src/xspice/evt/evtload.c ,
+ * src/xspice/mif/mif_inp2.c ,
+ * src/xspice/mif/mifask.c ,
+ * src/xspice/mif/mifgetmod.c ,
+ * src/xspice/mif/mifload.c ,
+ * src/xspice/mif/mifmask.c ,
+ * src/xspice/mif/mifmpara.c ,
+ * src/xspice/mif/mifsetup.c :
+    find a suitable home for **DEVices and DEVmaxnum in devdefs.h
+
 2010-07-24  Robert Larice
  * src/frontend/help/help.c ,
  * src/frontend/misccoms.c ,
diff --git a/src/include/cktdefs.h b/src/include/cktdefs.h
index b1bcfe754..911ef253a 100644
--- a/src/include/cktdefs.h
+++ b/src/include/cktdefs.h
@@ -19,7 +19,6 @@
 
 
 #define MAXNUMDEVS 64   /* Max number of possible devices PN:XXX may cause toubles*/
-extern int DEVmaxnum;   /* Not sure if still used */
 #define MAXNUMDEVNODES 4        /* Max No. of nodes per device */
                          /* Need to change for SOI devs ? */
 
diff --git a/src/include/devdefs.h b/src/include/devdefs.h
index 4422a66c3..cf132e424 100644
--- a/src/include/devdefs.h
+++ b/src/include/devdefs.h
@@ -106,6 +106,10 @@ typedef struct SPICEdev {
 } SPICEdev;  /* instance of structure for each possible type of device */
 
 
+extern SPICEdev **DEVices;
+extern int        DEVmaxnum;    /* size of DEVices array */
+
+
 /* IOP( )		Input/output parameter
  * IOPP( )	IO parameter which the principle value of a device (used
  *			for naming output variables in sensetivity)
diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c
index 62b97128a..79b850396 100644
--- a/src/spicelib/analysis/acan.c
+++ b/src/spicelib/analysis/acan.c
@@ -401,7 +401,6 @@ endsweep:
 int
 CKTacLoad(CKTcircuit *ckt)
 {
-    extern SPICEdev **DEVices;
     int i;
     int size;
     int error;
diff --git a/src/spicelib/analysis/cktdest.c b/src/spicelib/analysis/cktdest.c
index 594134fc6..068eb5631 100644
--- a/src/spicelib/analysis/cktdest.c
+++ b/src/spicelib/analysis/cktdest.c
@@ -18,9 +18,6 @@ Author: 1985 Thomas L. Quarles
 #include "sperror.h"
 
 
-extern SPICEdev **DEVices;
-
-
 int
 CKTdestroy(CKTcircuit *inCkt)
 {
diff --git a/src/spicelib/analysis/cktdisto.c b/src/spicelib/analysis/cktdisto.c
index bbc3d2484..140fae289 100644
--- a/src/spicelib/analysis/cktdisto.c
+++ b/src/spicelib/analysis/cktdisto.c
@@ -21,7 +21,6 @@ Author: 1988 Jaijeet S Roychowdhury
 int
 CKTdisto (CKTcircuit *ckt, int mode)
 {
-    extern SPICEdev **DEVices;
     DISTOAN* cv = (DISTOAN*) (ckt->CKTcurJob);
     int i;
     int error=0;
diff --git a/src/spicelib/analysis/cktdump.c b/src/spicelib/analysis/cktdump.c
index 6c3a329fb..4f5e10fb2 100644
--- a/src/spicelib/analysis/cktdump.c
+++ b/src/spicelib/analysis/cktdump.c
@@ -26,8 +26,6 @@ TODO:
 #include "gendefs.h"
 #include "devdefs.h"
  
-extern SPICEdev **DEVices;
-
 /* End cider integration */
 #endif
 
diff --git a/src/spicelib/analysis/cktfbran.c b/src/spicelib/analysis/cktfbran.c
index 36806447f..722e78626 100644
--- a/src/spicelib/analysis/cktfbran.c
+++ b/src/spicelib/analysis/cktfbran.c
@@ -20,7 +20,6 @@ Author: 1985 Thomas L. Quarles
 int
 CKTfndBranch(CKTcircuit *ckt, IFuid name)
 {
-    extern SPICEdev **DEVices;
     int i;
     int j;
 
diff --git a/src/spicelib/analysis/cktfndm.c b/src/spicelib/analysis/cktfndm.c
index a51ae015d..212aa09ee 100644
--- a/src/spicelib/analysis/cktfndm.c
+++ b/src/spicelib/analysis/cktfndm.c
@@ -7,6 +7,7 @@ Author: 1985 Thomas L. Quarles
 
 #include "ngspice.h"
 #include "cktdefs.h"
+#include "devdefs.h"
 #include "ifsim.h"
 #include "sperror.h"
 
diff --git a/src/spicelib/analysis/ckti2nod.c b/src/spicelib/analysis/ckti2nod.c
index afb8f3380..abbcf4bbe 100644
--- a/src/spicelib/analysis/ckti2nod.c
+++ b/src/spicelib/analysis/ckti2nod.c
@@ -19,8 +19,6 @@ Author: 1985 Thomas L. Quarles
 
 
 
-extern SPICEdev **DEVices;
-
 int
 CKTinst2Node(CKTcircuit *ckt, void *instPtr, int terminal, CKTnode **node, IFuid *nodeName)
 {
diff --git a/src/spicelib/analysis/cktic.c b/src/spicelib/analysis/cktic.c
index 50c47e512..083a186c1 100644
--- a/src/spicelib/analysis/cktic.c
+++ b/src/spicelib/analysis/cktic.c
@@ -10,11 +10,6 @@ Author: 1985 Thomas L. Quarles
 #include "devdefs.h"
 
 
-
-
-extern SPICEdev **DEVices;
-
-
 int
 CKTic(CKTcircuit *ckt)
 {
diff --git a/src/spicelib/analysis/cktload.c b/src/spicelib/analysis/cktload.c
index 16a2c025c..894782bd4 100644
--- a/src/spicelib/analysis/cktload.c
+++ b/src/spicelib/analysis/cktload.c
@@ -29,7 +29,6 @@ static int ZeroNoncurRow(SMPmatrix *matrix, CKTnode *nodes, int rownum);
 int
 CKTload(CKTcircuit *ckt)
 {
-    extern SPICEdev **DEVices;
     int i;
     int size;
     double startTime;
diff --git a/src/spicelib/analysis/cktmask.c b/src/spicelib/analysis/cktmask.c
index 302c77990..2b841d86a 100644
--- a/src/spicelib/analysis/cktmask.c
+++ b/src/spicelib/analysis/cktmask.c
@@ -14,10 +14,6 @@ Author: 1985 Thomas L. Quarles
 #include "sperror.h"
 
 
-extern SPICEdev **DEVices;
-
-
-
 /* ARGSUSED */
 int
 CKTmodAsk(CKTcircuit *ckt, GENmodel *modfast, int which, IFvalue *value, IFvalue *selector)
diff --git a/src/spicelib/analysis/cktmcrt.c b/src/spicelib/analysis/cktmcrt.c
index 0047a24b0..e938588cb 100644
--- a/src/spicelib/analysis/cktmcrt.c
+++ b/src/spicelib/analysis/cktmcrt.c
@@ -20,7 +20,6 @@ Author: 1985 Thomas L. Quarles
 int
 CKTmodCrt(CKTcircuit *ckt, int type, GENmodel **modfast, IFuid name)
 {
-    extern SPICEdev **DEVices;
     GENmodel *mymodfast = NULL;
     int error;
 
diff --git a/src/spicelib/analysis/cktmpar.c b/src/spicelib/analysis/cktmpar.c
index 24da1c7c5..cbc538438 100644
--- a/src/spicelib/analysis/cktmpar.c
+++ b/src/spicelib/analysis/cktmpar.c
@@ -14,11 +14,6 @@ Author: 1985 Thomas L. Quarles
 #include "sperror.h"
 
 
-
-extern SPICEdev **DEVices;
-
-
-
 /* ARGSUSED */
 int
 CKTmodParam(CKTcircuit *ckt, GENmodel *modfast, int param, IFvalue *val, IFvalue *selector)
diff --git a/src/spicelib/analysis/cktnoise.c b/src/spicelib/analysis/cktnoise.c
index 5c40e43e8..e947ece89 100644
--- a/src/spicelib/analysis/cktnoise.c
+++ b/src/spicelib/analysis/cktnoise.c
@@ -25,7 +25,6 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data)
 {
     double outNdens;
     int i;
-    extern SPICEdev **DEVices;
     IFvalue outData;    /* output variable (points to list of outputs)*/
     IFvalue refVal; /* reference variable (always 0)*/
     int error;
diff --git a/src/spicelib/analysis/cktop.c b/src/spicelib/analysis/cktop.c
index a3215dd22..d8b686d5e 100644
--- a/src/spicelib/analysis/cktop.c
+++ b/src/spicelib/analysis/cktop.c
@@ -93,7 +93,6 @@ ckt->CKTmode = firstmode;
 int
 CKTconvTest (CKTcircuit * ckt)
 {
-  extern SPICEdev **DEVices;
   int i;
   int error = OK;
 #ifdef PARALLEL_ARCH
diff --git a/src/spicelib/analysis/cktparam.c b/src/spicelib/analysis/cktparam.c
index 8bfaa8a2e..39d965635 100644
--- a/src/spicelib/analysis/cktparam.c
+++ b/src/spicelib/analysis/cktparam.c
@@ -14,10 +14,6 @@ Author: 1985 Thomas L. Quarles
 #include "sperror.h"
 
 
-
-extern SPICEdev **DEVices;
-
-
 /* ARGSUSED */
 int
 CKTparam(CKTcircuit *ckt, void *fast, int param, IFvalue *val, IFvalue *selector)
diff --git a/src/spicelib/analysis/cktpartn.c b/src/spicelib/analysis/cktpartn.c
index 19ae2e130..40f7d3902 100644
--- a/src/spicelib/analysis/cktpartn.c
+++ b/src/spicelib/analysis/cktpartn.c
@@ -16,8 +16,6 @@ Author: 1992 David A. Gates, UC Berkeley CADgroup
 #include "sperror.h"
 
 
-
-extern SPICEdev **DEVices;
 #ifdef XSPICE
 extern int *DEVicesfl;
 #endif
diff --git a/src/spicelib/analysis/cktpmnam.c b/src/spicelib/analysis/cktpmnam.c
index df02f1701..5f9d227e3 100644
--- a/src/spicelib/analysis/cktpmnam.c
+++ b/src/spicelib/analysis/cktpmnam.c
@@ -17,9 +17,6 @@ Author: 1985 Thomas L. Quarles
 #include "sperror.h"
 
 
-
-extern SPICEdev **DEVices;
-
 /* ARGSUSED */
 int
 CKTpModName(char *parm, IFvalue *val, CKTcircuit *ckt, int type, IFuid name, GENmodel **modfast)
diff --git a/src/spicelib/analysis/cktpname.c b/src/spicelib/analysis/cktpname.c
index ed5f06712..1cd1426cc 100644
--- a/src/spicelib/analysis/cktpname.c
+++ b/src/spicelib/analysis/cktpname.c
@@ -19,10 +19,6 @@ Author: 1985 Thomas L. Quarles
 #include "sperror.h"
 
 
-
-extern SPICEdev **DEVices;
-
-
 /* ARGSUSED */
 int
 CKTpName(char *parm, IFvalue *val, CKTcircuit *ckt, int dev, char *name, GENinstance **fast)
diff --git a/src/spicelib/analysis/cktpzld.c b/src/spicelib/analysis/cktpzld.c
index 928686b5f..d4f9c20ad 100644
--- a/src/spicelib/analysis/cktpzld.c
+++ b/src/spicelib/analysis/cktpzld.c
@@ -11,9 +11,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 #include "sperror.h"
 
 
-extern SPICEdev **DEVices;
-
-
 int
 CKTpzLoad(CKTcircuit *ckt, SPcomplex *s)
 {
diff --git a/src/spicelib/analysis/cktpzset.c b/src/spicelib/analysis/cktpzset.c
index cfa75bb3f..b00caede4 100644
--- a/src/spicelib/analysis/cktpzset.c
+++ b/src/spicelib/analysis/cktpzset.c
@@ -18,7 +18,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 int
 CKTpzSetup(CKTcircuit *ckt, int type)
 {
-  extern SPICEdev **DEVices;
     PZAN *pzan = (PZAN *) ckt->CKTcurJob;
     SMPmatrix *matrix;
     int error;
diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c
index 23528a46f..377f8d4cc 100644
--- a/src/spicelib/analysis/cktsens.c
+++ b/src/spicelib/analysis/cktsens.c
@@ -33,8 +33,6 @@ static int sens_temp(sgen *sg, CKTcircuit *ckt);
 static int count_steps(int type, double low, double high, int steps, double *stepsize);
 static double inc_freq(double freq, int type, double step_size);
 
-extern SPICEdev **DEVices;
-
 
 /*
  *	Procedure:
diff --git a/src/spicelib/analysis/cktsetup.c b/src/spicelib/analysis/cktsetup.c
index d5d224984..99db309d9 100644
--- a/src/spicelib/analysis/cktsetup.c
+++ b/src/spicelib/analysis/cktsetup.c
@@ -26,8 +26,6 @@ Author: 1985 Thomas L. Quarles
 extern void SetAnalyse( char * Analyse, int Percent);
 #endif
 
-extern SPICEdev **DEVices;
-
 
 int
 CKTsetup(CKTcircuit *ckt)
diff --git a/src/spicelib/analysis/cktsgen.c b/src/spicelib/analysis/cktsgen.c
index b8a228733..bfc700aaa 100644
--- a/src/spicelib/analysis/cktsgen.c
+++ b/src/spicelib/analysis/cktsgen.c
@@ -9,8 +9,6 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 #include "ifsim.h"
 #include "sensgen.h"
 
-extern SPICEdev **DEVices;
-
 	/* XXX */
 extern char	*Sfilter;
 
diff --git a/src/spicelib/analysis/ckttemp.c b/src/spicelib/analysis/ckttemp.c
index f839ce3ef..2fa7f18e1 100644
--- a/src/spicelib/analysis/ckttemp.c
+++ b/src/spicelib/analysis/ckttemp.c
@@ -17,11 +17,6 @@ Author: 1985 Thomas L. Quarles
 #include "sperror.h"
 
 
-
-extern SPICEdev **DEVices;
-
-
-
 int
 CKTtemp(CKTcircuit *ckt)
 {
diff --git a/src/spicelib/analysis/ckttroub.c b/src/spicelib/analysis/ckttroub.c
index a0d020626..4773c74fd 100644
--- a/src/spicelib/analysis/ckttroub.c
+++ b/src/spicelib/analysis/ckttroub.c
@@ -12,8 +12,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 
 #include "analysis.h"
 
-extern SPICEdev **DEVices;
-
 
 extern SPICEanalysis *analInfo[];
 
diff --git a/src/spicelib/analysis/ckttrunc.c b/src/spicelib/analysis/ckttrunc.c
index fec405aa0..48d1c928f 100644
--- a/src/spicelib/analysis/ckttrunc.c
+++ b/src/spicelib/analysis/ckttrunc.c
@@ -16,10 +16,6 @@ Author: 1985 Thomas L. Quarles
 #include "sperror.h"
 
 
-
-extern SPICEdev **DEVices;
-
-
 int
 CKTtrunc(CKTcircuit *ckt, double *timeStep)
 {
diff --git a/src/spicelib/analysis/ckttyplk.c b/src/spicelib/analysis/ckttyplk.c
index 28b1ac1b0..9f8f77f0b 100644
--- a/src/spicelib/analysis/ckttyplk.c
+++ b/src/spicelib/analysis/ckttyplk.c
@@ -12,9 +12,6 @@ Author: 1985 Thomas L. Quarles
 #include "devdefs.h"
 
 
-
-extern SPICEdev **DEVices;
-
 int
 CKTtypelook(char *type)
 {
diff --git a/src/spicelib/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c
index 0809075ea..cb9cfbd6d 100644
--- a/src/spicelib/analysis/dctrcurv.c
+++ b/src/spicelib/analysis/dctrcurv.c
@@ -23,7 +23,6 @@ Modified: 1999 Paolo Nenzi
 #endif
 
 #include <devdefs.h>
-extern SPICEdev **DEVices;
 
 #ifdef HAS_WINDOWS
 void SetAnalyse( char * Analyse, int Percent);
diff --git a/src/spicelib/devices/cktfinddev.c b/src/spicelib/devices/cktfinddev.c
index 3f76843d2..03bc9366f 100644
--- a/src/spicelib/devices/cktfinddev.c
+++ b/src/spicelib/devices/cktfinddev.c
@@ -5,6 +5,7 @@ Author: 1985 Thomas L. Quarles
 
 #include <config.h>
 #include <cktdefs.h>
+#include <devdefs.h>
 #include <sperror.h>
 #include "string.h"
 
diff --git a/src/unsupported/cktsenup.c b/src/unsupported/cktsenup.c
index 2a72feaad..c20d37404 100644
--- a/src/unsupported/cktsenup.c
+++ b/src/unsupported/cktsenup.c
@@ -25,7 +25,6 @@ int
 CKTsenUpdate(ckt)
 register CKTcircuit *ckt;
 {
-    extern SPICEdev *DEVices[];
     register int i;
     int error;
 
diff --git a/src/unsupported/cktsnld.c b/src/unsupported/cktsnld.c
index a6f6f0b77..589b2226e 100644
--- a/src/unsupported/cktsnld.c
+++ b/src/unsupported/cktsnld.c
@@ -26,7 +26,6 @@ int
 CKTsenLoad(ckt)
 register CKTcircuit *ckt;
 {
-    extern SPICEdev *DEVices[];
     register int i;
     int size,row,col;
     int error;
diff --git a/src/unsupported/cktsnprt.c b/src/unsupported/cktsnprt.c
index 77fe432c8..79e6aff1e 100644
--- a/src/unsupported/cktsnprt.c
+++ b/src/unsupported/cktsnprt.c
@@ -25,7 +25,6 @@ void
 CKTsenPrint(ckt)
 register CKTcircuit *ckt;
 {
-    extern SPICEdev *DEVices[];
     register int i;
 
     for (i=0;i<DEVmaxnum;i++) {
diff --git a/src/unsupported/cktsnset.c b/src/unsupported/cktsnset.c
index 9392e7956..1aa9eab4d 100644
--- a/src/unsupported/cktsnset.c
+++ b/src/unsupported/cktsnset.c
@@ -28,8 +28,6 @@ CKTsenSetup(ckt)
 register CKTcircuit *ckt;
 
 {
-    extern SPICEdev *DEVices[];
-
     register int i;
     int error;
     register SENstruct *info;
diff --git a/src/xspice/evt/evtload.c b/src/xspice/evt/evtload.c
index f7717183e..06ad92dbd 100755
--- a/src/xspice/evt/evtload.c
+++ b/src/xspice/evt/evtload.c
@@ -55,12 +55,6 @@ NON-STANDARD FEATURES
 #include "evtproto.h"
 
 
-
-
-extern SPICEdev **DEVices;
-
-
-
 static void EVTcreate_state(
     CKTcircuit  *ckt,
     int         inst_index);
diff --git a/src/xspice/mif/mif_inp2.c b/src/xspice/mif/mif_inp2.c
index 044efa045..44c1b20fe 100755
--- a/src/xspice/mif/mif_inp2.c
+++ b/src/xspice/mif/mif_inp2.c
@@ -63,8 +63,6 @@ NON-STANDARD FEATURES
                                /* See CKT/SPIinit.c                           */
 
 extern int *DEVicesfl; /*flags for the devices */
-extern  SPICEdev  **DEVices;   /* info about all device types */
-extern  int       DEVmaxnum;    /* size of DEVices array       */
 
 
 static void  MIFinit_inst(MIFmodel *mdfast, MIFinstance *fast);
diff --git a/src/xspice/mif/mifask.c b/src/xspice/mif/mifask.c
index 0e12c63a3..3f3bb1a52 100755
--- a/src/xspice/mif/mifask.c
+++ b/src/xspice/mif/mifask.c
@@ -54,14 +54,6 @@ NON-STANDARD FEATURES
 /* #include "suffix.h" */
 
 
-
-extern  SPICEdev    **DEVices;
-extern  int         DEVmaxnum;
-
-
-
-
-
 /*
 MIFask
 
diff --git a/src/xspice/mif/mifgetmod.c b/src/xspice/mif/mifgetmod.c
index e602a07ad..f661bf05e 100755
--- a/src/xspice/mif/mifgetmod.c
+++ b/src/xspice/mif/mifgetmod.c
@@ -64,8 +64,6 @@ NON-STANDARD FEATURES
     It is now defined in inpmkmod.c.      */
 extern INPmodel *modtab;
 
-extern SPICEdev **DEVices;        /* info about all device types */
-
 /*
 MIFgetMod
 
diff --git a/src/xspice/mif/mifload.c b/src/xspice/mif/mifload.c
index 6c6c75cf7..de2339c10 100755
--- a/src/xspice/mif/mifload.c
+++ b/src/xspice/mif/mifload.c
@@ -65,10 +65,6 @@ NON-STANDARD FEATURES
 
 
 
-extern SPICEdev **DEVices;        /* info about all device types */
-
-
-
 static void MIFauto_partial(
     MIFinstance     *here,
     void            (*cm_func) (Mif_Private_t *),
diff --git a/src/xspice/mif/mifmask.c b/src/xspice/mif/mifmask.c
index 500673764..f8d4ced66 100755
--- a/src/xspice/mif/mifmask.c
+++ b/src/xspice/mif/mifmask.c
@@ -54,13 +54,6 @@ NON-STANDARD FEATURES
 /* #include "suffix.h" */
 
 
-
-extern  SPICEdev    **DEVices;
-extern  int         DEVmaxnum;
-
-
-
-
 /*
 MIFmAsk
 
diff --git a/src/xspice/mif/mifmpara.c b/src/xspice/mif/mifmpara.c
index 1b262d6cb..9580d443a 100755
--- a/src/xspice/mif/mifmpara.c
+++ b/src/xspice/mif/mifmpara.c
@@ -57,13 +57,6 @@ NON-STANDARD FEATURES
 /* #include "suffix.h"  */
 
 
-
-extern  SPICEdev    **DEVices;
-extern  int         DEVmaxnum;
-
-
-
-
 /*
 MIFmParam
 
diff --git a/src/xspice/mif/mifsetup.c b/src/xspice/mif/mifsetup.c
index 01ede3f05..280af0624 100755
--- a/src/xspice/mif/mifsetup.c
+++ b/src/xspice/mif/mifsetup.c
@@ -54,9 +54,6 @@ NON-STANDARD FEATURES
 
 
 
-extern SPICEdev **DEVices;        /* info about all device types */
-
-
 /* define macro for easy creation of matrix entries/pointers for outputs */
 #define TSTALLOC(ptr,first,second) \
         if((smp_data_out->ptr = \