diff --git a/ChangeLog b/ChangeLog
index 671eb6334..5d2f3cf9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-11  Robert Larice
+ * src/spicelib/**/*.c :
+  auxiliary define `job' --> local variable `job'
+
 2011-12-11  Robert Larice
  * src/spicelib/**/*.c :
   auxiliary define (ANALYSIS*) ckt->CKTcurJob  -->  `job'
diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c
index 6f8905a22..aaa889c15 100644
--- a/src/spicelib/analysis/acan.c
+++ b/src/spicelib/analysis/acan.c
@@ -25,7 +25,7 @@ void SetAnalyse( char * Analyse, int Percent);
 int
 ACan(CKTcircuit *ckt, int restart)
 {
-    #define job ((ACAN *) ckt->CKTcurJob)
+    ACAN *job = (ACAN *) ckt->CKTcurJob;
 
     double freq;
     double freqTol; /* tolerence parameter for finding final frequency */
diff --git a/src/spicelib/analysis/cktnoise.c b/src/spicelib/analysis/cktnoise.c
index 0c2c8f320..493de8913 100644
--- a/src/spicelib/analysis/cktnoise.c
+++ b/src/spicelib/analysis/cktnoise.c
@@ -23,7 +23,7 @@ Author: 1987 Gary W. Ng
 int
 CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     double outNdens;
     int i;
diff --git a/src/spicelib/analysis/cktpzstr.c b/src/spicelib/analysis/cktpzstr.c
index 265b79cb7..788803533 100644
--- a/src/spicelib/analysis/cktpzstr.c
+++ b/src/spicelib/analysis/cktpzstr.c
@@ -518,7 +518,7 @@ int CKTpzStrat(PZtrial **set)
 int 
 CKTpzRunTrial(CKTcircuit *ckt, PZtrial **new_trialp, PZtrial **set)
 {
-    #define job ((PZAN *) ckt->CKTcurJob)
+    PZAN *job = (PZAN *) ckt->CKTcurJob;
 
     PZtrial	*match, *base, *new_trial;
     PZtrial	*p, *prev;
diff --git a/src/spicelib/analysis/dcpss.c b/src/spicelib/analysis/dcpss.c
index d20b82708..10b74ca85 100755
--- a/src/spicelib/analysis/dcpss.c
+++ b/src/spicelib/analysis/dcpss.c
@@ -51,7 +51,7 @@ CKTfour(int, int, double *, double *, double *, double, double *, double *, doub
 int
 DCpss(CKTcircuit *ckt, int restart)
 {
-    #define job ((PSSan *) ckt->CKTcurJob)
+    PSSan *job = (PSSan *) ckt->CKTcurJob;
 
     int oscnNode;
     int i;
diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c
index f0de2c32e..502c4828f 100644
--- a/src/spicelib/analysis/dctran.c
+++ b/src/spicelib/analysis/dctran.c
@@ -47,7 +47,7 @@ int
 DCtran(CKTcircuit *ckt,
        int restart)   /* forced restart flag */
 {
-    #define job ((TRANan *) ckt->CKTcurJob)
+    TRANan *job = (TRANan *) ckt->CKTcurJob;
 
     int i;
     double olddelta;
diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c
index cfa07018a..0efefe436 100644
--- a/src/spicelib/analysis/tfanal.c
+++ b/src/spicelib/analysis/tfanal.c
@@ -19,7 +19,7 @@ TFanal(CKTcircuit *ckt, int restart)
                     
                     /* forced restart flag */
 {
-    #define job ((TFan *) ckt->CKTcurJob)
+    TFan *job = (TFan *) ckt->CKTcurJob;
 
     int size;
     int insrc = 0, outsrc = 0;
diff --git a/src/spicelib/devices/bjt/bjtnoise.c b/src/spicelib/devices/bjt/bjtnoise.c
index 044d62381..6a42cf1c0 100644
--- a/src/spicelib/devices/bjt/bjtnoise.c
+++ b/src/spicelib/devices/bjt/bjtnoise.c
@@ -25,7 +25,7 @@ int
 BJTnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
           Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     BJTmodel *firstModel = (BJTmodel *) genmodel;
     BJTmodel *model;
diff --git a/src/spicelib/devices/bsim1/b1noi.c b/src/spicelib/devices/bsim1/b1noi.c
index 93666f7f2..7a4e1d01d 100644
--- a/src/spicelib/devices/bsim1/b1noi.c
+++ b/src/spicelib/devices/bsim1/b1noi.c
@@ -24,7 +24,7 @@ int
 B1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
            Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     B1model *firstModel = (B1model *) genmodel;
     B1model *model;
diff --git a/src/spicelib/devices/bsim2/b2noi.c b/src/spicelib/devices/bsim2/b2noi.c
index 5818dfdaa..4ddffd973 100644
--- a/src/spicelib/devices/bsim2/b2noi.c
+++ b/src/spicelib/devices/bsim2/b2noi.c
@@ -24,7 +24,7 @@ int
 B2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
            Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     B2model *firstModel = (B2model *) genmodel;
     B2model *model;
diff --git a/src/spicelib/devices/bsim3/b3noi.c b/src/spicelib/devices/bsim3/b3noi.c
index 7e4770891..eda4b509e 100644
--- a/src/spicelib/devices/bsim3/b3noi.c
+++ b/src/spicelib/devices/bsim3/b3noi.c
@@ -108,7 +108,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 BSIM3model *model = (BSIM3model *)inModel;
 BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3soi/b4soinoi.c b/src/spicelib/devices/bsim3soi/b4soinoi.c
index 856565a8d..778981929 100644
--- a/src/spicelib/devices/bsim3soi/b4soinoi.c
+++ b/src/spicelib/devices/bsim3soi/b4soinoi.c
@@ -104,7 +104,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 register B4SOImodel *model = (B4SOImodel *)inModel;
 register B4SOIinstance *here;
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c
index c264b807e..bb6f7a7e4 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c
@@ -98,7 +98,7 @@ int
 B3SOIDDnoise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, 
               Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 B3SOIDDmodel *model = (B3SOIDDmodel *)inModel;
 B3SOIDDinstance *here;
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c
index 7a8ce7106..bf072cecc 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c
@@ -98,7 +98,7 @@ int
 B3SOIFDnoise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, 
               Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 B3SOIFDmodel *model = (B3SOIFDmodel *)inModel;
 B3SOIFDinstance *here;
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
index 2e936877f..dfc0bf0f0 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
@@ -102,7 +102,7 @@ int
 B3SOIPDnoise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, 
               Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 B3SOIPDmodel *model = (B3SOIPDmodel *)inModel;
 B3SOIPDinstance *here;
diff --git a/src/spicelib/devices/bsim3v0/b3v0noi.c b/src/spicelib/devices/bsim3v0/b3v0noi.c
index ffa6f192c..a75ea3c0c 100644
--- a/src/spicelib/devices/bsim3v0/b3v0noi.c
+++ b/src/spicelib/devices/bsim3v0/b3v0noi.c
@@ -72,7 +72,7 @@ int
 BSIM3v0noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, 
               Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 BSIM3v0model *model = (BSIM3v0model *)inModel;
 BSIM3v0instance *here;
diff --git a/src/spicelib/devices/bsim3v1/b3v1noi.c b/src/spicelib/devices/bsim3v1/b3v1noi.c
index 94691f2a9..021cffb90 100644
--- a/src/spicelib/devices/bsim3v1/b3v1noi.c
+++ b/src/spicelib/devices/bsim3v1/b3v1noi.c
@@ -95,7 +95,7 @@ int
 BSIM3v1noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, 
               Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 BSIM3v1model *model = (BSIM3v1model *)inModel;
 BSIM3v1instance *here;
diff --git a/src/spicelib/devices/bsim3v32/b3v32noi.c b/src/spicelib/devices/bsim3v32/b3v32noi.c
index 1dd316f8d..93b3815e1 100644
--- a/src/spicelib/devices/bsim3v32/b3v32noi.c
+++ b/src/spicelib/devices/bsim3v32/b3v32noi.c
@@ -178,7 +178,7 @@ int
 BSIM3v32noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt,
 	    Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 BSIM3v32model *model = (BSIM3v32model *)inModel;
 BSIM3v32instance *here;
diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c
index 24743f281..6edb86dad 100644
--- a/src/spicelib/devices/bsim4/b4noi.c
+++ b/src/spicelib/devices/bsim4/b4noi.c
@@ -87,7 +87,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 BSIM4model *model = (BSIM4model *)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4v4/b4v4noi.c b/src/spicelib/devices/bsim4v4/b4v4noi.c
index 8955d8f67..a6ad79cbe 100644
--- a/src/spicelib/devices/bsim4v4/b4v4noi.c
+++ b/src/spicelib/devices/bsim4v4/b4v4noi.c
@@ -112,7 +112,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 BSIM4v4model *model = (BSIM4v4model *)inModel;
 BSIM4v4instance *here;
diff --git a/src/spicelib/devices/bsim4v5/b4v5noi.c b/src/spicelib/devices/bsim4v5/b4v5noi.c
index 863914e04..1786a0e6c 100644
--- a/src/spicelib/devices/bsim4v5/b4v5noi.c
+++ b/src/spicelib/devices/bsim4v5/b4v5noi.c
@@ -82,7 +82,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 BSIM4v5model *model = (BSIM4v5model *)inModel;
 BSIM4v5instance *here;
diff --git a/src/spicelib/devices/bsim4v6/b4v6noi.c b/src/spicelib/devices/bsim4v6/b4v6noi.c
index c3fcb2d80..4aa9d1c8f 100644
--- a/src/spicelib/devices/bsim4v6/b4v6noi.c
+++ b/src/spicelib/devices/bsim4v6/b4v6noi.c
@@ -83,7 +83,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
 BSIM4v6model *model = (BSIM4v6model *)inModel;
 BSIM4v6instance *here;
diff --git a/src/spicelib/devices/csw/cswnoise.c b/src/spicelib/devices/csw/cswnoise.c
index 4398d2184..1e71880f8 100644
--- a/src/spicelib/devices/csw/cswnoise.c
+++ b/src/spicelib/devices/csw/cswnoise.c
@@ -24,7 +24,7 @@ Author: 1987 Gary W. Ng
 int
 CSWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     CSWmodel *firstModel = (CSWmodel *) genmodel;
     CSWmodel *model;
diff --git a/src/spicelib/devices/dio/dionoise.c b/src/spicelib/devices/dio/dionoise.c
index 64a8d602d..7b80bbcf5 100644
--- a/src/spicelib/devices/dio/dionoise.c
+++ b/src/spicelib/devices/dio/dionoise.c
@@ -26,7 +26,7 @@ int
 DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
           Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     DIOmodel *firstModel = (DIOmodel *) genmodel;
     DIOmodel *model;
diff --git a/src/spicelib/devices/hisim2/hsm2noi.c b/src/spicelib/devices/hisim2/hsm2noi.c
index a1d0f1e68..8b5dd65ea 100644
--- a/src/spicelib/devices/hisim2/hsm2noi.c
+++ b/src/spicelib/devices/hisim2/hsm2noi.c
@@ -39,7 +39,7 @@ int HSM2noise (
      register Ndata *data,
      double *OnDens)
 {
-  #define job ((NOISEAN*)ckt->CKTcurJob)
+  NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
   register HSM2model *model = (HSM2model *)inModel;
   register HSM2instance *here;
diff --git a/src/spicelib/devices/hisimhv/hsmhvnoi.c b/src/spicelib/devices/hisimhv/hsmhvnoi.c
index 6fba13632..41e2e9701 100644
--- a/src/spicelib/devices/hisimhv/hsmhvnoi.c
+++ b/src/spicelib/devices/hisimhv/hsmhvnoi.c
@@ -42,7 +42,7 @@ int HSMHVnoise (
      register Ndata *data,
      double *OnDens)
 {
-  #define job ((NOISEAN*)ckt->CKTcurJob)
+  NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
   register HSMHVmodel *model = (HSMHVmodel *)inModel;
   register HSMHVinstance *here;
diff --git a/src/spicelib/devices/jfet/jfetnoi.c b/src/spicelib/devices/jfet/jfetnoi.c
index caf8eb032..a57c141fe 100644
--- a/src/spicelib/devices/jfet/jfetnoi.c
+++ b/src/spicelib/devices/jfet/jfetnoi.c
@@ -24,7 +24,7 @@ int
 JFETnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, 
            double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     JFETmodel *firstModel = (JFETmodel *) genmodel;
     JFETmodel *model;
diff --git a/src/spicelib/devices/jfet2/jfet2noi.c b/src/spicelib/devices/jfet2/jfet2noi.c
index d5249f0ba..c72ea4938 100644
--- a/src/spicelib/devices/jfet2/jfet2noi.c
+++ b/src/spicelib/devices/jfet2/jfet2noi.c
@@ -27,7 +27,7 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker )
 int
 JFET2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     JFET2model *firstModel = (JFET2model *) genmodel;
     JFET2model *model;
diff --git a/src/spicelib/devices/mes/mesnoise.c b/src/spicelib/devices/mes/mesnoise.c
index 75d78c378..b9c474fe9 100644
--- a/src/spicelib/devices/mes/mesnoise.c
+++ b/src/spicelib/devices/mes/mesnoise.c
@@ -24,7 +24,7 @@ int
 MESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data,
           double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     MESmodel *firstModel = (MESmodel *) genmodel;
     MESmodel *model;
diff --git a/src/spicelib/devices/mos1/mos1noi.c b/src/spicelib/devices/mos1/mos1noi.c
index fb60d63a0..c8f20faa0 100644
--- a/src/spicelib/devices/mos1/mos1noi.c
+++ b/src/spicelib/devices/mos1/mos1noi.c
@@ -25,7 +25,7 @@ int
 MOS1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
            Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     MOS1model *firstModel = (MOS1model *) genmodel;
     MOS1model *model;
diff --git a/src/spicelib/devices/mos2/mos2noi.c b/src/spicelib/devices/mos2/mos2noi.c
index 85203d923..fc0df268e 100644
--- a/src/spicelib/devices/mos2/mos2noi.c
+++ b/src/spicelib/devices/mos2/mos2noi.c
@@ -25,7 +25,7 @@ int
 MOS2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
            Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     MOS2model *firstModel = (MOS2model *) genmodel;
     MOS2model *model;
diff --git a/src/spicelib/devices/mos3/mos3noi.c b/src/spicelib/devices/mos3/mos3noi.c
index 25ded6685..18a518866 100644
--- a/src/spicelib/devices/mos3/mos3noi.c
+++ b/src/spicelib/devices/mos3/mos3noi.c
@@ -25,7 +25,7 @@ int
 MOS3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
            Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     MOS3model *firstModel = (MOS3model *) genmodel;
     MOS3model *model;
diff --git a/src/spicelib/devices/mos9/mos9noi.c b/src/spicelib/devices/mos9/mos9noi.c
index 0980d453d..7345cf7a4 100644
--- a/src/spicelib/devices/mos9/mos9noi.c
+++ b/src/spicelib/devices/mos9/mos9noi.c
@@ -25,7 +25,7 @@ int
 MOS9noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
            Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     MOS9model *firstModel = (MOS9model *) genmodel;
     MOS9model *model;
diff --git a/src/spicelib/devices/res/resnoise.c b/src/spicelib/devices/res/resnoise.c
index 7ed5ef732..69db2a4ad 100644
--- a/src/spicelib/devices/res/resnoise.c
+++ b/src/spicelib/devices/res/resnoise.c
@@ -30,7 +30,7 @@ int
 RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
           Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     RESmodel *firstModel = (RESmodel *) genmodel;
     RESmodel *model;
diff --git a/src/spicelib/devices/soi3/soi3nois.c b/src/spicelib/devices/soi3/soi3nois.c
index 0e8bb9b05..290058386 100644
--- a/src/spicelib/devices/soi3/soi3nois.c
+++ b/src/spicelib/devices/soi3/soi3nois.c
@@ -44,7 +44,7 @@ SOI3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
            Ndata *data, double *OnDens)
     
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     SOI3model *firstModel = (SOI3model *) genmodel;
     SOI3model *model;
diff --git a/src/spicelib/devices/sw/swnoise.c b/src/spicelib/devices/sw/swnoise.c
index 3cb787712..817d900bb 100644
--- a/src/spicelib/devices/sw/swnoise.c
+++ b/src/spicelib/devices/sw/swnoise.c
@@ -24,7 +24,7 @@ Author: 1987 Gary W. Ng
 int
 SWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     SWmodel *firstModel = (SWmodel *) genmodel;
     SWmodel *model;
diff --git a/src/spicelib/devices/vbic/vbicnoise.c b/src/spicelib/devices/vbic/vbicnoise.c
index 77b0e234c..f6b5dafbc 100644
--- a/src/spicelib/devices/vbic/vbicnoise.c
+++ b/src/spicelib/devices/vbic/vbicnoise.c
@@ -26,7 +26,7 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH
 int
 VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;
 
     VBICmodel *firstModel = (VBICmodel *) genmodel;
     VBICmodel *model;