diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c
index ea0bc0a94..90e11cad3 100644
--- a/src/frontend/runcoms2.c
+++ b/src/frontend/runcoms2.c
@@ -29,7 +29,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 
 #define RAWBUF_SIZE 32768
 extern char rawfileBuf[RAWBUF_SIZE];
-extern void line_free_x(struct card * deck, bool recurse);
+extern void line_free_x(struct card *deck, bool recurse);
 extern INPmodel *modtab;
 
 #define line_free(line, flag)                   \
diff --git a/src/frontend/shyu.c b/src/frontend/shyu.c
index ef2f65a9f..d9ca34448 100644
--- a/src/frontend/shyu.c
+++ b/src/frontend/shyu.c
@@ -29,7 +29,7 @@ if_sens_run(CKTcircuit *ckt, wordlist *args, INPtables *tab)
 {
     JOB *senseJob;
     JOB *opJob;
-    card *current;
+    struct card *current;
     IFvalue ptemp;
     IFvalue *parm;
     char buf[BSIZE_SP];
@@ -38,7 +38,7 @@ if_sens_run(CKTcircuit *ckt, wordlist *args, INPtables *tab)
     char *steptype;
     char *name;
     char *line;
-    card deck;
+    struct card deck;
     int error;
     int save;
     int flag = 0;
@@ -53,7 +53,7 @@ if_sens_run(CKTcircuit *ckt, wordlist *args, INPtables *tab)
     deck.linenum_orig = 0;
     deck.line         = buf;
 
-    current = (card *) &deck;
+    current = (struct card *) &deck;
     line = current->line;
     INPgetTok(&line, &token, 1);
 
diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c
index b6e4e48e8..d0194d9a5 100644
--- a/src/frontend/spiceif.c
+++ b/src/frontend/spiceif.c
@@ -160,16 +160,16 @@ if_inpdeck(struct card *deck, INPtables **tab)
 
     /* reset the model table, will be filled in anew in INPpas1() */
     modtab = NULL;
-    INPpas1(ckt, (card *) deck->nextcard, *tab);
+    INPpas1(ckt, (struct card *) deck->nextcard, *tab);
     /* store the new model table in the current circuit */
     ft_curckt->ci_modtab = modtab;
-    INPpas2(ckt, (card *) deck->nextcard, *tab, ft_curckt->ci_defTask);
+    INPpas2(ckt, (struct card *) deck->nextcard, *tab, ft_curckt->ci_defTask);
 
     /* INPpas2 has been modified to ignore .NODESET and .IC
      * cards. These are left till INPpas3 so that we can check for
      * nodeset/ic of non-existant nodes.  */
 
-    INPpas3(ckt, (card *) deck->nextcard,
+    INPpas3(ckt, (struct card *) deck->nextcard,
             *tab, ft_curckt->ci_defTask, ft_sim->nodeParms,
             ft_sim->numNodeParms);
 
@@ -300,7 +300,7 @@ if_run(CKTcircuit *ckt, char *what, wordlist *args, INPtables *tab)
 
         /*CDHW ci_curTask and ci_specTask point to the interactive task AAA CDHW*/
 
-        INPpas2(ckt, (card *) &deck, tab, ft_curckt->ci_specTask);
+        INPpas2(ckt, (struct card *) &deck, tab, ft_curckt->ci_specTask);
 
         if (deck.error) {
             fprintf(cp_err, "Warning: %s\n", deck.error);
diff --git a/src/frontend/subckt.c b/src/frontend/subckt.c
index 064304f34..5f04f5d87 100644
--- a/src/frontend/subckt.c
+++ b/src/frontend/subckt.c
@@ -74,7 +74,7 @@ Modified: 2000 AlansFixes
 
 #include "numparam/numpaif.h"
 
-extern void line_free_x(struct card * deck, bool recurse);
+extern void line_free_x(struct card *deck, bool recurse);
 
 #define line_free(line, flag)                   \
     do {                                        \
diff --git a/src/frontend/subckt.h b/src/frontend/subckt.h
index a21b8d875..576ace525 100644
--- a/src/frontend/subckt.h
+++ b/src/frontend/subckt.h
@@ -6,7 +6,7 @@
 #ifndef ngspice_SUBCKT_H
 #define ngspice_SUBCKT_H
 
-struct card * inp_subcktexpand(struct card *deck);
-struct card * inp_deckcopy(struct card *deck);
+struct card *inp_subcktexpand(struct card *deck);
+struct card *inp_deckcopy(struct card *deck);
 
 #endif
diff --git a/src/include/ngspice/dllitf.h b/src/include/ngspice/dllitf.h
index a8d950968..fe98a2851 100644
--- a/src/include/ngspice/dllitf.h
+++ b/src/include/ngspice/dllitf.h
@@ -15,7 +15,7 @@
 
 struct coreInfo_t {
 	/* MIF stuff */
-	void      ((*dllitf_MIF_INP2A)(CKTcircuit *, INPtables *, card *));
+	void      ((*dllitf_MIF_INP2A)(CKTcircuit *, INPtables *, struct card *));
 	char *    ((*dllitf_MIFgetMod)(CKTcircuit *, char *, INPmodel  **, INPtables *));
 	IFvalue * ((*dllitf_MIFgetValue)(CKTcircuit *, char **, int, INPtables *, char **));
 	int		  ((*dllitf_MIFsetup)(SMPmatrix *, GENmodel *, CKTcircuit *, int *));
diff --git a/src/include/ngspice/inpdefs.h b/src/include/ngspice/inpdefs.h
index 8e3025955..e5f7b0554 100644
--- a/src/include/ngspice/inpdefs.h
+++ b/src/include/ngspice/inpdefs.h
@@ -65,8 +65,8 @@ struct card {
     int linenum_orig;
     char *line;
     char *error;
-    card *nextcard;
-    card *actualLine;
+    struct card *nextcard;
+    struct card *actualLine;
 };
 
 /* structure used to save models in after they are read during pass 1 */
@@ -74,7 +74,7 @@ struct INPmodel{
     IFuid INPmodName;   /* uid of model */
     int INPmodType;     /* type index of device type */
     INPmodel *INPnextModel;  /* link to next model */
-    card *INPmodLine;   /* pointer to line describing model */
+    struct card *INPmodLine;   /* pointer to line describing model */
     GENmodel *INPmodfast;   /* high speed pointer to model for access */
 };
 
@@ -91,8 +91,8 @@ int INPaName(char *, IFvalue *, CKTcircuit *, int *, char *, GENinstance **, IFs
 int INPapName(CKTcircuit *, int, JOB *, char *, IFvalue *);
 void INPcaseFix(char *);
 char *INPdevParse(char **, CKTcircuit *, int, GENinstance *, double *, int *, INPtables *);
-char *INPdomodel(CKTcircuit *, card *, INPtables *);
-void INPdoOpts(CKTcircuit *, JOB *, card *, INPtables *);
+char *INPdomodel(CKTcircuit *, struct card *, INPtables *);
+void INPdoOpts(CKTcircuit *, JOB *, struct card *, INPtables *);
 char *INPerrCat(char *, char *);
 char *INPstrCat(char *, char *, char *);
 char *INPerror(int);
@@ -111,22 +111,22 @@ int INPinsert(char **, INPtables *);
 int INPretrieve(char **, INPtables *);
 int INPremove(char *, INPtables *);
 INPmodel *INPlookMod(const char *);
-int INPmakeMod(char *, int, card *);
+int INPmakeMod(char *, int, struct card *);
 char *INPmkTemp(char *);
-void INPpas1(CKTcircuit *, card *, INPtables *);
-void INPpas2(CKTcircuit *, card *, INPtables *, TSKtask *);
-void INPpas3(CKTcircuit *, card *, INPtables *, TSKtask *, IFparm *, int);
+void INPpas1(CKTcircuit *, struct card *, INPtables *);
+void INPpas2(CKTcircuit *, struct card *, INPtables *, TSKtask *);
+void INPpas3(CKTcircuit *, struct card *, INPtables *, TSKtask *, IFparm *, int);
 int INPpName(char *, IFvalue *, CKTcircuit *, int, GENinstance *);
 int INPtermInsert(CKTcircuit *, char **, INPtables *, CKTnode **);
 int INPmkTerm(CKTcircuit *, char **, INPtables *, CKTnode **);
 int INPtypelook(char *);
-int INP2dot(CKTcircuit *, INPtables *, card *, TSKtask *, CKTnode *);
+int INP2dot(CKTcircuit *, INPtables *, struct card *, TSKtask *, CKTnode *);
 INPtables *INPtabInit(int);
 void INPkillMods(void);
 void INPtabEnd(INPtables *);
 char * INPfindVer(char *line, char *version);
 int INPgetStr(char **line, char **token, int gobble);
-int INPgetTitle(CKTcircuit **ckt, card **data);
+int INPgetTitle(CKTcircuit **ckt, struct card **data);
 int INPgetUTok(char **line, char **token, int gobble);
 int INPgetU2Tok(char **line, char **token, int gobble);
 int INPremTerm(char *token, INPtables *tab);
diff --git a/src/include/ngspice/mifproto.h b/src/include/ngspice/mifproto.h
index 0aeaa6a4d..192044193 100644
--- a/src/include/ngspice/mifproto.h
+++ b/src/include/ngspice/mifproto.h
@@ -53,7 +53,7 @@ NON-STANDARD FEATURES
 extern void MIF_INP2A(
     CKTcircuit   *ckt,      /* circuit structure to put mod/inst structs in */
     INPtables    *tab,      /* symbol table for node names, etc.            */
-    card         *current   /* the card we are to parse                     */
+    struct card  *current   /* the card we are to parse                     */
 );
 
 
diff --git a/src/spicelib/parser/inp2b.c b/src/spicelib/parser/inp2b.c
index 70b1af108..b4f3b844f 100644
--- a/src/spicelib/parser/inp2b.c
+++ b/src/spicelib/parser/inp2b.c
@@ -12,7 +12,7 @@ Author: 1988 Thomas L. Quarles
 #include "inpxx.h"
 #include "ngspice/cktdefs.h"
 
-void INP2B(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2B(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
     /* Bname <node> <node> [V=expr] [I=expr] */
diff --git a/src/spicelib/parser/inp2c.c b/src/spicelib/parser/inp2c.c
index 737df1d6f..823f221c1 100644
--- a/src/spicelib/parser/inp2c.c
+++ b/src/spicelib/parser/inp2c.c
@@ -10,7 +10,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2C(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2C(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
 /* parse a capacitor card */
diff --git a/src/spicelib/parser/inp2d.c b/src/spicelib/parser/inp2d.c
index ea1c28242..59952dc8f 100644
--- a/src/spicelib/parser/inp2d.c
+++ b/src/spicelib/parser/inp2d.c
@@ -12,7 +12,7 @@ Modified: 2001 Paolo Nenzi (Cider Integration)
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2D(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2D(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
 /* Dname <node> <node> <model> [<val>] [OFF] [IC=<val>] */
diff --git a/src/spicelib/parser/inp2dot.c b/src/spicelib/parser/inp2dot.c
index a59fa98cf..f5a82516c 100644
--- a/src/spicelib/parser/inp2dot.c
+++ b/src/spicelib/parser/inp2dot.c
@@ -15,7 +15,7 @@ Modified: 2000 AlansFixes
 #include "ngspice/tskdefs.h"
 
 static int
-dot_noise(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
+dot_noise(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
           TSKtask *task, CKTnode *gnode, JOB *foo)
 {
 	int which;			/* which analysis we are performing */
@@ -114,7 +114,7 @@ dot_noise(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 
 
 static int
-dot_op(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
+dot_op(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
        TSKtask *task, CKTnode *gnode, JOB *foo)
 {
 	int which;			/* which analysis we are performing */
@@ -136,7 +136,7 @@ dot_op(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 
 
 static int
-dot_disto(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
+dot_disto(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
           TSKtask *task, CKTnode *gnode, JOB *foo)
 {
 	int which;			/* which analysis we are performing */
@@ -172,7 +172,7 @@ dot_disto(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 
 
 static int
-dot_ac(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
+dot_ac(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
        TSKtask *task, CKTnode *gnode, JOB *foo)
 {
 	int error;			/* error code temporary */
@@ -204,7 +204,7 @@ dot_ac(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 }
 
 static int
-dot_pz(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
+dot_pz(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
        TSKtask *task, CKTnode *gnode, JOB *foo)
 {
 	int error;			/* error code temporary */
@@ -241,7 +241,7 @@ dot_pz(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 
 
 static int
-dot_dc(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
+dot_dc(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
        TSKtask *task, CKTnode *gnode, JOB *foo)
 {
 	char *name;			/* the resistor's name */
@@ -287,7 +287,7 @@ dot_dc(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 
 
 static int
-dot_tf(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
+dot_tf(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
        TSKtask *task, CKTnode *gnode, JOB *foo)
 {
 	char *name;			/* the resistor's name */
@@ -348,7 +348,7 @@ dot_tf(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 
 
 static int
-dot_tran(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
+dot_tran(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
          TSKtask *task, CKTnode *gnode, JOB *foo)
 {
 	int error;			/* error code temporary */
@@ -398,7 +398,7 @@ dot_tran(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 
 
 static int
-dot_sens(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
+dot_sens(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
          TSKtask *task, CKTnode *gnode, JOB *foo)
 {
 	char *name;			/* the resistor's name */
@@ -488,7 +488,7 @@ dot_sens(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 
 #ifdef WANT_SENSE2
 static int
-dot_sens2(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
+dot_sens2(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
           TSKtask *task, CKTnode *gnode, JOB *foo)
 {
 	int error;			/* error code temporary */
@@ -554,7 +554,7 @@ dot_sens2(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 #ifdef WITH_PSS
 /*SP: Steady State Analyis */
 static int
-dot_pss(char *line, void *ckt, INPtables *tab, card *current,
+dot_pss(char *line, void *ckt, INPtables *tab, struct card *current,
         void *task, void *gnode, JOB *foo)
 {
 	int error;			/* error code temporary */
@@ -613,7 +613,7 @@ dot_pss(char *line, void *ckt, INPtables *tab, card *current,
 #endif
 
 static int
-dot_options(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
+dot_options(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
             TSKtask *task, CKTnode *gnode, JOB *foo)
 {
 	NG_IGNORE(line);
@@ -630,7 +630,7 @@ dot_options(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
 
 
 int
-INP2dot(CKTcircuit *ckt, INPtables *tab, card *current, TSKtask *task, CKTnode *gnode)
+INP2dot(CKTcircuit *ckt, INPtables *tab, struct card *current, TSKtask *task, CKTnode *gnode)
 {
 
 	/* .<something> Many possibilities */
diff --git a/src/spicelib/parser/inp2e.c b/src/spicelib/parser/inp2e.c
index 51592f2d2..45f0c1451 100644
--- a/src/spicelib/parser/inp2e.c
+++ b/src/spicelib/parser/inp2e.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2E(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2E(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
 /* Ename <node> <node> <node> <node> <val> */
diff --git a/src/spicelib/parser/inp2f.c b/src/spicelib/parser/inp2f.c
index 18c025f3c..c099dbda5 100644
--- a/src/spicelib/parser/inp2f.c
+++ b/src/spicelib/parser/inp2f.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2F(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2F(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
 /* Fname <node> <node> <vname> <val> */
diff --git a/src/spicelib/parser/inp2g.c b/src/spicelib/parser/inp2g.c
index a249d318d..659490b96 100644
--- a/src/spicelib/parser/inp2g.c
+++ b/src/spicelib/parser/inp2g.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2G(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2G(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
 /* Gname <node> <node> <node> <node> <val> */
diff --git a/src/spicelib/parser/inp2h.c b/src/spicelib/parser/inp2h.c
index 33d8129d5..c558647e9 100644
--- a/src/spicelib/parser/inp2h.c
+++ b/src/spicelib/parser/inp2h.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2H(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2H(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
 /* Hname <node> <node> <vname> <val> */
diff --git a/src/spicelib/parser/inp2i.c b/src/spicelib/parser/inp2i.c
index 644e174b5..cec95080f 100644
--- a/src/spicelib/parser/inp2i.c
+++ b/src/spicelib/parser/inp2i.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2I(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2I(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
     /* Iname <node> <node> [ [DC] <val>] [AC [<val> [<val> ] ] ]
diff --git a/src/spicelib/parser/inp2j.c b/src/spicelib/parser/inp2j.c
index 9263ba99c..0021e3522 100644
--- a/src/spicelib/parser/inp2j.c
+++ b/src/spicelib/parser/inp2j.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2J(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2J(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
     /* Jname <node> <node> <node> <model> [<val>] [OFF] [IC=<val>,<val>] */
diff --git a/src/spicelib/parser/inp2k.c b/src/spicelib/parser/inp2k.c
index 838c52122..058833943 100644
--- a/src/spicelib/parser/inp2k.c
+++ b/src/spicelib/parser/inp2k.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2K(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2K(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
 /* Kname Lname Lname <val> */
diff --git a/src/spicelib/parser/inp2l.c b/src/spicelib/parser/inp2l.c
index 2e1058a88..d81294630 100644
--- a/src/spicelib/parser/inp2l.c
+++ b/src/spicelib/parser/inp2l.c
@@ -10,7 +10,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2L(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2L(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
 /* parse an inductor card */
diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c
index abc538a45..a87772be1 100644
--- a/src/spicelib/parser/inp2m.c
+++ b/src/spicelib/parser/inp2m.c
@@ -36,7 +36,7 @@ model_numnodes(int type)
 
 
 void
-INP2M(CKTcircuit *ckt, INPtables *tab, card *current)
+INP2M(CKTcircuit *ckt, INPtables *tab, struct card *current)
 {
     /* Mname <node> <node> <node> <node> <model> [L=<val>]
      *       [W=<val>] [AD=<val>] [AS=<val>] [PD=<val>]
diff --git a/src/spicelib/parser/inp2n.c b/src/spicelib/parser/inp2n.c
index ce4f1288b..3cccbbb15 100644
--- a/src/spicelib/parser/inp2n.c
+++ b/src/spicelib/parser/inp2n.c
@@ -16,7 +16,7 @@ University of Science and Technology of China
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2N(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2N(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 /* parse a numerical device  card */
 /* Nname <node> <node> [<node> ...] [<mname>] */
diff --git a/src/spicelib/parser/inp2o.c b/src/spicelib/parser/inp2o.c
index d2ea82b9c..82600f54f 100644
--- a/src/spicelib/parser/inp2o.c
+++ b/src/spicelib/parser/inp2o.c
@@ -12,7 +12,7 @@ Author: 1990 Jaijeet S. Roychowdhury
 #include "inpxx.h"
 
 
-void INP2O(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2O(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
     /* Oname <node> <node> <node> <node> [IC=<val>,<val>,<val>,<val>] */
diff --git a/src/spicelib/parser/inp2p.c b/src/spicelib/parser/inp2p.c
index b922cce35..13387e787 100644
--- a/src/spicelib/parser/inp2p.c
+++ b/src/spicelib/parser/inp2p.c
@@ -15,7 +15,7 @@ void
 INP2P(
     CKTcircuit *ckt,
     INPtables *tab,
-    card *current)
+    struct card *current)
 
 {
 
diff --git a/src/spicelib/parser/inp2q.c b/src/spicelib/parser/inp2q.c
index 45ac66e28..a98871c41 100644
--- a/src/spicelib/parser/inp2q.c
+++ b/src/spicelib/parser/inp2q.c
@@ -28,7 +28,7 @@ model_numnodes(int type)
 }
 
 
-void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
+void INP2Q(CKTcircuit *ckt, INPtables * tab, struct card *current, CKTnode *gnode)
 {
 
     /* Qname <node> <node> <node> [<node>] <model> [<val>] [OFF]
diff --git a/src/spicelib/parser/inp2r.c b/src/spicelib/parser/inp2r.c
index 57ff19d89..1f5bf28b2 100644
--- a/src/spicelib/parser/inp2r.c
+++ b/src/spicelib/parser/inp2r.c
@@ -18,7 +18,7 @@ Remarks:  This code is based on a version written by Serban Popescu which
 /* undefine to add tracing to this file */
 /* #define TRACE */
 
-void INP2R(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2R(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 /* parse a resistor card */
 /* Rname <node> <node> [<val>][<mname>][w=<val>][l=<val>][ac=<val>] */
diff --git a/src/spicelib/parser/inp2s.c b/src/spicelib/parser/inp2s.c
index bcd3c2cda..dd8fa5909 100644
--- a/src/spicelib/parser/inp2s.c
+++ b/src/spicelib/parser/inp2s.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2S(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2S(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
     /* Sname <node> <node> <node> <node> [<modname>] [IC] */
diff --git a/src/spicelib/parser/inp2t.c b/src/spicelib/parser/inp2t.c
index f34073a33..da04f21e2 100644
--- a/src/spicelib/parser/inp2t.c
+++ b/src/spicelib/parser/inp2t.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2T(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2T(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
     /* Tname <node> <node> <node> <node> [TD=<val>] 
diff --git a/src/spicelib/parser/inp2u.c b/src/spicelib/parser/inp2u.c
index 5e6bb6275..93db3900c 100644
--- a/src/spicelib/parser/inp2u.c
+++ b/src/spicelib/parser/inp2u.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2U(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2U(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
     /* Uname <node> <node> <model> [l=<val>] [n=<val>] */
 
diff --git a/src/spicelib/parser/inp2v.c b/src/spicelib/parser/inp2v.c
index 0c726ad18..09153988f 100644
--- a/src/spicelib/parser/inp2v.c
+++ b/src/spicelib/parser/inp2v.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2V(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2V(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
     /* Vname <node> <node> [ [DC] <val>] [AC [<val> [<val> ] ] ]
diff --git a/src/spicelib/parser/inp2w.c b/src/spicelib/parser/inp2w.c
index 78046fde1..69d2f9b46 100644
--- a/src/spicelib/parser/inp2w.c
+++ b/src/spicelib/parser/inp2w.c
@@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2W(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2W(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
     /* Wname <node> <node> <vctrl> [<modname>] [IC] */
diff --git a/src/spicelib/parser/inp2y.c b/src/spicelib/parser/inp2y.c
index 385ff4bb4..c47d65759 100644
--- a/src/spicelib/parser/inp2y.c
+++ b/src/spicelib/parser/inp2y.c
@@ -15,7 +15,7 @@ void
 INP2Y(
     CKTcircuit *ckt,
     INPtables *tab,
-    card *current)
+    struct card *current)
 
 {
 /* parse a txl card */
diff --git a/src/spicelib/parser/inp2z.c b/src/spicelib/parser/inp2z.c
index 7624fdd7e..881a75720 100644
--- a/src/spicelib/parser/inp2z.c
+++ b/src/spicelib/parser/inp2z.c
@@ -18,7 +18,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-void INP2Z(CKTcircuit *ckt, INPtables * tab, card * current)
+void INP2Z(CKTcircuit *ckt, INPtables * tab, struct card *current)
 {
 
     /* Zname <node> <node> <node> <model> [<val>] [OFF] [IC=<val>,<val>] */
diff --git a/src/spicelib/parser/inpdomod.c b/src/spicelib/parser/inpdomod.c
index 954d2253b..fc4f8dd64 100644
--- a/src/spicelib/parser/inpdomod.c
+++ b/src/spicelib/parser/inpdomod.c
@@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
  * Note that multi-line models are handled in the calling fcn
  * (INPpas1).
  *-------------------------------------------------------------*/
-char *INPdomodel(CKTcircuit *ckt, card * image, INPtables * tab)
+char *INPdomodel(CKTcircuit *ckt, struct card *image, INPtables * tab)
 {
 
     char *modname;
diff --git a/src/spicelib/parser/inpdoopt.c b/src/spicelib/parser/inpdoopt.c
index 33d388e56..61d44ba0a 100644
--- a/src/spicelib/parser/inpdoopt.c
+++ b/src/spicelib/parser/inpdoopt.c
@@ -21,7 +21,7 @@ void
 INPdoOpts(
     CKTcircuit *ckt,
     JOB *anal,
-    card *optCard,
+    struct card *optCard,
     INPtables *tab)
 {
     char *line;
diff --git a/src/spicelib/parser/inpgmod.c b/src/spicelib/parser/inpgmod.c
index b2c158a58..60d33b9c9 100644
--- a/src/spicelib/parser/inpgmod.c
+++ b/src/spicelib/parser/inpgmod.c
@@ -326,7 +326,7 @@ INPgetMod(CKTcircuit *ckt, char *name, INPmodel **model, INPtables *tab)
 static int
 INPparseNumMod(CKTcircuit *ckt, INPmodel *model, INPtables *tab, char **errMessage)
 {
-    card *txtCard;           /* Text description of a card */
+    struct card *txtCard;    /* Text description of a card */
     GENcard *tmpCard;        /* Processed description of a card */
     IFcardInfo *info = NULL; /* Info about the type of card located */
     char *cardName = NULL;   /* name of a card */
diff --git a/src/spicelib/parser/inpgtitl.c b/src/spicelib/parser/inpgtitl.c
index cab2fccfb..17362deab 100644
--- a/src/spicelib/parser/inpgtitl.c
+++ b/src/spicelib/parser/inpgtitl.c
@@ -16,7 +16,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "inpxx.h"
 
-int INPgetTitle(CKTcircuit **ckt, card ** data)
+int INPgetTitle(CKTcircuit **ckt, struct card ** data)
 {
     int error;
 
diff --git a/src/spicelib/parser/inplist.c b/src/spicelib/parser/inplist.c
index 559c24518..ace824aaf 100644
--- a/src/spicelib/parser/inplist.c
+++ b/src/spicelib/parser/inplist.c
@@ -16,13 +16,13 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "inpxx.h"
 
-extern void INPlist(FILE *file, card *deck, int type);  /* nowhere used function */
+extern void INPlist(FILE *file, struct card *deck, int type);  /* nowhere used function */
 
-void INPlist(FILE * file, card * deck, int type)
+void INPlist(FILE * file, struct card *deck, int type)
 {
 
-    card *here;
-    card *there;
+    struct card *here;
+    struct card *there;
 
     if (type == LOGICAL) {
 	for (here = deck; here != NULL; here = here->nextcard) {
diff --git a/src/spicelib/parser/inpmkmod.c b/src/spicelib/parser/inpmkmod.c
index f79284d40..456c4f5e4 100644
--- a/src/spicelib/parser/inpmkmod.c
+++ b/src/spicelib/parser/inpmkmod.c
@@ -19,7 +19,7 @@ INPmodel *modtab = NULL;
  * Note that the model table INPmodel
  *--------------------------------------------------------------*/
 
-int INPmakeMod(char *token, int type, card * line)
+int INPmakeMod(char *token, int type, struct card *line)
 {
    register INPmodel **i;
 
diff --git a/src/spicelib/parser/inppas1.c b/src/spicelib/parser/inppas1.c
index 57146ddc0..b990cadf6 100644
--- a/src/spicelib/parser/inppas1.c
+++ b/src/spicelib/parser/inppas1.c
@@ -11,9 +11,9 @@ Author: 1985 Thomas L. Quarles
  * The first pass of the circuit parser just looks for '.model' lines
  */
 
-void INPpas1(CKTcircuit *ckt, card * deck, INPtables * tab)
+void INPpas1(CKTcircuit *ckt, struct card *deck, INPtables * tab)
 {
-    card *current;
+    struct card *current;
     char *temp, *thisline;
 
     for (current = deck; current != NULL; current = current->nextcard) {
diff --git a/src/spicelib/parser/inppas2.c b/src/spicelib/parser/inppas2.c
index 505603a3a..c53c85922 100644
--- a/src/spicelib/parser/inppas2.c
+++ b/src/spicelib/parser/inppas2.c
@@ -23,10 +23,10 @@ Author: 1985 Thomas L. Quarles
 /* pass 2 - Scan through the lines.  ".model" cards have processed in
  *  pass1 and are ignored here.  */
 
-void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task)
+void INPpas2(CKTcircuit *ckt, struct card *data, INPtables * tab, TSKtask *task)
 {
 
-    card *current;
+    struct card *current;
     char c;
     char *groundname = "0";
     char *gname;
diff --git a/src/spicelib/parser/inppas3.c b/src/spicelib/parser/inppas3.c
index 7fdbda01e..86180491a 100644
--- a/src/spicelib/parser/inppas3.c
+++ b/src/spicelib/parser/inppas3.c
@@ -21,11 +21,11 @@ extern IFsimulator *ft_sim;
  * warning.  */
 
 void
-INPpas3(CKTcircuit *ckt, card *data, INPtables *tab, TSKtask *task,
+INPpas3(CKTcircuit *ckt, struct card *data, INPtables *tab, TSKtask *task,
         IFparm *nodeParms, int numNodeParms)
 {
 
-    card *current;
+    struct card *current;
     int error;			/* used by the macros defined above */
     char *line;			/* the part of the current line left
                                    to parse */
diff --git a/src/spicelib/parser/inpxx.h b/src/spicelib/parser/inpxx.h
index 83dc2da72..afbb9d162 100644
--- a/src/spicelib/parser/inpxx.h
+++ b/src/spicelib/parser/inpxx.h
@@ -8,30 +8,30 @@
 
 /* inp2xx.c */
 
-void INP2B(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2C(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2D(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2E(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2F(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2G(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2H(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2I(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2J(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2K(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2L(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2M(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2N(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2O(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2P(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2Q(CKTcircuit *ckt, INPtables *tab, card *current, CKTnode *gnode);
-void INP2R(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2S(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2T(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2U(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2V(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2W(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2Y(CKTcircuit *ckt, INPtables *tab, card *current);
-void INP2Z(CKTcircuit *ckt, INPtables *tab, card *current);
+void INP2B(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2C(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2D(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2E(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2F(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2G(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2H(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2I(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2J(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2K(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2L(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2M(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2N(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2O(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2P(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2Q(CKTcircuit *ckt, INPtables *tab, struct card *current, CKTnode *gnode);
+void INP2R(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2S(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2T(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2U(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2V(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2W(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2Y(CKTcircuit *ckt, INPtables *tab, struct card *current);
+void INP2Z(CKTcircuit *ckt, INPtables *tab, struct card *current);
 
 
 /* ptfuncs.c */
diff --git a/src/xspice/icm/dlmain.c b/src/xspice/icm/dlmain.c
index 61d591a14..a2aed9cc4 100644
--- a/src/xspice/icm/dlmain.c
+++ b/src/xspice/icm/dlmain.c
@@ -105,7 +105,7 @@ CM_EXPORT void *CMgetCoreItfPtr(void) {
 void MIF_INP2A(
     CKTcircuit   *ckt,      /* circuit structure to put mod/inst structs in */
     INPtables    *tab,      /* symbol table for node names, etc.            */
-    card         *current   /* the card we are to parse                     */
+    struct card  *current   /* the card we are to parse                     */
 	) {
 	(coreitf->dllitf_MIF_INP2A)(ckt,tab,current);
 }
diff --git a/src/xspice/mif/mif_inp2.c b/src/xspice/mif/mif_inp2.c
index de788499e..d6d62cb2d 100644
--- a/src/xspice/mif/mif_inp2.c
+++ b/src/xspice/mif/mif_inp2.c
@@ -62,7 +62,7 @@ static void  MIFinit_inst(MIFmodel *mdfast, MIFinstance *fast);
 static void  MIFget_port_type(
     CKTcircuit       *ckt,      /* circuit structure to put mod/inst structs in */
     INPtables        *tab,      /* symbol table for node names, etc.            */
-    card             *current,  /* MUST be named 'current' for spice macros     */
+    struct card      *current,  /* MUST be named 'current' for spice macros     */
     char             **line,
     char             **next_token,
     Mif_Token_Type_t *next_token_type,
@@ -75,7 +75,7 @@ static void  MIFget_port_type(
 static void MIFget_port(
     CKTcircuit       *ckt,      /* circuit structure to put mod/inst structs in */
     INPtables        *tab,      /* symbol table for node names, etc.            */
-    card             *current,  /* MUST be named 'current' for spice macros     */
+    struct card      *current,  /* MUST be named 'current' for spice macros     */
     MIFinstance      *fast,     /* pointer to instance struct */
     char             **line,
     char             **next_token,
@@ -142,7 +142,7 @@ void
 MIF_INP2A (
     CKTcircuit   *ckt,      /* circuit structure to put mod/inst structs in */
     INPtables    *tab,      /* symbol table for node names, etc.            */
-    card         *current ) /* the card we are to parse                     */
+    struct card  *current ) /* the card we are to parse                     */
 /* Must be called "current" for compatibility   */
 /* with macros                                  */
 {
@@ -682,7 +682,7 @@ static void
 MIFget_port_type(
     CKTcircuit       *ckt,      /* circuit structure to put mod/inst structs in */
     INPtables        *tab,      /* symbol table for node names, etc.            */
-    card             *current,  /* MUST be named 'current' for spice macros     */
+    struct card      *current,  /* MUST be named 'current' for spice macros     */
     char             **line,
     char             **next_token,
     Mif_Token_Type_t *next_token_type,
@@ -777,7 +777,7 @@ static void
 MIFget_port(
     CKTcircuit       *ckt,      /* circuit structure to put mod/inst structs in */
     INPtables        *tab,      /* symbol table for node names, etc.            */
-    card             *current,  /* MUST be named 'current' for spice macros     */
+    struct card      *current,  /* MUST be named 'current' for spice macros     */
     MIFinstance      *fast,     /* pointer to instance struct */
     char             **line,
     char             **next_token,