diff --git a/.gitignore b/.gitignore
index fdcecdeb4..10731e4f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,10 @@ Makefile.in
 /missing
 /ylwrap
 /ar-lib
+/ngspice.pc
+
+/src/frontend/parse-bison.*
+/src/spicelib/parser/inpptree-parser.*
 
 /src/include/ngspice/config.h.in
 /src/include/ngspice/config.h
diff --git a/Makefile.am b/Makefile.am
index 1d204fd58..3a7b0d186 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ EXTRA_DIST = FAQ autogen.sh Stuarts_Poly_Notes  \
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 ar-lib compile config.guess \
 			src/include/ngspice/config.h.in config.sub configure install-sh \
 			missing mkinstalldirs stamp-h.in ltconfig \
-			ltmain.sh depcomp ylwrap
+			ltmain.sh depcomp ylwrap ngspice.pc
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/src/xspice/icm/GNUmakefile.in b/src/xspice/icm/GNUmakefile.in
index 29eb60d94..632c4d140 100644
--- a/src/xspice/icm/GNUmakefile.in
+++ b/src/xspice/icm/GNUmakefile.in
@@ -77,8 +77,10 @@ cm-deps := \
 cm-descr := \
 	$(cm)/cmextrn.h \
 	$(cm)/cminfo.h \
+	$(cm)/cminfo2.h \
 	$(cm)/udnextrn.h \
 	$(cm)/udninfo.h \
+	$(cm)/udninfo2.h \
 	$(cm)/objects.inc
 
 
diff --git a/src/xspice/icm/analog/.gitignore b/src/xspice/icm/analog/.gitignore
index abef3a30c..fda83b3e8 100644
--- a/src/xspice/icm/analog/.gitignore
+++ b/src/xspice/icm/analog/.gitignore
@@ -2,10 +2,12 @@
 
 /cmextrn.h
 /cminfo.h
+/cminfo2.h
 /dlmain.c
 /objects.inc
 /udnextrn.h
 /udninfo.h
+/udninfo2.h
 
 /*/*.c
 
diff --git a/src/xspice/icm/digital/.gitignore b/src/xspice/icm/digital/.gitignore
index a766619af..758076c5d 100644
--- a/src/xspice/icm/digital/.gitignore
+++ b/src/xspice/icm/digital/.gitignore
@@ -2,10 +2,12 @@
 
 /cmextrn.h
 /cminfo.h
+/cminfo2.h
 /dlmain.c
 /objects.inc
 /udnextrn.h
 /udninfo.h
+/udninfo2.h
 
 /*/*.c
 
diff --git a/src/xspice/icm/spice2poly/.gitignore b/src/xspice/icm/spice2poly/.gitignore
index 27b44acbe..9b60b041f 100644
--- a/src/xspice/icm/spice2poly/.gitignore
+++ b/src/xspice/icm/spice2poly/.gitignore
@@ -2,10 +2,12 @@
 
 /cmextrn.h
 /cminfo.h
+/cminfo2.h
 /dlmain.c
 /objects.inc
 /udnextrn.h
 /udninfo.h
+/udninfo2.h
 
 /*/*.c
 
diff --git a/src/xspice/icm/table/.gitignore b/src/xspice/icm/table/.gitignore
new file mode 100644
index 000000000..00a3641ed
--- /dev/null
+++ b/src/xspice/icm/table/.gitignore
@@ -0,0 +1,11 @@
+/table.cm
+
+/cmextrn.h
+/cminfo.h
+/cminfo2.h
+/objects.inc
+/udnextrn.h
+/udninfo.h
+/udninfo2.h
+
+/*/*.c
diff --git a/src/xspice/icm/xtradev/.gitignore b/src/xspice/icm/xtradev/.gitignore
index efea9c1c9..b803004ac 100644
--- a/src/xspice/icm/xtradev/.gitignore
+++ b/src/xspice/icm/xtradev/.gitignore
@@ -2,10 +2,12 @@
 
 /cmextrn.h
 /cminfo.h
+/cminfo2.h
 /dlmain.c
 /objects.inc
 /udnextrn.h
 /udninfo.h
+/udninfo2.h
 
 /*/*.c
 
diff --git a/src/xspice/icm/xtraevt/.gitignore b/src/xspice/icm/xtraevt/.gitignore
index a27aace1d..352f6580d 100644
--- a/src/xspice/icm/xtraevt/.gitignore
+++ b/src/xspice/icm/xtraevt/.gitignore
@@ -2,10 +2,12 @@
 
 /cmextrn.h
 /cminfo.h
+/cminfo2.h
 /dlmain.c
 /objects.inc
 /udnextrn.h
 /udninfo.h
+/udninfo2.h
 
 /*/*.c