diff --git a/ChangeLog b/ChangeLog
index 2cb7aa207..690b39cc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
+2010-11-16  Robert Larice
+ * src/**/* :
+    rename `IGNORE()' --> `NG_IGNORE()'
+      due to name collision on windows.
+
 2010-11-16 Holger Vogt
-* linear.c: prevent loop in case of vector not found 
+ * linear.c: prevent loop in case of vector not found
 
 2010-11-16  Robert Larice
  * src/Makefile.am :
diff --git a/src/ciderlib/oned/onesetup.c b/src/ciderlib/oned/onesetup.c
index ad2834f2c..078b3cf47 100644
--- a/src/ciderlib/oned/onesetup.c
+++ b/src/ciderlib/oned/onesetup.c
@@ -123,7 +123,7 @@ ONEcopyBCinfo(ONEdevice *pDevice, ONEelem *pElem, BDRYcard *bdry, int index)
   int eIndex;
   double length;
 
-  IGNORE(pDevice);
+  NG_IGNORE(pDevice);
 
   /* First add fixed charge. */
   pNode = pElem->pNodes[index];
diff --git a/src/ciderlib/twod/twoadmit.c b/src/ciderlib/twod/twoadmit.c
index d4111b6af..e262b4525 100644
--- a/src/ciderlib/twod/twoadmit.c
+++ b/src/ciderlib/twod/twoadmit.c
@@ -765,7 +765,7 @@ contactAdmittance(TWOdevice *pDevice, TWOcontact *pContact, BOOLEAN delVContact,
   SPcomplex prod1, prod2, sum;
   double temp;
 
-  IGNORE(pDevice);
+  NG_IGNORE(pDevice);
 
   CMPLX_ASSIGN_VALUE(yTotal, 0.0, 0.0);
 
@@ -966,7 +966,7 @@ oxideAdmittance(TWOdevice *pDevice, TWOcontact *pContact, BOOLEAN delVContact,
   SPcomplex psiAc;
   SPcomplex prod1, prod2;
 
-  IGNORE(pDevice);
+  NG_IGNORE(pDevice);
 
   CMPLX_ASSIGN_VALUE(yTotal, 0.0, 0.0);
 
diff --git a/src/ciderlib/twod/twocond.c b/src/ciderlib/twod/twocond.c
index 5654cc12d..3f46be328 100644
--- a/src/ciderlib/twod/twocond.c
+++ b/src/ciderlib/twod/twocond.c
@@ -274,7 +274,7 @@ double
   double gTotal = 0.0;
   int nInc, pInc;
   
-  IGNORE(pDevice);
+  NG_IGNORE(pDevice);
 
   /* for one carrier the rest of this code relies on appropriate 
      current derivative term to be zero */
@@ -435,7 +435,7 @@ double
   double dPsiDv;
   double gTotal = 0.0;
   
-  IGNORE(pDevice);
+  NG_IGNORE(pDevice);
 
   if ( !tranAnalysis ) {
     return( gTotal );
diff --git a/src/ciderlib/twod/twocurr.c b/src/ciderlib/twod/twocurr.c
index 896321d93..464fc1704 100644
--- a/src/ciderlib/twod/twocurr.c
+++ b/src/ciderlib/twod/twocurr.c
@@ -25,7 +25,7 @@ nodeCurrents(TWOelem *pElem, TWOnode *pNode, double *mun, double *mup,
   double epsL = 0.0, epsR = 0.0, epsT = 0.0, epsB = 0.0;
   double coeff1, coeff2;
 
-  IGNORE(pElem);
+  NG_IGNORE(pElem);
 
   /* Find all four neighboring elements */
   pElemTL = pNode->pTLElem;
diff --git a/src/ciderlib/twod/twofield.c b/src/ciderlib/twod/twofield.c
index 33e3e8399..3950ccc85 100644
--- a/src/ciderlib/twod/twofield.c
+++ b/src/ciderlib/twod/twofield.c
@@ -21,7 +21,7 @@ nodeFields(TWOelem *pElem, TWOnode *pNode, double *ex, double *ey)
   double dxL = 0.0, dxR = 0.0, dyT = 0.0, dyB = 0.0;
   double ef1, ef2, coeff1, coeff2;
 
-  IGNORE(pElem);
+  NG_IGNORE(pElem);
 
   /* Find all four neighboring elements */
   pElemTL = pNode->pTLElem;
diff --git a/src/ciderlib/twod/twomobfn.c b/src/ciderlib/twod/twomobfn.c
index 6d4909e8a..128446bd9 100644
--- a/src/ciderlib/twod/twomobfn.c
+++ b/src/ciderlib/twod/twomobfn.c
@@ -47,9 +47,9 @@ MOBsurfElec(TWOmaterial *info, TWOelem *pElem, double ex, double ey,
   double dElDWx;                   /* Lateral Derivative x Component */
   double dElDWy;                   /* Lateral Derivative y Component */
   
-  IGNORE(wx);
-  IGNORE(wy);
-  IGNORE(totalConc);
+  NG_IGNORE(wx);
+  NG_IGNORE(wy);
+  NG_IGNORE(totalConc);
 
   if ( pElem->surface ) { /* replace one field component with surface field */
     if ( pElem->direction == 0 ) {
@@ -251,9 +251,9 @@ MOBsurfHole(TWOmaterial *info, TWOelem *pElem, double ex, double ey,
   double dElDWx;                   /* Lateral Derivative x Component */
   double dElDWy;                   /* Lateral Derivative y Component */
   
-  IGNORE(wx);
-  IGNORE(wy);
-  IGNORE(totalConc);
+  NG_IGNORE(wx);
+  NG_IGNORE(wy);
+  NG_IGNORE(totalConc);
 
   if ( pElem->surface ) { /* replace one field component with surface field */
     if ( pElem->direction == 0 ) {
diff --git a/src/frontend/arg.c b/src/frontend/arg.c
index b281d481a..df748e8f1 100644
--- a/src/frontend/arg.c
+++ b/src/frontend/arg.c
@@ -96,8 +96,8 @@ void arg_set(wordlist *wl, struct comm *command)
 
 void arg_display(wordlist *wl, struct comm *command)
 {
-    IGNORE(wl);
-    IGNORE(command);
+    NG_IGNORE(wl);
+    NG_IGNORE(command);
 
     /* just return; display does the right thing */
 
diff --git a/src/frontend/aspice.c b/src/frontend/aspice.c
index ebf5b73d1..f37023400 100644
--- a/src/frontend/aspice.c
+++ b/src/frontend/aspice.c
@@ -156,7 +156,7 @@ com_jobs(wordlist *wl)
 {
     struct proc *p;
 
-    IGNORE(wl);
+    NG_IGNORE(wl);
 
     for (p = running; p; p = p->pr_next)
         fprintf(cp_out, "%d\t%.70s\n", p->pr_pid, p->pr_name);
@@ -416,7 +416,7 @@ void
 com_aspice(
     wordlist *wl)
 {
-	IGNORE(wl);
+	NG_IGNORE(wl);
 	fprintf(cp_err, "Asynchronous spice jobs are not available.\n");
 	return;
 }
@@ -425,7 +425,7 @@ void
 com_jobs(
     wordlist *wl)
 {
-	IGNORE(wl);
+	NG_IGNORE(wl);
 	fprintf(cp_err, "Asynchronous spice jobs are not available.\n");
 	return;
 }
@@ -440,7 +440,7 @@ void
 com_rspice(
     wordlist *wl)
 {
-	IGNORE(wl);
+	NG_IGNORE(wl);
 	fprintf(cp_err, "Remote spice jobs are not available.\n");
 	return;
 }
diff --git a/src/frontend/breakp.c b/src/frontend/breakp.c
index 889c8e539..413362b18 100644
--- a/src/frontend/breakp.c
+++ b/src/frontend/breakp.c
@@ -205,7 +205,7 @@ com_sttus(wordlist *wl)
 {
     struct dbcomm *d, *dc;
 
-    IGNORE(wl);
+    NG_IGNORE(wl);
 
     for (d = dbs; d; d = d->db_next) {
         if (d->db_type == DB_TRACENODE) {
diff --git a/src/frontend/com_dump.c b/src/frontend/com_dump.c
index cb91eee20..f48577004 100644
--- a/src/frontend/com_dump.c
+++ b/src/frontend/com_dump.c
@@ -13,7 +13,7 @@
 void
 com_dump(wordlist *wl)
 {
-    IGNORE(wl);
+    NG_IGNORE(wl);
 
     if (!ft_curckt || !ft_curckt->ci_ckt) {
         fprintf(cp_err, "Error: no circuit loaded.\n");
diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c
index 4017c946d..8e98e30b3 100644
--- a/src/frontend/com_measure2.c
+++ b/src/frontend/com_measure2.c
@@ -952,7 +952,7 @@ static void measure_ERR3(void) {
 
 void com_dotmeasure(wordlist *wl) {
 
-   IGNORE(wl);
+   NG_IGNORE(wl);
 
 /* simulation info */
 //      printf("*%s\n", plot_cur->pl_title);
diff --git a/src/frontend/com_rehash.c b/src/frontend/com_rehash.c
index de8072d9c..3ad6303f8 100644
--- a/src/frontend/com_rehash.c
+++ b/src/frontend/com_rehash.c
@@ -17,7 +17,7 @@ com_rehash(wordlist *wl)
 {
     char *s;
 
-    IGNORE(wl);
+    NG_IGNORE(wl);
 
     if (!cp_dounixcom) {
         fprintf(cp_err, "Error: unixcom not set.\n");
diff --git a/src/frontend/com_state.c b/src/frontend/com_state.c
index 82d8302f8..6d170f2ad 100644
--- a/src/frontend/com_state.c
+++ b/src/frontend/com_state.c
@@ -14,7 +14,7 @@
 void
 com_state(wordlist *wl)
 {
-    IGNORE(wl);
+    NG_IGNORE(wl);
 
     if (!ft_curckt) {
         fprintf(cp_err, "Error: no circuit loaded.\n");
diff --git a/src/frontend/com_sysinfo.c b/src/frontend/com_sysinfo.c
index ffa15bee1..912c65b8a 100644
--- a/src/frontend/com_sysinfo.c
+++ b/src/frontend/com_sysinfo.c
@@ -90,7 +90,7 @@ void com_sysinfo(wordlist *wl)
    int errorcode;
    TesSystemInfo* info;
 
-   IGNORE(wl);
+   NG_IGNORE(wl);
 
    info = TMALLOC(TesSystemInfo, 1);
 
diff --git a/src/frontend/device.c b/src/frontend/device.c
index fe808110e..fc4604e47 100644
--- a/src/frontend/device.c
+++ b/src/frontend/device.c
@@ -403,8 +403,8 @@ all_show_old(wordlist *wl, int mode)
 int
 printstr_n(dgen *dg, IFparm *p, int i)
 {
-    IGNORE(p);
-    IGNORE(i);
+    NG_IGNORE(p);
+    NG_IGNORE(i);
 
     if (dg->instance)
         fprintf(cp_out," %*.*s", DEV_WIDTH, DEV_WIDTH, dg->instance->GENname);
@@ -416,8 +416,8 @@ printstr_n(dgen *dg, IFparm *p, int i)
 int
 printstr_m(dgen *dg, IFparm *p, int i)
 {
-    IGNORE(p);
-    IGNORE(i);
+    NG_IGNORE(p);
+    NG_IGNORE(i);
 
     if (dg->model)
         fprintf(cp_out," %*.*s", DEV_WIDTH, DEV_WIDTH, dg->model->GENmodName);
@@ -573,9 +573,9 @@ listparam(wordlist *p, dgen *dg)
 
 int bogus1(dgen *dg, IFparm *p, int i)
 {
-    IGNORE(dg);
-    IGNORE(p);
-    IGNORE(i);
+    NG_IGNORE(dg);
+    NG_IGNORE(p);
+    NG_IGNORE(i);
 
     fprintf(cp_out," %*s", DEV_WIDTH, "---------");
     return 0;
@@ -583,9 +583,9 @@ int bogus1(dgen *dg, IFparm *p, int i)
 
 int bogus2(dgen *dg, IFparm *p, int i)
 {
-    IGNORE(dg);
-    IGNORE(p);
-    IGNORE(i);
+    NG_IGNORE(dg);
+    NG_IGNORE(p);
+    NG_IGNORE(i);
 
     fprintf(cp_out," %*s", DEV_WIDTH, "?????????");
     return 0;
diff --git a/src/frontend/error.c b/src/frontend/error.c
index cf77abb0a..49f8b8777 100644
--- a/src/frontend/error.c
+++ b/src/frontend/error.c
@@ -39,7 +39,7 @@ controlled_exit(int status)
 void
 fperror(char *mess, int code)
 {
-    IGNORE(code);
+    NG_IGNORE(code);
     fprintf(cp_err, "%s: floating point exception.\n", mess);
     return;
 }
diff --git a/src/frontend/fourier.c b/src/frontend/fourier.c
index 714872f8a..7dc63ff92 100644
--- a/src/frontend/fourier.c
+++ b/src/frontend/fourier.c
@@ -263,7 +263,7 @@ CKTfour(int ndata,		/* number of entries in the Time and
     int j;
     double tmp;
 
-    IGNORE(Time);
+    NG_IGNORE(Time);
 
     /* clear output/computation arrays */
 
diff --git a/src/frontend/gens.c b/src/frontend/gens.c
index 800870609..014179b99 100644
--- a/src/frontend/gens.c
+++ b/src/frontend/gens.c
@@ -30,7 +30,7 @@ dgen_init(GENcircuit *ckt, wordlist *wl, int nomix, int flag, int model)
 	dgen	*dg, *dg_save;
 	wordlist **prevp;
 
-	IGNORE(nomix);
+	NG_IGNORE(nomix);
 
 	dg = NEW(dgen);
 	dg->ckt = ckt;
diff --git a/src/frontend/help/textdisp.c b/src/frontend/help/textdisp.c
index c84588579..4ac9e35cd 100644
--- a/src/frontend/help/textdisp.c
+++ b/src/frontend/help/textdisp.c
@@ -128,7 +128,7 @@ hlp_thandle(topic **parent)
 void
 hlp_tkillwin(topic *top)
 {
-    IGNORE(top);
+    NG_IGNORE(top);
 
     if (curtop)
         curtop = curtop->parent;
diff --git a/src/frontend/help/x11disp.c b/src/frontend/help/x11disp.c
index 76d083e9d..ff990b508 100644
--- a/src/frontend/help/x11disp.c
+++ b/src/frontend/help/x11disp.c
@@ -34,8 +34,8 @@ static Display *display;
 static void handle_wm_messages(Widget w, XtPointer client_data, XEvent *event, Boolean *cont) {
     topic *top = (topic *) client_data;
 
-    IGNORE(cont);
-    IGNORE(w);
+    NG_IGNORE(cont);
+    NG_IGNORE(w);
 
     if (event->type == ClientMessage
             && event->xclient.message_type == atom_wm_protocols
@@ -231,8 +231,8 @@ newtopic(Widget w, caddr_t client_data, caddr_t call_data)
     toplink *result = ((handle *) client_data)->result;
     topic *newtop;
 
-    IGNORE(call_data);
-    IGNORE(w);
+    NG_IGNORE(call_data);
+    NG_IGNORE(w);
 
     if (!(newtop = hlp_read(result->place))) {
       fprintf(stderr, "Internal error: bad link\n");
@@ -255,8 +255,8 @@ delete(Widget w, caddr_t client_data, caddr_t call_data)
 
     topic *top = (topic *) client_data;
 
-    IGNORE(call_data);
-    IGNORE(w);
+    NG_IGNORE(call_data);
+    NG_IGNORE(w);
 
     hlp_killfamily(top);
     hlp_fixchildren(top);
@@ -268,8 +268,8 @@ quit(Widget w, caddr_t client_data, caddr_t call_data)
 
     topic *top = (topic *) client_data, *parent = top->parent;
 
-    IGNORE(call_data);
-    IGNORE(w);
+    NG_IGNORE(call_data);
+    NG_IGNORE(w);
 
     while (parent && parent->parent) parent = parent->parent;
     hlp_killfamily(parent ? parent : top);
diff --git a/src/frontend/help/xdisplay.c b/src/frontend/help/xdisplay.c
index d30b14940..bae5e01a5 100644
--- a/src/frontend/help/xdisplay.c
+++ b/src/frontend/help/xdisplay.c
@@ -30,8 +30,8 @@ int hlp_buttonstyle = BS_LEFT;
 
 /* ARGSUSED */ void hlp_xwait(topic *top, bool on)
 {
-    IGNORE(on);
-    IGNORE(top);
+    NG_IGNORE(on);
+    NG_IGNORE(top);
 }
 
 void hlp_xclosedisplay(void) {}
diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index 3fc045ccf..e7874c796 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -3144,7 +3144,7 @@ inp_sort_params( struct line *start_card, struct line *end_card, struct line *ca
   struct line **ptr_array;
   struct line **ptr_array_ordered;
 
-  IGNORE(end_card);
+  NG_IGNORE(end_card);
 
   if ( start_card == NULL ) return;    
 
diff --git a/src/frontend/misccoms.c b/src/frontend/misccoms.c
index c000398b7..e7a397464 100644
--- a/src/frontend/misccoms.c
+++ b/src/frontend/misccoms.c
@@ -116,7 +116,7 @@ com_bug(wordlist *wl)
 {
     char buf[BSIZE_SP];
 
-    IGNORE(wl);
+    NG_IGNORE(wl);
 
     if (!Bug_Addr || !*Bug_Addr) {
         fprintf(cp_err, "Error: No address to send bug reports to.\n");
diff --git a/src/frontend/mw_coms.c b/src/frontend/mw_coms.c
index 7b37b7c06..a32fd1969 100644
--- a/src/frontend/mw_coms.c
+++ b/src/frontend/mw_coms.c
@@ -31,7 +31,7 @@ com_removecirc(wordlist *wl)
     char* namecircuit;
     char buf[80];
 
-    IGNORE(wl);
+    NG_IGNORE(wl);
 
     /* Allocation of a temp wordlist */
     wlist = (struct wordlist *)malloc(sizeof(struct wordlist));
diff --git a/src/frontend/numparam/spicenum.c b/src/frontend/numparam/spicenum.c
index e9ef5cef0..b1408187a 100644
--- a/src/frontend/numparam/spicenum.c
+++ b/src/frontend/numparam/spicenum.c
@@ -925,7 +925,7 @@ nupa_fetchinstance (void)
 
 void dump_symbols( tdico *dico_p )
 {
-   IGNORE(dico_p);
+   NG_IGNORE(dico_p);
 
    fprintf (stderr, "Symbol table\n");
    nupa_list_params ( stderr ) ;
diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index e2117a4aa..6291767ff 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -433,7 +433,7 @@ define (tdico * dico,
    SPICE_DSTRING vartemp ;		/* vairable temp */
    NGHASHPTR htable_p ;			/* hash table */
 
-   IGNORE(pval);
+   NG_IGNORE(pval);
 
    spice_dstring_init(&vartemp) ;
 
diff --git a/src/frontend/nutinp.c b/src/frontend/nutinp.c
index 5566e6b7d..b962e9fb3 100644
--- a/src/frontend/nutinp.c
+++ b/src/frontend/nutinp.c
@@ -271,12 +271,12 @@ nutinp_source(char *file)
 void
 nutinp_dodeck(struct line *deck, char *tt, wordlist *end, bool reuse, struct line *options, char *filename)
 {
-    IGNORE(filename);
-    IGNORE(options);
-    IGNORE(reuse);
-    IGNORE(end);
-    IGNORE(tt);
-    IGNORE(deck);
+    NG_IGNORE(filename);
+    NG_IGNORE(options);
+    NG_IGNORE(reuse);
+    NG_IGNORE(end);
+    NG_IGNORE(tt);
+    NG_IGNORE(deck);
 
     /* This was "ifdef notdef"-ed out, so I tossed it */
 }
diff --git a/src/frontend/nutmegif.c b/src/frontend/nutmegif.c
index 4995fd523..46190b6bc 100644
--- a/src/frontend/nutmegif.c
+++ b/src/frontend/nutmegif.c
@@ -15,11 +15,11 @@
 
 struct variable * nutif_getparam(CKTcircuit *ckt, char **name, char *param, int ind, int do_model)
 {
-    IGNORE(do_model);
-    IGNORE(ind);
-    IGNORE(param);
-    IGNORE(name);
-    IGNORE(ckt);
+    NG_IGNORE(do_model);
+    NG_IGNORE(ind);
+    NG_IGNORE(param);
+    NG_IGNORE(name);
+    NG_IGNORE(ckt);
 
     return ((struct variable *) NULL);
 }
diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c
index 8c3bc62f1..892fc05d3 100644
--- a/src/frontend/outitf.c
+++ b/src/frontend/outitf.c
@@ -624,9 +624,9 @@ OUTpData(void *plotPtr, IFvalue *refValue, IFvalue *valuePtr)
 int
 OUTwReference(void *plotPtr, IFvalue *valuePtr, void **refPtr)
 {
-    IGNORE(refPtr);
-    IGNORE(valuePtr);
-    IGNORE(plotPtr);
+    NG_IGNORE(refPtr);
+    NG_IGNORE(valuePtr);
+    NG_IGNORE(plotPtr);
 
     return (OK);
 }
@@ -634,10 +634,10 @@ OUTwReference(void *plotPtr, IFvalue *valuePtr, void **refPtr)
 int
 OUTwData(void *plotPtr, int dataIndex, IFvalue *valuePtr, void *refPtr)
 {
-    IGNORE(refPtr);
-    IGNORE(valuePtr);
-    IGNORE(dataIndex);
-    IGNORE(plotPtr);
+    NG_IGNORE(refPtr);
+    NG_IGNORE(valuePtr);
+    NG_IGNORE(dataIndex);
+    NG_IGNORE(plotPtr);
 
     return (OK);
 }
@@ -646,7 +646,7 @@ OUTwData(void *plotPtr, int dataIndex, IFvalue *valuePtr, void *refPtr)
 int
 OUTwEnd(void *plotPtr)
 {
-    IGNORE(plotPtr);
+    NG_IGNORE(plotPtr);
     return (OK);
 }
 
@@ -679,10 +679,10 @@ OUTendPlot(void *plotPtr)
 int
 OUTbeginDomain(void *plotPtr, IFuid refName, int refType, IFvalue *outerRefValue)
 {
-    IGNORE(outerRefValue);
-    IGNORE(refType);
-    IGNORE(refName);
-    IGNORE(plotPtr);
+    NG_IGNORE(outerRefValue);
+    NG_IGNORE(refType);
+    NG_IGNORE(refName);
+    NG_IGNORE(plotPtr);
 
     return (OK);
 }
@@ -691,7 +691,7 @@ OUTbeginDomain(void *plotPtr, IFuid refName, int refType, IFvalue *outerRefValue
 int
 OUTendDomain(void *plotPtr)
 {
-    IGNORE(plotPtr);
+    NG_IGNORE(plotPtr);
     return (OK);
 }
 
@@ -706,7 +706,7 @@ OUTattributes(void *plotPtr, IFuid varName, int param, IFvalue *value)
     GRIDTYPE type;
     int i;
 
-    IGNORE(value);
+    NG_IGNORE(value);
 
     if (param == OUT_SCALE_LIN)
 	type = GRID_LIN;
diff --git a/src/frontend/parse-bison.c b/src/frontend/parse-bison.c
index ca2865a59..dcd6a9d25 100644
--- a/src/frontend/parse-bison.c
+++ b/src/frontend/parse-bison.c
@@ -1867,9 +1867,9 @@ yyreturn:
 static void
 PPerror (YYLTYPE *locp, char **line, struct pnode **retval, char const *s)
 {
-  IGNORE(locp);
-  IGNORE(line);
-  IGNORE(retval);
+  NG_IGNORE(locp);
+  NG_IGNORE(line);
+  NG_IGNORE(retval);
 
   fprintf (stderr, "%s: %s\n", __func__, s);
 }
diff --git a/src/frontend/parse-bison.y b/src/frontend/parse-bison.y
index 01a766609..6c74c274b 100644
--- a/src/frontend/parse-bison.y
+++ b/src/frontend/parse-bison.y
@@ -163,9 +163,9 @@ exp:
 static void
 PPerror (YYLTYPE *locp, char **line, struct pnode **retval, char const *s)
 {
-  IGNORE(locp);
-  IGNORE(line);
-  IGNORE(retval);
+  NG_IGNORE(locp);
+  NG_IGNORE(line);
+  NG_IGNORE(retval);
 
   fprintf (stderr, "%s: %s\n", __func__, s);
 }
diff --git a/src/frontend/parse.c b/src/frontend/parse.c
index a728acb49..65326902f 100644
--- a/src/frontend/parse.c
+++ b/src/frontend/parse.c
@@ -526,7 +526,7 @@ char *
 db_print_pnode_tree(struct pnode *p, char *print)
 {
 #if 1
-    IGNORE(print);
+    NG_IGNORE(print);
     db_print_pnode(stdout, p);
     return NULL;
 #else
diff --git a/src/frontend/parser/complete.c b/src/frontend/parser/complete.c
index 3c8dd6980..e0d89b65a 100644
--- a/src/frontend/parser/complete.c
+++ b/src/frontend/parser/complete.c
@@ -335,9 +335,9 @@ printem(wordlist *wl)
 void
 cp_ccom(wordlist *wlist, char *buf, bool esc)
 {
-    IGNORE(wlist);
-    IGNORE(buf);
-    IGNORE(esc);
+    NG_IGNORE(wlist);
+    NG_IGNORE(buf);
+    NG_IGNORE(esc);
     return;
 }
 #endif
@@ -572,7 +572,7 @@ cp_kwswitch(int class, char *tree)
 void
 cp_ccrestart(bool kwords)
 {
-    IGNORE(kwords);
+    NG_IGNORE(kwords);
 
     /* Ack. */
     return;
diff --git a/src/frontend/parser/unixcom.c b/src/frontend/parser/unixcom.c
index ace1c34c9..aff6861f2 100644
--- a/src/frontend/parser/unixcom.c
+++ b/src/frontend/parser/unixcom.c
@@ -240,8 +240,8 @@ cp_hstat(void)
 void
 cp_rehash(char *pathlist, bool docc)
 {
-    IGNORE(docc);
-    IGNORE(pathlist);
+    NG_IGNORE(docc);
+    NG_IGNORE(pathlist);
 }
 
 bool
diff --git a/src/frontend/plotting/agraf.c b/src/frontend/plotting/agraf.c
index aea11b031..630551c26 100644
--- a/src/frontend/plotting/agraf.c
+++ b/src/frontend/plotting/agraf.c
@@ -45,9 +45,9 @@ ft_agraf(double *xlims, double *ylims, struct dvec *xscale, struct plot *plot, s
     int i, j, k;
     int shift;
 
-    IGNORE(xdel);
-    IGNORE(ydel);
-    IGNORE(ylog);
+    NG_IGNORE(xdel);
+    NG_IGNORE(ydel);
+    NG_IGNORE(ylog);
 
     /* ANSI C does not specify how many digits are in an exponent for %c
      * We assumed it was 2.  If it's more, shift starting position over.
diff --git a/src/frontend/plotting/gnuplot.c b/src/frontend/plotting/gnuplot.c
index 08f41906c..521e777f0 100644
--- a/src/frontend/plotting/gnuplot.c
+++ b/src/frontend/plotting/gnuplot.c
@@ -236,13 +236,13 @@ ft_writesimple(double *xlims, double *ylims, char *filename, char *title, char *
 
     char filename_data[128];
 
-    IGNORE(xlims);
-    IGNORE(ylims);
-    IGNORE(title);
-    IGNORE(xlabel);
-    IGNORE(ylabel);
-    IGNORE(gridtype);
-    IGNORE(plottype);
+    NG_IGNORE(xlims);
+    NG_IGNORE(ylims);
+    NG_IGNORE(title);
+    NG_IGNORE(xlabel);
+    NG_IGNORE(ylabel);
+    NG_IGNORE(gridtype);
+    NG_IGNORE(plottype);
 
     sprintf(filename_data, "%s.data", filename);
 
diff --git a/src/frontend/plotting/graf.c b/src/frontend/plotting/graf.c
index ed2baf6db..be4cbe45d 100644
--- a/src/frontend/plotting/graf.c
+++ b/src/frontend/plotting/graf.c
@@ -83,7 +83,7 @@ gr_init(double *xlims, double *ylims, /* The size of the screen. */
     wordlist *wl;
     char *comb_title;
 
-    IGNORE(nplots);
+    NG_IGNORE(nplots);
 
     if (!(graph = NewGraph())) {
       return(FALSE);
@@ -443,7 +443,7 @@ drawlegend(GRAPH *graph, int plotno, struct dvec *dv)
 void
 gr_end(struct dvec *dv)
 {
-    IGNORE(dv);
+    NG_IGNORE(dv);
     DevUpdate();
 }
 
diff --git a/src/frontend/plotting/grid.c b/src/frontend/plotting/grid.c
index 8ea3f3d5d..e67348bb7 100644
--- a/src/frontend/plotting/grid.c
+++ b/src/frontend/plotting/grid.c
@@ -483,8 +483,8 @@ drawlingrid(GRAPH *graph, char *units, int spacing, int nsp, double dst, double
     double m, step;
     char buf[LABEL_CHARS];
 
-    IGNORE(onedec);
-    IGNORE(mult);
+    NG_IGNORE(onedec);
+    NG_IGNORE(mult);
 
     /* i counts how many pixels we have drawn, and j counts which unit
      * we are at.
@@ -1318,7 +1318,7 @@ arcset(GRAPH *graph, double rad, double prevrad, double irad, double iprevrad, d
     double iangle = atan2((double) prevrad, (double) irad);
     int x, xlab, ylab;
 
-    IGNORE(nlab);
+    NG_IGNORE(nlab);
 
     /* Let's be lazy and just draw everything -- we won't get called too
      * much and the circles get clipped anyway...
diff --git a/src/frontend/plotting/plot5.c b/src/frontend/plotting/plot5.c
index 0c5258229..5e150c997 100644
--- a/src/frontend/plotting/plot5.c
+++ b/src/frontend/plotting/plot5.c
@@ -203,7 +203,7 @@ Plt5_SetLinestyle(int linestyleid)
 int
 Plt5_SetColor(int colorid)
 {
-    IGNORE(colorid);
+    NG_IGNORE(colorid);
 
     /* do nothing */
     return 0;
diff --git a/src/frontend/plotting/x11.c b/src/frontend/plotting/x11.c
index 336f5e1a7..9b69c5f1f 100644
--- a/src/frontend/plotting/x11.c
+++ b/src/frontend/plotting/x11.c
@@ -270,7 +270,7 @@ handlekeypressed(Widget w, caddr_t clientdata, caddr_t calldata)
     char text[4];
     int nbytes;
 
-    IGNORE(w);
+    NG_IGNORE(w);
 
     nbytes = XLookupString(keyev, text, 4, NULL, NULL);
     if (!nbytes) return;
@@ -296,7 +296,7 @@ handlebuttonev(Widget w, caddr_t clientdata, caddr_t calldata)
 
     XButtonEvent *buttonev = (XButtonEvent *) calldata;
 
-    IGNORE(w);
+    NG_IGNORE(w);
 
     switch (buttonev->button) {
       case Button1:
@@ -313,8 +313,8 @@ handlebuttonev(Widget w, caddr_t clientdata, caddr_t calldata)
 static void handle_wm_messages(Widget w, XtPointer client_data, XEvent *event, Boolean *cont) {
     GRAPH *graph = (GRAPH *) client_data;
 
-    IGNORE(cont);
-    IGNORE(w);
+    NG_IGNORE(cont);
+    NG_IGNORE(w);
 
     if (event->type == ClientMessage
             && event->xclient.message_type == atom_wm_protocols
@@ -558,10 +558,10 @@ X11_Text(char *text, int x, int y)
 int
 X11_DefineColor(int colorid, double red, double green, double blue)
 {
-    IGNORE(blue);
-    IGNORE(green);
-    IGNORE(red);
-    IGNORE(colorid);
+    NG_IGNORE(blue);
+    NG_IGNORE(green);
+    NG_IGNORE(red);
+    NG_IGNORE(colorid);
 
     internalerror("X11_DefineColor not implemented.");
     return 0;
@@ -571,8 +571,8 @@ X11_DefineColor(int colorid, double red, double green, double blue)
 int
 X11_DefineLinestyle(int linestyleid, int mask)
 {
-    IGNORE(mask);
-    IGNORE(linestyleid);
+    NG_IGNORE(mask);
+    NG_IGNORE(linestyleid);
 
     internalerror("X11_DefineLinestyle not implemented.");
     return 0;
@@ -845,8 +845,8 @@ zoomin(GRAPH *graph)
 void
 hardcopy(Widget w, caddr_t client_data, caddr_t call_data)
 {
-	IGNORE(call_data);
-	IGNORE(w);
+	NG_IGNORE(call_data);
+	NG_IGNORE(w);
 
 	/* com_hardcopy() -> gr_resize() -> setcolor() dirung postscript
 	printing will act on currentgraph with a DEVDEP inherited from PSdevdep.
@@ -874,8 +874,8 @@ killwin(Widget w, caddr_t client_data, caddr_t call_data)
 
     GRAPH *graph = (GRAPH *) client_data;
 
-    IGNORE(call_data);
-    IGNORE(w);
+    NG_IGNORE(call_data);
+    NG_IGNORE(w);
 
     /* Iplots are done asynchronously */
     DEVDEP(graph).isopen = 0;
@@ -910,7 +910,7 @@ redraw(Widget w, caddr_t client_data, caddr_t call_data)
     XRectangle rects[30];
     int n = 1;
 
-    IGNORE(w);
+    NG_IGNORE(w);
 
     DEVDEP(graph).isopen = 1;
 
@@ -949,7 +949,7 @@ resize(Widget w, caddr_t client_data, caddr_t call_data)
     GRAPH *graph = (GRAPH *) client_data;
     XEvent ev;
 
-    IGNORE(call_data);
+    NG_IGNORE(call_data);
 
     /* pull out all other exposure events
        Also, get rid of other StructureNotify events on this window. */
diff --git a/src/frontend/runcoms.c b/src/frontend/runcoms.c
index 9dc0b38e9..13e77b1d7 100644
--- a/src/frontend/runcoms.c
+++ b/src/frontend/runcoms.c
@@ -383,9 +383,9 @@ ft_dorun(char *file)
 bool
 ft_getOutReq(FILE **fpp, struct plot **plotp, bool *binp, char *name, char *title)
 {
-   IGNORE(title);
-   IGNORE(name);
-   IGNORE(plotp);
+   NG_IGNORE(title);
+   NG_IGNORE(name);
+   NG_IGNORE(plotp);
 
    if (rawfileFp) {
        *fpp = rawfileFp;
diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c
index 0e6a43785..f2338fd55 100644
--- a/src/frontend/runcoms2.c
+++ b/src/frontend/runcoms2.c
@@ -52,7 +52,7 @@ com_resume(wordlist *wl)
    bool ascii = AsciiRawFile;
    /*end saj*/
 
-   IGNORE(wl);
+   NG_IGNORE(wl);
 
    /*saj fix segment*/
    if (!ft_curckt) {
@@ -174,7 +174,7 @@ com_rset(wordlist *wl)
 {
     struct variable *v, *next;
 
-    IGNORE(wl);
+    NG_IGNORE(wl);
 
     if (ft_curckt == NULL) {
         fprintf(cp_err, "Error: there is no circuit loaded.\n");
diff --git a/src/frontend/signal_handler.c b/src/frontend/signal_handler.c
index 7ccb0617f..f9de1dcf6 100644
--- a/src/frontend/signal_handler.c
+++ b/src/frontend/signal_handler.c
@@ -87,7 +87,7 @@ ft_sigintr(void)
 RETSIGTYPE
 sigfloat(int sig, int code)
 {
-    IGNORE(sig);
+    NG_IGNORE(sig);
 
     gr_clean();
     fperror("Error", code);
diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c
index 430b21c31..a60a5c971 100644
--- a/src/frontend/spiceif.c
+++ b/src/frontend/spiceif.c
@@ -536,7 +536,7 @@ fputs("\t(Note that you must use an = to separate option name and value.)\n",
 void
 if_dump(CKTcircuit *ckt, FILE *file)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*void *cc = (void *) ckt;*/
 
@@ -620,7 +620,7 @@ spif_getparam_special(CKTcircuit *ckt,char **name,char *param,int ind,int do_mod
     GENmodel *mod=(GENmodel *)NULL;
     IFdevice *device;
 
-    IGNORE(do_model);
+    NG_IGNORE(do_model);
 
     /* fprintf(cp_err, "Calling if_getparam(%s, %s)\n", *name, param); */
 
@@ -1011,7 +1011,7 @@ parmlookup(IFdevice *dev, GENinstance **inptr, char *param, int do_model, int in
 {
     int i;
 
-    IGNORE(inptr);
+    NG_IGNORE(inptr);
 
     /* First try the device questions... */
     if (!do_model && dev->numInstanceParms) {
@@ -1058,7 +1058,7 @@ doask(CKTcircuit *ckt, int typecode, GENinstance *dev, GENmodel *mod, IFparm *op
     static IFvalue pv;
     int err;
 
-    IGNORE(typecode);
+    NG_IGNORE(typecode);
 
     pv.iValue = ind;    /* Sometimes this will be junk and ignored... */
 
@@ -1093,7 +1093,7 @@ doset(CKTcircuit *ckt, int typecode, GENinstance *dev, GENmodel *mod, IFparm *op
     double *dptr;
     int i;
 
-    IGNORE(typecode);
+    NG_IGNORE(typecode);
 
     /* Count items */
     if (opt->dataType & IF_VECTOR) {
diff --git a/src/frontend/where.c b/src/frontend/where.c
index a27460f93..54992440a 100644
--- a/src/frontend/where.c
+++ b/src/frontend/where.c
@@ -18,7 +18,7 @@ com_where(wordlist *wl)
 {
 	char	*msg;
 
-   IGNORE(wl);
+   NG_IGNORE(wl);
 
    /*CDHW typing where with no current circuit caused crashes CDHW*/
    if (!ft_curckt) {
diff --git a/src/include/ngspice.h b/src/include/ngspice.h
index 255ca4cdc..2c770280f 100644
--- a/src/include/ngspice.h
+++ b/src/include/ngspice.h
@@ -246,7 +246,7 @@ extern int tcl_fprintf(FILE *f, const char *format, ...);
 #endif
 
 /* macro to ignore unused variables and parameters */
-#define IGNORE(x)  (void)x
+#define NG_IGNORE(x)  (void)x
 
 
 #endif /* NGSPICE_H_INCLUDED */
diff --git a/src/main.c b/src/main.c
index 487817ae4..2b8b824e2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -237,10 +237,10 @@ IFfrontEnd nutmeginfo;
 int
 if_run(CKTcircuit *t, char *w, wordlist *s, INPtables *b)
 {
-    IGNORE(b);
-    IGNORE(s);
-    IGNORE(w);
-    IGNORE(t);
+    NG_IGNORE(b);
+    NG_IGNORE(s);
+    NG_IGNORE(w);
+    NG_IGNORE(t);
 
     return (0);
 }
@@ -249,9 +249,9 @@ if_run(CKTcircuit *t, char *w, wordlist *s, INPtables *b)
 int
 if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab)
 {
-    IGNORE(tab);
-    IGNORE(args);
-    IGNORE(t);
+    NG_IGNORE(tab);
+    NG_IGNORE(args);
+    NG_IGNORE(t);
 
     return (0);
 }
@@ -260,8 +260,8 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab)
 void
 if_dump(CKTcircuit *ckt, FILE *fp)
 {
-    IGNORE(fp);
-    IGNORE(ckt);
+    NG_IGNORE(fp);
+    NG_IGNORE(ckt);
 
     return;
 }
@@ -270,8 +270,8 @@ if_dump(CKTcircuit *ckt, FILE *fp)
 CKTcircuit *
 if_inpdeck(struct line *deck, INPtables **tab)
 {
-    IGNORE(tab);
-    IGNORE(deck);
+    NG_IGNORE(tab);
+    NG_IGNORE(deck);
     return NULL;
 }
 
@@ -279,10 +279,10 @@ if_inpdeck(struct line *deck, INPtables **tab)
 int
 if_option(CKTcircuit *ckt, char *name, enum cp_types type, void *value)
 {
-    IGNORE(value);
-    IGNORE(type);
-    IGNORE(name);
-    IGNORE(ckt);
+    NG_IGNORE(value);
+    NG_IGNORE(type);
+    NG_IGNORE(name);
+    NG_IGNORE(ckt);
 
     return 0;
 }
@@ -290,8 +290,8 @@ if_option(CKTcircuit *ckt, char *name, enum cp_types type, void *value)
 /* -------------------------------------------------------------------------- */
 void if_cktfree(CKTcircuit *ckt, INPtables *tab)
 {
-    IGNORE(tab);
-    IGNORE(ckt);
+    NG_IGNORE(tab);
+    NG_IGNORE(ckt);
 
     return;
 }
@@ -299,14 +299,14 @@ void if_cktfree(CKTcircuit *ckt, INPtables *tab)
 /* -------------------------------------------------------------------------- */
 void if_setndnames(char *line)
 {
-    IGNORE(line);
+    NG_IGNORE(line);
 }
 
 /* -------------------------------------------------------------------------- */
 char *
 if_errstring(int code)
 {
-    IGNORE(code);
+    NG_IGNORE(code);
     return ("spice error");
 }
 
@@ -314,9 +314,9 @@ if_errstring(int code)
 void
 if_setparam_model(CKTcircuit *ckt, char **name, char *val)
 {
-    IGNORE(val);
-    IGNORE(name);
-    IGNORE(ckt);
+    NG_IGNORE(val);
+    NG_IGNORE(name);
+    NG_IGNORE(ckt);
 
     return;
 }
@@ -324,11 +324,11 @@ if_setparam_model(CKTcircuit *ckt, char **name, char *val)
 void
 if_setparam(CKTcircuit *ckt, char **name, char *param, struct dvec *val, int do_model)
 {
-    IGNORE(do_model);
-    IGNORE(val);
-    IGNORE(param);
-    IGNORE(name);
-    IGNORE(ckt);
+    NG_IGNORE(do_model);
+    NG_IGNORE(val);
+    NG_IGNORE(param);
+    NG_IGNORE(name);
+    NG_IGNORE(ckt);
 
     return;
 }
@@ -337,10 +337,10 @@ if_setparam(CKTcircuit *ckt, char **name, char *param, struct dvec *val, int do_
 bool
 if_tranparams(struct circ *ckt, double *start, double *stop, double *step)
 {
-    IGNORE(step);
-    IGNORE(stop);
-    IGNORE(start);
-    IGNORE(ckt);
+    NG_IGNORE(step);
+    NG_IGNORE(stop);
+    NG_IGNORE(start);
+    NG_IGNORE(ckt);
 
     return (FALSE);
 }
@@ -349,8 +349,8 @@ if_tranparams(struct circ *ckt, double *start, double *stop, double *step)
 struct variable *
 if_getstat(CKTcircuit *ckt, char *name)
 {
-    IGNORE(name);
-    IGNORE(ckt);
+    NG_IGNORE(name);
+    NG_IGNORE(ckt);
 
     return (NULL);
 }
@@ -373,30 +373,30 @@ Ipc_Status_t ipc_send_errchk(void ) {
 }
 Ipc_Status_t ipc_get_line(char *str , int *len , Ipc_Wait_t wait ){
   Ipc_Status_t x = IPC_STATUS_OK;
-  IGNORE(str);
-  IGNORE(len);
-  IGNORE(wait);
+  NG_IGNORE(str);
+  NG_IGNORE(len);
+  NG_IGNORE(wait);
 
   return(x);
 }
 struct line *ENHtranslate_poly(struct line *deck){
-  IGNORE(deck);
+  NG_IGNORE(deck);
   return(NULL);
 }
 int load_opus(char *name){
-  IGNORE(name);
+  NG_IGNORE(name);
   return(1);
 }
 char  *MIFgettok(char **s){
-  IGNORE(s);
+  NG_IGNORE(s);
   return(NULL);
 }
 void EVTprint(wordlist *wl){
-  IGNORE(wl);
+  NG_IGNORE(wl);
   return;
 }
 struct dvec *EVTfindvec(char *node){
-  IGNORE(node);
+  NG_IGNORE(node);
   return NULL;
 }
 #endif /* XSPICE */
diff --git a/src/maths/cmaths/cmath2.c b/src/maths/cmaths/cmath2.c
index f2e327367..708091bb6 100644
--- a/src/maths/cmaths/cmath2.c
+++ b/src/maths/cmaths/cmath2.c
@@ -249,7 +249,7 @@ cx_rnd(void *data, short int type, int length, int *newlength, short int *newtyp
 void *
 cx_sunif(void *data, short int type, int length, int *newlength, short int *newtype)
 {
-    IGNORE(data);
+    NG_IGNORE(data);
 
     *newlength = length;
     checkseed();
@@ -280,7 +280,7 @@ cx_sunif(void *data, short int type, int length, int *newlength, short int *newt
 void *
 cx_sgauss(void *data, short int type, int length, int *newlength, short int *newtype)
 {
-    IGNORE(data);
+    NG_IGNORE(data);
 
     *newlength = length;
     checkseed();
@@ -394,8 +394,8 @@ cx_length(void *data, short int type, int length, int *newlength, short int *new
 {
     double *d;
 
-    IGNORE(data);
-    IGNORE(type);
+    NG_IGNORE(data);
+    NG_IGNORE(type);
 
     *newlength = 1;
     *newtype = VF_REAL;
@@ -417,7 +417,7 @@ cx_vector(void *data, short int type, int length, int *newlength, short int *new
     int i, len;
     double *d;
 
-    IGNORE(length);
+    NG_IGNORE(length);
 
     if (type == VF_REAL)
         len = (int)FTEcabs(*dd);
@@ -444,7 +444,7 @@ cx_unitvec(void *data, short int type, int length, int *newlength, short int *ne
     int i, len;
     double *d;
 
-    IGNORE(length);
+    NG_IGNORE(length);
 
     if (type == VF_REAL)
         len = (int)FTEcabs(*dd);
diff --git a/src/maths/sparse/spsmp.c b/src/maths/sparse/spsmp.c
index 4bd2133b4..c2a5497cb 100644
--- a/src/maths/sparse/spsmp.c
+++ b/src/maths/sparse/spsmp.c
@@ -148,7 +148,7 @@ SMPclear(SMPmatrix *Matrix)
     spClear( Matrix );
 }
 
-#define IGNORE(x)  (void)x
+#define NG_IGNORE(x)  (void)x
 
 /*
  * SMPcLUfac()
@@ -157,7 +157,7 @@ SMPclear(SMPmatrix *Matrix)
 int
 SMPcLUfac(SMPmatrix *Matrix, double PivTol)
 {
-    IGNORE(PivTol);
+    NG_IGNORE(PivTol);
 
     spSetComplex( Matrix );
     return spFactor( Matrix );
@@ -170,7 +170,7 @@ SMPcLUfac(SMPmatrix *Matrix, double PivTol)
 int
 SMPluFac(SMPmatrix *Matrix, double PivTol, double Gmin)
 {
-    IGNORE(PivTol);
+    NG_IGNORE(PivTol);
     spSetReal( Matrix );
     LoadGmin( Matrix, Gmin );
     return spFactor( Matrix );
@@ -208,8 +208,8 @@ void
 SMPcaSolve(SMPmatrix *Matrix, double RHS[], double iRHS[],
 	   double Spare[], double iSpare[])
 {
-    IGNORE(iSpare);
-    IGNORE(Spare);
+    NG_IGNORE(iSpare);
+    NG_IGNORE(Spare);
 
     spSolveTransposed( Matrix, RHS, RHS, iRHS, iRHS );
 }
@@ -221,8 +221,8 @@ void
 SMPcSolve(SMPmatrix *Matrix, double RHS[], double iRHS[],
 	  double Spare[], double iSpare[])
 {
-    IGNORE(iSpare);
-    IGNORE(Spare);
+    NG_IGNORE(iSpare);
+    NG_IGNORE(Spare);
 
     spSolve( Matrix, RHS, RHS, iRHS, iRHS );
 }
@@ -233,7 +233,7 @@ SMPcSolve(SMPmatrix *Matrix, double RHS[], double iRHS[],
 void
 SMPsolve(SMPmatrix *Matrix, double RHS[], double Spare[])
 {
-    IGNORE(Spare);
+    NG_IGNORE(Spare);
 
     spSolve( Matrix, RHS, RHS, (spREAL*)NULL, (spREAL*)NULL );
 }
@@ -284,7 +284,7 @@ SMPpreOrder(SMPmatrix *Matrix)
 void
 SMPprint(SMPmatrix *Matrix, FILE *File)
 {
-    IGNORE(File);
+    NG_IGNORE(File);
 
     spPrint( Matrix, 0, 1, 1 );
 }
diff --git a/src/ngnutmeg.c b/src/ngnutmeg.c
index eea6568d0..96ab3a8c5 100644
--- a/src/ngnutmeg.c
+++ b/src/ngnutmeg.c
@@ -68,7 +68,7 @@ IFsimulator SIMinfo = {
 void
 NDEVacct(CKTcircuit *ckt, FILE *file)
 {
-IGNORE(ckt);
+NG_IGNORE(ckt);
 fprintf(file, "Ouch, you have called NDEV from ngnutmeg\n");
 }
 #endif
diff --git a/src/ngsconvert.c b/src/ngsconvert.c
index ea11a2e65..0909ce76f 100644
--- a/src/ngsconvert.c
+++ b/src/ngsconvert.c
@@ -437,23 +437,23 @@ void cp_pushcontrol(void) { }
 void cp_popcontrol(void) { }
 void out_init(void) { }
 void cp_doquit(void) { exit(0); }
-void cp_usrvars(struct variable **v1, struct variable **v2) { IGNORE(v2); IGNORE(v1); return; }
-int cp_evloop(char *s) { IGNORE(s); return (0); }
-void cp_ccon(bool o) { IGNORE(o); }
-char*if_errstring(int c) { IGNORE(c); return ("error"); }
+void cp_usrvars(struct variable **v1, struct variable **v2) { NG_IGNORE(v2); NG_IGNORE(v1); return; }
+int cp_evloop(char *s) { NG_IGNORE(s); return (0); }
+void cp_ccon(bool o) { NG_IGNORE(o); }
+char*if_errstring(int c) { NG_IGNORE(c); return ("error"); }
 #ifndef out_printf
-void out_printf(char *fmt, ...) { IGNORE(fmt); }
+void out_printf(char *fmt, ...) { NG_IGNORE(fmt); }
 #endif
-void out_send(char *string) { IGNORE(string); }
-struct variable * cp_enqvar(char *word) { IGNORE(word); return (NULL); }
-struct dvec *vec_get(const char *word) { IGNORE(word); return (NULL); }
+void out_send(char *string) { NG_IGNORE(string); }
+struct variable * cp_enqvar(char *word) { NG_IGNORE(word); return (NULL); }
+struct dvec *vec_get(const char *word) { NG_IGNORE(word); return (NULL); }
 void cp_ccom(wordlist *w, char *b, bool e) {
-  IGNORE(e);
-  IGNORE(b);
-  IGNORE(w); return; }
+  NG_IGNORE(e);
+  NG_IGNORE(b);
+  NG_IGNORE(w); return; }
 int cp_usrset(struct variable *v, bool i) {
-    IGNORE(i);
-    IGNORE(v); return(US_OK); }
+    NG_IGNORE(i);
+    NG_IGNORE(v); return(US_OK); }
 
 int disptype;
 
diff --git a/src/spicelib/analysis/acaskq.c b/src/spicelib/analysis/acaskq.c
index 5ba63a4ab..7181df05c 100644
--- a/src/spicelib/analysis/acaskq.c
+++ b/src/spicelib/analysis/acaskq.c
@@ -16,7 +16,7 @@ Author: 1985 Thomas L. Quarles
 int 
 ACaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/acsetp.c b/src/spicelib/analysis/acsetp.c
index eb0784881..934aaf84c 100644
--- a/src/spicelib/analysis/acsetp.c
+++ b/src/spicelib/analysis/acsetp.c
@@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
 int 
 ACsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/cktacct.c b/src/spicelib/analysis/cktacct.c
index 3aa3a7184..3fb79c926 100644
--- a/src/spicelib/analysis/cktacct.c
+++ b/src/spicelib/analysis/cktacct.c
@@ -24,7 +24,7 @@ Author: 1985 Thomas L. Quarles
 int
 CKTacct(CKTcircuit *ckt, JOB *anal, int which, IFvalue *val)
 {
-    IGNORE(anal);
+    NG_IGNORE(anal);
 
     switch(which) {
         
diff --git a/src/spicelib/analysis/cktaskaq.c b/src/spicelib/analysis/cktaskaq.c
index 932be79d0..13c77c764 100644
--- a/src/spicelib/analysis/cktaskaq.c
+++ b/src/spicelib/analysis/cktaskaq.c
@@ -20,7 +20,7 @@ CKTaskAnalQ(CKTcircuit *ckt, JOB *analPtr, int parm, IFvalue *value, IFvalue *se
 {
     int type = analPtr->JOBtype;
 
-    IGNORE(selector);
+    NG_IGNORE(selector);
 
     if((analInfo[type]->askQuest) == NULL) return(E_BADPARM);
     return( (*(analInfo[type]->askQuest))(ckt,analPtr,parm,value));
diff --git a/src/spicelib/analysis/cktasknq.c b/src/spicelib/analysis/cktasknq.c
index 3675efb75..67f60a7e1 100644
--- a/src/spicelib/analysis/cktasknq.c
+++ b/src/spicelib/analysis/cktasknq.c
@@ -21,8 +21,8 @@ Author: 1985 Thomas L. Quarles
 int
 CKTaskNodQst(CKTcircuit *ckt, CKTnode *node, int parm, IFvalue *value, IFvalue *selector)
 {
-    IGNORE(ckt);
-    IGNORE(selector);
+    NG_IGNORE(ckt);
+    NG_IGNORE(selector);
 
     if(!node) return(E_BADPARM);
     switch(parm) {
diff --git a/src/spicelib/analysis/cktdelt.c b/src/spicelib/analysis/cktdelt.c
index d712fad67..7661fa697 100644
--- a/src/spicelib/analysis/cktdelt.c
+++ b/src/spicelib/analysis/cktdelt.c
@@ -18,7 +18,7 @@ CKTdelTask(CKTcircuit *ckt, TSKtask *task)
     JOB *job;
     JOB *old=NULL;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for(job = task->jobs; job; job=job->JOBnextJob){
         if(old) FREE(old);
diff --git a/src/spicelib/analysis/cktdlti.c b/src/spicelib/analysis/cktdlti.c
index 396fc196b..834027e5f 100644
--- a/src/spicelib/analysis/cktdlti.c
+++ b/src/spicelib/analysis/cktdlti.c
@@ -20,8 +20,8 @@ Author: 1985 Thomas L. Quarles
 int
 CKTdltInst(CKTcircuit *ckt, void *instance)
 {
-    IGNORE(ckt);
-    IGNORE(instance);
+    NG_IGNORE(ckt);
+    NG_IGNORE(instance);
 
     return(E_UNSUPP);
 }
diff --git a/src/spicelib/analysis/cktfnda.c b/src/spicelib/analysis/cktfnda.c
index 227b41c26..d60ed0331 100644
--- a/src/spicelib/analysis/cktfnda.c
+++ b/src/spicelib/analysis/cktfnda.c
@@ -25,9 +25,9 @@ CKTfndAnal(CKTcircuit *ckt, int *analIndex, JOB **anal, IFuid name, TSKtask *inT
     TSKtask *task = /* fixme, drop that */ inTask;
     JOB *here;
 
-    IGNORE(ckt);
-    IGNORE(analIndex);
-    IGNORE(taskName);
+    NG_IGNORE(ckt);
+    NG_IGNORE(analIndex);
+    NG_IGNORE(taskName);
 
     for (here = task->jobs; here; here = here->JOBnextJob) {
         if(strcmp(here->JOBname,name)==0) {
diff --git a/src/spicelib/analysis/cktftask.c b/src/spicelib/analysis/cktftask.c
index e98eb6093..7ece554ed 100644
--- a/src/spicelib/analysis/cktftask.c
+++ b/src/spicelib/analysis/cktftask.c
@@ -20,9 +20,9 @@ Author: 1985 Thomas L. Quarles
 int
 CKTfndTask(CKTcircuit *ckt, TSKtask **taskPtr, IFuid taskName)
 {
-    IGNORE(ckt);
-    IGNORE(taskPtr);
-    IGNORE(taskName);
+    NG_IGNORE(ckt);
+    NG_IGNORE(taskPtr);
+    NG_IGNORE(taskName);
 
     return(E_UNSUPP);
 }
diff --git a/src/spicelib/analysis/cktmask.c b/src/spicelib/analysis/cktmask.c
index 389a528bf..199e8c654 100644
--- a/src/spicelib/analysis/cktmask.c
+++ b/src/spicelib/analysis/cktmask.c
@@ -20,7 +20,7 @@ CKTmodAsk(CKTcircuit *ckt, GENmodel *modfast, int which, IFvalue *value, IFvalue
 {
     int type = modfast->GENmodType;
 
-    IGNORE(selector);
+    NG_IGNORE(selector);
 
     if((*DEVices[type]).DEVmodAsk) {
         return( (*((*DEVices[type]).DEVmodAsk)) (ckt,
diff --git a/src/spicelib/analysis/cktmknod.c b/src/spicelib/analysis/cktmknod.c
index 6172f55f2..86bb0fdfe 100644
--- a/src/spicelib/analysis/cktmknod.c
+++ b/src/spicelib/analysis/cktmknod.c
@@ -21,7 +21,7 @@ CKTmkNode(CKTcircuit *ckt, CKTnode **node)
 {
     CKTnode *mynode;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     mynode = TMALLOC(CKTnode, 1);
     if(mynode == (CKTnode *)NULL) return(E_NOMEM);
diff --git a/src/spicelib/analysis/cktmpar.c b/src/spicelib/analysis/cktmpar.c
index 81ba4eeb2..d651618fa 100644
--- a/src/spicelib/analysis/cktmpar.c
+++ b/src/spicelib/analysis/cktmpar.c
@@ -20,8 +20,8 @@ CKTmodParam(CKTcircuit *ckt, GENmodel *modfast, int param, IFvalue *val, IFvalue
 {
     int type = modfast->GENmodType;
 
-    IGNORE(ckt);
-    IGNORE(selector);
+    NG_IGNORE(ckt);
+    NG_IGNORE(selector);
 
     if (((*DEVices[type]).DEVmodParam)) {
         return(((*((*DEVices[type]).DEVmodParam)) (param,val,
diff --git a/src/spicelib/analysis/cktnewan.c b/src/spicelib/analysis/cktnewan.c
index 414233f65..5a8a3683f 100644
--- a/src/spicelib/analysis/cktnewan.c
+++ b/src/spicelib/analysis/cktnewan.c
@@ -18,7 +18,7 @@ extern SPICEanalysis *analInfo[];
 int
 CKTnewAnal(CKTcircuit *ckt, int type, IFuid name, JOB **analPtr, TSKtask *taskPtr)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     if(type==0) {
         /* special case for analysis type 0 == option card */
diff --git a/src/spicelib/analysis/cktntask.c b/src/spicelib/analysis/cktntask.c
index 0e19ec1f1..816e4a82b 100644
--- a/src/spicelib/analysis/cktntask.c
+++ b/src/spicelib/analysis/cktntask.c
@@ -24,7 +24,7 @@ CKTnewTask(CKTcircuit *ckt, TSKtask **taskPtr, IFuid taskName, TSKtask **defPtr)
 {
     TSKtask *tsk, *def=NULL;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     *taskPtr = TMALLOC(TSKtask, 1);
     if(*taskPtr==NULL) return(E_NOMEM);
diff --git a/src/spicelib/analysis/cktop.c b/src/spicelib/analysis/cktop.c
index a4e393d7f..61118d2ab 100644
--- a/src/spicelib/analysis/cktop.c
+++ b/src/spicelib/analysis/cktop.c
@@ -393,7 +393,7 @@ gillespie_src (CKTcircuit * ckt, long int firstmode,
   double *OldRhsOld, *OldCKTstate0;
   CKTnode *n;
 
-  IGNORE(iterlim);
+  NG_IGNORE(iterlim);
 
   ckt->CKTmode = firstmode;
   (*(SPfrontEnd->IFerror)) (ERR_INFO,
@@ -601,7 +601,7 @@ spice3_src (CKTcircuit * ckt, long int firstmode,
 
   int converged, i;
 
-  IGNORE(iterlim);
+  NG_IGNORE(iterlim);
 
   ckt->CKTmode = firstmode;
   (*(SPfrontEnd->IFerror)) (ERR_INFO,
diff --git a/src/spicelib/analysis/cktparam.c b/src/spicelib/analysis/cktparam.c
index 646c962c4..d8447aaef 100644
--- a/src/spicelib/analysis/cktparam.c
+++ b/src/spicelib/analysis/cktparam.c
@@ -21,7 +21,7 @@ CKTparam(CKTcircuit *ckt, GENinstance *fast, int param, IFvalue *val, IFvalue *s
     int type;
     GENinstance *myfast = /*fixme*/ fast;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     type = myfast->GENmodPtr->GENmodType;
     if(((*DEVices[type]).DEVparam)) {
diff --git a/src/spicelib/analysis/cktpmnam.c b/src/spicelib/analysis/cktpmnam.c
index 31bddf6b2..71c706cc4 100644
--- a/src/spicelib/analysis/cktpmnam.c
+++ b/src/spicelib/analysis/cktpmnam.c
@@ -31,7 +31,7 @@ CKTpModName(char *parm, IFvalue *val, CKTcircuit *ckt, int type, IFuid name, GEN
     int error;  /* int to store evaluate error return codes in */
     int i;
 
-    IGNORE(name);
+    NG_IGNORE(name);
 
     for(i=0;i<(*(*DEVices[type]).DEVpublic.numModelParms);i++) {
         if(strcmp(parm,((*DEVices[type]).DEVpublic.modelParms[i].keyword))==0){
diff --git a/src/spicelib/analysis/cktpname.c b/src/spicelib/analysis/cktpname.c
index 493748d97..7531044e6 100644
--- a/src/spicelib/analysis/cktpname.c
+++ b/src/spicelib/analysis/cktpname.c
@@ -33,7 +33,7 @@ CKTpName(char *parm, IFvalue *val, CKTcircuit *ckt, int dev, char *name, GENinst
     int error;  /* int to store evaluate error return codes in */
     int i;
 
-    IGNORE(name);
+    NG_IGNORE(name);
 
     for(i=0;i<(*(*DEVices[dev]).DEVpublic.numInstanceParms);i++) {
         if(strcmp(parm,
diff --git a/src/spicelib/analysis/cktpzstr.c b/src/spicelib/analysis/cktpzstr.c
index 0d9840987..a43dc4b70 100644
--- a/src/spicelib/analysis/cktpzstr.c
+++ b/src/spicelib/analysis/cktpzstr.c
@@ -781,7 +781,7 @@ CKTpzVerify(PZtrial **set, PZtrial *new_trial)
 
     PZtrial *t, *prev;
 
-    IGNORE(set);
+    NG_IGNORE(set);
 
     NZeros += 1;
     if (new_trial->s.imag != 0.0)
diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c
index 52b248f1f..9d5e7a76d 100644
--- a/src/spicelib/analysis/cktsens.c
+++ b/src/spicelib/analysis/cktsens.c
@@ -719,7 +719,7 @@ sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val)
 {
 	int	pid;
 
-	IGNORE(ckt);
+	NG_IGNORE(ckt);
 
 	error = 0;
 
@@ -765,7 +765,7 @@ sens_setp(sgen *sg, CKTcircuit *ckt, IFvalue *val)
 {
 	int	pid;
 
-	IGNORE(ckt);
+	NG_IGNORE(ckt);
 
 	error = 0;
 
diff --git a/src/spicelib/analysis/cktsetap.c b/src/spicelib/analysis/cktsetap.c
index d6be54e03..6d14f4390 100644
--- a/src/spicelib/analysis/cktsetap.c
+++ b/src/spicelib/analysis/cktsetap.c
@@ -20,7 +20,7 @@ CKTsetAnalPm(CKTcircuit *ckt, JOB *analPtr, int parm, IFvalue *value, IFvalue *s
 {
     int type = analPtr->JOBtype;
 
-    IGNORE(selector);
+    NG_IGNORE(selector);
 
     if((analInfo[type]->setParm)==NULL) return(E_BADPARM);
     return( (*(analInfo[type]->setParm))(ckt,analPtr,parm,value) );
diff --git a/src/spicelib/analysis/cktsetnp.c b/src/spicelib/analysis/cktsetnp.c
index 5fa5fc42f..ba8af9262 100644
--- a/src/spicelib/analysis/cktsetnp.c
+++ b/src/spicelib/analysis/cktsetnp.c
@@ -20,8 +20,8 @@ Author: 1985 Thomas L. Quarles
 int
 CKTsetNodPm(CKTcircuit *ckt, CKTnode *node, int parm, IFvalue *value, IFvalue *selector)
 {
-    IGNORE(ckt);
-    IGNORE(selector);
+    NG_IGNORE(ckt);
+    NG_IGNORE(selector);
 
     if(!node) return(E_BADPARM);
     switch(parm) {
diff --git a/src/spicelib/analysis/cktsgen.c b/src/spicelib/analysis/cktsgen.c
index caa3ab97e..23a2da1f3 100644
--- a/src/spicelib/analysis/cktsgen.c
+++ b/src/spicelib/analysis/cktsgen.c
@@ -179,19 +179,19 @@ sgen_next(sgen **xsg)
 
 int set_inst(sgen *sg)
 {
-	IGNORE(sg);
+	NG_IGNORE(sg);
 	return 1;
 }
 
 int set_model(sgen *sg)
 {
-	IGNORE(sg);
+	NG_IGNORE(sg);
 	return 1;
 }
 
 int set_dev(sgen *sg)
 {
-	IGNORE(sg);
+	NG_IGNORE(sg);
 	return 1;
 }
 
diff --git a/src/spicelib/analysis/cktsopt.c b/src/spicelib/analysis/cktsopt.c
index 3faaee6f9..939249897 100644
--- a/src/spicelib/analysis/cktsopt.c
+++ b/src/spicelib/analysis/cktsopt.c
@@ -32,7 +32,7 @@ CKTsetOpt(CKTcircuit *ckt, JOB *anal, int opt, IFvalue *val)
 {
     TSKtask *task = (TSKtask *)anal;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(opt) {
 
diff --git a/src/spicelib/analysis/daskq.c b/src/spicelib/analysis/daskq.c
index bdd3ce623..868413bc8 100644
--- a/src/spicelib/analysis/daskq.c
+++ b/src/spicelib/analysis/daskq.c
@@ -14,7 +14,7 @@ Author: 1988 Jaijeet S Roychowdhury
 int 
 DaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/dcoaskq.c b/src/spicelib/analysis/dcoaskq.c
index f31997369..322cbf307 100644
--- a/src/spicelib/analysis/dcoaskq.c
+++ b/src/spicelib/analysis/dcoaskq.c
@@ -14,10 +14,10 @@ Author: 1985 Thomas L. Quarles
 int 
 DCOaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
-    IGNORE(anal);
-    IGNORE(which);
-    IGNORE(value);
+    NG_IGNORE(ckt);
+    NG_IGNORE(anal);
+    NG_IGNORE(which);
+    NG_IGNORE(value);
     return(E_BADPARM);
 }
 
diff --git a/src/spicelib/analysis/dcop.c b/src/spicelib/analysis/dcop.c
index 04db2d19e..311507da4 100644
--- a/src/spicelib/analysis/dcop.c
+++ b/src/spicelib/analysis/dcop.c
@@ -27,7 +27,7 @@ DCop(CKTcircuit *ckt, int notused)
     int numNames;
     void *plot = NULL;
 
-    IGNORE(notused);
+    NG_IGNORE(notused);
   
 #ifdef XSPICE
 /* gtri - add - wbk - 12/19/90 - Add IPC stuff and initialize anal_init and anal_type */
diff --git a/src/spicelib/analysis/dcosetp.c b/src/spicelib/analysis/dcosetp.c
index 9433ecba8..f6658b999 100644
--- a/src/spicelib/analysis/dcosetp.c
+++ b/src/spicelib/analysis/dcosetp.c
@@ -16,9 +16,9 @@ Author: 1985 Thomas L. Quarles
 int 
 DCOsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
-    IGNORE(anal);
-    IGNORE(value);
+    NG_IGNORE(ckt);
+    NG_IGNORE(anal);
+    NG_IGNORE(value);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/dctaskq.c b/src/spicelib/analysis/dctaskq.c
index d39df4e47..379183894 100644
--- a/src/spicelib/analysis/dctaskq.c
+++ b/src/spicelib/analysis/dctaskq.c
@@ -14,9 +14,9 @@ Author: 1985 Thomas L. Quarles
 int 
 DCTaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
-    IGNORE(anal);
-    IGNORE(value);
+    NG_IGNORE(ckt);
+    NG_IGNORE(anal);
+    NG_IGNORE(value);
     switch(which) {
 
     default:
diff --git a/src/spicelib/analysis/dctsetp.c b/src/spicelib/analysis/dctsetp.c
index c914c6470..071362764 100644
--- a/src/spicelib/analysis/dctsetp.c
+++ b/src/spicelib/analysis/dctsetp.c
@@ -17,7 +17,7 @@ DCTsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
     TRCV* cv= (TRCV*)anal;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/distoan.c b/src/spicelib/analysis/distoan.c
index 51cad2529..265c7278d 100644
--- a/src/spicelib/analysis/distoan.c
+++ b/src/spicelib/analysis/distoan.c
@@ -56,7 +56,7 @@ DISTOan(CKTcircuit *ckt, int restart)
     double time,time1;
 #endif
 
-        IGNORE(restart);
+        NG_IGNORE(restart);
 
 
 		/* start at beginning */
diff --git a/src/spicelib/analysis/dkerproc.c b/src/spicelib/analysis/dkerproc.c
index 0c6818307..be0a17b6e 100644
--- a/src/spicelib/analysis/dkerproc.c
+++ b/src/spicelib/analysis/dkerproc.c
@@ -14,7 +14,7 @@ DkerProc(int type, double *rPtr, double *iPtr, int size, DISTOAN *job)
 {
 int i;
 
-IGNORE(job);
+NG_IGNORE(job);
 
 switch(type) {
 
diff --git a/src/spicelib/analysis/dsetparm.c b/src/spicelib/analysis/dsetparm.c
index 38be2d81c..9bd43a71d 100644
--- a/src/spicelib/analysis/dsetparm.c
+++ b/src/spicelib/analysis/dsetparm.c
@@ -15,7 +15,7 @@ Author: 1988 Jaijeet S Roychowdhury
 int 
 DsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/naskq.c b/src/spicelib/analysis/naskq.c
index 272aa117e..b7703889b 100644
--- a/src/spicelib/analysis/naskq.c
+++ b/src/spicelib/analysis/naskq.c
@@ -13,7 +13,7 @@ Author: 1987 Gary W. Ng
 int 
 NaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/nsetparm.c b/src/spicelib/analysis/nsetparm.c
index 231e36806..09f4674ea 100644
--- a/src/spicelib/analysis/nsetparm.c
+++ b/src/spicelib/analysis/nsetparm.c
@@ -14,7 +14,7 @@ Author: 1987 Gary W. Ng
 int 
 NsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/pzan.c b/src/spicelib/analysis/pzan.c
index 6a3e0e935..8eef2a681 100644
--- a/src/spicelib/analysis/pzan.c
+++ b/src/spicelib/analysis/pzan.c
@@ -23,7 +23,7 @@ PZan(CKTcircuit *ckt, int reset)
     IFuid *nameList;
     void *plot = NULL;
 
-    IGNORE(reset);
+    NG_IGNORE(reset);
 
     error = PZinit(ckt);
     if (error != OK) return error;
diff --git a/src/spicelib/analysis/pzsetp.c b/src/spicelib/analysis/pzsetp.c
index 0d10eeebd..881d8c699 100644
--- a/src/spicelib/analysis/pzsetp.c
+++ b/src/spicelib/analysis/pzsetp.c
@@ -16,7 +16,7 @@ Author: 1985 Thomas L. Quarles
 int 
 PZsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/sensaskq.c b/src/spicelib/analysis/sensaskq.c
index 7b9ffcb0f..24ca4f606 100644
--- a/src/spicelib/analysis/sensaskq.c
+++ b/src/spicelib/analysis/sensaskq.c
@@ -15,7 +15,7 @@ SENSask(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
     SENS_AN	*sinfo = (SENS_AN *) anal;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch (which) {
 
diff --git a/src/spicelib/analysis/senssetp.c b/src/spicelib/analysis/senssetp.c
index 6c261a0d1..0a05d6cff 100644
--- a/src/spicelib/analysis/senssetp.c
+++ b/src/spicelib/analysis/senssetp.c
@@ -16,7 +16,7 @@ SENSsetParam(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
     SENS_AN	*sinfo = (SENS_AN *) anal;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c
index 25cc5b78c..80e963c58 100644
--- a/src/spicelib/analysis/tfanal.c
+++ b/src/spicelib/analysis/tfanal.c
@@ -38,7 +38,7 @@ TFanal(CKTcircuit *ckt, int restart)
 #define inuid (uids[1]) /* unique id for the transfer function input imp. */
 #define outuid (uids[2]) /* unique id for the transfer function out. imp. */
 
-    IGNORE(restart);
+    NG_IGNORE(restart);
 
     /* first, find the operating point */
     converged = CKTop(ckt,
diff --git a/src/spicelib/analysis/tfaskq.c b/src/spicelib/analysis/tfaskq.c
index bf2c6a0aa..40fb2eae9 100644
--- a/src/spicelib/analysis/tfaskq.c
+++ b/src/spicelib/analysis/tfaskq.c
@@ -14,9 +14,9 @@ Author: 1985 Thomas L. Quarles
 int 
 TFaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(value);
-    IGNORE(anal);
-    IGNORE(ckt);
+    NG_IGNORE(value);
+    NG_IGNORE(anal);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/tfsetp.c b/src/spicelib/analysis/tfsetp.c
index 3fc013b2b..0efe14e3a 100644
--- a/src/spicelib/analysis/tfsetp.c
+++ b/src/spicelib/analysis/tfsetp.c
@@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
 int 
 TFsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/tranaskq.c b/src/spicelib/analysis/tranaskq.c
index 2f62e013c..0f3f47fd7 100644
--- a/src/spicelib/analysis/tranaskq.c
+++ b/src/spicelib/analysis/tranaskq.c
@@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles
 int 
 TRANaskQuest(CKTcircuit *ckt, JOB *anal, int which,IFvalue *value)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/transetp.c b/src/spicelib/analysis/transetp.c
index aac14675a..cd6073b6d 100644
--- a/src/spicelib/analysis/transetp.c
+++ b/src/spicelib/analysis/transetp.c
@@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
 int 
 TRANsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
 
diff --git a/src/spicelib/devices/asrc/asrcacld.c b/src/spicelib/devices/asrc/asrcacld.c
index 6b4ebb606..18bca8f89 100644
--- a/src/spicelib/devices/asrc/asrcacld.c
+++ b/src/spicelib/devices/asrc/asrcacld.c
@@ -30,7 +30,7 @@ ASRCacLoad(GENmodel *inModel, CKTcircuit *ckt)
     double *derivs;
     double rhs;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the Arbitrary source models */
     for( ; model != NULL; model = model->ASRCnextModel ) {
diff --git a/src/spicelib/devices/asrc/asrcask.c b/src/spicelib/devices/asrc/asrcask.c
index 5f617b51f..a165e8b60 100644
--- a/src/spicelib/devices/asrc/asrcask.c
+++ b/src/spicelib/devices/asrc/asrcask.c
@@ -26,7 +26,7 @@ ASRCask(CKTcircuit *ckt, GENinstance *instPtr, int which, IFvalue *value, IFvalu
 {
     ASRCinstance *here = (ASRCinstance*)instPtr;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case ASRC_CURRENT:
diff --git a/src/spicelib/devices/asrc/asrcpar.c b/src/spicelib/devices/asrc/asrcpar.c
index 4f253bc05..a4d550630 100644
--- a/src/spicelib/devices/asrc/asrcpar.c
+++ b/src/spicelib/devices/asrc/asrcpar.c
@@ -19,7 +19,7 @@ ASRCparam(int param, IFvalue *value, GENinstance *fast, IFvalue *select)
 {
     ASRCinstance *here = (ASRCinstance*)fast;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case ASRC_VOLTAGE:
diff --git a/src/spicelib/devices/asrc/asrcpzld.c b/src/spicelib/devices/asrc/asrcpzld.c
index 010be25af..9ba479650 100644
--- a/src/spicelib/devices/asrc/asrcpzld.c
+++ b/src/spicelib/devices/asrc/asrcpzld.c
@@ -23,7 +23,7 @@ ASRCpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     double value;
     int i, j;
 
-    IGNORE(s);
+    NG_IGNORE(s);
 
     /*  loop through all the Arbitrary source models */
     for( ; model != NULL; model = model->ASRCnextModel ) {
diff --git a/src/spicelib/devices/asrc/asrcset.c b/src/spicelib/devices/asrc/asrcset.c
index 51b5520d6..9129fc405 100644
--- a/src/spicelib/devices/asrc/asrcset.c
+++ b/src/spicelib/devices/asrc/asrcset.c
@@ -27,7 +27,7 @@ ASRCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     int v_first;
     CKTnode *tmp;
 
-    IGNORE(states);
+    NG_IGNORE(states);
 
     /*  loop through all the user models*/
     for( ; model != NULL; model = model->ASRCnextModel ) {
diff --git a/src/spicelib/devices/bjt/bjtmask.c b/src/spicelib/devices/bjt/bjtmask.c
index 70740be7a..377cc141c 100644
--- a/src/spicelib/devices/bjt/bjtmask.c
+++ b/src/spicelib/devices/bjt/bjtmask.c
@@ -21,7 +21,7 @@ BJTmAsk(CKTcircuit *ckt, GENmodel *instPtr, int which, IFvalue *value)
 {
     BJTmodel *here = (BJTmodel*)instPtr;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case BJT_MOD_TNOM:
diff --git a/src/spicelib/devices/bjt/bjtparam.c b/src/spicelib/devices/bjt/bjtparam.c
index 8146c8e68..7bf98e5f6 100644
--- a/src/spicelib/devices/bjt/bjtparam.c
+++ b/src/spicelib/devices/bjt/bjtparam.c
@@ -24,7 +24,7 @@ BJTparam(int param, IFvalue *value, GENinstance *instPtr, IFvalue *select)
 {
     BJTinstance *here = (BJTinstance*)instPtr;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case BJT_AREA:
diff --git a/src/spicelib/devices/bjt2/bjt2mask.c b/src/spicelib/devices/bjt2/bjt2mask.c
index 77d7770dd..266382837 100644
--- a/src/spicelib/devices/bjt2/bjt2mask.c
+++ b/src/spicelib/devices/bjt2/bjt2mask.c
@@ -22,7 +22,7 @@ BJT2mAsk(CKTcircuit *ckt, GENmodel *instPtr, int which, IFvalue *value)
 {
     BJT2model *here = (BJT2model*)instPtr;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case BJT2_MOD_TNOM:
diff --git a/src/spicelib/devices/bjt2/bjt2param.c b/src/spicelib/devices/bjt2/bjt2param.c
index 78d30f091..563569d70 100644
--- a/src/spicelib/devices/bjt2/bjt2param.c
+++ b/src/spicelib/devices/bjt2/bjt2param.c
@@ -25,7 +25,7 @@ BJT2param(int param, IFvalue *value, GENinstance *instPtr, IFvalue *select)
 {
     BJT2instance *here = (BJT2instance*)instPtr;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case BJT2_AREA:
diff --git a/src/spicelib/devices/bsim1/b1ask.c b/src/spicelib/devices/bsim1/b1ask.c
index 865256155..95d7dac6a 100644
--- a/src/spicelib/devices/bsim1/b1ask.c
+++ b/src/spicelib/devices/bsim1/b1ask.c
@@ -18,7 +18,7 @@ B1ask(CKTcircuit *ckt, GENinstance *inst, int which,
 {
     B1instance *here = (B1instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case BSIM1_L:
diff --git a/src/spicelib/devices/bsim1/b1mask.c b/src/spicelib/devices/bsim1/b1mask.c
index b90e9de29..8128a1d31 100644
--- a/src/spicelib/devices/bsim1/b1mask.c
+++ b/src/spicelib/devices/bsim1/b1mask.c
@@ -20,7 +20,7 @@ B1mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     B1model *model = (B1model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
         switch(which) {
         case BSIM1_MOD_VFB0: 
diff --git a/src/spicelib/devices/bsim1/b1par.c b/src/spicelib/devices/bsim1/b1par.c
index 7eb16e63b..04f9184d6 100644
--- a/src/spicelib/devices/bsim1/b1par.c
+++ b/src/spicelib/devices/bsim1/b1par.c
@@ -19,7 +19,7 @@ B1param(int param, IFvalue *value, GENinstance *inst,
 {
     B1instance *here = (B1instance*)inst;
     
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case BSIM1_W:
diff --git a/src/spicelib/devices/bsim1/b1temp.c b/src/spicelib/devices/bsim1/b1temp.c
index efc3d76cc..eca350008 100644
--- a/src/spicelib/devices/bsim1/b1temp.c
+++ b/src/spicelib/devices/bsim1/b1temp.c
@@ -27,7 +27,7 @@ B1temp(GENmodel *inModel, CKTcircuit *ckt)
     double Leff;    /* effective channel length im micron */
     double Weff;    /* effective channel width in micron */
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the B1 device models */
     for( ; model != NULL; model = model->B1nextModel ) {
diff --git a/src/spicelib/devices/bsim2/b2ask.c b/src/spicelib/devices/bsim2/b2ask.c
index b4d9f0eef..a41762069 100644
--- a/src/spicelib/devices/bsim2/b2ask.c
+++ b/src/spicelib/devices/bsim2/b2ask.c
@@ -18,7 +18,7 @@ B2ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 {
     B2instance *here = (B2instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case BSIM2_L:
diff --git a/src/spicelib/devices/bsim2/b2mask.c b/src/spicelib/devices/bsim2/b2mask.c
index f0282487d..19664072d 100644
--- a/src/spicelib/devices/bsim2/b2mask.c
+++ b/src/spicelib/devices/bsim2/b2mask.c
@@ -20,7 +20,7 @@ B2mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     B2model *model = (B2model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
         switch(which) {
         case BSIM2_MOD_VFB0: 
diff --git a/src/spicelib/devices/bsim2/b2par.c b/src/spicelib/devices/bsim2/b2par.c
index ba41c5e09..ba0ec2573 100644
--- a/src/spicelib/devices/bsim2/b2par.c
+++ b/src/spicelib/devices/bsim2/b2par.c
@@ -18,7 +18,7 @@ B2param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     B2instance *here = (B2instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case BSIM2_W:
diff --git a/src/spicelib/devices/bsim2/b2temp.c b/src/spicelib/devices/bsim2/b2temp.c
index 42d625238..49aec821c 100644
--- a/src/spicelib/devices/bsim2/b2temp.c
+++ b/src/spicelib/devices/bsim2/b2temp.c
@@ -27,7 +27,7 @@ B2temp(GENmodel *inModel, CKTcircuit *ckt)
     double CoxWoverL, Inv_L, Inv_W, tmp;
     int Size_Not_Found;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the B2 device models */
     for( ; model != NULL; model = model->B2nextModel ) {
diff --git a/src/spicelib/devices/bsim3/b3ask.c b/src/spicelib/devices/bsim3/b3ask.c
index 7673b80c7..37cefbb6f 100644
--- a/src/spicelib/devices/bsim3/b3ask.c
+++ b/src/spicelib/devices/bsim3/b3ask.c
@@ -26,7 +26,7 @@ IFvalue *select)
 {
 BSIM3instance *here = (BSIM3instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case BSIM3_L:
diff --git a/src/spicelib/devices/bsim3/b3check.c b/src/spicelib/devices/bsim3/b3check.c
index ee30b0165..123f63b9c 100644
--- a/src/spicelib/devices/bsim3/b3check.c
+++ b/src/spicelib/devices/bsim3/b3check.c
@@ -29,7 +29,7 @@ struct bsim3SizeDependParam *pParam;
 int Fatal_Flag = 0;
 FILE *fplog;
     
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     if ((fplog = fopen("b3v3check.log", "w")) != NULL)
     {   pParam = here->pParam;
diff --git a/src/spicelib/devices/bsim3/b3mask.c b/src/spicelib/devices/bsim3/b3mask.c
index af41ac3fd..d17a6ff39 100644
--- a/src/spicelib/devices/bsim3/b3mask.c
+++ b/src/spicelib/devices/bsim3/b3mask.c
@@ -25,7 +25,7 @@ IFvalue *value)
 {
     BSIM3model *model = (BSIM3model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case BSIM3_MOD_MOBMOD:
diff --git a/src/spicelib/devices/bsim3/b3par.c b/src/spicelib/devices/bsim3/b3par.c
index 95744f64a..cc105174b 100644
--- a/src/spicelib/devices/bsim3/b3par.c
+++ b/src/spicelib/devices/bsim3/b3par.c
@@ -26,7 +26,7 @@ IFvalue *select)
 
     BSIM3instance *here = (BSIM3instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     if ( !cp_getvar( "scale", CP_REAL, (double*) &scale ) ) scale = 1;
 
diff --git a/src/spicelib/devices/bsim3soi/b4soiask.c b/src/spicelib/devices/bsim3soi/b4soiask.c
index 00e03fc8f..f349133c5 100644
--- a/src/spicelib/devices/bsim3soi/b4soiask.c
+++ b/src/spicelib/devices/bsim3soi/b4soiask.c
@@ -29,7 +29,7 @@ B4SOIask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue
 {
 B4SOIinstance *here = (B4SOIinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case B4SOI_L:
diff --git a/src/spicelib/devices/bsim3soi/b4soicheck.c b/src/spicelib/devices/bsim3soi/b4soicheck.c
index 18fc55984..8d7cc7980 100644
--- a/src/spicelib/devices/bsim3soi/b4soicheck.c
+++ b/src/spicelib/devices/bsim3soi/b4soicheck.c
@@ -30,7 +30,7 @@ struct b4soiSizeDependParam *pParam;
 int Fatal_Flag = 0;
 FILE *fplog;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     if ((fplog = fopen("b4soiv1check.log", "w")) != NULL)
     {   pParam = here->pParam;
diff --git a/src/spicelib/devices/bsim3soi/b4soimask.c b/src/spicelib/devices/bsim3soi/b4soimask.c
index f6b4393b7..c8d395c0f 100644
--- a/src/spicelib/devices/bsim3soi/b4soimask.c
+++ b/src/spicelib/devices/bsim3soi/b4soimask.c
@@ -30,7 +30,7 @@ IFvalue *value)
 {
     B4SOImodel *model = (B4SOImodel *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case B4SOI_MOD_MOBMOD:
diff --git a/src/spicelib/devices/bsim3soi/b4soipar.c b/src/spicelib/devices/bsim3soi/b4soipar.c
index 8bf39ab60..a1888696d 100644
--- a/src/spicelib/devices/bsim3soi/b4soipar.c
+++ b/src/spicelib/devices/bsim3soi/b4soipar.c
@@ -28,7 +28,7 @@ IFvalue *select)
 {
     B4SOIinstance *here = (B4SOIinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) 
     {   case B4SOI_W:
diff --git a/src/spicelib/devices/bsim3soi/b4soipzld.c b/src/spicelib/devices/bsim3soi/b4soipzld.c
index 0fbc90fa5..fbe63b1e3 100644
--- a/src/spicelib/devices/bsim3soi/b4soipzld.c
+++ b/src/spicelib/devices/bsim3soi/b4soipzld.c
@@ -36,7 +36,7 @@ double FwdSum, RevSum, Gm, Gmbs;
 
 double m;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for (; model != NULL; model = model->B4SOInextModel) 
     {    for (here = model->B4SOIinstances; here!= NULL;
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddask.c b/src/spicelib/devices/bsim3soi_dd/b3soiddask.c
index 38f27ed01..908ccec29 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddask.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddask.c
@@ -25,7 +25,7 @@ B3SOIDDask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 {
 B3SOIDDinstance *here = (B3SOIDDinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case B3SOIDD_L:
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddcheck.c b/src/spicelib/devices/bsim3soi_dd/b3soiddcheck.c
index 3bbe90d7b..16a48ddd1 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddcheck.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddcheck.c
@@ -26,7 +26,7 @@ struct b3soiddSizeDependParam *pParam;
 int Fatal_Flag = 0;
 FILE *fplog;
     
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     if ((fplog = fopen("b3soiddv2check.log", "w")) != NULL)
     {   pParam = here->pParam;
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c
index 05459ffb0..d28565ac7 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c
@@ -57,8 +57,8 @@ static double
 B3SOIDDSmartVbs(double New, double Old, B3SOIDDinstance *here, 
                 CKTcircuit *ckt, int *check)
 {
-    IGNORE(Old);
-    IGNORE(check);
+    NG_IGNORE(Old);
+    NG_IGNORE(check);
 
    /* only do it for floating body and DC */
    if (here->B3SOIDDfloat && (ckt->CKTmode & (MODEDC | MODEDCOP)))
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddmask.c b/src/spicelib/devices/bsim3soi_dd/b3soiddmask.c
index cf9b44e57..cbec10897 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddmask.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddmask.c
@@ -21,7 +21,7 @@ B3SOIDDmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     B3SOIDDmodel *model = (B3SOIDDmodel *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case B3SOIDD_MOD_MOBMOD:
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddpar.c b/src/spicelib/devices/bsim3soi_dd/b3soiddpar.c
index ac726c455..daa5c1c3c 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddpar.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddpar.c
@@ -21,7 +21,7 @@ B3SOIDDparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     B3SOIDDinstance *here = (B3SOIDDinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) 
     {   case B3SOIDD_W:
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c
index ffe7313b7..5f420e0e6 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c
@@ -32,7 +32,7 @@ double FwdSum, RevSum, Gm, Gmbs;
 
 double m;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for (; model != NULL; model = model->B3SOIDDnextModel) 
     {    for (here = model->B3SOIDDinstances; here!= NULL;
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdask.c b/src/spicelib/devices/bsim3soi_fd/b3soifdask.c
index 62bee7749..e17ca335d 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdask.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdask.c
@@ -24,7 +24,7 @@ B3SOIFDask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 {
 B3SOIFDinstance *here = (B3SOIFDinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case B3SOIFD_L:
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdcheck.c b/src/spicelib/devices/bsim3soi_fd/b3soifdcheck.c
index 52a3bb972..23cee02f4 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdcheck.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdcheck.c
@@ -26,7 +26,7 @@ struct b3soifdSizeDependParam *pParam;
 int Fatal_Flag = 0;
 FILE *fplog;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
     
     if ((fplog = fopen("b3soifdv2check.log", "w")) != NULL)
     {   pParam = here->pParam;
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c
index cf0daeb35..24dceb8c0 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c
@@ -57,8 +57,8 @@ static double
 B3SOIFDSmartVbs(double New, double Old, B3SOIFDinstance *here, 
                 CKTcircuit *ckt, int *check)
 {
-   IGNORE(Old);
-   IGNORE(check);
+   NG_IGNORE(Old);
+   NG_IGNORE(check);
 
    /* only do it for floating body and DC */
    if (here->B3SOIFDfloat && (ckt->CKTmode & (MODEDC | MODEDCOP)))
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdmask.c b/src/spicelib/devices/bsim3soi_fd/b3soifdmask.c
index d02c5f9e1..206c2205f 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdmask.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdmask.c
@@ -25,7 +25,7 @@ B3SOIFDmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     B3SOIFDmodel *model = (B3SOIFDmodel *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case B3SOIFD_MOD_MOBMOD:
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdpar.c b/src/spicelib/devices/bsim3soi_fd/b3soifdpar.c
index 4cd8e39f6..7a0d70c43 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdpar.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdpar.c
@@ -22,7 +22,7 @@ B3SOIFDparam(int param, IFvalue *value, GENinstance *inst,
 {
     B3SOIFDinstance *here = (B3SOIFDinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) 
     {   case B3SOIFD_W:
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c
index dbdf5bde8..4e42eb593 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c
@@ -31,7 +31,7 @@ double FwdSum, RevSum, Gm, Gmbs;
 
 double m;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for (; model != NULL; model = model->B3SOIFDnextModel) 
     {    for (here = model->B3SOIFDinstances; here!= NULL;
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdask.c b/src/spicelib/devices/bsim3soi_pd/b3soipdask.c
index 5f5e2976b..8b18b0cf0 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdask.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdask.c
@@ -26,7 +26,7 @@ B3SOIPDask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 {
 B3SOIPDinstance *here = (B3SOIPDinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case B3SOIPD_L:
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdcheck.c b/src/spicelib/devices/bsim3soi_pd/b3soipdcheck.c
index 1a692eeba..cfdf1fce7 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdcheck.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdcheck.c
@@ -30,7 +30,7 @@ struct b3soipdSizeDependParam *pParam;
 int Fatal_Flag = 0;
 FILE *fplog;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
     
     if ((fplog = fopen("b3soipdv223check.log", "w")) != NULL)
     {   pParam = here->pParam;
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdmask.c b/src/spicelib/devices/bsim3soi_pd/b3soipdmask.c
index 0d4f981a2..a0a61b31d 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdmask.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdmask.c
@@ -29,7 +29,7 @@ B3SOIPDmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     B3SOIPDmodel *model = (B3SOIPDmodel *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case B3SOIPD_MOD_MOBMOD:
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
index 6860b6e84..eef8e593a 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
@@ -55,7 +55,7 @@ struct b3soipdSizeDependParam *pParam;
 double cd, esat, DelClm, EffFreq, N0, Nl;
 double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, Ssi;
 
-    IGNORE(vgs);
+    NG_IGNORE(vgs);
 
     pParam = here->pParam;
     cd = fabs(here->B3SOIPDcd) * here->B3SOIPDm;
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdpar.c b/src/spicelib/devices/bsim3soi_pd/b3soipdpar.c
index 5944d7e56..5772cf2a9 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdpar.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdpar.c
@@ -23,7 +23,7 @@ B3SOIPDparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     B3SOIPDinstance *here = (B3SOIPDinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) 
     {   case B3SOIPD_W:
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c
index 88dd07aaf..9513be440 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c
@@ -31,7 +31,7 @@ double FwdSum, RevSum, Gm, Gmbs;
 
 double m;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for (; model != NULL; model = model->B3SOIPDnextModel) 
     {    for (here = model->B3SOIPDinstances; here!= NULL;
diff --git a/src/spicelib/devices/bsim3v0/b3v0ask.c b/src/spicelib/devices/bsim3v0/b3v0ask.c
index 41b511c62..4cb10cde0 100644
--- a/src/spicelib/devices/bsim3v0/b3v0ask.c
+++ b/src/spicelib/devices/bsim3v0/b3v0ask.c
@@ -18,7 +18,7 @@ BSIM3v0ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 {
 BSIM3v0instance *here = (BSIM3v0instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case BSIM3v0_L:
diff --git a/src/spicelib/devices/bsim3v0/b3v0mask.c b/src/spicelib/devices/bsim3v0/b3v0mask.c
index 0e253de12..03e682cbf 100644
--- a/src/spicelib/devices/bsim3v0/b3v0mask.c
+++ b/src/spicelib/devices/bsim3v0/b3v0mask.c
@@ -21,7 +21,7 @@ IFvalue *value)
 {
     BSIM3v0model *model = (BSIM3v0model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case BSIM3v0_MOD_MOBMOD:
diff --git a/src/spicelib/devices/bsim3v0/b3v0par.c b/src/spicelib/devices/bsim3v0/b3v0par.c
index ff4eb11b9..63907b7e3 100644
--- a/src/spicelib/devices/bsim3v0/b3v0par.c
+++ b/src/spicelib/devices/bsim3v0/b3v0par.c
@@ -18,7 +18,7 @@ BSIM3v0param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 
     BSIM3v0instance *here = (BSIM3v0instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     if ( !cp_getvar( "scale", CP_REAL, (double*) &scale ) ) scale = 1;
 
diff --git a/src/spicelib/devices/bsim3v0/b3v0pzld.c b/src/spicelib/devices/bsim3v0/b3v0pzld.c
index 7f59abc87..86eb05cfd 100644
--- a/src/spicelib/devices/bsim3v0/b3v0pzld.c
+++ b/src/spicelib/devices/bsim3v0/b3v0pzld.c
@@ -24,7 +24,7 @@ double FwdSum, RevSum, Gm, Gmbs;
 
 double m;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for (; model != NULL; model = model->BSIM3v0nextModel) 
     {    for (here = model->BSIM3v0instances; here!= NULL;
diff --git a/src/spicelib/devices/bsim3v1/b3v1ask.c b/src/spicelib/devices/bsim3v1/b3v1ask.c
index 5dc40b0ba..7cf8e6c2a 100644
--- a/src/spicelib/devices/bsim3v1/b3v1ask.c
+++ b/src/spicelib/devices/bsim3v1/b3v1ask.c
@@ -24,7 +24,7 @@ BSIM3v1ask (CKTcircuit * ckt, GENinstance * inst, int which, IFvalue * value,
 {
   BSIM3v1instance *here = (BSIM3v1instance *) inst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (which)
     {
diff --git a/src/spicelib/devices/bsim3v1/b3v1check.c b/src/spicelib/devices/bsim3v1/b3v1check.c
index 1b88dfc08..006fc6784 100644
--- a/src/spicelib/devices/bsim3v1/b3v1check.c
+++ b/src/spicelib/devices/bsim3v1/b3v1check.c
@@ -27,7 +27,7 @@ struct bsim3v1SizeDependParam *pParam;
 int Fatal_Flag = 0;
 FILE *fplog;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
     
     if ((fplog = fopen("b3v3_1check.log", "w")) != NULL)
     {   pParam = here->pParam;
diff --git a/src/spicelib/devices/bsim3v1/b3v1mask.c b/src/spicelib/devices/bsim3v1/b3v1mask.c
index f2b9e43e2..8b9cda657 100644
--- a/src/spicelib/devices/bsim3v1/b3v1mask.c
+++ b/src/spicelib/devices/bsim3v1/b3v1mask.c
@@ -23,7 +23,7 @@ BSIM3v1mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     BSIM3v1model *model = (BSIM3v1model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case BSIM3v1_MOD_MOBMOD:
diff --git a/src/spicelib/devices/bsim3v1/b3v1par.c b/src/spicelib/devices/bsim3v1/b3v1par.c
index bd9369d6d..6363ad465 100644
--- a/src/spicelib/devices/bsim3v1/b3v1par.c
+++ b/src/spicelib/devices/bsim3v1/b3v1par.c
@@ -24,7 +24,7 @@ BSIM3v1param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 
     BSIM3v1instance *here = (BSIM3v1instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     if ( !cp_getvar( "scale", CP_REAL, (double*) &scale ) ) scale = 1;
 
diff --git a/src/spicelib/devices/bsim3v1/b3v1pzld.c b/src/spicelib/devices/bsim3v1/b3v1pzld.c
index 1dcf0e950..13fc655af 100644
--- a/src/spicelib/devices/bsim3v1/b3v1pzld.c
+++ b/src/spicelib/devices/bsim3v1/b3v1pzld.c
@@ -30,7 +30,7 @@ double FwdSum, RevSum, Gm, Gmbs;
 
 double m;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for (; model != NULL; model = model->BSIM3v1nextModel) 
     {    for (here = model->BSIM3v1instances; here!= NULL;
diff --git a/src/spicelib/devices/bsim3v1a/b3v1aask.c b/src/spicelib/devices/bsim3v1a/b3v1aask.c
index 1e3e6a719..3b343165d 100644
--- a/src/spicelib/devices/bsim3v1a/b3v1aask.c
+++ b/src/spicelib/devices/bsim3v1a/b3v1aask.c
@@ -20,7 +20,7 @@ BSIM3v1Aask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 {
 BSIM3v1Ainstance *here = (BSIM3v1Ainstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case BSIM3v1A_L:
diff --git a/src/spicelib/devices/bsim3v1a/b3v1amask.c b/src/spicelib/devices/bsim3v1a/b3v1amask.c
index 96d6ef2f3..5926dc6c1 100644
--- a/src/spicelib/devices/bsim3v1a/b3v1amask.c
+++ b/src/spicelib/devices/bsim3v1a/b3v1amask.c
@@ -18,7 +18,7 @@ BSIM3v1AmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     BSIM3v1Amodel *model = (BSIM3v1Amodel *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case BSIM3v1A_MOD_MOBMOD:
diff --git a/src/spicelib/devices/bsim3v1a/b3v1apar.c b/src/spicelib/devices/bsim3v1a/b3v1apar.c
index 0508a0e42..08b438918 100644
--- a/src/spicelib/devices/bsim3v1a/b3v1apar.c
+++ b/src/spicelib/devices/bsim3v1a/b3v1apar.c
@@ -19,7 +19,7 @@ BSIM3v1Aparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 
     BSIM3v1Ainstance *here = (BSIM3v1Ainstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     if ( !cp_getvar( "scale", CP_REAL, (double*) &scale ) ) scale = 1;
 
diff --git a/src/spicelib/devices/bsim3v1a/b3v1apzld.c b/src/spicelib/devices/bsim3v1a/b3v1apzld.c
index 95445e5a3..88fb878cc 100644
--- a/src/spicelib/devices/bsim3v1a/b3v1apzld.c
+++ b/src/spicelib/devices/bsim3v1a/b3v1apzld.c
@@ -25,7 +25,7 @@ double FwdSum, RevSum, Gm, Gmbs;
 
 double m;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for (; model != NULL; model = model->BSIM3v1AnextModel) 
     {    for (here = model->BSIM3v1Ainstances; here!= NULL;
diff --git a/src/spicelib/devices/bsim3v1s/b3v1sask.c b/src/spicelib/devices/bsim3v1s/b3v1sask.c
index a2bc44a33..c3057658a 100644
--- a/src/spicelib/devices/bsim3v1s/b3v1sask.c
+++ b/src/spicelib/devices/bsim3v1s/b3v1sask.c
@@ -19,7 +19,7 @@ BSIM3v1Sask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 {
 BSIM3v1Sinstance *here = (BSIM3v1Sinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case BSIM3v1S_L:
diff --git a/src/spicelib/devices/bsim3v1s/b3v1scheck.c b/src/spicelib/devices/bsim3v1s/b3v1scheck.c
index a2797a893..8a6cbe103 100644
--- a/src/spicelib/devices/bsim3v1s/b3v1scheck.c
+++ b/src/spicelib/devices/bsim3v1s/b3v1scheck.c
@@ -22,7 +22,7 @@ struct bsim3v1sSizeDependParam *pParam;
 int Fatal_Flag = 0;
 FILE *fplog;
     
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     if ((fplog = fopen("BSIM3V3_1S_check.log", "w")) != NULL)
     {   pParam = here->pParam;
diff --git a/src/spicelib/devices/bsim3v1s/b3v1smask.c b/src/spicelib/devices/bsim3v1s/b3v1smask.c
index 337272c64..9faab940b 100644
--- a/src/spicelib/devices/bsim3v1s/b3v1smask.c
+++ b/src/spicelib/devices/bsim3v1s/b3v1smask.c
@@ -18,7 +18,7 @@ BSIM3v1SmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     BSIM3v1Smodel *model = (BSIM3v1Smodel *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case BSIM3v1S_MOD_MOBMOD:
diff --git a/src/spicelib/devices/bsim3v1s/b3v1spar.c b/src/spicelib/devices/bsim3v1s/b3v1spar.c
index 03ec999f6..7cf37ea90 100644
--- a/src/spicelib/devices/bsim3v1s/b3v1spar.c
+++ b/src/spicelib/devices/bsim3v1s/b3v1spar.c
@@ -19,7 +19,7 @@ BSIM3v1Sparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 
     BSIM3v1Sinstance *here = (BSIM3v1Sinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     if ( !cp_getvar( "scale", CP_REAL, (double*) &scale ) ) scale = 1;
 
diff --git a/src/spicelib/devices/bsim3v1s/b3v1spzld.c b/src/spicelib/devices/bsim3v1s/b3v1spzld.c
index 8856ae3b2..1e6216514 100644
--- a/src/spicelib/devices/bsim3v1s/b3v1spzld.c
+++ b/src/spicelib/devices/bsim3v1s/b3v1spzld.c
@@ -23,7 +23,7 @@ double cggb, cgdb, cgsb, cbgb, cbdb, cbsb, cddb, cdgb, cdsb;
 double GSoverlapCap, GDoverlapCap, GBoverlapCap;
 double FwdSum, RevSum, Gm, Gmbs;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for (; model != NULL; model = model->BSIM3v1SnextModel) 
     {    for (here = model->BSIM3v1Sinstances; here!= NULL;
diff --git a/src/spicelib/devices/bsim3v32/b3v32ask.c b/src/spicelib/devices/bsim3v32/b3v32ask.c
index 0728dc709..a5e725572 100644
--- a/src/spicelib/devices/bsim3v32/b3v32ask.c
+++ b/src/spicelib/devices/bsim3v32/b3v32ask.c
@@ -23,7 +23,7 @@ BSIM3v32ask (CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 {
 BSIM3v32instance *here = (BSIM3v32instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case BSIM3v32_L:
diff --git a/src/spicelib/devices/bsim3v32/b3v32check.c b/src/spicelib/devices/bsim3v32/b3v32check.c
index 6e50be9ee..5280d4a43 100644
--- a/src/spicelib/devices/bsim3v32/b3v32check.c
+++ b/src/spicelib/devices/bsim3v32/b3v32check.c
@@ -26,7 +26,7 @@ struct bsim3SizeDependParam *pParam;
 int Fatal_Flag = 0;
 FILE *fplog;
     
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     if ((fplog = fopen("b3v3check.log", "w")) != NULL)
     {   pParam = here->pParam;
diff --git a/src/spicelib/devices/bsim3v32/b3v32mask.c b/src/spicelib/devices/bsim3v32/b3v32mask.c
index a877fe678..bcb898eac 100644
--- a/src/spicelib/devices/bsim3v32/b3v32mask.c
+++ b/src/spicelib/devices/bsim3v32/b3v32mask.c
@@ -22,7 +22,7 @@ BSIM3v32mAsk (CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     BSIM3v32model *model = (BSIM3v32model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case BSIM3v32_MOD_MOBMOD:
diff --git a/src/spicelib/devices/bsim3v32/b3v32par.c b/src/spicelib/devices/bsim3v32/b3v32par.c
index 802df412d..951465868 100644
--- a/src/spicelib/devices/bsim3v32/b3v32par.c
+++ b/src/spicelib/devices/bsim3v32/b3v32par.c
@@ -23,7 +23,7 @@ BSIM3v32param (int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 
     BSIM3v32instance *here = (BSIM3v32instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     if ( !cp_getvar( "scale", CP_REAL, (double*) &scale ) ) scale = 1;
 
diff --git a/src/spicelib/devices/bsim4/b4ask.c b/src/spicelib/devices/bsim4/b4ask.c
index ef3ef0c9c..1e7bb708a 100644
--- a/src/spicelib/devices/bsim4/b4ask.c
+++ b/src/spicelib/devices/bsim4/b4ask.c
@@ -32,7 +32,7 @@ IFvalue *select)
 {
 BSIM4instance *here = (BSIM4instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case BSIM4_L:
diff --git a/src/spicelib/devices/bsim4/b4geo.c b/src/spicelib/devices/bsim4/b4geo.c
index aef314109..38ce20563 100644
--- a/src/spicelib/devices/bsim4/b4geo.c
+++ b/src/spicelib/devices/bsim4/b4geo.c
@@ -267,7 +267,7 @@ return 0;
 int
 BSIM4RdsEndIso(double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG, double nuEnd, int rgeo, int Type, double *Rend)
 {	
-	IGNORE(DMDG);
+	NG_IGNORE(DMDG);
 
 	if (Type == 1)
 	{   switch(rgeo)
@@ -324,8 +324,8 @@ return 0;
 int
 BSIM4RdsEndSha(double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG, double nuEnd, int rgeo, int Type, double *Rend)
 {
-        IGNORE(DMCI);
-        IGNORE(DMDG);
+        NG_IGNORE(DMCI);
+        NG_IGNORE(DMDG);
 
         if (Type == 1)
         {   switch(rgeo)
diff --git a/src/spicelib/devices/bsim4/b4mask.c b/src/spicelib/devices/bsim4/b4mask.c
index 713efac52..4a0cdf52c 100644
--- a/src/spicelib/devices/bsim4/b4mask.c
+++ b/src/spicelib/devices/bsim4/b4mask.c
@@ -35,7 +35,7 @@ IFvalue *value)
 {
     BSIM4model *model = (BSIM4model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case BSIM4_MOD_MOBMOD :
diff --git a/src/spicelib/devices/bsim4/b4par.c b/src/spicelib/devices/bsim4/b4par.c
index 5b5bd7ee4..166cfc948 100644
--- a/src/spicelib/devices/bsim4/b4par.c
+++ b/src/spicelib/devices/bsim4/b4par.c
@@ -32,7 +32,7 @@ IFvalue *select)
 
     BSIM4instance *here = (BSIM4instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     if ( !cp_getvar( "scale", CP_REAL, (double*) &scale ) ) scale = 1;
 
diff --git a/src/spicelib/devices/bsim4v2/b4v2ask.c b/src/spicelib/devices/bsim4v2/b4v2ask.c
index e15eff363..6e1812705 100644
--- a/src/spicelib/devices/bsim4v2/b4v2ask.c
+++ b/src/spicelib/devices/bsim4v2/b4v2ask.c
@@ -30,7 +30,7 @@ IFvalue *select)
 {
 BSIM4v2instance *here = (BSIM4v2instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case BSIM4v2_L:
diff --git a/src/spicelib/devices/bsim4v2/b4v2check.c b/src/spicelib/devices/bsim4v2/b4v2check.c
index 20ce8187a..8e9938511 100644
--- a/src/spicelib/devices/bsim4v2/b4v2check.c
+++ b/src/spicelib/devices/bsim4v2/b4v2check.c
@@ -30,7 +30,7 @@ struct bsim4SizeDependParam *pParam;
 int Fatal_Flag = 0;
 FILE *fplog;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
     
     if ((fplog = fopen("bsim4.out", "w")) != NULL)
     {   pParam = here->pParam;
diff --git a/src/spicelib/devices/bsim4v2/b4v2geo.c b/src/spicelib/devices/bsim4v2/b4v2geo.c
index 63392cae2..cb0de12bb 100644
--- a/src/spicelib/devices/bsim4v2/b4v2geo.c
+++ b/src/spicelib/devices/bsim4v2/b4v2geo.c
@@ -283,7 +283,7 @@ double nuEnd,
 int rgeo, int Type,
 double *Rend)
 {	
-	IGNORE(DMDG);
+	NG_IGNORE(DMDG);
 
 	if (Type == 1)
 	{   switch(rgeo)
@@ -344,8 +344,8 @@ double nuEnd,
 int rgeo, int Type,
 double *Rend)
 {
-        IGNORE(DMCI);
-        IGNORE(DMDG);
+        NG_IGNORE(DMCI);
+        NG_IGNORE(DMDG);
 
         if (Type == 1)
         {   switch(rgeo)
diff --git a/src/spicelib/devices/bsim4v2/b4v2mask.c b/src/spicelib/devices/bsim4v2/b4v2mask.c
index 638e96e18..cedd3c6f4 100644
--- a/src/spicelib/devices/bsim4v2/b4v2mask.c
+++ b/src/spicelib/devices/bsim4v2/b4v2mask.c
@@ -27,7 +27,7 @@ IFvalue *value)
 {
     BSIM4v2model *model = (BSIM4v2model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case BSIM4v2_MOD_MOBMOD :
diff --git a/src/spicelib/devices/bsim4v2/b4v2par.c b/src/spicelib/devices/bsim4v2/b4v2par.c
index affce096a..77e55ad01 100644
--- a/src/spicelib/devices/bsim4v2/b4v2par.c
+++ b/src/spicelib/devices/bsim4v2/b4v2par.c
@@ -25,7 +25,7 @@ IFvalue *select)
 
     BSIM4v2instance *here = (BSIM4v2instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     if ( !cp_getvar( "scale", CP_REAL, (double*) &scale ) ) scale = 1;
 
diff --git a/src/spicelib/devices/bsim4v3/b4v3ask.c b/src/spicelib/devices/bsim4v3/b4v3ask.c
index 5a1562a9e..acce4dc6e 100644
--- a/src/spicelib/devices/bsim4v3/b4v3ask.c
+++ b/src/spicelib/devices/bsim4v3/b4v3ask.c
@@ -30,7 +30,7 @@ IFvalue *select)
 {
 BSIM4v3instance *here = (BSIM4v3instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case BSIM4v3_L:
diff --git a/src/spicelib/devices/bsim4v3/b4v3check.c b/src/spicelib/devices/bsim4v3/b4v3check.c
index 8812aa9f3..15fbfb39c 100644
--- a/src/spicelib/devices/bsim4v3/b4v3check.c
+++ b/src/spicelib/devices/bsim4v3/b4v3check.c
@@ -32,7 +32,7 @@ struct bsim4v3SizeDependParam *pParam;
 int Fatal_Flag = 0;
 FILE *fplog;
     
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     if ((fplog = fopen("bsim4v3.out", "w")) != NULL)
     {   pParam = here->pParam;
diff --git a/src/spicelib/devices/bsim4v3/b4v3geo.c b/src/spicelib/devices/bsim4v3/b4v3geo.c
index 3a9db356d..65f807a74 100644
--- a/src/spicelib/devices/bsim4v3/b4v3geo.c
+++ b/src/spicelib/devices/bsim4v3/b4v3geo.c
@@ -283,7 +283,7 @@ double nuEnd,
 int rgeo, int Type,
 double *Rend)
 {	
-	IGNORE(DMDG);
+	NG_IGNORE(DMDG);
 
 	if (Type == 1)
 	{   switch(rgeo)
@@ -344,8 +344,8 @@ double nuEnd,
 int rgeo, int Type,
 double *Rend)
 {
-        IGNORE(DMCI);
-        IGNORE(DMDG);
+        NG_IGNORE(DMCI);
+        NG_IGNORE(DMDG);
 
         if (Type == 1)
         {   switch(rgeo)
diff --git a/src/spicelib/devices/bsim4v3/b4v3mask.c b/src/spicelib/devices/bsim4v3/b4v3mask.c
index c52791a39..89e8f1cfc 100644
--- a/src/spicelib/devices/bsim4v3/b4v3mask.c
+++ b/src/spicelib/devices/bsim4v3/b4v3mask.c
@@ -30,7 +30,7 @@ IFvalue *value)
 {
     BSIM4v3model *model = (BSIM4v3model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case BSIM4v3_MOD_MOBMOD :
diff --git a/src/spicelib/devices/bsim4v3/b4v3par.c b/src/spicelib/devices/bsim4v3/b4v3par.c
index 081015664..a11fc5ce0 100644
--- a/src/spicelib/devices/bsim4v3/b4v3par.c
+++ b/src/spicelib/devices/bsim4v3/b4v3par.c
@@ -28,7 +28,7 @@ IFvalue *select)
 
     BSIM4v3instance *here = (BSIM4v3instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     if ( !cp_getvar( "scale", CP_REAL, (double*) &scale ) ) scale = 1;
 
diff --git a/src/spicelib/devices/bsim4v4/b4v4ask.c b/src/spicelib/devices/bsim4v4/b4v4ask.c
index 70f8454b3..1b7177242 100644
--- a/src/spicelib/devices/bsim4v4/b4v4ask.c
+++ b/src/spicelib/devices/bsim4v4/b4v4ask.c
@@ -29,7 +29,7 @@ IFvalue *select)
 {
 BSIM4v4instance *here = (BSIM4v4instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case BSIM4v4_L:
diff --git a/src/spicelib/devices/bsim4v4/b4v4geo.c b/src/spicelib/devices/bsim4v4/b4v4geo.c
index 0a387505c..6fcb999fe 100644
--- a/src/spicelib/devices/bsim4v4/b4v4geo.c
+++ b/src/spicelib/devices/bsim4v4/b4v4geo.c
@@ -281,7 +281,7 @@ double nuEnd,
 int rgeo, int Type,
 double *Rend)
 {	
-	IGNORE(DMDG);
+	NG_IGNORE(DMDG);
 
 	if (Type == 1)
 	{   switch(rgeo)
@@ -342,8 +342,8 @@ double nuEnd,
 int rgeo, int Type,
 double *Rend)
 {
-        IGNORE(DMCI);
-        IGNORE(DMDG);
+        NG_IGNORE(DMCI);
+        NG_IGNORE(DMDG);
 
         if (Type == 1)
         {   switch(rgeo)
diff --git a/src/spicelib/devices/bsim4v4/b4v4mask.c b/src/spicelib/devices/bsim4v4/b4v4mask.c
index 6f4ab11c1..915e8a526 100644
--- a/src/spicelib/devices/bsim4v4/b4v4mask.c
+++ b/src/spicelib/devices/bsim4v4/b4v4mask.c
@@ -30,7 +30,7 @@ IFvalue *value)
 {
     BSIM4v4model *model = (BSIM4v4model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case BSIM4v4_MOD_MOBMOD :
diff --git a/src/spicelib/devices/bsim4v4/b4v4par.c b/src/spicelib/devices/bsim4v4/b4v4par.c
index 361d65936..e28c5cc13 100644
--- a/src/spicelib/devices/bsim4v4/b4v4par.c
+++ b/src/spicelib/devices/bsim4v4/b4v4par.c
@@ -29,7 +29,7 @@ IFvalue *select)
 
     BSIM4v4instance *here = (BSIM4v4instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     if ( !cp_getvar( "scale", CP_REAL, (double*) &scale ) ) scale = 1;
 
diff --git a/src/spicelib/devices/bsim4v5/b4v5ask.c b/src/spicelib/devices/bsim4v5/b4v5ask.c
index 893673e04..bd4fef616 100644
--- a/src/spicelib/devices/bsim4v5/b4v5ask.c
+++ b/src/spicelib/devices/bsim4v5/b4v5ask.c
@@ -30,7 +30,7 @@ IFvalue *select)
 {
 BSIM4v5instance *here = (BSIM4v5instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) 
     {   case BSIM4v5_L:
diff --git a/src/spicelib/devices/bsim4v5/b4v5geo.c b/src/spicelib/devices/bsim4v5/b4v5geo.c
index 9822ae7e2..eabe24340 100644
--- a/src/spicelib/devices/bsim4v5/b4v5geo.c
+++ b/src/spicelib/devices/bsim4v5/b4v5geo.c
@@ -281,7 +281,7 @@ double nuEnd,
 int rgeo, int Type,
 double *Rend)
 {	
-	IGNORE(DMDG);
+	NG_IGNORE(DMDG);
 
 	if (Type == 1)
 	{   switch(rgeo)
@@ -342,8 +342,8 @@ double nuEnd,
 int rgeo, int Type,
 double *Rend)
 {
-        IGNORE(DMCI);
-        IGNORE(DMDG);
+        NG_IGNORE(DMCI);
+        NG_IGNORE(DMDG);
 
         if (Type == 1)
         {   switch(rgeo)
diff --git a/src/spicelib/devices/bsim4v5/b4v5mask.c b/src/spicelib/devices/bsim4v5/b4v5mask.c
index 391ad9872..8850f23a3 100644
--- a/src/spicelib/devices/bsim4v5/b4v5mask.c
+++ b/src/spicelib/devices/bsim4v5/b4v5mask.c
@@ -31,7 +31,7 @@ IFvalue *value)
 {
     BSIM4v5model *model = (BSIM4v5model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) 
     {   case BSIM4v5_MOD_MOBMOD :
diff --git a/src/spicelib/devices/bsim4v5/b4v5par.c b/src/spicelib/devices/bsim4v5/b4v5par.c
index 160694a94..2f7b7969f 100644
--- a/src/spicelib/devices/bsim4v5/b4v5par.c
+++ b/src/spicelib/devices/bsim4v5/b4v5par.c
@@ -30,7 +30,7 @@ IFvalue *select)
 
     BSIM4v5instance *here = (BSIM4v5instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     if ( !cp_getvar( "scale", CP_REAL, (double*) &scale ) ) scale = 1;
 
diff --git a/src/spicelib/devices/cap/capmask.c b/src/spicelib/devices/cap/capmask.c
index 8997ab650..aedccf034 100644
--- a/src/spicelib/devices/cap/capmask.c
+++ b/src/spicelib/devices/cap/capmask.c
@@ -21,7 +21,7 @@ CAPmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     CAPmodel *here = (CAPmodel*)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case CAP_MOD_TNOM:
diff --git a/src/spicelib/devices/cap/capparam.c b/src/spicelib/devices/cap/capparam.c
index c6ed2ffff..8a2eadd61 100644
--- a/src/spicelib/devices/cap/capparam.c
+++ b/src/spicelib/devices/cap/capparam.c
@@ -19,7 +19,7 @@ CAPparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     CAPinstance *here = (CAPinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case CAP_CAP:
diff --git a/src/spicelib/devices/cap/cappzld.c b/src/spicelib/devices/cap/cappzld.c
index b96b137d2..0fb2b5c0a 100644
--- a/src/spicelib/devices/cap/cappzld.c
+++ b/src/spicelib/devices/cap/cappzld.c
@@ -24,7 +24,7 @@ CAPpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     double m;
     CAPinstance *here;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for( ; model != NULL; model = model->CAPnextModel) {
         for( here = model->CAPinstances;here != NULL; 
diff --git a/src/spicelib/devices/cccs/cccsload.c b/src/spicelib/devices/cccs/cccsload.c
index 5b9d768f4..e91532578 100644
--- a/src/spicelib/devices/cccs/cccsload.c
+++ b/src/spicelib/devices/cccs/cccsload.c
@@ -23,7 +23,7 @@ CCCSload(GENmodel *inModel, CKTcircuit *ckt)
     CCCSmodel *model = (CCCSmodel*)inModel;
     CCCSinstance *here;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCCSnextModel ) {
diff --git a/src/spicelib/devices/cccs/cccspar.c b/src/spicelib/devices/cccs/cccspar.c
index 39c33a338..3a6b13b48 100644
--- a/src/spicelib/devices/cccs/cccspar.c
+++ b/src/spicelib/devices/cccs/cccspar.c
@@ -18,7 +18,7 @@ CCCSparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     CCCSinstance *here = (CCCSinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case CCCS_GAIN:
diff --git a/src/spicelib/devices/cccs/cccspzld.c b/src/spicelib/devices/cccs/cccspzld.c
index aad8388db..892dc0311 100644
--- a/src/spicelib/devices/cccs/cccspzld.c
+++ b/src/spicelib/devices/cccs/cccspzld.c
@@ -24,8 +24,8 @@ CCCSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     CCCSmodel *model = (CCCSmodel*)inModel;
     CCCSinstance *here;
 
-    IGNORE(ckt);
-    IGNORE(s);
+    NG_IGNORE(ckt);
+    NG_IGNORE(s);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCCSnextModel ) {
diff --git a/src/spicelib/devices/cccs/cccsset.c b/src/spicelib/devices/cccs/cccsset.c
index 8f5c8045b..583e53f56 100644
--- a/src/spicelib/devices/cccs/cccsset.c
+++ b/src/spicelib/devices/cccs/cccsset.c
@@ -24,7 +24,7 @@ CCCSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     CCCSmodel *model = (CCCSmodel*)inModel;
     CCCSinstance *here;
 
-    IGNORE(states);
+    NG_IGNORE(states);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCCSnextModel ) {
diff --git a/src/spicelib/devices/ccvs/ccvsload.c b/src/spicelib/devices/ccvs/ccvsload.c
index 422345aa7..1afe18a0e 100644
--- a/src/spicelib/devices/ccvs/ccvsload.c
+++ b/src/spicelib/devices/ccvs/ccvsload.c
@@ -23,7 +23,7 @@ CCVSload(GENmodel *inModel, CKTcircuit *ckt)
     CCVSmodel *model = (CCVSmodel*)inModel;
     CCVSinstance *here;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCVSnextModel ) {
diff --git a/src/spicelib/devices/ccvs/ccvspar.c b/src/spicelib/devices/ccvs/ccvspar.c
index c11f89ba3..7ac2c541e 100644
--- a/src/spicelib/devices/ccvs/ccvspar.c
+++ b/src/spicelib/devices/ccvs/ccvspar.c
@@ -18,7 +18,7 @@ CCVSparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     CCVSinstance *here = (CCVSinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case CCVS_TRANS:
diff --git a/src/spicelib/devices/ccvs/ccvspzld.c b/src/spicelib/devices/ccvs/ccvspzld.c
index c16644ad0..db21b5de6 100644
--- a/src/spicelib/devices/ccvs/ccvspzld.c
+++ b/src/spicelib/devices/ccvs/ccvspzld.c
@@ -24,8 +24,8 @@ CCVSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     CCVSmodel *model = (CCVSmodel*)inModel;
     CCVSinstance *here;
 
-    IGNORE(ckt);
-    IGNORE(s);
+    NG_IGNORE(ckt);
+    NG_IGNORE(s);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCVSnextModel ) {
diff --git a/src/spicelib/devices/ccvs/ccvsset.c b/src/spicelib/devices/ccvs/ccvsset.c
index 002378655..11590e889 100644
--- a/src/spicelib/devices/ccvs/ccvsset.c
+++ b/src/spicelib/devices/ccvs/ccvsset.c
@@ -22,7 +22,7 @@ CCVSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     int error;
     CKTnode *tmp;
 
-    IGNORE(states);
+    NG_IGNORE(states);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->CCVSnextModel ) {
diff --git a/src/spicelib/devices/cpl/cplask.c b/src/spicelib/devices/cpl/cplask.c
index e385c1814..eb39f5ada 100644
--- a/src/spicelib/devices/cpl/cplask.c
+++ b/src/spicelib/devices/cpl/cplask.c
@@ -20,8 +20,8 @@ CPLask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *s
 {
     CPLinstance *here = (CPLinstance *)inst;
 
-    IGNORE(ckt);
-    IGNORE(select);
+    NG_IGNORE(ckt);
+    NG_IGNORE(select);
 
     switch(which) {
         case CPL_POS_NODE:
diff --git a/src/spicelib/devices/cpl/cplload.c b/src/spicelib/devices/cpl/cplload.c
index 882c9fc23..92f0db97d 100644
--- a/src/spicelib/devices/cpl/cplload.c
+++ b/src/spicelib/devices/cpl/cplload.c
@@ -410,7 +410,7 @@ right_consts(CPLinstance *here,	CPLine *cp, int	t, int time, double h, double h1
    int ext;
    int noL;
 
-    IGNORE(here);
+    NG_IGNORE(here);
 
    noL = cp->noL;
 
diff --git a/src/spicelib/devices/cpl/cplmask.c b/src/spicelib/devices/cpl/cplmask.c
index fa062121c..0d67f7ff2 100644
--- a/src/spicelib/devices/cpl/cplmask.c
+++ b/src/spicelib/devices/cpl/cplmask.c
@@ -20,7 +20,7 @@ CPLmAsk(CKTcircuit *ckt, GENmodel *inModel, int which, IFvalue *value)
 {
     CPLmodel *model = (CPLmodel *)inModel;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case CPL_R:
diff --git a/src/spicelib/devices/cpl/cplparam.c b/src/spicelib/devices/cpl/cplparam.c
index af7d85045..bf73b3f64 100644
--- a/src/spicelib/devices/cpl/cplparam.c
+++ b/src/spicelib/devices/cpl/cplparam.c
@@ -20,7 +20,7 @@ CPLparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 
     CPLinstance *here = (CPLinstance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case CPL_POS_NODE:
diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c
index efd68bf07..855900b22 100644
--- a/src/spicelib/devices/cpl/cplsetup.c
+++ b/src/spicelib/devices/cpl/cplsetup.c
@@ -145,7 +145,7 @@ CPLsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
     char **branchname;
     int noL;
 
-    IGNORE(state);
+    NG_IGNORE(state);
 
     /*  loop through all the models */
     for( ; model != NULL; model = model->CPLnextModel ) {
@@ -535,7 +535,7 @@ new_memory(int dim, int deg, int deg_o)
 {
    int i, j;
 
-   IGNORE(deg);
+   NG_IGNORE(deg);
 
    for (i = 0; i < dim; i++)
       for (j = 0; j < dim; j++) 
@@ -582,7 +582,7 @@ static double
 static void 
 free_vector(double *v, int nl, int nh)
 {
-   IGNORE(nh);
+   NG_IGNORE(nh);
 
    free((void*) (v +nl));
 }
@@ -1732,7 +1732,7 @@ root3(double a1, double a2, double a3, double x)
 static int 
 div3(double a1, double a2, double a3, double x, double *p1, double *p2)
 {
-        IGNORE(a2);
+        NG_IGNORE(a2);
 
         *p1 = a1 + x;
 
diff --git a/src/spicelib/devices/csw/cswask.c b/src/spicelib/devices/csw/cswask.c
index 0e597c81d..fbcb0e9bf 100644
--- a/src/spicelib/devices/csw/cswask.c
+++ b/src/spicelib/devices/csw/cswask.c
@@ -26,7 +26,7 @@ CSWask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *s
     CSWinstance *here = (CSWinstance*)inst;
     static char *msg = "Current and power not available in ac analysis";
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case CSW_CONTROL:
diff --git a/src/spicelib/devices/csw/cswmask.c b/src/spicelib/devices/csw/cswmask.c
index c1e9dc653..49c2adbe5 100644
--- a/src/spicelib/devices/csw/cswmask.c
+++ b/src/spicelib/devices/csw/cswmask.c
@@ -25,7 +25,7 @@ CSWmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     CSWmodel *here = (CSWmodel*)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case CSW_RON:
diff --git a/src/spicelib/devices/csw/cswparam.c b/src/spicelib/devices/csw/cswparam.c
index c613c93ab..a54088219 100644
--- a/src/spicelib/devices/csw/cswparam.c
+++ b/src/spicelib/devices/csw/cswparam.c
@@ -18,7 +18,7 @@ CSWparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     CSWinstance *here = (CSWinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case  CSW_CONTROL:
diff --git a/src/spicelib/devices/csw/cswpzld.c b/src/spicelib/devices/csw/cswpzld.c
index 546612877..8e944ffd5 100644
--- a/src/spicelib/devices/csw/cswpzld.c
+++ b/src/spicelib/devices/csw/cswpzld.c
@@ -27,7 +27,7 @@ CSWpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     double g_now;
     int current_state;
 
-    IGNORE(s);
+    NG_IGNORE(s);
 
     /*  loop through all the switch models */
     for( ; model != NULL; model = model->CSWnextModel ) {
diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c
index 3ad1589ad..bb952efa2 100644
--- a/src/spicelib/devices/dev.c
+++ b/src/spicelib/devices/dev.c
@@ -487,7 +487,6 @@ int load_opus(char *name){
 
 void *dlopen(const char *name,int type)
 {
-	IGNORE(type);
 	return LoadLibrary(name);
 }
 
diff --git a/src/spicelib/devices/devsup.c b/src/spicelib/devices/devsup.c
index 4a56a4098..faf7da257 100644
--- a/src/spicelib/devices/devsup.c
+++ b/src/spicelib/devices/devsup.c
@@ -263,7 +263,7 @@ DEVqmeyer(double vgs,		/* initial voltage gate-source */
     double vddif2;
     double vgst;
 
-    IGNORE(vgb);
+    NG_IGNORE(vgb);
 
 #define MAGIC_VDS 0.025
 
diff --git a/src/spicelib/devices/dio/diomask.c b/src/spicelib/devices/dio/diomask.c
index 636515698..b92b1d58d 100644
--- a/src/spicelib/devices/dio/diomask.c
+++ b/src/spicelib/devices/dio/diomask.c
@@ -21,7 +21,7 @@ DIOmAsk (CKTcircuit *ckt, GENmodel *inModel, int which, IFvalue *value)
 {
     DIOmodel *model = (DIOmodel*)inModel;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch (which) {
         case DIO_MOD_IS:
diff --git a/src/spicelib/devices/dio/dioparam.c b/src/spicelib/devices/dio/dioparam.c
index fd6add1b5..d0794942b 100644
--- a/src/spicelib/devices/dio/dioparam.c
+++ b/src/spicelib/devices/dio/dioparam.c
@@ -20,7 +20,7 @@ DIOparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     DIOinstance *here = (DIOinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case DIO_AREA:
diff --git a/src/spicelib/devices/hfet1/hfetask.c b/src/spicelib/devices/hfet1/hfetask.c
index 0da1a5e12..2e0144ebb 100644
--- a/src/spicelib/devices/hfet1/hfetask.c
+++ b/src/spicelib/devices/hfet1/hfetask.c
@@ -22,7 +22,7 @@ HFETAask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue
     HFETAinstance *here = (HFETAinstance*)inst;
     static char *msg = "Current and power not available in ac analysis";
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case HFETA_LENGTH:
diff --git a/src/spicelib/devices/hfet1/hfetmask.c b/src/spicelib/devices/hfet1/hfetmask.c
index 9f33248db..1570976c9 100644
--- a/src/spicelib/devices/hfet1/hfetmask.c
+++ b/src/spicelib/devices/hfet1/hfetmask.c
@@ -21,7 +21,7 @@ HFETAmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     HFETAmodel *here = (HFETAmodel*)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case HFETA_MOD_VTO:
diff --git a/src/spicelib/devices/hfet1/hfetparam.c b/src/spicelib/devices/hfet1/hfetparam.c
index 00a927ebb..ebe972cdd 100644
--- a/src/spicelib/devices/hfet1/hfetparam.c
+++ b/src/spicelib/devices/hfet1/hfetparam.c
@@ -16,7 +16,7 @@ HFETAparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     HFETAinstance *here = (HFETAinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case HFETA_LENGTH:
diff --git a/src/spicelib/devices/hfet2/hfet2ask.c b/src/spicelib/devices/hfet2/hfet2ask.c
index 63e54a6b2..94fda2f7a 100644
--- a/src/spicelib/devices/hfet2/hfet2ask.c
+++ b/src/spicelib/devices/hfet2/hfet2ask.c
@@ -23,7 +23,7 @@ HFET2ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
     HFET2instance *here = (HFET2instance*)inst;
     static char *msg = "Current and power not available in ac analysis";
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case HFET2_LENGTH:
diff --git a/src/spicelib/devices/hfet2/hfet2load.c b/src/spicelib/devices/hfet2/hfet2load.c
index 4527116e5..d6b402011 100644
--- a/src/spicelib/devices/hfet2/hfet2load.c
+++ b/src/spicelib/devices/hfet2/hfet2load.c
@@ -384,7 +384,7 @@ static void hfeta2(HFET2model *model, HFET2instance *here, CKTcircuit *ckt,
   double delvgtvgs;
   double delvsatevgt;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
   vt     = CONSTKoverQ*TEMP;
   etavth = ETA*vt;
diff --git a/src/spicelib/devices/hfet2/hfet2mask.c b/src/spicelib/devices/hfet2/hfet2mask.c
index b7eb758f0..c7cbeb8b3 100644
--- a/src/spicelib/devices/hfet2/hfet2mask.c
+++ b/src/spicelib/devices/hfet2/hfet2mask.c
@@ -21,7 +21,7 @@ HFET2mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     HFET2model *here = (HFET2model*)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case HFET2_MOD_VTO:
diff --git a/src/spicelib/devices/hfet2/hfet2param.c b/src/spicelib/devices/hfet2/hfet2param.c
index a391a4954..e6bd2ff2b 100644
--- a/src/spicelib/devices/hfet2/hfet2param.c
+++ b/src/spicelib/devices/hfet2/hfet2param.c
@@ -15,7 +15,7 @@ int HFET2param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
   
   HFET2instance *here = (HFET2instance*)inst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
   
   switch(param) {
     case HFET2_LENGTH:
diff --git a/src/spicelib/devices/hisim/hsm1ask.c b/src/spicelib/devices/hisim/hsm1ask.c
index fb5e84515..37566f297 100644
--- a/src/spicelib/devices/hisim/hsm1ask.c
+++ b/src/spicelib/devices/hisim/hsm1ask.c
@@ -22,7 +22,7 @@ HSM1ask(CKTcircuit *ckt, GENinstance *inst, int which,
 {
   HSM1instance *here = (HSM1instance*)inst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (which) {
   case HSM1_L:
diff --git a/src/spicelib/devices/hisim/hsm1eval102.c b/src/spicelib/devices/hisim/hsm1eval102.c
index 6e6cdfdec..fef3d3bcb 100644
--- a/src/spicelib/devices/hisim/hsm1eval102.c
+++ b/src/spicelib/devices/hisim/hsm1eval102.c
@@ -448,7 +448,7 @@ double  T10 , T20 , T21 , T30 , T31 ;
 /* intrinsic fringing capacitance */
 double	Cgdf, Cgdfring ;
 
-    IGNORE(pMS);
+    NG_IGNORE(pMS);
 
 /*================ Start of executable code.=================*/
 
diff --git a/src/spicelib/devices/hisim/hsm1eval112.c b/src/spicelib/devices/hisim/hsm1eval112.c
index d9545e39e..be6e11b6c 100644
--- a/src/spicelib/devices/hisim/hsm1eval112.c
+++ b/src/spicelib/devices/hisim/hsm1eval112.c
@@ -474,7 +474,7 @@ double  T7_dVbs , T7_dVds , T7_dVgs ;
 double  T8_dVbs , T8_dVds , T8_dVgs ;
 double  T10 , T20 , T21 , T30 , T31 ;
 
-    IGNORE(pMS);
+    NG_IGNORE(pMS);
 
 /*================ Start of executable code.=================*/
 
diff --git a/src/spicelib/devices/hisim/hsm1eval120.c b/src/spicelib/devices/hisim/hsm1eval120.c
index 199e492e0..b5f568c5c 100644
--- a/src/spicelib/devices/hisim/hsm1eval120.c
+++ b/src/spicelib/devices/hisim/hsm1eval120.c
@@ -545,7 +545,7 @@ double  T20 , T21 , T30 , T31 ;
 
 double c_eox ;
 
-    IGNORE(pMS);
+    NG_IGNORE(pMS);
 
 /*================ Start of executable code.=================*/
 
diff --git a/src/spicelib/devices/hisim/hsm1ld.c b/src/spicelib/devices/hisim/hsm1ld.c
index a8ac9f55e..992ba6ba1 100644
--- a/src/spicelib/devices/hisim/hsm1ld.c
+++ b/src/spicelib/devices/hisim/hsm1ld.c
@@ -24,8 +24,8 @@ static void
 ShowPhysVals(HSM1instance *here, HSM1model *model,int isFirst, double vds, 
              double vgs, double vbs, double vgd, double vbd, double vgb)
 {
-  IGNORE(vgd);
-  IGNORE(vbd);
+  NG_IGNORE(vgd);
+  NG_IGNORE(vbd);
 
   /* regard the epsilon-quantity as 0.0 */
   vds = (fabs(vds) < SHOW_EPS_QUANT) ? 0.0 : vds;
diff --git a/src/spicelib/devices/hisim/hsm1mask.c b/src/spicelib/devices/hisim/hsm1mask.c
index edb8ef9fb..86487584e 100644
--- a/src/spicelib/devices/hisim/hsm1mask.c
+++ b/src/spicelib/devices/hisim/hsm1mask.c
@@ -21,7 +21,7 @@ HSM1mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
   HSM1model *model = (HSM1model *)inst;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   switch (which) {
   case HSM1_MOD_NMOS:
diff --git a/src/spicelib/devices/hisim/hsm1par.c b/src/spicelib/devices/hisim/hsm1par.c
index c00b753c9..ab3907e08 100644
--- a/src/spicelib/devices/hisim/hsm1par.c
+++ b/src/spicelib/devices/hisim/hsm1par.c
@@ -19,7 +19,7 @@ HSM1param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
   HSM1instance *here = (HSM1instance*)inst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (param) {
   case HSM1_W:
diff --git a/src/spicelib/devices/hisim/hsm1pzld.c b/src/spicelib/devices/hisim/hsm1pzld.c
index 0b6914170..52a8c4afd 100644
--- a/src/spicelib/devices/hisim/hsm1pzld.c
+++ b/src/spicelib/devices/hisim/hsm1pzld.c
@@ -35,7 +35,7 @@ HSM1pzLoad(GENmodel *inModel, register CKTcircuit *ckt,
   
   double m; /* Multiplier */
   
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   for ( ;model != NULL ;model = model->HSM1nextModel ) {
     for ( here = model->HSM1instances ;here!= NULL ;
diff --git a/src/spicelib/devices/hisim/hsm1temp.c b/src/spicelib/devices/hisim/hsm1temp.c
index b2a2c7552..90cb6429b 100644
--- a/src/spicelib/devices/hisim/hsm1temp.c
+++ b/src/spicelib/devices/hisim/hsm1temp.c
@@ -19,8 +19,8 @@
 int 
 HSM1temp(GENmodel *inModel, CKTcircuit *ckt)
 {
-  IGNORE(inModel);
-  IGNORE(ckt);
+  NG_IGNORE(inModel);
+  NG_IGNORE(ckt);
 
   /* "ckt->CKTtemp" dependence of HiSIM parameters is treated all in
    * HSM1evaluate102/112/120(). So there is no task in HSM1temp().
diff --git a/src/spicelib/devices/ind/indmask.c b/src/spicelib/devices/ind/indmask.c
index 906cb08c0..f36244c66 100644
--- a/src/spicelib/devices/ind/indmask.c
+++ b/src/spicelib/devices/ind/indmask.c
@@ -20,7 +20,7 @@ INDmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     INDmodel *here = (INDmodel*)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case IND_MOD_IND:
diff --git a/src/spicelib/devices/ind/indparam.c b/src/spicelib/devices/ind/indparam.c
index 35f6a9f41..7c8fba333 100644
--- a/src/spicelib/devices/ind/indparam.c
+++ b/src/spicelib/devices/ind/indparam.c
@@ -18,7 +18,7 @@ INDparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     INDinstance *here = (INDinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case IND_IND:
diff --git a/src/spicelib/devices/ind/indpzld.c b/src/spicelib/devices/ind/indpzld.c
index 3716ceee9..cacfd48aa 100644
--- a/src/spicelib/devices/ind/indpzld.c
+++ b/src/spicelib/devices/ind/indpzld.c
@@ -21,7 +21,7 @@ INDpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     double val;
     INDinstance *here;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for( ; model != NULL; model = model->INDnextModel) {
         for( here = model->INDinstances;here != NULL; 
diff --git a/src/spicelib/devices/ind/mutparam.c b/src/spicelib/devices/ind/mutparam.c
index 47f406fab..98f55a2d3 100644
--- a/src/spicelib/devices/ind/mutparam.c
+++ b/src/spicelib/devices/ind/mutparam.c
@@ -19,7 +19,7 @@ MUTparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     MUTinstance *here = (MUTinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case MUT_COEFF:
diff --git a/src/spicelib/devices/ind/mutpzld.c b/src/spicelib/devices/ind/mutpzld.c
index 3e7fc3fcf..e06d33471 100644
--- a/src/spicelib/devices/ind/mutpzld.c
+++ b/src/spicelib/devices/ind/mutpzld.c
@@ -22,7 +22,7 @@ MUTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     double val;
     MUTinstance *here;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for( ; model != NULL; model = model->MUTnextModel) {
         for( here = model->MUTinstances;here != NULL; 
diff --git a/src/spicelib/devices/ind/mutsetup.c b/src/spicelib/devices/ind/mutsetup.c
index 6c0ca4054..8be8d6808 100644
--- a/src/spicelib/devices/ind/mutsetup.c
+++ b/src/spicelib/devices/ind/mutsetup.c
@@ -26,7 +26,7 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     int ktype;
     int error;
 
-    IGNORE(states);
+    NG_IGNORE(states);
 
     /*  loop through all the inductor models */
     for( ; model != NULL; model = model->MUTnextModel ) {
diff --git a/src/spicelib/devices/ind/mutsprt.c b/src/spicelib/devices/ind/mutsprt.c
index 9062e96be..60cc894db 100644
--- a/src/spicelib/devices/ind/mutsprt.c
+++ b/src/spicelib/devices/ind/mutsprt.c
@@ -25,7 +25,7 @@ MUTsPrint(GENmodel *inModel, CKTcircuit* ckt)
     MUTmodel *model = (MUTmodel*)inModel;
     MUTinstance *here;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     printf("MUTUAL INDUCTORS-----------------\n");
     /*  loop through all the inductor models */
diff --git a/src/spicelib/devices/ind/muttemp.c b/src/spicelib/devices/ind/muttemp.c
index fb3b20ccd..4d9782618 100644
--- a/src/spicelib/devices/ind/muttemp.c
+++ b/src/spicelib/devices/ind/muttemp.c
@@ -21,7 +21,7 @@ MUTtemp(GENmodel *inModel, CKTcircuit *ckt)
     MUTinstance *here;
     double ind1, ind2;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the inductor models */
     for( ; model != NULL; model = model->MUTnextModel ) {
diff --git a/src/spicelib/devices/isrc/isrcask.c b/src/spicelib/devices/isrc/isrcask.c
index bc613357f..c1337de18 100644
--- a/src/spicelib/devices/isrc/isrcask.c
+++ b/src/spicelib/devices/isrc/isrcask.c
@@ -28,7 +28,7 @@ ISRCask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *
     int temp;
     double *v, *w;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case ISRC_DC:
diff --git a/src/spicelib/devices/isrc/isrcpar.c b/src/spicelib/devices/isrc/isrcpar.c
index 950df5b5b..17d26bcd2 100644
--- a/src/spicelib/devices/isrc/isrcpar.c
+++ b/src/spicelib/devices/isrc/isrcpar.c
@@ -21,7 +21,7 @@ ISRCparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 int i;	
     ISRCinstance *here = (ISRCinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case ISRC_DC:
diff --git a/src/spicelib/devices/isrc/isrctemp.c b/src/spicelib/devices/isrc/isrctemp.c
index 182d3c22f..cc8345521 100644
--- a/src/spicelib/devices/isrc/isrctemp.c
+++ b/src/spicelib/devices/isrc/isrctemp.c
@@ -18,7 +18,7 @@ ISRCtemp(GENmodel *inModel, CKTcircuit *ckt)
     ISRCinstance *here;
     double radians;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     for( ; model != NULL; model = model->ISRCnextModel ) {
 
diff --git a/src/spicelib/devices/jfet/jfetask.c b/src/spicelib/devices/jfet/jfetask.c
index a1ec67091..959d2d8f6 100644
--- a/src/spicelib/devices/jfet/jfetask.c
+++ b/src/spicelib/devices/jfet/jfetask.c
@@ -23,7 +23,7 @@ JFETask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
     JFETinstance *here = (JFETinstance*)inst;
     static char *msg = "Current and power not available for ac analysis";
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case JFET_TEMP:
diff --git a/src/spicelib/devices/jfet/jfetmask.c b/src/spicelib/devices/jfet/jfetmask.c
index 6773e1b2d..82cebbd0f 100644
--- a/src/spicelib/devices/jfet/jfetmask.c
+++ b/src/spicelib/devices/jfet/jfetmask.c
@@ -24,7 +24,7 @@ JFETmAsk(CKTcircuit *ckt, GENmodel *inModel, int which, IFvalue *value)
 {
     JFETmodel *model = (JFETmodel*)inModel;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case JFET_MOD_TNOM:
diff --git a/src/spicelib/devices/jfet/jfetpar.c b/src/spicelib/devices/jfet/jfetpar.c
index 1af0e3bbb..46c4f6ed7 100644
--- a/src/spicelib/devices/jfet/jfetpar.c
+++ b/src/spicelib/devices/jfet/jfetpar.c
@@ -19,7 +19,7 @@ JFETparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     JFETinstance *here = (JFETinstance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case JFET_TEMP:
diff --git a/src/spicelib/devices/jfet2/jfet2ask.c b/src/spicelib/devices/jfet2/jfet2ask.c
index 6ecf3ff01..8ca20ffab 100644
--- a/src/spicelib/devices/jfet2/jfet2ask.c
+++ b/src/spicelib/devices/jfet2/jfet2ask.c
@@ -26,7 +26,7 @@ JFET2ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
     JFET2instance *here = (JFET2instance*)inst;
     static char *msg = "Current and power not available for ac analysis";
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case JFET2_TEMP:
diff --git a/src/spicelib/devices/jfet2/jfet2mask.c b/src/spicelib/devices/jfet2/jfet2mask.c
index d004fac03..66b69c1b8 100644
--- a/src/spicelib/devices/jfet2/jfet2mask.c
+++ b/src/spicelib/devices/jfet2/jfet2mask.c
@@ -26,7 +26,7 @@ JFET2mAsk(CKTcircuit *ckt, GENmodel *inModel, int which, IFvalue *value)
 {
     JFET2model *model = (JFET2model*)inModel;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case JFET2_MOD_TNOM:
diff --git a/src/spicelib/devices/jfet2/jfet2par.c b/src/spicelib/devices/jfet2/jfet2par.c
index b2120dcc7..de60bc6ff 100644
--- a/src/spicelib/devices/jfet2/jfet2par.c
+++ b/src/spicelib/devices/jfet2/jfet2par.c
@@ -23,7 +23,7 @@ JFET2param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     JFET2instance *here = (JFET2instance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case JFET2_TEMP:
diff --git a/src/spicelib/devices/jfet2/psmodel.c b/src/spicelib/devices/jfet2/psmodel.c
index aeb7d797c..3f655e749 100644
--- a/src/spicelib/devices/jfet2/psmodel.c
+++ b/src/spicelib/devices/jfet2/psmodel.c
@@ -349,7 +349,7 @@ double *xGds
                 
     double cdsqr = fac * ids * del * wtd/wtddet;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     *Gm   = dr*gm  - di*xgm;
     *xGm  = di*gm  + dr*xgm;
diff --git a/src/spicelib/devices/ltra/ltraask.c b/src/spicelib/devices/ltra/ltraask.c
index f94f0794f..d6f596643 100644
--- a/src/spicelib/devices/ltra/ltraask.c
+++ b/src/spicelib/devices/ltra/ltraask.c
@@ -22,8 +22,8 @@ LTRAask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *
   LTRAinstance *here = (LTRAinstance *) inst;
   int temp;
 
-  IGNORE(select);
-  IGNORE(ckt);
+  NG_IGNORE(select);
+  NG_IGNORE(ckt);
 
   switch (which) {
   case LTRA_POS_NODE1:
diff --git a/src/spicelib/devices/ltra/ltramask.c b/src/spicelib/devices/ltra/ltramask.c
index 8141d239a..f7a4d990a 100644
--- a/src/spicelib/devices/ltra/ltramask.c
+++ b/src/spicelib/devices/ltra/ltramask.c
@@ -19,7 +19,7 @@ LTRAmAsk(CKTcircuit *ckt, GENmodel *inModel, int param, IFvalue *value)
 {
   LTRAmodel *mods = (LTRAmodel *) inModel;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   switch (param) {
   case LTRA_MOD_LTRA:
diff --git a/src/spicelib/devices/ltra/ltramisc.c b/src/spicelib/devices/ltra/ltramisc.c
index 3e8ba0f49..26c6109d7 100644
--- a/src/spicelib/devices/ltra/ltramisc.c
+++ b/src/spicelib/devices/ltra/ltramisc.c
@@ -272,7 +272,7 @@ LTRArlcH1dashFunc(double time, double T, double alpha, double beta)
 {
   double besselarg, exparg, returnval;
   /* T is not used in this function */
-  IGNORE(T);
+  NG_IGNORE(T);
 
   /*
    * result = alpha * e^{- beta*time} * {I_1(alpha*time) - I_0(alpha*time)}
@@ -451,7 +451,7 @@ LTRArcCoeffsSetup(double *h1dashfirstcoeff, double *h2firstcoeff, double *h3dash
   int doh1 = 1, doh2 = 1, doh3 = 1;
   int i, auxindex;
 
-  IGNORE(listsize);
+  NG_IGNORE(listsize);
 
   /* coefflists should already have been allocated to the necessary size */
 
@@ -593,7 +593,7 @@ LTRArlcCoeffsSetup(double *h1dashfirstcoeff, double *h2firstcoeff, double *h3das
 
   int i, auxindex;
 
-  IGNORE(listsize);
+  NG_IGNORE(listsize);
 
   /* coefflists should already have been allocated to the necessary size */
 
diff --git a/src/spicelib/devices/ltra/ltrapar.c b/src/spicelib/devices/ltra/ltrapar.c
index 45a46d987..e5d130d78 100644
--- a/src/spicelib/devices/ltra/ltrapar.c
+++ b/src/spicelib/devices/ltra/ltrapar.c
@@ -16,7 +16,7 @@ LTRAparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
   LTRAinstance *here = (LTRAinstance *) inst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (param) {
   case LTRA_V1:
diff --git a/src/spicelib/devices/ltra/ltraset.c b/src/spicelib/devices/ltra/ltraset.c
index 35b5c59d2..1f9e39b8e 100644
--- a/src/spicelib/devices/ltra/ltraset.c
+++ b/src/spicelib/devices/ltra/ltraset.c
@@ -22,7 +22,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
   int error;
   CKTnode *tmp;
 
-  IGNORE(state);
+  NG_IGNORE(state);
 
   /* loop through all the transmission line models */
   for (; model != NULL; model = model->LTRAnextModel) {
diff --git a/src/spicelib/devices/ltra/ltratemp.c b/src/spicelib/devices/ltra/ltratemp.c
index 7ed7936d8..622ad82e4 100644
--- a/src/spicelib/devices/ltra/ltratemp.c
+++ b/src/spicelib/devices/ltra/ltratemp.c
@@ -20,7 +20,7 @@ LTRAtemp(GENmodel *inModel, CKTcircuit *ckt)
   LTRAmodel *model = (LTRAmodel *) inModel;
   LTRAinstance *here;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   /* loop through all the transmission line models */
   for (; model != NULL; model = model->LTRAnextModel) {
diff --git a/src/spicelib/devices/mes/mesask.c b/src/spicelib/devices/mes/mesask.c
index d4b6a9f18..498d139f7 100644
--- a/src/spicelib/devices/mes/mesask.c
+++ b/src/spicelib/devices/mes/mesask.c
@@ -21,7 +21,7 @@ MESask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *s
     MESinstance *here = (MESinstance*)inst;
     static char *msg = "Current and power not available in ac analysis";
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case MES_AREA:
diff --git a/src/spicelib/devices/mes/mesmask.c b/src/spicelib/devices/mes/mesmask.c
index 2911f3554..fde028a96 100644
--- a/src/spicelib/devices/mes/mesmask.c
+++ b/src/spicelib/devices/mes/mesmask.c
@@ -20,7 +20,7 @@ MESmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     MESmodel *here = (MESmodel*)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case MES_MOD_VTO:
diff --git a/src/spicelib/devices/mes/mesparam.c b/src/spicelib/devices/mes/mesparam.c
index 88d73a656..e1cb87167 100644
--- a/src/spicelib/devices/mes/mesparam.c
+++ b/src/spicelib/devices/mes/mesparam.c
@@ -18,7 +18,7 @@ MESparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     MESinstance *here = (MESinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case MES_AREA:
diff --git a/src/spicelib/devices/mes/mestemp.c b/src/spicelib/devices/mes/mestemp.c
index bdff2a60b..44395f410 100644
--- a/src/spicelib/devices/mes/mestemp.c
+++ b/src/spicelib/devices/mes/mestemp.c
@@ -21,7 +21,7 @@ MEStemp(GENmodel *inModel, CKTcircuit *ckt)
     MESmodel *model = (MESmodel*)inModel;
     double xfc, temp;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the diode models */
     for( ; model != NULL; model = model->MESnextModel ) {
diff --git a/src/spicelib/devices/mesa/mesaask.c b/src/spicelib/devices/mesa/mesaask.c
index 08d1cceae..fdab24000 100644
--- a/src/spicelib/devices/mesa/mesaask.c
+++ b/src/spicelib/devices/mesa/mesaask.c
@@ -22,7 +22,7 @@ MESAask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *
     MESAinstance *here = (MESAinstance*)inst;
     static char *msg = "Current and power not available in ac analysis";
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case MESA_LENGTH:
diff --git a/src/spicelib/devices/mesa/mesamask.c b/src/spicelib/devices/mesa/mesamask.c
index 36f1ce848..a8cc1eaad 100644
--- a/src/spicelib/devices/mesa/mesamask.c
+++ b/src/spicelib/devices/mesa/mesamask.c
@@ -20,7 +20,7 @@ MESAmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     MESAmodel *here = (MESAmodel*)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case MESA_MOD_VTO:
diff --git a/src/spicelib/devices/mesa/mesaparam.c b/src/spicelib/devices/mesa/mesaparam.c
index 2dca4e7d8..86b0cce3a 100644
--- a/src/spicelib/devices/mesa/mesaparam.c
+++ b/src/spicelib/devices/mesa/mesaparam.c
@@ -17,7 +17,7 @@ MESAparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     MESAinstance *here = (MESAinstance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case MESA_LENGTH:
diff --git a/src/spicelib/devices/mos1/mos1mask.c b/src/spicelib/devices/mos1/mos1mask.c
index 1a95c99c2..c670f7149 100644
--- a/src/spicelib/devices/mos1/mos1mask.c
+++ b/src/spicelib/devices/mos1/mos1mask.c
@@ -18,7 +18,7 @@ MOS1mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     MOS1model *model = (MOS1model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case MOS1_MOD_TNOM:
diff --git a/src/spicelib/devices/mos1/mos1par.c b/src/spicelib/devices/mos1/mos1par.c
index 4dcd13b26..d837d6ce5 100644
--- a/src/spicelib/devices/mos1/mos1par.c
+++ b/src/spicelib/devices/mos1/mos1par.c
@@ -20,7 +20,7 @@ MOS1param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     MOS1instance *here = (MOS1instance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case MOS1_TEMP:
diff --git a/src/spicelib/devices/mos2/mos2mask.c b/src/spicelib/devices/mos2/mos2mask.c
index 218706ac7..21672363f 100644
--- a/src/spicelib/devices/mos2/mos2mask.c
+++ b/src/spicelib/devices/mos2/mos2mask.c
@@ -16,7 +16,7 @@ MOS2mAsk(CKTcircuit *ckt, GENmodel *inModel, int param,
 {
     MOS2model *model = (MOS2model *)inModel;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(param) {
         case MOS2_MOD_TNOM:
diff --git a/src/spicelib/devices/mos2/mos2par.c b/src/spicelib/devices/mos2/mos2par.c
index d0428bb77..95806249d 100644
--- a/src/spicelib/devices/mos2/mos2par.c
+++ b/src/spicelib/devices/mos2/mos2par.c
@@ -21,7 +21,7 @@ MOS2param(int param, IFvalue *value, GENinstance *inst,
 {
     MOS2instance *here = (MOS2instance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case MOS2_TEMP:
diff --git a/src/spicelib/devices/mos3/mos3mask.c b/src/spicelib/devices/mos3/mos3mask.c
index 4b5616e51..200998816 100644
--- a/src/spicelib/devices/mos3/mos3mask.c
+++ b/src/spicelib/devices/mos3/mos3mask.c
@@ -22,7 +22,7 @@ MOS3mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     MOS3model *here = (MOS3model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case MOS3_MOD_TNOM:
diff --git a/src/spicelib/devices/mos3/mos3par.c b/src/spicelib/devices/mos3/mos3par.c
index 201533bc5..ae8d82e8d 100644
--- a/src/spicelib/devices/mos3/mos3par.c
+++ b/src/spicelib/devices/mos3/mos3par.c
@@ -20,7 +20,7 @@ MOS3param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     MOS3instance *here = (MOS3instance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
     	
diff --git a/src/spicelib/devices/mos6/mos6mask.c b/src/spicelib/devices/mos6/mos6mask.c
index 98bdbc06c..42e44670b 100644
--- a/src/spicelib/devices/mos6/mos6mask.c
+++ b/src/spicelib/devices/mos6/mos6mask.c
@@ -16,7 +16,7 @@ MOS6mAsk(CKTcircuit *ckt, GENmodel *inModel, int param,
 {
     MOS6model *model = (MOS6model *)inModel;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(param) {
         case MOS6_MOD_TNOM:
diff --git a/src/spicelib/devices/mos6/mos6par.c b/src/spicelib/devices/mos6/mos6par.c
index 3cd16d057..b9d341b23 100644
--- a/src/spicelib/devices/mos6/mos6par.c
+++ b/src/spicelib/devices/mos6/mos6par.c
@@ -19,7 +19,7 @@ MOS6param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     MOS6instance *here = (MOS6instance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case MOS6_TEMP:
diff --git a/src/spicelib/devices/mos9/mos9mask.c b/src/spicelib/devices/mos9/mos9mask.c
index 5e80d883e..d05305c64 100644
--- a/src/spicelib/devices/mos9/mos9mask.c
+++ b/src/spicelib/devices/mos9/mos9mask.c
@@ -22,7 +22,7 @@ MOS9mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     MOS9model *here = (MOS9model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case MOS9_MOD_TNOM:
diff --git a/src/spicelib/devices/mos9/mos9par.c b/src/spicelib/devices/mos9/mos9par.c
index d1daebc3c..24590687c 100644
--- a/src/spicelib/devices/mos9/mos9par.c
+++ b/src/spicelib/devices/mos9/mos9par.c
@@ -21,7 +21,7 @@ MOS9param(int param, IFvalue *value, GENinstance *inst,
 {
     MOS9instance *here = (MOS9instance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
 
diff --git a/src/spicelib/devices/nbjt/nbjtask.c b/src/spicelib/devices/nbjt/nbjtask.c
index 116f3db92..68bbc8e96 100644
--- a/src/spicelib/devices/nbjt/nbjtask.c
+++ b/src/spicelib/devices/nbjt/nbjtask.c
@@ -22,7 +22,7 @@ NBJTask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue
 {
   NBJTinstance *inst = (NBJTinstance *) inInst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (which) {
   case NBJT_AREA:
diff --git a/src/spicelib/devices/nbjt/nbjtdump.c b/src/spicelib/devices/nbjt/nbjtdump.c
index edac66517..d631b7151 100644
--- a/src/spicelib/devices/nbjt/nbjtdump.c
+++ b/src/spicelib/devices/nbjt/nbjtdump.c
@@ -154,7 +154,7 @@ NBJTacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
   register NBJTinstance *inst;
   OUTPcard *output;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   for (; model != NULL; model = model->NBJTnextModel) {
     output = model->NBJToutputs;
diff --git a/src/spicelib/devices/nbjt/nbjtmpar.c b/src/spicelib/devices/nbjt/nbjtmpar.c
index 0e1acee71..ee568d19e 100644
--- a/src/spicelib/devices/nbjt/nbjtmpar.c
+++ b/src/spicelib/devices/nbjt/nbjtmpar.c
@@ -17,8 +17,8 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 int
 NBJTmParam(int param, IFvalue *value, GENmodel *inModel)
 {
-  IGNORE(value);
-  IGNORE(inModel);
+  NG_IGNORE(value);
+  NG_IGNORE(inModel);
 
   switch (param) {
   case NBJT_MOD_NBJT:
diff --git a/src/spicelib/devices/nbjt/nbjtparm.c b/src/spicelib/devices/nbjt/nbjtparm.c
index c0758b5e5..3adc23288 100644
--- a/src/spicelib/devices/nbjt/nbjtparm.c
+++ b/src/spicelib/devices/nbjt/nbjtparm.c
@@ -19,7 +19,7 @@ NBJTparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
 {
   register NBJTinstance *inst = (NBJTinstance *) inInst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (param) {
   case NBJT_AREA:
diff --git a/src/spicelib/devices/nbjt/nbjtpzld.c b/src/spicelib/devices/nbjt/nbjtpzld.c
index be971d1f6..e75b02373 100644
--- a/src/spicelib/devices/nbjt/nbjtpzld.c
+++ b/src/spicelib/devices/nbjt/nbjtpzld.c
@@ -29,7 +29,7 @@ NBJTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
   SPcomplex yIcVce, yIcVbe;
   double startTime;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   for (; model != NULL; model = model->NBJTnextModel) {
     FieldDepMobility = model->NBJTmodels->MODLfieldDepMobility;
diff --git a/src/spicelib/devices/nbjt2/nbt2ask.c b/src/spicelib/devices/nbjt2/nbt2ask.c
index 92a945d3b..745e9880b 100644
--- a/src/spicelib/devices/nbjt2/nbt2ask.c
+++ b/src/spicelib/devices/nbjt2/nbt2ask.c
@@ -23,7 +23,7 @@ NBJT2ask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalu
 {
   NBJT2instance *inst = (NBJT2instance *) inInst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (which) {
   case NBJT2_WIDTH:
diff --git a/src/spicelib/devices/nbjt2/nbt2dump.c b/src/spicelib/devices/nbjt2/nbt2dump.c
index 1fb0ef9a7..7e754ea3e 100644
--- a/src/spicelib/devices/nbjt2/nbt2dump.c
+++ b/src/spicelib/devices/nbjt2/nbt2dump.c
@@ -155,7 +155,7 @@ NBJT2acct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
   register NBJT2instance *inst;
   OUTPcard *output;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   for (; model != NULL; model = model->NBJT2nextModel) {
     output = model->NBJT2outputs;
diff --git a/src/spicelib/devices/nbjt2/nbt2mpar.c b/src/spicelib/devices/nbjt2/nbt2mpar.c
index d6619d3c0..b7905ed11 100644
--- a/src/spicelib/devices/nbjt2/nbt2mpar.c
+++ b/src/spicelib/devices/nbjt2/nbt2mpar.c
@@ -17,8 +17,8 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 int
 NBJT2mParam(int param, IFvalue *value, GENmodel *inModel)
 {
-  IGNORE(value);
-  IGNORE(inModel);
+  NG_IGNORE(value);
+  NG_IGNORE(inModel);
 
   switch (param) {
   case NBJT2_MOD_NBJT:
diff --git a/src/spicelib/devices/nbjt2/nbt2parm.c b/src/spicelib/devices/nbjt2/nbt2parm.c
index 93bb4c9ee..5fb2bdf64 100644
--- a/src/spicelib/devices/nbjt2/nbt2parm.c
+++ b/src/spicelib/devices/nbjt2/nbt2parm.c
@@ -19,7 +19,7 @@ NBJT2param(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
 {
   register NBJT2instance *inst = (NBJT2instance *) inInst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (param) {
   case NBJT2_WIDTH:
diff --git a/src/spicelib/devices/nbjt2/nbt2pzld.c b/src/spicelib/devices/nbjt2/nbt2pzld.c
index 7321b1db1..3e19995f0 100644
--- a/src/spicelib/devices/nbjt2/nbt2pzld.c
+++ b/src/spicelib/devices/nbjt2/nbt2pzld.c
@@ -23,7 +23,7 @@ NBJT2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
   SPcomplex yIcVce, yIcVbe;
   double startTime;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
  
   for (; model != NULL; model = model->NBJT2nextModel) {
     FieldDepMobility = model->NBJT2models->MODLfieldDepMobility;
diff --git a/src/spicelib/devices/ndev/ndevacld.c b/src/spicelib/devices/ndev/ndevacld.c
index 584c1e302..a8d5cbd6a 100644
--- a/src/spicelib/devices/ndev/ndevacld.c
+++ b/src/spicelib/devices/ndev/ndevacld.c
@@ -19,8 +19,8 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 int
 NDEVacLoad(GENmodel *inModel, CKTcircuit *ckt)
 {
-  IGNORE(inModel);
-  IGNORE(ckt);
+  NG_IGNORE(inModel);
+  NG_IGNORE(ckt);
  
   return (OK);
 }
diff --git a/src/spicelib/devices/ndev/ndevask.c b/src/spicelib/devices/ndev/ndevask.c
index a99b1ed05..81f037de4 100644
--- a/src/spicelib/devices/ndev/ndevask.c
+++ b/src/spicelib/devices/ndev/ndevask.c
@@ -23,11 +23,11 @@ NDEVask(
   IFvalue *value,
   IFvalue *select )
 {
-  IGNORE(ckt);
-  IGNORE(inInst);
-  IGNORE(which);
-  IGNORE(value);
-  IGNORE(select);
+  NG_IGNORE(ckt);
+  NG_IGNORE(inInst);
+  NG_IGNORE(which);
+  NG_IGNORE(value);
+  NG_IGNORE(select);
 
   return (OK);
   /* NOTREACHED */
diff --git a/src/spicelib/devices/ndev/ndevdump.c b/src/spicelib/devices/ndev/ndevdump.c
index a59d80322..6f2a1b9c2 100644
--- a/src/spicelib/devices/ndev/ndevdump.c
+++ b/src/spicelib/devices/ndev/ndevdump.c
@@ -26,8 +26,8 @@ NDEV_dump(
   GENmodel *inModel,
   CKTcircuit *ckt )
 {
-    IGNORE(inModel);
-    IGNORE(ckt);
+    NG_IGNORE(inModel);
+    NG_IGNORE(ckt);
   
 }
 
@@ -39,8 +39,8 @@ NDEV_acct(
   CKTcircuit *ckt,
   FILE *file )
 {
-    IGNORE(inModel);
-    IGNORE(ckt);
-    IGNORE(file);
+    NG_IGNORE(inModel);
+    NG_IGNORE(ckt);
+    NG_IGNORE(file);
   
 }
diff --git a/src/spicelib/devices/ndev/ndevload.c b/src/spicelib/devices/ndev/ndevload.c
index cbb92d03c..6fc02d858 100644
--- a/src/spicelib/devices/ndev/ndevload.c
+++ b/src/spicelib/devices/ndev/ndevload.c
@@ -79,7 +79,7 @@ int NDEVgetic(GENmodel *inModel, CKTcircuit *ckt)
     NDEVmodel *model = (NDEVmodel*)inModel;
     NDEVinstance *here;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*
      * grab initial conditions out of rhs array.   User specified, so use
diff --git a/src/spicelib/devices/ndev/ndevmdel.c b/src/spicelib/devices/ndev/ndevmdel.c
index 15e7f00a3..c274ef856 100644
--- a/src/spicelib/devices/ndev/ndevmdel.c
+++ b/src/spicelib/devices/ndev/ndevmdel.c
@@ -14,9 +14,9 @@ NDEVmDelete(
   IFuid modname,
   GENmodel *kill )
 {
-  IGNORE(inModel);
-  IGNORE(modname);
-  IGNORE(kill);
+  NG_IGNORE(inModel);
+  NG_IGNORE(modname);
+  NG_IGNORE(kill);
 
 
   return (OK);
diff --git a/src/spicelib/devices/ndev/ndevparm.c b/src/spicelib/devices/ndev/ndevparm.c
index 7b7b3a09f..639b9adda 100644
--- a/src/spicelib/devices/ndev/ndevparm.c
+++ b/src/spicelib/devices/ndev/ndevparm.c
@@ -17,9 +17,9 @@ NDEVparam(
   GENinstance *inInst,
   IFvalue *select )
 {
-  IGNORE(value);
-  IGNORE(inInst);
-  IGNORE(select);
+  NG_IGNORE(value);
+  NG_IGNORE(inInst);
+  NG_IGNORE(select);
 
   switch (param) {
   case NDEV_MOD_NDEV:
diff --git a/src/spicelib/devices/ndev/ndevpzld.c b/src/spicelib/devices/ndev/ndevpzld.c
index 6d3adf289..8f7dab89f 100644
--- a/src/spicelib/devices/ndev/ndevpzld.c
+++ b/src/spicelib/devices/ndev/ndevpzld.c
@@ -17,9 +17,9 @@ NDEVpzLoad(
   register CKTcircuit *ckt,
   SPcomplex *s )
 {
-  IGNORE(inModel);
-  IGNORE(ckt);
-  IGNORE(s);
+  NG_IGNORE(inModel);
+  NG_IGNORE(ckt);
+  NG_IGNORE(s);
  
   return (OK);
 }
diff --git a/src/spicelib/devices/ndev/ndevset.c b/src/spicelib/devices/ndev/ndevset.c
index 0d6f629f3..b5fc17722 100644
--- a/src/spicelib/devices/ndev/ndevset.c
+++ b/src/spicelib/devices/ndev/ndevset.c
@@ -33,8 +33,8 @@ int NDEVsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states
   int i,j;
   CKTnode *node;        
   
-  IGNORE(ckt);
-  IGNORE(states);
+  NG_IGNORE(ckt);
+  NG_IGNORE(states);
 
     /*  loop through all the ndev models */
     for( ; model != NULL; model = model->NDEVnextModel ) {
diff --git a/src/spicelib/devices/ndev/ndevtemp.c b/src/spicelib/devices/ndev/ndevtemp.c
index e7b6f469a..f34603b58 100644
--- a/src/spicelib/devices/ndev/ndevtemp.c
+++ b/src/spicelib/devices/ndev/ndevtemp.c
@@ -22,8 +22,8 @@ NDEVtemp(
  * perform the temperature update to the diode
  */
 {
-  IGNORE(inModel);
-  IGNORE(ckt);
+  NG_IGNORE(inModel);
+  NG_IGNORE(ckt);
 
   return (OK);
 }
diff --git a/src/spicelib/devices/ndev/ndevtrun.c b/src/spicelib/devices/ndev/ndevtrun.c
index fec838204..890a5b1d7 100644
--- a/src/spicelib/devices/ndev/ndevtrun.c
+++ b/src/spicelib/devices/ndev/ndevtrun.c
@@ -18,9 +18,9 @@ NDEVtrunc(
   double *timeStep )
 
 {
-  IGNORE(inModel);
-  IGNORE(ckt);
-  IGNORE(timeStep);
+  NG_IGNORE(inModel);
+  NG_IGNORE(ckt);
+  NG_IGNORE(timeStep);
 
   return (OK);
 }
diff --git a/src/spicelib/devices/numd/numdask.c b/src/spicelib/devices/numd/numdask.c
index d00945ebd..b39c459f4 100644
--- a/src/spicelib/devices/numd/numdask.c
+++ b/src/spicelib/devices/numd/numdask.c
@@ -24,7 +24,7 @@ NUMDask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue
 {
   NUMDinstance *inst = (NUMDinstance *) inInst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (which) {
   case NUMD_AREA:
diff --git a/src/spicelib/devices/numd/numddump.c b/src/spicelib/devices/numd/numddump.c
index ab435fd38..795cf257a 100644
--- a/src/spicelib/devices/numd/numddump.c
+++ b/src/spicelib/devices/numd/numddump.c
@@ -141,7 +141,7 @@ NUMDacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
   register NUMDinstance *inst;
   OUTPcard *output;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   for (; model != NULL; model = model->NUMDnextModel) {
     output = model->NUMDoutputs;
diff --git a/src/spicelib/devices/numd/numdmpar.c b/src/spicelib/devices/numd/numdmpar.c
index 9a6404a62..b7c79d81c 100644
--- a/src/spicelib/devices/numd/numdmpar.c
+++ b/src/spicelib/devices/numd/numdmpar.c
@@ -17,8 +17,8 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 int
 NUMDmParam(int param, IFvalue *value, GENmodel *inModel)
 {
-  IGNORE(value);
-  IGNORE(inModel);
+  NG_IGNORE(value);
+  NG_IGNORE(inModel);
 
   switch (param) {
   case NUMD_MOD_NUMD:
diff --git a/src/spicelib/devices/numd/numdparm.c b/src/spicelib/devices/numd/numdparm.c
index ce04cc158..2fa560f9f 100644
--- a/src/spicelib/devices/numd/numdparm.c
+++ b/src/spicelib/devices/numd/numdparm.c
@@ -15,7 +15,7 @@ NUMDparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
 {
   NUMDinstance *inst = (NUMDinstance *) inInst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (param) {
   case NUMD_AREA:
diff --git a/src/spicelib/devices/numd/numdpzld.c b/src/spicelib/devices/numd/numdpzld.c
index 87a540eed..7ec1d02b6 100644
--- a/src/spicelib/devices/numd/numdpzld.c
+++ b/src/spicelib/devices/numd/numdpzld.c
@@ -23,7 +23,7 @@ NUMDpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
   SPcomplex y;
   double startTime;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   /* loop through all the diode models */
   for (; model != NULL; model = model->NUMDnextModel) {
diff --git a/src/spicelib/devices/numd2/nud2ask.c b/src/spicelib/devices/numd2/nud2ask.c
index 5fcc16297..d274e77b0 100644
--- a/src/spicelib/devices/numd2/nud2ask.c
+++ b/src/spicelib/devices/numd2/nud2ask.c
@@ -23,7 +23,7 @@ NUMD2ask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalu
 {
   NUMD2instance *inst = (NUMD2instance *) inInst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (which) {
   case NUMD2_WIDTH:
diff --git a/src/spicelib/devices/numd2/nud2dump.c b/src/spicelib/devices/numd2/nud2dump.c
index 32ad03934..21d6e07dd 100644
--- a/src/spicelib/devices/numd2/nud2dump.c
+++ b/src/spicelib/devices/numd2/nud2dump.c
@@ -142,7 +142,7 @@ NUMD2acct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
   register NUMD2instance *inst;
   OUTPcard *output;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   for (; model != NULL; model = model->NUMD2nextModel) {
     output = model->NUMD2outputs;
diff --git a/src/spicelib/devices/numd2/nud2mpar.c b/src/spicelib/devices/numd2/nud2mpar.c
index e0ab3c939..26ba42cd7 100644
--- a/src/spicelib/devices/numd2/nud2mpar.c
+++ b/src/spicelib/devices/numd2/nud2mpar.c
@@ -17,8 +17,8 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 int
 NUMD2mParam(int param, IFvalue *value, GENmodel *inModel)
 {
-  IGNORE(value);
-  IGNORE(inModel);
+  NG_IGNORE(value);
+  NG_IGNORE(inModel);
 
   switch (param) {
   case NUMD2_MOD_NUMD:
diff --git a/src/spicelib/devices/numd2/nud2parm.c b/src/spicelib/devices/numd2/nud2parm.c
index bc7daaf6c..b2fad2bcd 100644
--- a/src/spicelib/devices/numd2/nud2parm.c
+++ b/src/spicelib/devices/numd2/nud2parm.c
@@ -15,7 +15,7 @@ NUMD2param(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
 {
   NUMD2instance *inst = (NUMD2instance *) inInst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (param) {
   case NUMD2_WIDTH:
diff --git a/src/spicelib/devices/numd2/nud2pzld.c b/src/spicelib/devices/numd2/nud2pzld.c
index 44d373a55..bc481239f 100644
--- a/src/spicelib/devices/numd2/nud2pzld.c
+++ b/src/spicelib/devices/numd2/nud2pzld.c
@@ -22,7 +22,7 @@ NUMD2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
   SPcomplex y;
   double startTime;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   /* loop through all the diode models */
   for (; model != NULL; model = model->NUMD2nextModel) {
diff --git a/src/spicelib/devices/numos/nummask.c b/src/spicelib/devices/numos/nummask.c
index c340b3579..60eb8304f 100644
--- a/src/spicelib/devices/numos/nummask.c
+++ b/src/spicelib/devices/numos/nummask.c
@@ -21,7 +21,7 @@ NUMOSask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalu
 {
   NUMOSinstance *inst = (NUMOSinstance *) inInst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (which) {
   case NUMOS_AREA:
diff --git a/src/spicelib/devices/numos/nummdump.c b/src/spicelib/devices/numos/nummdump.c
index 6e3d152f2..300181e47 100644
--- a/src/spicelib/devices/numos/nummdump.c
+++ b/src/spicelib/devices/numos/nummdump.c
@@ -156,7 +156,7 @@ NUMOSacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
   register NUMOSinstance *inst;
   OUTPcard *output;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   for (; model != NULL; model = model->NUMOSnextModel) {
     output = model->NUMOSoutputs;
diff --git a/src/spicelib/devices/numos/nummmpar.c b/src/spicelib/devices/numos/nummmpar.c
index 1435bc150..a9db9ec0b 100644
--- a/src/spicelib/devices/numos/nummmpar.c
+++ b/src/spicelib/devices/numos/nummmpar.c
@@ -17,8 +17,8 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 int
 NUMOSmParam(int param, IFvalue *value, GENmodel *inModel)
 {
-  IGNORE(value);
-  IGNORE(inModel);
+  NG_IGNORE(value);
+  NG_IGNORE(inModel);
 
   switch (param) {
   case NUMOS_MOD_NUMOS:
diff --git a/src/spicelib/devices/numos/nummparm.c b/src/spicelib/devices/numos/nummparm.c
index 1d81cca66..3e5316b17 100644
--- a/src/spicelib/devices/numos/nummparm.c
+++ b/src/spicelib/devices/numos/nummparm.c
@@ -19,7 +19,7 @@ NUMOSparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
 {
   register NUMOSinstance *inst = (NUMOSinstance *) inInst;
 
-  IGNORE(select);
+  NG_IGNORE(select);
 
   switch (param) {
   case NUMOS_AREA:
diff --git a/src/spicelib/devices/numos/nummpzld.c b/src/spicelib/devices/numos/nummpzld.c
index 9e149189f..243fe4636 100644
--- a/src/spicelib/devices/numos/nummpzld.c
+++ b/src/spicelib/devices/numos/nummpzld.c
@@ -22,7 +22,7 @@ NUMOSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
   struct mosAdmittances yAc;
   double startTime;
 
-  IGNORE(ckt);
+  NG_IGNORE(ckt);
 
   for (; model != NULL; model = model->NUMOSnextModel) {
     FieldDepMobility = model->NUMOSmodels->MODLfieldDepMobility;
diff --git a/src/spicelib/devices/res/resload.c b/src/spicelib/devices/res/resload.c
index 2d816234a..5a23424c7 100644
--- a/src/spicelib/devices/res/resload.c
+++ b/src/spicelib/devices/res/resload.c
@@ -64,7 +64,7 @@ RESacload(GENmodel *inModel, CKTcircuit *ckt)
     double difference;
     double factor;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the resistor models */
     for( ; model != NULL; model = model->RESnextModel ) {
diff --git a/src/spicelib/devices/res/resmask.c b/src/spicelib/devices/res/resmask.c
index 1c5ffd7ab..c03101514 100644
--- a/src/spicelib/devices/res/resmask.c
+++ b/src/spicelib/devices/res/resmask.c
@@ -21,7 +21,7 @@ RESmodAsk(CKTcircuit *ckt, GENmodel *inModel, int which, IFvalue *value)
 
     RESmodel *model = (RESmodel *)inModel;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case RES_MOD_TNOM:
diff --git a/src/spicelib/devices/res/resparam.c b/src/spicelib/devices/res/resparam.c
index d08bafdbd..85fbcc11f 100644
--- a/src/spicelib/devices/res/resparam.c
+++ b/src/spicelib/devices/res/resparam.c
@@ -16,7 +16,7 @@ RESparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     RESinstance *here = (RESinstance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case RES_TEMP:
diff --git a/src/spicelib/devices/res/respzld.c b/src/spicelib/devices/res/respzld.c
index 82266a929..284947be3 100644
--- a/src/spicelib/devices/res/respzld.c
+++ b/src/spicelib/devices/res/respzld.c
@@ -23,8 +23,8 @@ RESpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     RESinstance *here;
     double m;
 
-    IGNORE(s);
-    IGNORE(ckt);
+    NG_IGNORE(s);
+    NG_IGNORE(ckt);
 
     /*  loop through all the resistor models */
     for( ; model != NULL; model = model->RESnextModel ) {
diff --git a/src/spicelib/devices/res/ressetup.c b/src/spicelib/devices/res/ressetup.c
index 3df8217b4..0d4690ebc 100644
--- a/src/spicelib/devices/res/ressetup.c
+++ b/src/spicelib/devices/res/ressetup.c
@@ -19,8 +19,8 @@ RESsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit*ckt, int *state)
     RESmodel *model = (RESmodel *)inModel;
     RESinstance *here;
 
-    IGNORE(state);
-    IGNORE(ckt);
+    NG_IGNORE(state);
+    NG_IGNORE(ckt);
 
     /*  loop through all the resistor models */
     for( ; model != NULL; model = model->RESnextModel ) {
diff --git a/src/spicelib/devices/soi3/soi3ask.c b/src/spicelib/devices/soi3/soi3ask.c
index e3e1fb266..1e96b6293 100644
--- a/src/spicelib/devices/soi3/soi3ask.c
+++ b/src/spicelib/devices/soi3/soi3ask.c
@@ -37,7 +37,7 @@ SOI3ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 {
     SOI3instance *here = (SOI3instance*)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     /* The line below belong to the parts of the case statement that are also
      * commented out */
diff --git a/src/spicelib/devices/soi3/soi3cap.c b/src/spicelib/devices/soi3/soi3cap.c
index 87cbb2f23..74124dfaf 100644
--- a/src/spicelib/devices/soi3/soi3cap.c
+++ b/src/spicelib/devices/soi3/soi3cap.c
@@ -72,9 +72,9 @@ double ccgf,ccd,ccs,ccdeltaT,ccgb;
 double vg,vgacc,Egacc,tmpacc,Qacc;
 double csf;
 
-IGNORE(gammaB);
-IGNORE(Phiplusvsb);
-IGNORE(vgB);
+NG_IGNORE(gammaB);
+NG_IGNORE(Phiplusvsb);
+NG_IGNORE(vgB);
 
 /****** Part 2 - extract variables passed from soi3load(), which  ******/
 /****** have been passed to soi3cap() in *arg arrays.             ******/
diff --git a/src/spicelib/devices/soi3/soi3mask.c b/src/spicelib/devices/soi3/soi3mask.c
index ee3185311..35692e2f8 100644
--- a/src/spicelib/devices/soi3/soi3mask.c
+++ b/src/spicelib/devices/soi3/soi3mask.c
@@ -36,7 +36,7 @@ SOI3mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     SOI3model *model = (SOI3model *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case SOI3_MOD_VTO:
diff --git a/src/spicelib/devices/soi3/soi3par.c b/src/spicelib/devices/soi3/soi3par.c
index 86aba9332..63a70bd01 100644
--- a/src/spicelib/devices/soi3/soi3par.c
+++ b/src/spicelib/devices/soi3/soi3par.c
@@ -34,7 +34,7 @@ SOI3param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     SOI3instance *here = (SOI3instance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case SOI3_L:
diff --git a/src/spicelib/devices/sw/swask.c b/src/spicelib/devices/sw/swask.c
index f81d51138..c16680bce 100644
--- a/src/spicelib/devices/sw/swask.c
+++ b/src/spicelib/devices/sw/swask.c
@@ -26,7 +26,7 @@ SWask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *se
     SWinstance *here = (SWinstance *)inst;
     static char *msg = "Current and power not available in ac analysis";
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case SW_POS_NODE:
diff --git a/src/spicelib/devices/sw/swmask.c b/src/spicelib/devices/sw/swmask.c
index 250ebd122..b1c347ae8 100644
--- a/src/spicelib/devices/sw/swmask.c
+++ b/src/spicelib/devices/sw/swmask.c
@@ -25,7 +25,7 @@ SWmAsk(CKTcircuit *ckt, GENmodel *inModel, int which, IFvalue *value)
 {
     SWmodel *model = (SWmodel *)inModel;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case SW_MOD_RON:
diff --git a/src/spicelib/devices/sw/swparam.c b/src/spicelib/devices/sw/swparam.c
index f4b256e03..302bbfac5 100644
--- a/src/spicelib/devices/sw/swparam.c
+++ b/src/spicelib/devices/sw/swparam.c
@@ -18,7 +18,7 @@ SWparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     SWinstance *here = (SWinstance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case SW_IC_ON:
diff --git a/src/spicelib/devices/sw/swpzload.c b/src/spicelib/devices/sw/swpzload.c
index 5b4b63aed..32b82f5ae 100644
--- a/src/spicelib/devices/sw/swpzload.c
+++ b/src/spicelib/devices/sw/swpzload.c
@@ -26,7 +26,7 @@ SWpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     double g_now;
     int current_state;
 
-    IGNORE(s);
+    NG_IGNORE(s);
 
     /*  loop through all the switch models */
     for( ; model != NULL; model = model->SWnextModel ) {
diff --git a/src/spicelib/devices/tra/traask.c b/src/spicelib/devices/tra/traask.c
index 050fa6e22..c1193cace 100644
--- a/src/spicelib/devices/tra/traask.c
+++ b/src/spicelib/devices/tra/traask.c
@@ -27,8 +27,8 @@ TRAask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *s
     int temp;
     double *v, *w;
 
-    IGNORE(select);
-    IGNORE(ckt);
+    NG_IGNORE(select);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case TRA_POS_NODE1:
diff --git a/src/spicelib/devices/tra/traparam.c b/src/spicelib/devices/tra/traparam.c
index 168c78731..2c108c9a3 100644
--- a/src/spicelib/devices/tra/traparam.c
+++ b/src/spicelib/devices/tra/traparam.c
@@ -18,7 +18,7 @@ TRAparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     TRAinstance *here = (TRAinstance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case TRA_RELTOL:
diff --git a/src/spicelib/devices/tra/trasetup.c b/src/spicelib/devices/tra/trasetup.c
index e32ed1619..8071230b8 100644
--- a/src/spicelib/devices/tra/trasetup.c
+++ b/src/spicelib/devices/tra/trasetup.c
@@ -25,7 +25,7 @@ TRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
     int error;
     CKTnode *tmp;
 
-    IGNORE(state);
+    NG_IGNORE(state);
 
     /*  loop through all the transmission line models */
     for( ; model != NULL; model = model->TRAnextModel ) {
diff --git a/src/spicelib/devices/tra/tratemp.c b/src/spicelib/devices/tra/tratemp.c
index cf79d1371..7c3de2516 100644
--- a/src/spicelib/devices/tra/tratemp.c
+++ b/src/spicelib/devices/tra/tratemp.c
@@ -23,7 +23,7 @@ TRAtemp(GENmodel *inModel, CKTcircuit *ckt)
     TRAmodel *model = (TRAmodel *)inModel;
     TRAinstance *here;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the transmission line models */
     for( ; model != NULL; model = model->TRAnextModel ) {
diff --git a/src/spicelib/devices/txl/txlask.c b/src/spicelib/devices/txl/txlask.c
index a8af5caea..d00a3bd3b 100644
--- a/src/spicelib/devices/txl/txlask.c
+++ b/src/spicelib/devices/txl/txlask.c
@@ -20,8 +20,8 @@ TXLask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *s
 {
     TXLinstance *fast = (TXLinstance *)inst;
 
-    IGNORE(select);
-    IGNORE(ckt);
+    NG_IGNORE(select);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case TXL_OUT_NODE:
diff --git a/src/spicelib/devices/txl/txlmask.c b/src/spicelib/devices/txl/txlmask.c
index e35296079..c2cc940be 100644
--- a/src/spicelib/devices/txl/txlmask.c
+++ b/src/spicelib/devices/txl/txlmask.c
@@ -22,7 +22,7 @@ TXLmodAsk(CKTcircuit *ckt, GENmodel *inModel, int which, IFvalue *value)
 {
     TXLmodel *model = (TXLmodel *)inModel;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case TXL_R:
diff --git a/src/spicelib/devices/txl/txlparam.c b/src/spicelib/devices/txl/txlparam.c
index 9d254c154..8d922d8f0 100644
--- a/src/spicelib/devices/txl/txlparam.c
+++ b/src/spicelib/devices/txl/txlparam.c
@@ -18,7 +18,7 @@ TXLparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     TXLinstance *here = (TXLinstance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case TXL_IN_NODE:
diff --git a/src/spicelib/devices/txl/txlsetup.c b/src/spicelib/devices/txl/txlsetup.c
index c1fbf4841..9970240c1 100644
--- a/src/spicelib/devices/txl/txlsetup.c
+++ b/src/spicelib/devices/txl/txlsetup.c
@@ -82,7 +82,7 @@ TXLsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit*ckt, int *state)
   CKTnode *tmp;
   int error;
 
-  IGNORE(state);
+  NG_IGNORE(state);
 
     /*  loop through all the models */
     for( ; model != NULL; model = model->TXLnextModel ) {
@@ -214,7 +214,7 @@ ReadTxL(TXLinstance *tx, CKTcircuit *ckt)
    ERLINE *er;
    double LL = 1e-12;
 	
-   IGNORE(ckt);
+   NG_IGNORE(ckt);
 
    p = tx->in_node_name;
    n = tx->out_node_name;
@@ -587,7 +587,7 @@ root3(double a1, double a2, double a3, double x)
 static int 
 div3(double a1, double a2, double a3, double x, double *p1, double *p2)
 {
-   IGNORE(a2);
+   NG_IGNORE(a2);
 
    *p1 = a1 + x;
    *p2 = - a3 / x;
diff --git a/src/spicelib/devices/urc/urcask.c b/src/spicelib/devices/urc/urcask.c
index af2350fe2..db06fccf4 100644
--- a/src/spicelib/devices/urc/urcask.c
+++ b/src/spicelib/devices/urc/urcask.c
@@ -26,8 +26,8 @@ URCask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *s
 {
     URCinstance *here = (URCinstance *)inst;
 
-    IGNORE(select);
-    IGNORE(ckt);
+    NG_IGNORE(select);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case URC_POS_NODE:
diff --git a/src/spicelib/devices/urc/urcmask.c b/src/spicelib/devices/urc/urcmask.c
index 0e06782d9..def98d154 100644
--- a/src/spicelib/devices/urc/urcmask.c
+++ b/src/spicelib/devices/urc/urcmask.c
@@ -25,7 +25,7 @@ URCmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     URCmodel *here = (URCmodel *)inst;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case URC_MOD_K:
diff --git a/src/spicelib/devices/urc/urcparam.c b/src/spicelib/devices/urc/urcparam.c
index a78ac0e7b..accf18775 100644
--- a/src/spicelib/devices/urc/urcparam.c
+++ b/src/spicelib/devices/urc/urcparam.c
@@ -18,7 +18,7 @@ URCparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     URCinstance *here = (URCinstance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case URC_LEN:
diff --git a/src/spicelib/devices/urc/urcsetup.c b/src/spicelib/devices/urc/urcsetup.c
index 053ac8dad..78e15e740 100644
--- a/src/spicelib/devices/urc/urcsetup.c
+++ b/src/spicelib/devices/urc/urcsetup.c
@@ -54,8 +54,8 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
     IFuid capUid;
     IFuid eltUid;
 
-    IGNORE(state);
-    IGNORE(matrix);
+    NG_IGNORE(state);
+    NG_IGNORE(matrix);
 
     rtype = CKTtypelook("Resistor");
     ctype = CKTtypelook("Capacitor");
diff --git a/src/spicelib/devices/vbic/vbicmask.c b/src/spicelib/devices/vbic/vbicmask.c
index d738b89d0..4b56cc5f9 100644
--- a/src/spicelib/devices/vbic/vbicmask.c
+++ b/src/spicelib/devices/vbic/vbicmask.c
@@ -21,7 +21,7 @@ VBICmAsk(CKTcircuit *ckt, GENmodel *instPtr, int which, IFvalue *value)
 {
     VBICmodel *here = (VBICmodel*)instPtr;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch(which) {
         case VBIC_MOD_TNOM:
diff --git a/src/spicelib/devices/vbic/vbicparam.c b/src/spicelib/devices/vbic/vbicparam.c
index 7037d1843..7f531cbfe 100644
--- a/src/spicelib/devices/vbic/vbicparam.c
+++ b/src/spicelib/devices/vbic/vbicparam.c
@@ -24,7 +24,7 @@ VBICparam(int param, IFvalue *value, GENinstance *instPtr, IFvalue *select)
 {
     VBICinstance *here = (VBICinstance*)instPtr;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case VBIC_AREA:
diff --git a/src/spicelib/devices/vccs/vccsload.c b/src/spicelib/devices/vccs/vccsload.c
index c9aa010ea..26e4a8d14 100644
--- a/src/spicelib/devices/vccs/vccsload.c
+++ b/src/spicelib/devices/vccs/vccsload.c
@@ -23,7 +23,7 @@ VCCSload(GENmodel *inModel, CKTcircuit *ckt)
     VCCSmodel *model = (VCCSmodel *)inModel;
     VCCSinstance *here;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the source models */
     for( ; model != NULL; model = model->VCCSnextModel ) {
diff --git a/src/spicelib/devices/vccs/vccspar.c b/src/spicelib/devices/vccs/vccspar.c
index ad5e23445..28eab5f3e 100644
--- a/src/spicelib/devices/vccs/vccspar.c
+++ b/src/spicelib/devices/vccs/vccspar.c
@@ -19,7 +19,7 @@ VCCSparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     VCCSinstance *here = (VCCSinstance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case VCCS_TRANS:
diff --git a/src/spicelib/devices/vccs/vccspzld.c b/src/spicelib/devices/vccs/vccspzld.c
index a7f1342c8..41b8c53c8 100644
--- a/src/spicelib/devices/vccs/vccspzld.c
+++ b/src/spicelib/devices/vccs/vccspzld.c
@@ -24,8 +24,8 @@ VCCSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     VCCSmodel *model = (VCCSmodel *)inModel;
     VCCSinstance *here;
 
-    IGNORE(s);
-    IGNORE(ckt);
+    NG_IGNORE(s);
+    NG_IGNORE(ckt);
 
     /*  loop through all the source models */
     for( ; model != NULL; model = model->VCCSnextModel ) {
diff --git a/src/spicelib/devices/vccs/vccsset.c b/src/spicelib/devices/vccs/vccsset.c
index 5db876d82..3697c8697 100644
--- a/src/spicelib/devices/vccs/vccsset.c
+++ b/src/spicelib/devices/vccs/vccsset.c
@@ -25,8 +25,8 @@ VCCSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     VCCSmodel *model = (VCCSmodel *)inModel;
     VCCSinstance *here;
 
-    IGNORE(states);
-    IGNORE(ckt);
+    NG_IGNORE(states);
+    NG_IGNORE(ckt);
 
     /*  loop through all the current source models */
     for( ; model != NULL; model = model->VCCSnextModel ) {
diff --git a/src/spicelib/devices/vcvs/vcvsload.c b/src/spicelib/devices/vcvs/vcvsload.c
index 3a924d269..e58740938 100644
--- a/src/spicelib/devices/vcvs/vcvsload.c
+++ b/src/spicelib/devices/vcvs/vcvsload.c
@@ -22,7 +22,7 @@ VCVSload(GENmodel *inModel, CKTcircuit *ckt)
     VCVSmodel *model = (VCVSmodel *)inModel;
     VCVSinstance *here;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->VCVSnextModel ) {
diff --git a/src/spicelib/devices/vcvs/vcvspar.c b/src/spicelib/devices/vcvs/vcvspar.c
index b3314a17f..e421d0f18 100644
--- a/src/spicelib/devices/vcvs/vcvspar.c
+++ b/src/spicelib/devices/vcvs/vcvspar.c
@@ -18,7 +18,7 @@ VCVSparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     VCVSinstance *here = (VCVSinstance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case VCVS_GAIN:
diff --git a/src/spicelib/devices/vcvs/vcvspzld.c b/src/spicelib/devices/vcvs/vcvspzld.c
index b98448302..d8e43b40c 100644
--- a/src/spicelib/devices/vcvs/vcvspzld.c
+++ b/src/spicelib/devices/vcvs/vcvspzld.c
@@ -23,8 +23,8 @@ VCVSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     VCVSmodel *model = (VCVSmodel *)inModel;
     VCVSinstance *here;
 
-    IGNORE(s);
-    IGNORE(ckt);
+    NG_IGNORE(s);
+    NG_IGNORE(ckt);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->VCVSnextModel ) {
diff --git a/src/spicelib/devices/vcvs/vcvsset.c b/src/spicelib/devices/vcvs/vcvsset.c
index f6fd544be..fe007feb7 100644
--- a/src/spicelib/devices/vcvs/vcvsset.c
+++ b/src/spicelib/devices/vcvs/vcvsset.c
@@ -23,7 +23,7 @@ VCVSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     int error;
     CKTnode *tmp;
 
-    IGNORE(states);
+    NG_IGNORE(states);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->VCVSnextModel ) {
diff --git a/src/spicelib/devices/vsrc/vsrcask.c b/src/spicelib/devices/vsrc/vsrcask.c
index d61d95001..6d22ae283 100644
--- a/src/spicelib/devices/vsrc/vsrcask.c
+++ b/src/spicelib/devices/vsrc/vsrcask.c
@@ -28,7 +28,7 @@ VSRCask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *
     static char *msg =  "Current and power not available in ac analysis";
     double *v, *w;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(which) {
         case VSRC_DC:
diff --git a/src/spicelib/devices/vsrc/vsrcpar.c b/src/spicelib/devices/vsrc/vsrcpar.c
index 8219a1f9c..8f3b75d45 100644
--- a/src/spicelib/devices/vsrc/vsrcpar.c
+++ b/src/spicelib/devices/vsrc/vsrcpar.c
@@ -20,7 +20,7 @@ VSRCparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
     int i;
     VSRCinstance *here = (VSRCinstance *)inst;
 
-    IGNORE(select);
+    NG_IGNORE(select);
 
     switch(param) {
         case VSRC_DC:
diff --git a/src/spicelib/devices/vsrc/vsrcpzld.c b/src/spicelib/devices/vsrc/vsrcpzld.c
index 1953ffcd2..07f49add0 100644
--- a/src/spicelib/devices/vsrc/vsrcpzld.c
+++ b/src/spicelib/devices/vsrc/vsrcpzld.c
@@ -17,8 +17,8 @@ VSRCpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
     VSRCmodel *model = (VSRCmodel *)inModel;
     VSRCinstance *here;
 
-    IGNORE(s);
-    IGNORE(ckt);
+    NG_IGNORE(s);
+    NG_IGNORE(ckt);
 
     for( ; model != NULL; model = model->VSRCnextModel ) {
 
diff --git a/src/spicelib/devices/vsrc/vsrcpzs.c b/src/spicelib/devices/vsrc/vsrcpzs.c
index 29ff7a121..d80b47233 100644
--- a/src/spicelib/devices/vsrc/vsrcpzs.c
+++ b/src/spicelib/devices/vsrc/vsrcpzs.c
@@ -21,7 +21,7 @@ VSRCpzSetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt,
     CKTnode *tmp;
     int error;
 
-    IGNORE(state);
+    NG_IGNORE(state);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->VSRCnextModel ) {
diff --git a/src/spicelib/devices/vsrc/vsrcset.c b/src/spicelib/devices/vsrc/vsrcset.c
index 0d5c1f5ee..87c610948 100644
--- a/src/spicelib/devices/vsrc/vsrcset.c
+++ b/src/spicelib/devices/vsrc/vsrcset.c
@@ -22,7 +22,7 @@ VSRCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
     CKTnode *tmp;
     int error;
 
-    IGNORE(state);
+    NG_IGNORE(state);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->VSRCnextModel ) {
diff --git a/src/spicelib/devices/vsrc/vsrctemp.c b/src/spicelib/devices/vsrc/vsrctemp.c
index 58712f645..69b4572f4 100644
--- a/src/spicelib/devices/vsrc/vsrctemp.c
+++ b/src/spicelib/devices/vsrc/vsrctemp.c
@@ -20,7 +20,7 @@ VSRCtemp(GENmodel *inModel, CKTcircuit *ckt)
     VSRCinstance *here;
     double radians;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /*  loop through all the voltage source models */
     for( ; model != NULL; model = model->VSRCnextModel ) {
diff --git a/src/spicelib/parser/ifnewuid.c b/src/spicelib/parser/ifnewuid.c
index ba305efdf..3561c674b 100644
--- a/src/spicelib/parser/ifnewuid.c
+++ b/src/spicelib/parser/ifnewuid.c
@@ -83,7 +83,7 @@ int IFdelUid(CKTcircuit *ckt, IFuid uid, int type)
 {
     int error;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     switch (type) {
     case UID_ANALYSIS:
diff --git a/src/spicelib/parser/inp2dot.c b/src/spicelib/parser/inp2dot.c
index def58a5ef..118bd1184 100644
--- a/src/spicelib/parser/inp2dot.c
+++ b/src/spicelib/parser/inp2dot.c
@@ -128,9 +128,9 @@ dot_op(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
     int i;			/* generic loop variable */
     int error;			/* error code temporary */
 
-    IGNORE(line);
-    IGNORE(tab);
-    IGNORE(gnode);
+    NG_IGNORE(line);
+    NG_IGNORE(tab);
+    NG_IGNORE(gnode);
 
     /* .op */
     which = -1;
@@ -160,7 +160,7 @@ dot_disto(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
     IFvalue *parm;		/* a pointer to a value struct for function returns */
     char *steptype;		/* ac analysis, type of stepping function */
 
-    IGNORE(gnode);
+    NG_IGNORE(gnode);
 
     /* .disto {DEC OCT LIN} NP FSTART FSTOP <F2OVERF1> */
     which = -1;
@@ -203,7 +203,7 @@ dot_ac(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
     int i;			/* generic loop variable */
     char *steptype;		/* ac analysis, type of stepping function */
 
-    IGNORE(gnode);
+    NG_IGNORE(gnode);
 
     /* .ac {DEC OCT LIN} NP FSTART FSTOP */
     which = -1;
@@ -242,7 +242,7 @@ dot_pz(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
     int i;			/* generic loop variable */
     char *steptype;		/* ac analysis, type of stepping function */
 
-    IGNORE(gnode);
+    NG_IGNORE(gnode);
 
     /* .pz nodeI nodeG nodeJ nodeK {V I} {POL ZER PZ} */
     which = -1;
@@ -286,7 +286,7 @@ dot_dc(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
     int which;			/* which analysis we are performing */
     int i;			/* generic loop variable */
 
-    IGNORE(gnode);
+    NG_IGNORE(gnode);
 
     /* .dc SRC1NAME Vstart1 Vstop1 Vinc1 [SRC2NAME Vstart2 */
     /*        Vstop2 Vinc2 */
@@ -412,7 +412,7 @@ dot_tran(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
     double dtemp;		/* random double precision temporary */
     char *word;			/* something to stick a word of input into */
 
-    IGNORE(gnode);
+    NG_IGNORE(gnode);
 
     /* .tran Tstep Tstop <Tstart <Tmax> > <UIC> */
     which = -1;
@@ -632,9 +632,9 @@ static int
 dot_options(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 	  TSKtask *task, CKTnode *gnode, JOB *foo)
 {
-	IGNORE(line);
-	IGNORE(gnode);
-	IGNORE(foo);
+	NG_IGNORE(line);
+	NG_IGNORE(gnode);
+	NG_IGNORE(foo);
 
 	/* .option - specify program options - rather complicated */
 	/* use a subroutine to handle all of them to keep this    */
diff --git a/src/spicelib/parser/inpdomod.c b/src/spicelib/parser/inpdomod.c
index c67e25e3e..c0564ea06 100644
--- a/src/spicelib/parser/inpdomod.c
+++ b/src/spicelib/parser/inpdomod.c
@@ -28,7 +28,7 @@ char *INPdomodel(CKTcircuit *ckt, card * image, INPtables * tab)
     char *val;
     double rval=0, lval=0;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     line = image->line;
     
diff --git a/src/spicelib/parser/inppas3.c b/src/spicelib/parser/inppas3.c
index de033d06c..cbbdfae32 100644
--- a/src/spicelib/parser/inppas3.c
+++ b/src/spicelib/parser/inppas3.c
@@ -38,7 +38,7 @@ INPpas3(CKTcircuit *ckt, card *data, INPtables *tab, TSKtask *task,
     int which;			/* which analysis we are performing */
     CKTnode *node1;		/* the first node's node pointer */
 
-    IGNORE(task);
+    NG_IGNORE(task);
 
 #ifdef TRACE
     /* SDB debug statement */
diff --git a/src/spicelib/parser/inpptree-parser.c b/src/spicelib/parser/inpptree-parser.c
index cede2753c..16fa45fcb 100644
--- a/src/spicelib/parser/inpptree-parser.c
+++ b/src/spicelib/parser/inpptree-parser.c
@@ -1761,9 +1761,9 @@ yyreturn:
 static void
 PTerror (char **line, struct INPparseNode **retval, void *ckt, char const *s)
 {
-  IGNORE(line);
-  IGNORE(retval);
-  IGNORE(ckt);
+  NG_IGNORE(line);
+  NG_IGNORE(retval);
+  NG_IGNORE(ckt);
 
   fprintf (stderr, "%s: %s\n", __func__, s);
 }
diff --git a/src/spicelib/parser/inpptree-parser.y b/src/spicelib/parser/inpptree-parser.y
index 28d8c7680..341cf8879 100644
--- a/src/spicelib/parser/inpptree-parser.y
+++ b/src/spicelib/parser/inpptree-parser.y
@@ -110,9 +110,9 @@ nonempty_arglist:
 static void
 PTerror (char **line, struct INPparseNode **retval, void *ckt, char const *s)
 {
-  IGNORE(line);
-  IGNORE(retval);
-  IGNORE(ckt);
+  NG_IGNORE(line);
+  NG_IGNORE(retval);
+  NG_IGNORE(ckt);
 
   fprintf (stderr, "%s: %s\n", __func__, s);
 }
diff --git a/src/spicelib/parser/inpsymt.c b/src/spicelib/parser/inpsymt.c
index b6e8f4245..84907f0f5 100644
--- a/src/spicelib/parser/inpsymt.c
+++ b/src/spicelib/parser/inpsymt.c
@@ -81,7 +81,7 @@ int INPmkTerm(CKTcircuit *ckt, char **token, INPtables * tab, CKTnode **node)
     int key;
     struct INPnTab *t;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     key = hash(*token, tab->INPtermsize);
     for (t = tab->INPtermsymtab[key]; t; t = t->t_next) {
diff --git a/src/tclspice.c b/src/tclspice.c
index a572c7cb0..2443d3280 100755
--- a/src/tclspice.c
+++ b/src/tclspice.c
@@ -245,8 +245,8 @@ static int blt_vnum;
 static int spice_header TCL_CMDPROCARGS(clientData,interp,argc,argv){
   char buf[256];
   char *date, *name, *title;
-  IGNORE(clientData);
-  IGNORE(argv);
+  NG_IGNORE(clientData);
+  NG_IGNORE(argv);
   if (argc != 1) {
     Tcl_SetResult(interp, "Wrong # args. spice::spice_header",TCL_STATIC);
     return TCL_ERROR;
@@ -266,7 +266,7 @@ static int spice_data TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   char buf[256];
   int i, type;
   char *name;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc > 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::spice_data ?plot?",
         TCL_STATIC);
@@ -408,7 +408,7 @@ static int lastVector TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   char *blt;
   int i;
   double *V;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc != 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::lastVector vecName",TCL_STATIC);
     return TCL_ERROR;
@@ -450,7 +450,7 @@ static int get_value TCL_CMDPROCARGS(clientData,interp,argc,argv) {
 	char *var;
 	int i, vindex, j;
 	double val=0;
-	IGNORE(clientData);
+	NG_IGNORE(clientData);
 	if(argc != 3) {
 	    Tcl_SetResult(interp,
 				"Wrong # args. spice::get_value spice_variable index",
@@ -502,7 +502,7 @@ static int vectoblt TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   struct dvec *var_dvec;
   double *realData, *compData;
   int compIndex; //index to loop inside the vectors' data
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
 
   if (argc < 3 || argc > 4){
     Tcl_SetResult(interp, "Wrong # args. spice::vectoblt spice_variable real_bltVector [imag_bltVector]",TCL_STATIC);
@@ -581,7 +581,7 @@ static int spicetoblt TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   char *blt, *var;
   int start=0,end=-1,len;
 
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc < 3 || argc > 5) {
     Tcl_SetResult(interp, "Wrong # args. spice::spicetoblt spice_variable vecName ?start? ?end?",TCL_STATIC);
     return TCL_ERROR;
@@ -697,7 +697,7 @@ static int _thread_stop(void){
 }
 
 void sighandler_tclspice(int num) {
-	IGNORE(num);
+	NG_IGNORE(num);
 	if(fl_running) _thread_stop();
 	return;
 }
@@ -785,7 +785,7 @@ static int _run(int argc,char **argv){
    
 static int _tcl_dispatch TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   int i;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   save_interp();
   /* Looks backwards through the first command and strips the :: part */ 
   for(i = strlen(argv[0])-1;i > 0;i--)
@@ -797,7 +797,7 @@ static int _tcl_dispatch TCL_CMDPROCARGS(clientData,interp,argc,argv) {
 
 /* Runs the spice command given in spice <cmd>*/
 static int _spice_dispatch TCL_CMDPROCARGS(clientData,interp,argc,argv) {
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   save_interp();
   if(argc == 1) return TCL_OK;
   return _run(argc-1,(char **)&argv[1]);
@@ -806,9 +806,9 @@ static int _spice_dispatch TCL_CMDPROCARGS(clientData,interp,argc,argv) {
 #ifdef THREADS
 /*Checks if spice is runnuing in the background */
 static int running TCL_CMDPROCARGS(clientData,interp,argc,argv) {
-  IGNORE(clientData);
-  IGNORE(argc);
-  IGNORE(argv);
+  NG_IGNORE(clientData);
+  NG_IGNORE(argc);
+  NG_IGNORE(argv);
   Tcl_SetObjResult(interp,Tcl_NewIntObj((long) (fl_running && !fl_exited)));
   return TCL_OK;
 }
@@ -824,7 +824,7 @@ static int plot_variables TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   struct plot *pl;
   int plot;
   struct dvec *v;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   
   if (argc != 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::plot_variables plot",TCL_STATIC);
@@ -852,7 +852,7 @@ static int plot_variablesInfo TCL_CMDPROCARGS(clientData,interp,argc,argv){
   char buf[256];
   char *name; 
   int length;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
 
   if (argc != 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::plot_variablesInfo plot",TCL_STATIC);
@@ -884,7 +884,7 @@ static int plot_get_value TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   struct dvec *v;
   char *name;
   int plot,index;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
     
   if (argc != 4) {
     Tcl_SetResult(interp, "Wrong # args. spice::plot_get_value name plot index",TCL_STATIC);
@@ -919,7 +919,7 @@ static int plot_datapoints TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   struct plot *pl;
   struct dvec *v;
   int plot;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
 
   if (argc != 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::plot_datapoints plot",TCL_STATIC);
@@ -944,7 +944,7 @@ static int plot_datapoints TCL_CMDPROCARGS(clientData,interp,argc,argv) {
 static int plot_title TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   struct plot *pl;
   int plot;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc != 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::plot_title plot",TCL_STATIC);
     return TCL_ERROR;
@@ -964,7 +964,7 @@ static int plot_date TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   struct plot *pl;
 
   int plot;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc != 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::plot_date plot",TCL_STATIC);
     return TCL_ERROR;
@@ -983,7 +983,7 @@ static int plot_date TCL_CMDPROCARGS(clientData,interp,argc,argv) {
 static int plot_name TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   struct plot *pl;
   int plot;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc != 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::plot_name plot",TCL_STATIC);
     return TCL_ERROR;
@@ -1002,7 +1002,7 @@ static int plot_name TCL_CMDPROCARGS(clientData,interp,argc,argv) {
 static int plot_typename TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   struct plot *pl;
   int plot;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc != 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::plot_typename plot",TCL_STATIC);
     return TCL_ERROR;
@@ -1026,7 +1026,7 @@ static int plot_nvars TCL_CMDPROCARGS(clientData,interp,argc,argv){
   int plot;
   int i=0;
   
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc != 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::plot_nvars plot",TCL_STATIC);
     return TCL_ERROR;
@@ -1048,7 +1048,7 @@ static int plot_defaultscale TCL_CMDPROCARGS(clientData,interp,argc,argv){
   struct plot *pl;
   int plot;
   
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc != 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::plot_defaultscale plot",
         TCL_STATIC);
@@ -1081,7 +1081,7 @@ static int plot_getvector TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   struct dvec *v;
   struct plot *pl;
 
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc < 4 || argc > 6) {
     Tcl_SetResult(interp,
         "Wrong # args. spice::plot_getvector plot spice_variable vecName ?start? ?end?",
@@ -1142,9 +1142,9 @@ static int plot_getvector TCL_CMDPROCARGS(clientData,interp,argc,argv) {
 }
 
 static int plot_getplot TCL_CMDPROCARGS(clientData,interp,argc,argv) {
-  IGNORE(clientData);
-  IGNORE(argc);
-  IGNORE(argv);
+  NG_IGNORE(clientData);
+  NG_IGNORE(argc);
+  NG_IGNORE(argv);
   if(plot_cur) {
   	Tcl_SetObjResult(interp,Tcl_NewStringObj(plot_cur->pl_typename,-1));
   }
@@ -1161,7 +1161,7 @@ static int get_output TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   int tmp_1,tmp_2=0;
   char buf[1024];
   int outfd,outfd2=0;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   save_interp();
   if ((argc < 2) || (argc > 3)) {
     Tcl_SetResult(interp, "Wrong # args. spice::get_output script ?var_for_stderr?",TCL_STATIC);
@@ -1222,7 +1222,7 @@ static int get_param TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   char *device, *param;
   struct variable *v;
   char buf[128];
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc != 3) {
     Tcl_SetResult(interp, "Wrong # args. spice::get_param device param",TCL_STATIC);
     return TCL_ERROR;
@@ -1272,7 +1272,7 @@ int get_mod_param TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   char buf[128];
   bool found;
 
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc < 2 || argc >3) {
     Tcl_SetResult(interp, 
       "Wrong # args. spice::get_mod_param device|model [all|param]", TCL_STATIC);
@@ -1341,7 +1341,7 @@ int get_mod_param TCL_CMDPROCARGS(clientData,interp,argc,argv) {
  * Spice will still adjust it to keep accuracy wuithin reltol and abstol
  */
 static int delta TCL_CMDPROCARGS(clientData,interp,argc,argv) {
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc < 1 ||argc > 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::delta ?value?",TCL_STATIC);
     return TCL_ERROR;
@@ -1365,7 +1365,7 @@ static int delta TCL_CMDPROCARGS(clientData,interp,argc,argv) {
  */
 static int maxstep TCL_CMDPROCARGS(clientData,interp,argc,argv) {
   TRANan *job;
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc < 1 ||argc > 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::maxstep ?value?",TCL_STATIC);
     return TCL_ERROR;
@@ -1663,8 +1663,8 @@ int stepCallbackPending;
 
 void stepEventSetup(ClientData clientData,int flags) {
 	Tcl_Time t;
-	IGNORE(clientData);
-	IGNORE(flags);
+	NG_IGNORE(clientData);
+	NG_IGNORE(flags);
 	if(stepCallbackPending) {
 		t.sec  = 0;
 		t.usec = 0;
@@ -1676,8 +1676,8 @@ void stepEventSetup(ClientData clientData,int flags) {
 }
 
 int stepEventHandler(Tcl_Event *evPtr, int flags) {
-	IGNORE(evPtr);
-	IGNORE(flags);
+	NG_IGNORE(evPtr);
+	NG_IGNORE(flags);
 	if(stepCallbackPending) {
 		stepCallbackPending = 0;
 		Tcl_Preserve((ClientData)spice_interp);
@@ -1689,8 +1689,8 @@ int stepEventHandler(Tcl_Event *evPtr, int flags) {
 }
 
 void stepEventCheck(ClientData clientData,int flags) {
-	IGNORE(clientData);
-	IGNORE(flags);
+	NG_IGNORE(clientData);
+	NG_IGNORE(flags);
 	if(stepCallbackPending) {
 		Tcl_Event *tclEvent;
 		tclEvent = (Tcl_Event *) ckalloc(sizeof(Tcl_Event));
@@ -1702,8 +1702,8 @@ void stepEventCheck(ClientData clientData,int flags) {
 int triggerEventHandler(Tcl_Event *evPtr, int flags) {
 	static char buf[512];
 	int rtn=TCL_OK;
-	IGNORE(evPtr);
-	IGNORE(flags);
+	NG_IGNORE(evPtr);
+	NG_IGNORE(flags);
 	Tcl_Preserve((ClientData)spice_interp);
 #ifdef THREADS
 	mutex_lock(&triggerMutex);
@@ -1733,8 +1733,8 @@ quit:
 
 void triggerEventSetup(ClientData clientData,int flags) {
 	Tcl_Time t;
-	IGNORE(clientData);
-	IGNORE(flags);
+	NG_IGNORE(clientData);
+	NG_IGNORE(flags);
 	if(eventQueue) {
 		t.sec  = 0;
 		t.usec = 0;
@@ -1746,8 +1746,8 @@ void triggerEventSetup(ClientData clientData,int flags) {
 }
 
 void triggerEventCheck(ClientData clientData,int flags) {
-	IGNORE(clientData);
-	IGNORE(flags);
+	NG_IGNORE(clientData);
+	NG_IGNORE(flags);
 #ifdef THREADS
 	mutex_lock(&triggerMutex);
 #endif
@@ -1884,7 +1884,7 @@ static int resetTriggers(void) {
  */
 static int registerTriggerCallback TCL_CMDPROCARGS(clientData,interp,argc,argv){
 
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc > 3) {
     Tcl_SetResult(interp,
 			"Wrong # args. spice::registerTriggerCallback ?proc? ?ms?",
@@ -1921,7 +1921,7 @@ static int registerTriggerCallback TCL_CMDPROCARGS(clientData,interp,argc,argv){
  */
 static int registerStepCallback TCL_CMDPROCARGS(clientData,interp,argc,argv){
 
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc > 4) {
     Tcl_SetResult(interp,
 			"Wrong # args. spice::registerStepCallback ?proc? ?steps? ?ms?",
@@ -1971,7 +1971,7 @@ static int registerTrigger TCL_CMDPROCARGS(clientData,interp,argc,argv){
   int type;
   double Vavg, Vmin, Vmax;
   
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc < 4 && argc > 6) {
     Tcl_SetResult(interp, "Wrong # args. spice::registerTrigger vecName Vmin Vmax ?type? ?string?",TCL_STATIC);
     return TCL_ERROR;
@@ -2063,7 +2063,7 @@ static int unregisterTrigger TCL_CMDPROCARGS(clientData,interp,argc,argv){
   struct watch *tmp;
   struct watch **cut;
 
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc != 2 && argc != 3) {
     Tcl_SetResult(interp, "Wrong # args. spice::unregisterTrigger vecName ?type?",TCL_STATIC);
     return TCL_ERROR;
@@ -2119,8 +2119,8 @@ static int unregisterTrigger TCL_CMDPROCARGS(clientData,interp,argc,argv){
 */
 static int popTriggerEvent TCL_CMDPROCARGS(clientData,interp,argc,argv){
   
-  IGNORE(clientData);
-  IGNORE(argv);
+  NG_IGNORE(clientData);
+  NG_IGNORE(argv);
   if (argc != 1) {
     Tcl_SetResult(interp, "Wrong # args. spice::popTriggerEvent",TCL_STATIC);
     return TCL_ERROR;
@@ -2170,8 +2170,8 @@ static int listTriggers TCL_CMDPROCARGS(clientData,interp,argc,argv){
   struct watch *tmp;
   Tcl_Obj *list;
   
-  IGNORE(clientData);
-  IGNORE(argv);
+  NG_IGNORE(clientData);
+  NG_IGNORE(argv);
   if (argc != 1) {
     Tcl_SetResult(interp, "Wrong # args. spice::listTriggers",TCL_STATIC);
     return TCL_ERROR;
@@ -2200,7 +2200,7 @@ static int tmeasure TCL_CMDPROCARGS(clientData,interp,argc,argv){
   wordlist *wl= NULL;
   double mvalue;
 
-  IGNORE(clientData);
+  NG_IGNORE(clientData);
   if (argc <= 2) {
     Tcl_SetResult(interp, "Wrong # args. spice::listTriggers",TCL_STATIC);
     return TCL_ERROR;
diff --git a/src/xspice/cm/cmexport.c b/src/xspice/cm/cmexport.c
index 8b198b98b..047562112 100755
--- a/src/xspice/cm/cmexport.c
+++ b/src/xspice/cm/cmexport.c
@@ -10,7 +10,7 @@ static void *tcalloc(size_t a, size_t b) {
 
 #ifdef HAVE_LIBGC
 static void no_free(void *p) {
-  IGNORE(p);
+  NG_IGNORE(p);
 }
 #endif
 
diff --git a/src/xspice/evt/evtqueue.c b/src/xspice/evt/evtqueue.c
index b5c16043d..5078cabae 100755
--- a/src/xspice/evt/evtqueue.c
+++ b/src/xspice/evt/evtqueue.c
@@ -97,7 +97,7 @@ void EVTqueue_output(
 
     Mif_Boolean_t       splice;
 
-    IGNORE(udn_index);
+    NG_IGNORE(udn_index);
 
     /* Get pointers for fast access */
     output_queue = &(ckt->evt->queue.output);
diff --git a/src/xspice/evt/evttermi.c b/src/xspice/evt/evttermi.c
index 4855f72fd..48d95f5f9 100755
--- a/src/xspice/evt/evttermi.c
+++ b/src/xspice/evt/evttermi.c
@@ -188,7 +188,7 @@ static void EVTinst_insert(
     Evt_Inst_Info_t *inst;
     Evt_Inst_Info_t **inst_ptr;
 
-    IGNORE(err_msg);
+    NG_IGNORE(err_msg);
 
 
     /* Scan list of instances in event structure to see if already there */
@@ -417,7 +417,7 @@ static void EVTport_insert(
 
     int                 index;
 
-    IGNORE(err_msg);
+    NG_IGNORE(err_msg);
 
     /* Find the end of the port info list */
     port = ckt->evt->info.port_list;
@@ -481,7 +481,7 @@ static void EVToutput_insert(
 
     int                   index;
 
-    IGNORE(err_msg);
+    NG_IGNORE(err_msg);
 
     /* Find the end of the port info list */
     output = ckt->evt->info.output_list;
diff --git a/src/xspice/idn/idndig.c b/src/xspice/idn/idndig.c
index e310ab23f..629baff49 100755
--- a/src/xspice/idn/idndig.c
+++ b/src/xspice/idn/idndig.c
@@ -59,7 +59,7 @@ static void idn_digital_create(void **evt_struct)
 
 static void idn_digital_dismantle(void *evt_struct)
 {
-    IGNORE(evt_struct);
+    NG_IGNORE(evt_struct);
 
     /* Do nothing.  There are no internally malloc'ed things to dismantle */
 }
diff --git a/src/xspice/ipc/ipcsockets.c b/src/xspice/ipc/ipcsockets.c
index a3e78d7b5..d1c36f630 100755
--- a/src/xspice/ipc/ipcsockets.c
+++ b/src/xspice/ipc/ipcsockets.c
@@ -171,8 +171,8 @@ ipc_transport_initialize_server (
   unsigned int  server_length;          /* Size of server structure        */
   unsigned int  port_num;        /* Port number converted from server_name */
 
-  IGNORE(mode);
-  IGNORE(protocol);
+  NG_IGNORE(mode);
+  NG_IGNORE(protocol);
 
   /* assert (protocol == IPC_PROTOCOL_V2); */ /* allow v1 protocol - wbk */
   assert (sock_state == IPC_SOCK_UNINITIALIZED);
diff --git a/src/xspice/mif/mif_inp2.c b/src/xspice/mif/mif_inp2.c
index aeab9d112..f16d28acd 100755
--- a/src/xspice/mif/mif_inp2.c
+++ b/src/xspice/mif/mif_inp2.c
@@ -667,8 +667,8 @@ MIFget_port_type(
 
     int              i;
 
-    IGNORE(ckt);
-    IGNORE(tab);
+    NG_IGNORE(ckt);
+    NG_IGNORE(tab);
 
     if(**line == '\0') {
         LITERR("Missing connections on A device");
diff --git a/src/xspice/mif/mifask.c b/src/xspice/mif/mifask.c
index 671e3f4f7..bcb4c9147 100755
--- a/src/xspice/mif/mifask.c
+++ b/src/xspice/mif/mifask.c
@@ -85,8 +85,8 @@ int MIFask(
 
     Mif_Boolean_t  is_array;
 
-    IGNORE(ckt);
-    IGNORE(select);
+    NG_IGNORE(ckt);
+    NG_IGNORE(select);
 
     /* Arrange for access to MIF specific data in the instance */
     inst = (MIFinstance *) inInst;
diff --git a/src/xspice/mif/mifgetvalue.c b/src/xspice/mif/mifgetvalue.c
index b719963ae..4d629d839 100755
--- a/src/xspice/mif/mifgetvalue.c
+++ b/src/xspice/mif/mifgetvalue.c
@@ -104,8 +104,8 @@ MIFgetValue (
     int     value_type;
     int     is_array;
 
-    IGNORE(ckt);
-    IGNORE(tab);
+    NG_IGNORE(ckt);
+    NG_IGNORE(tab);
 
     /* Mask off non-type bits */
     value_type = type & IF_VARTYPES;
diff --git a/src/xspice/mif/mifmask.c b/src/xspice/mif/mifmask.c
index 63c21ad4e..d9479b2ca 100755
--- a/src/xspice/mif/mifmask.c
+++ b/src/xspice/mif/mifmask.c
@@ -80,7 +80,7 @@ int MIFmAsk(
 
     Mif_Boolean_t  is_array;
 
-    IGNORE(ckt);
+    NG_IGNORE(ckt);
 
     /* Arrange for access to MIF specific data in the model */
     model = (MIFmodel *) inModel;
diff --git a/src/xspice/xspice.c b/src/xspice/xspice.c
index 6f9d36deb..6d630b99e 100755
--- a/src/xspice/xspice.c
+++ b/src/xspice/xspice.c
@@ -9,7 +9,7 @@ static void *tcalloc(size_t a, size_t b) {
 }
 
 static void no_free(void *p) {
-  IGNORE(p);
+  NG_IGNORE(p);
 }
 
 static FILE * no_file(void) {