From 1b4c17a46494dc809a2315b495718e33065932bd Mon Sep 17 00:00:00 2001
From: h_vogt <h_vogt>
Date: Thu, 27 Dec 2012 14:25:43 +0100
Subject: [PATCH] rename spicelib/parser/inp.h to inpxx.h

since we have another "inp.h" in src/frontend
---
 src/spicelib/parser/Makefile.am        | 2 +-
 src/spicelib/parser/ifeval.c           | 2 +-
 src/spicelib/parser/ifnewuid.c         | 2 +-
 src/spicelib/parser/inp2b.c            | 2 +-
 src/spicelib/parser/inp2c.c            | 2 +-
 src/spicelib/parser/inp2d.c            | 2 +-
 src/spicelib/parser/inp2dot.c          | 2 +-
 src/spicelib/parser/inp2e.c            | 2 +-
 src/spicelib/parser/inp2f.c            | 2 +-
 src/spicelib/parser/inp2g.c            | 2 +-
 src/spicelib/parser/inp2h.c            | 2 +-
 src/spicelib/parser/inp2i.c            | 2 +-
 src/spicelib/parser/inp2j.c            | 2 +-
 src/spicelib/parser/inp2k.c            | 2 +-
 src/spicelib/parser/inp2l.c            | 2 +-
 src/spicelib/parser/inp2m.c            | 2 +-
 src/spicelib/parser/inp2n.c            | 2 +-
 src/spicelib/parser/inp2o.c            | 2 +-
 src/spicelib/parser/inp2p.c            | 2 +-
 src/spicelib/parser/inp2q.c            | 2 +-
 src/spicelib/parser/inp2r.c            | 2 +-
 src/spicelib/parser/inp2s.c            | 2 +-
 src/spicelib/parser/inp2t.c            | 2 +-
 src/spicelib/parser/inp2u.c            | 2 +-
 src/spicelib/parser/inp2v.c            | 2 +-
 src/spicelib/parser/inp2w.c            | 2 +-
 src/spicelib/parser/inp2y.c            | 2 +-
 src/spicelib/parser/inp2z.c            | 2 +-
 src/spicelib/parser/inpaname.c         | 2 +-
 src/spicelib/parser/inpapnam.c         | 2 +-
 src/spicelib/parser/inpcfix.c          | 2 +-
 src/spicelib/parser/inpdomod.c         | 2 +-
 src/spicelib/parser/inpdpar.c          | 2 +-
 src/spicelib/parser/inperrc.c          | 2 +-
 src/spicelib/parser/inperror.c         | 2 +-
 src/spicelib/parser/inpeval.c          | 2 +-
 src/spicelib/parser/inpfindl.c         | 2 +-
 src/spicelib/parser/inpfindv.c         | 2 +-
 src/spicelib/parser/inpgmod.c          | 2 +-
 src/spicelib/parser/inpgstr.c          | 2 +-
 src/spicelib/parser/inpgtitl.c         | 2 +-
 src/spicelib/parser/inpgtok.c          | 2 +-
 src/spicelib/parser/inpgval.c          | 2 +-
 src/spicelib/parser/inpkmods.c         | 2 +-
 src/spicelib/parser/inplist.c          | 2 +-
 src/spicelib/parser/inpmkmod.c         | 2 +-
 src/spicelib/parser/inpmktmp.c         | 2 +-
 src/spicelib/parser/inppas2.c          | 2 +-
 src/spicelib/parser/inppname.c         | 2 +-
 src/spicelib/parser/inpptree.c         | 2 +-
 src/spicelib/parser/inpsymt.c          | 2 +-
 src/spicelib/parser/inptyplk.c         | 2 +-
 src/spicelib/parser/{inp.h => inpxx.h} | 0
 src/spicelib/parser/ptfuncs.c          | 2 +-
 src/spicelib/parser/sperror.c          | 2 +-
 visualc/vngspice.vcproj                | 4 ++--
 56 files changed, 56 insertions(+), 56 deletions(-)
 rename src/spicelib/parser/{inp.h => inpxx.h} (100%)

diff --git a/src/spicelib/parser/Makefile.am b/src/spicelib/parser/Makefile.am
index 0683ce675..a51572e8a 100644
--- a/src/spicelib/parser/Makefile.am
+++ b/src/spicelib/parser/Makefile.am
@@ -67,7 +67,7 @@ libinp_la_SOURCES = \
 		inptyplk.c	\
 		ptfuncs.c	\
 		sperror.c	\
-		inp.h
+		inpxx.h
 
 $(srcdir)/inpptree.c : inpptree-parser.c
 inpptree-parser.c inpptree-parser.h : inpptree-parser.y
diff --git a/src/spicelib/parser/ifeval.c b/src/spicelib/parser/ifeval.c
index eab1a9895..e3fcca3da 100644
--- a/src/spicelib/parser/ifeval.c
+++ b/src/spicelib/parser/ifeval.c
@@ -10,7 +10,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "ngspice/iferrmsg.h"
 #include "ngspice/inpptree.h"
-#include "inp.h"
+#include "inpxx.h"
 #include "ngspice/cktdefs.h"
 
 /* Uncomment to allow tracing */
diff --git a/src/spicelib/parser/ifnewuid.c b/src/spicelib/parser/ifnewuid.c
index 4b26bb8e7..cad6a5a5c 100644
--- a/src/spicelib/parser/ifnewuid.c
+++ b/src/spicelib/parser/ifnewuid.c
@@ -24,7 +24,7 @@ extern int vasprintf(char **out, const char *fmt, va_list ap);
 #include "ngspice/ifsim.h"
 #include "ngspice/iferrmsg.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 /* va: we should use tmalloc, whith also makes failure test */
diff --git a/src/spicelib/parser/inp2b.c b/src/spicelib/parser/inp2b.c
index 21b72e28b..70b1af108 100644
--- a/src/spicelib/parser/inp2b.c
+++ b/src/spicelib/parser/inp2b.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 #include "ngspice/cktdefs.h"
 
 void INP2B(CKTcircuit *ckt, INPtables * tab, card * current)
diff --git a/src/spicelib/parser/inp2c.c b/src/spicelib/parser/inp2c.c
index a749bfb18..b8aaac369 100644
--- a/src/spicelib/parser/inp2c.c
+++ b/src/spicelib/parser/inp2c.c
@@ -8,7 +8,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2C(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2d.c b/src/spicelib/parser/inp2d.c
index a92339f9b..2a6489f2c 100644
--- a/src/spicelib/parser/inp2d.c
+++ b/src/spicelib/parser/inp2d.c
@@ -10,7 +10,7 @@ Modified: 2001 Paolo Nenzi (Cider Integration)
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2D(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2dot.c b/src/spicelib/parser/inp2dot.c
index d1fb530d3..cc72da736 100644
--- a/src/spicelib/parser/inp2dot.c
+++ b/src/spicelib/parser/inp2dot.c
@@ -10,7 +10,7 @@ Modified: 2000 AlansFixes
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 #include "ngspice/cpdefs.h"
 #include "ngspice/tskdefs.h"
 
diff --git a/src/spicelib/parser/inp2e.c b/src/spicelib/parser/inp2e.c
index aef59507f..51592f2d2 100644
--- a/src/spicelib/parser/inp2e.c
+++ b/src/spicelib/parser/inp2e.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2E(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2f.c b/src/spicelib/parser/inp2f.c
index fb1717333..18c025f3c 100644
--- a/src/spicelib/parser/inp2f.c
+++ b/src/spicelib/parser/inp2f.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2F(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2g.c b/src/spicelib/parser/inp2g.c
index 6d7356d0c..a249d318d 100644
--- a/src/spicelib/parser/inp2g.c
+++ b/src/spicelib/parser/inp2g.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2G(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2h.c b/src/spicelib/parser/inp2h.c
index 4666c62c5..33d8129d5 100644
--- a/src/spicelib/parser/inp2h.c
+++ b/src/spicelib/parser/inp2h.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2H(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2i.c b/src/spicelib/parser/inp2i.c
index f168f45fb..8895eb5fe 100644
--- a/src/spicelib/parser/inp2i.c
+++ b/src/spicelib/parser/inp2i.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2I(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2j.c b/src/spicelib/parser/inp2j.c
index b2cffcfca..5dcd3be41 100644
--- a/src/spicelib/parser/inp2j.c
+++ b/src/spicelib/parser/inp2j.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2J(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2k.c b/src/spicelib/parser/inp2k.c
index 01c9111e0..838c52122 100644
--- a/src/spicelib/parser/inp2k.c
+++ b/src/spicelib/parser/inp2k.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2K(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2l.c b/src/spicelib/parser/inp2l.c
index 8685e6fae..d72330a6e 100644
--- a/src/spicelib/parser/inp2l.c
+++ b/src/spicelib/parser/inp2l.c
@@ -8,7 +8,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2L(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c
index 467433ba1..29c03657a 100644
--- a/src/spicelib/parser/inp2m.c
+++ b/src/spicelib/parser/inp2m.c
@@ -10,7 +10,7 @@ Modified: 2001 Paolo Nenzi (Cider Integration)
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void
 INP2M (CKTcircuit *ckt, INPtables * tab, card * current)
diff --git a/src/spicelib/parser/inp2n.c b/src/spicelib/parser/inp2n.c
index de019d910..fbb85d786 100644
--- a/src/spicelib/parser/inp2n.c
+++ b/src/spicelib/parser/inp2n.c
@@ -14,7 +14,7 @@ University of Science and Technology of China
 #include "../devices/ndev/ndevdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2N(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2o.c b/src/spicelib/parser/inp2o.c
index 736e68684..d401d5aed 100644
--- a/src/spicelib/parser/inp2o.c
+++ b/src/spicelib/parser/inp2o.c
@@ -9,7 +9,7 @@ Author: 1990 Jaijeet S. Roychowdhury
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 void INP2O(CKTcircuit *ckt, INPtables * tab, card * current)
diff --git a/src/spicelib/parser/inp2p.c b/src/spicelib/parser/inp2p.c
index fc2a4dd8a..da733acfa 100644
--- a/src/spicelib/parser/inp2p.c
+++ b/src/spicelib/parser/inp2p.c
@@ -9,7 +9,7 @@ Author: 1992 Charles Hough
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void
 INP2P(
diff --git a/src/spicelib/parser/inp2q.c b/src/spicelib/parser/inp2q.c
index b4dc29e0e..d3f859bec 100644
--- a/src/spicelib/parser/inp2q.c
+++ b/src/spicelib/parser/inp2q.c
@@ -9,7 +9,7 @@ Modified: 2001 Paolo Nenzi (Cider Integration)
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
 {
diff --git a/src/spicelib/parser/inp2r.c b/src/spicelib/parser/inp2r.c
index 702bb8a0d..29c5b6db3 100644
--- a/src/spicelib/parser/inp2r.c
+++ b/src/spicelib/parser/inp2r.c
@@ -12,7 +12,7 @@ Remarks:  This code is based on a version written by Serban Popescu which
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 /* undefine to add tracing to this file */
 /* #define TRACE */
diff --git a/src/spicelib/parser/inp2s.c b/src/spicelib/parser/inp2s.c
index d65b122fd..720241609 100644
--- a/src/spicelib/parser/inp2s.c
+++ b/src/spicelib/parser/inp2s.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2S(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2t.c b/src/spicelib/parser/inp2t.c
index 9bedf6038..f34073a33 100644
--- a/src/spicelib/parser/inp2t.c
+++ b/src/spicelib/parser/inp2t.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2T(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2u.c b/src/spicelib/parser/inp2u.c
index df7a7de28..8505b5513 100644
--- a/src/spicelib/parser/inp2u.c
+++ b/src/spicelib/parser/inp2u.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2U(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2v.c b/src/spicelib/parser/inp2v.c
index e1dcd92fd..01ce5ddf8 100644
--- a/src/spicelib/parser/inp2v.c
+++ b/src/spicelib/parser/inp2v.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2V(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2w.c b/src/spicelib/parser/inp2w.c
index a6d7d9c0d..813e6439f 100644
--- a/src/spicelib/parser/inp2w.c
+++ b/src/spicelib/parser/inp2w.c
@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2W(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inp2y.c b/src/spicelib/parser/inp2y.c
index 16313f83b..49545098d 100644
--- a/src/spicelib/parser/inp2y.c
+++ b/src/spicelib/parser/inp2y.c
@@ -9,7 +9,7 @@ Author: 1992 Charles Hough
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void
 INP2Y(
diff --git a/src/spicelib/parser/inp2z.c b/src/spicelib/parser/inp2z.c
index 94bad54eb..fc50ab3b8 100644
--- a/src/spicelib/parser/inp2z.c
+++ b/src/spicelib/parser/inp2z.c
@@ -16,7 +16,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2Z(CKTcircuit *ckt, INPtables * tab, card * current)
 {
diff --git a/src/spicelib/parser/inpaname.c b/src/spicelib/parser/inpaname.c
index 8c4a72981..5a251f916 100644
--- a/src/spicelib/parser/inpaname.c
+++ b/src/spicelib/parser/inpaname.c
@@ -17,7 +17,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "ngspice/ifsim.h"
 #include "ngspice/iferrmsg.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int
 INPaName(char *parm, IFvalue * val, CKTcircuit *ckt, int *dev, char *devnam,
diff --git a/src/spicelib/parser/inpapnam.c b/src/spicelib/parser/inpapnam.c
index 060656749..106e3a14e 100644
--- a/src/spicelib/parser/inpapnam.c
+++ b/src/spicelib/parser/inpapnam.c
@@ -9,7 +9,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/iferrmsg.h"
 #include "ngspice/cpdefs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int
 INPapName(CKTcircuit *ckt, int type, JOB *analPtr, char *parmname,
diff --git a/src/spicelib/parser/inpcfix.c b/src/spicelib/parser/inpcfix.c
index 205c7af88..93a6ebcf4 100644
--- a/src/spicelib/parser/inpcfix.c
+++ b/src/spicelib/parser/inpcfix.c
@@ -9,7 +9,7 @@ Author: 1985 Thomas L. Quarles
 #include <ctype.h>
 #include "ngspice/fteext.h"
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 void INPcaseFix(register char *string)
diff --git a/src/spicelib/parser/inpdomod.c b/src/spicelib/parser/inpdomod.c
index 234d4ecbd..de55f7e7f 100644
--- a/src/spicelib/parser/inpdomod.c
+++ b/src/spicelib/parser/inpdomod.c
@@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include "ngspice/iferrmsg.h"
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 /*--------------------------------------------------------------
  * This fcn takes the model card & examines it.  Depending upon
diff --git a/src/spicelib/parser/inpdpar.c b/src/spicelib/parser/inpdpar.c
index 2add6fa42..fedf1a4ae 100644
--- a/src/spicelib/parser/inpdpar.c
+++ b/src/spicelib/parser/inpdpar.c
@@ -18,7 +18,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/iferrmsg.h"
 #include "ngspice/cpdefs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 char *INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast,
 		  double *leading, int *waslead, INPtables * tab)
diff --git a/src/spicelib/parser/inperrc.c b/src/spicelib/parser/inperrc.c
index a069d6e8d..3dadd8ab0 100644
--- a/src/spicelib/parser/inperrc.c
+++ b/src/spicelib/parser/inperrc.c
@@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include <stdio.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 char *INPerrCat(char *a, char *b)
diff --git a/src/spicelib/parser/inperror.c b/src/spicelib/parser/inperror.c
index 5882be06b..219114b1b 100644
--- a/src/spicelib/parser/inperror.c
+++ b/src/spicelib/parser/inperror.c
@@ -23,7 +23,7 @@ extern int vasprintf(char **out, const char *fmt, va_list ap);
 #include "ngspice/ifsim.h"
 #include "ngspice/iferrmsg.h"
 #include "ngspice/sperror.h"
-#include "inp.h"
+#include "inpxx.h"
 
 char *INPerror(int type)
 {
diff --git a/src/spicelib/parser/inpeval.c b/src/spicelib/parser/inpeval.c
index 1f5995a8d..843bf5cc5 100644
--- a/src/spicelib/parser/inpeval.c
+++ b/src/spicelib/parser/inpeval.c
@@ -7,7 +7,7 @@ Author: 1985 Thomas L. Quarles
 #include <stdio.h>
 #include <ctype.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 double INPevaluate(char **line, int *error, int gobble)
 		/* non-zero to gobble rest of token, zero to leave it alone */
diff --git a/src/spicelib/parser/inpfindl.c b/src/spicelib/parser/inpfindl.c
index 74779c795..72d515195 100644
--- a/src/spicelib/parser/inpfindl.c
+++ b/src/spicelib/parser/inpfindl.c
@@ -12,7 +12,7 @@ Modified: 1999 Paolo Nenzi - Now we can use a two digits level code -
 
 #include "ngspice/ngspice.h"
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 char *INPfindLev(char *line, int *level)
 {
diff --git a/src/spicelib/parser/inpfindv.c b/src/spicelib/parser/inpfindv.c
index 49596fe53..d5f36b0c5 100644
--- a/src/spicelib/parser/inpfindv.c
+++ b/src/spicelib/parser/inpfindv.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 char *INPfindVer(char *line, char *version)
 {
diff --git a/src/spicelib/parser/inpgmod.c b/src/spicelib/parser/inpgmod.c
index c9a1b01cc..31b389591 100644
--- a/src/spicelib/parser/inpgmod.c
+++ b/src/spicelib/parser/inpgmod.c
@@ -9,7 +9,7 @@ Modified: 2001 Paolo Nenzi (Cider Integration)
 #include "ngspice/ifsim.h"
 #include "ngspice/cpstd.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 #include <errno.h>
 
 #ifdef CIDER
diff --git a/src/spicelib/parser/inpgstr.c b/src/spicelib/parser/inpgstr.c
index 39a19a651..92389c999 100644
--- a/src/spicelib/parser/inpgstr.c
+++ b/src/spicelib/parser/inpgstr.c
@@ -11,7 +11,7 @@ Author: 1985 Thomas L. Quarles
 #include <stdio.h>
 #include "ngspice/iferrmsg.h"
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int INPgetStr(char **line, char **token, int gobble)
 				/* eat non-whitespace trash AFTER token? */
diff --git a/src/spicelib/parser/inpgtitl.c b/src/spicelib/parser/inpgtitl.c
index 4e200ea31..cab2fccfb 100644
--- a/src/spicelib/parser/inpgtitl.c
+++ b/src/spicelib/parser/inpgtitl.c
@@ -14,7 +14,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/iferrmsg.h"
 #include "ngspice/cpstd.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int INPgetTitle(CKTcircuit **ckt, card ** data)
 {
diff --git a/src/spicelib/parser/inpgtok.c b/src/spicelib/parser/inpgtok.c
index dce183443..83de945cb 100644
--- a/src/spicelib/parser/inpgtok.c
+++ b/src/spicelib/parser/inpgtok.c
@@ -16,7 +16,7 @@ Modified: 2000 AlansFixes
 #include "ngspice/ngspice.h"
 #include "ngspice/iferrmsg.h"
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 /*-------------------------------------------------------------------
  * INPgetTok -- this fcn extracts a generic input token from 
diff --git a/src/spicelib/parser/inpgval.c b/src/spicelib/parser/inpgval.c
index 3bbd2e80d..6143738d3 100644
--- a/src/spicelib/parser/inpgval.c
+++ b/src/spicelib/parser/inpgval.c
@@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ifsim.h"
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpptree.h"
-#include "inp.h"
+#include "inpxx.h"
 
 IFvalue *INPgetValue(CKTcircuit *ckt, char **line, int type, INPtables * tab)
 {
diff --git a/src/spicelib/parser/inpkmods.c b/src/spicelib/parser/inpkmods.c
index 02a3c4841..ec84f3105 100644
--- a/src/spicelib/parser/inpkmods.c
+++ b/src/spicelib/parser/inpkmods.c
@@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include <stdio.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 extern INPmodel *modtab;
diff --git a/src/spicelib/parser/inplist.c b/src/spicelib/parser/inplist.c
index ff528b4c9..559c24518 100644
--- a/src/spicelib/parser/inplist.c
+++ b/src/spicelib/parser/inplist.c
@@ -14,7 +14,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include <stdio.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 extern void INPlist(FILE *file, card *deck, int type);  /* nowhere used function */
 
diff --git a/src/spicelib/parser/inpmkmod.c b/src/spicelib/parser/inpmkmod.c
index b37e28d96..7335a8329 100644
--- a/src/spicelib/parser/inpmkmod.c
+++ b/src/spicelib/parser/inpmkmod.c
@@ -7,7 +7,7 @@ Author: 1985 Thomas L. Quarles
 #include <stdio.h>
 #include "ngspice/inpdefs.h"
 #include "ngspice/iferrmsg.h"
-#include "inp.h"
+#include "inpxx.h"
 
 /*  global input model table.  */
 INPmodel *modtab = NULL;
diff --git a/src/spicelib/parser/inpmktmp.c b/src/spicelib/parser/inpmktmp.c
index 21d2945b4..e9cc504cd 100644
--- a/src/spicelib/parser/inpmktmp.c
+++ b/src/spicelib/parser/inpmktmp.c
@@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include <stdio.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 char *INPmkTemp(char *string)
diff --git a/src/spicelib/parser/inppas2.c b/src/spicelib/parser/inppas2.c
index c16b879fa..69cd2082a 100644
--- a/src/spicelib/parser/inppas2.c
+++ b/src/spicelib/parser/inppas2.c
@@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/inpmacs.h"
 
 #include "inppas2.h"
-#include "inp.h"
+#include "inpxx.h"
 
 #ifdef XSPICE
 /* gtri - add - wbk - 11/9/90 - include function prototypes */
diff --git a/src/spicelib/parser/inppname.c b/src/spicelib/parser/inppname.c
index df9d9d479..ef3d8644a 100644
--- a/src/spicelib/parser/inppname.c
+++ b/src/spicelib/parser/inppname.c
@@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "ngspice/ifsim.h"
 #include "ngspice/iferrmsg.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int INPpName(char *parm, IFvalue * val, CKTcircuit *ckt, int dev, GENinstance *fast)
 		    /* the name of the parameter to set */
diff --git a/src/spicelib/parser/inpptree.c b/src/spicelib/parser/inpptree.c
index cff52a398..110036bdc 100644
--- a/src/spicelib/parser/inpptree.c
+++ b/src/spicelib/parser/inpptree.c
@@ -9,7 +9,7 @@ Author: 1987 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "ngspice/iferrmsg.h"
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpptree.h"
-#include "inp.h"
+#include "inpxx.h"
 
 extern void controlled_exit(int status);
 
diff --git a/src/spicelib/parser/inpsymt.c b/src/spicelib/parser/inpsymt.c
index 11bc452df..c56f0779d 100644
--- a/src/spicelib/parser/inpsymt.c
+++ b/src/spicelib/parser/inpsymt.c
@@ -16,7 +16,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "ngspice/inpdefs.h"
 #include "ngspice/cpstd.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 static int hash(char *name, int tsize);
diff --git a/src/spicelib/parser/inptyplk.c b/src/spicelib/parser/inptyplk.c
index b30dc0b92..578e4d411 100644
--- a/src/spicelib/parser/inptyplk.c
+++ b/src/spicelib/parser/inptyplk.c
@@ -12,7 +12,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/cpdefs.h"
 #include "ngspice/fteext.h"
 #include "ngspice/ifsim.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int INPtypelook(char *type)
 {
diff --git a/src/spicelib/parser/inp.h b/src/spicelib/parser/inpxx.h
similarity index 100%
rename from src/spicelib/parser/inp.h
rename to src/spicelib/parser/inpxx.h
diff --git a/src/spicelib/parser/ptfuncs.c b/src/spicelib/parser/ptfuncs.c
index 90bd2a2b0..5ae64ae4c 100644
--- a/src/spicelib/parser/ptfuncs.c
+++ b/src/spicelib/parser/ptfuncs.c
@@ -13,7 +13,7 @@ Author: 1987 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "ngspice/fteext.h"
 #include "ngspice/ifsim.h"
 #include "ngspice/inpptree.h"
-#include "inp.h"
+#include "inpxx.h"
 
 /* XXX These should be in math.h */
 
diff --git a/src/spicelib/parser/sperror.c b/src/spicelib/parser/sperror.c
index 63447b1be..1ada7e7d7 100644
--- a/src/spicelib/parser/sperror.c
+++ b/src/spicelib/parser/sperror.c
@@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/sperror.h"
 #include "ngspice/cktdefs.h"
 #include "ngspice/ifsim.h"
-#include "inp.h"
+#include "inpxx.h"
 
 const char *SPerror(int type)
 {
diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj
index eaf5cf927..9ae466145 100644
--- a/visualc/vngspice.vcproj
+++ b/visualc/vngspice.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
@@ -2145,7 +2145,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\parser\inp.h"
+				RelativePath="..\src\spicelib\parser\inpxx.h"
 				>
 			</File>
 			<File