diff --git a/src/maths/ni/Makefile.am b/src/maths/ni/Makefile.am
index fd33403b0..d343a7aef 100644
--- a/src/maths/ni/Makefile.am
+++ b/src/maths/ni/Makefile.am
@@ -4,31 +4,19 @@ noinst_LTLIBRARIES = libni.la
 
 libni_la_SOURCES = \
 		niaciter.c	\
-		niaciter.h	\
 		nicomcof.c	\
-		nicomcof.h	\
 		niconv.c	\
-		niconv.h	\
 		nidest.c	\
-		nidest.h	\
 		niditer.c	\
-		niditer.h	\
 		niinit.c	\
-		niinit.h	\
 		niinteg.c	\
-		niinteg.h	\
 		niiter.c	\
-		niiter.h	\
 		niniter.c	\
-		niniter.h	\
 		nipred.c	\
 		nipred.h	\
 		nipzmeth.c	\
-		nipzmeth.h	\
 		nireinit.c	\
-		nireinit.h	\
-		nisenre.c	\
-		nisenre.h
+		nisenre.c
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
diff --git a/src/maths/ni/niaciter.c b/src/maths/ni/niaciter.c
index a5d6cd391..4c5dc1b00 100644
--- a/src/maths/ni/niaciter.c
+++ b/src/maths/ni/niaciter.c
@@ -18,7 +18,6 @@ Modified 1999 Emmanuel Rouat
 #include "ngspice/trandefs.h"
 #include "ngspice/cktdefs.h"
 #include "ngspice/sperror.h"
-#include "niaciter.h"
 
 
 int
diff --git a/src/maths/ni/niaciter.h b/src/maths/ni/niaciter.h
deleted file mode 100644
index 9218b1d06..000000000
--- a/src/maths/ni/niaciter.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*************
- * Header file for niaciter.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NIACITER_H_INCLUDED
-#define NIACITER_H_INCLUDED
-
-
-
-#endif
diff --git a/src/maths/ni/nicomcof.c b/src/maths/ni/nicomcof.c
index 7686c0d3a..7dcd7ed38 100644
--- a/src/maths/ni/nicomcof.c
+++ b/src/maths/ni/nicomcof.c
@@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 #include "ngspice/sperror.h"
-#include "nicomcof.h"
 
 
 int
diff --git a/src/maths/ni/nicomcof.h b/src/maths/ni/nicomcof.h
deleted file mode 100644
index dbef6bcc9..000000000
--- a/src/maths/ni/nicomcof.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*************
- * Header file for nicomcof.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NICOMCOF_H_INCLUDED
-#define NICOMCOF_H_INCLUDED
-
-
-
-#endif
diff --git a/src/maths/ni/niconv.c b/src/maths/ni/niconv.c
index 2ae50a1bb..203e65b61 100644
--- a/src/maths/ni/niconv.c
+++ b/src/maths/ni/niconv.c
@@ -13,7 +13,6 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 #include "ngspice/smpdefs.h"
-#include "niconv.h"
 
 
 int
diff --git a/src/maths/ni/niconv.h b/src/maths/ni/niconv.h
deleted file mode 100644
index 2e1008fab..000000000
--- a/src/maths/ni/niconv.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*************
- * Header file for niconv.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NICONV_H_INCLUDED
-#define NICONV_H_INCLUDED
-
-
-
-#endif
diff --git a/src/maths/ni/nidest.c b/src/maths/ni/nidest.c
index bbe3e7186..3258f3c89 100644
--- a/src/maths/ni/nidest.c
+++ b/src/maths/ni/nidest.c
@@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles
 
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
-#include "nidest.h"
 
 
 void
diff --git a/src/maths/ni/nidest.h b/src/maths/ni/nidest.h
deleted file mode 100644
index 2fef401de..000000000
--- a/src/maths/ni/nidest.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*************
- * Header file for nidest.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NIDEST_H_INCLUDED
-#define NIDEST_H_INCLUDED
-
-
-
-#endif
diff --git a/src/maths/ni/niditer.c b/src/maths/ni/niditer.c
index bf8915875..1b9f19689 100644
--- a/src/maths/ni/niditer.c
+++ b/src/maths/ni/niditer.c
@@ -16,7 +16,6 @@ Author: 1988 Jaijeet S. Roychowdhury
 #include "ngspice/trandefs.h"
 #include "ngspice/cktdefs.h"
 #include "ngspice/sperror.h"
-#include "niditer.h"
 
 
 int
diff --git a/src/maths/ni/niditer.h b/src/maths/ni/niditer.h
deleted file mode 100644
index aea4678d0..000000000
--- a/src/maths/ni/niditer.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*************
- * Header file for niditer.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NIDITER_H_INCLUDED
-#define NIDITER_H_INCLUDED
-
-
-
-
-#endif
diff --git a/src/maths/ni/niinit.c b/src/maths/ni/niinit.c
index d9bca9764..481d40916 100644
--- a/src/maths/ni/niinit.c
+++ b/src/maths/ni/niinit.c
@@ -15,7 +15,6 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/cktdefs.h"
 #include "ngspice/sperror.h"
 #include "ngspice/smpdefs.h"
-#include "niinit.h"
 
 
 int
diff --git a/src/maths/ni/niinit.h b/src/maths/ni/niinit.h
deleted file mode 100644
index 77e534393..000000000
--- a/src/maths/ni/niinit.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*************
- * Header file for niinit.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NIINIT_H_INCLUDED
-#define NIINIT_H_INCLUDED
-
-
-
-
-#endif
diff --git a/src/maths/ni/niinteg.c b/src/maths/ni/niinteg.c
index 2a4bf194b..c3653f5d5 100644
--- a/src/maths/ni/niinteg.c
+++ b/src/maths/ni/niinteg.c
@@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 #include "ngspice/sperror.h"
-#include "niinteg.h"
 
 #define ccap qcap+1
 
diff --git a/src/maths/ni/niinteg.h b/src/maths/ni/niinteg.h
deleted file mode 100644
index 14b914c02..000000000
--- a/src/maths/ni/niinteg.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*************
- * Header file for niinteg.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NIINTEG_H_INCLUDED
-#define NIINTEG_H_INCLUDED
-
-
-
-
-#endif
diff --git a/src/maths/ni/niiter.c b/src/maths/ni/niiter.c
index f530c3ac8..6bb50704c 100644
--- a/src/maths/ni/niiter.c
+++ b/src/maths/ni/niiter.c
@@ -18,7 +18,6 @@ Modified: 2001 AlansFixes
 #include "ngspice/cktdefs.h"
 #include "ngspice/smpdefs.h"
 #include "ngspice/sperror.h"
-#include "niiter.h"
 
 
 /* NIiter() - return value is non-zero for convergence failure */
diff --git a/src/maths/ni/niiter.h b/src/maths/ni/niiter.h
deleted file mode 100644
index b3cb5a486..000000000
--- a/src/maths/ni/niiter.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*************
- * Header file for niiter.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NIITER_H_INCLUDED
-#define NIITER_H_INCLUDED
-
-
-
-
-#endif
diff --git a/src/maths/ni/niniter.c b/src/maths/ni/niniter.c
index f3eee6c07..c4f13ebe8 100644
--- a/src/maths/ni/niniter.c
+++ b/src/maths/ni/niniter.c
@@ -5,7 +5,7 @@ Author: 1987 Gary W. Ng
 
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
-#include "niniter.h"
+
 
 /*
  * NInzIter (ckt, posDrive, negDrive)
diff --git a/src/maths/ni/niniter.h b/src/maths/ni/niniter.h
deleted file mode 100644
index 0a5ffe7fc..000000000
--- a/src/maths/ni/niniter.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*************
- * Header file for niniter.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NINITER_H_INCLUDED
-#define NINITER_H_INCLUDED
-
-
-
-#endif
diff --git a/src/maths/ni/nipzmeth.c b/src/maths/ni/nipzmeth.c
index 0bbf8bd28..488b8fdf7 100644
--- a/src/maths/ni/nipzmeth.c
+++ b/src/maths/ni/nipzmeth.c
@@ -8,7 +8,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 #include "ngspice/cktdefs.h"
 #include "ngspice/devdefs.h"
 #include "ngspice/sperror.h"
-#include "nipzmeth.h"
 
 
 #ifdef PZDEBUG
diff --git a/src/maths/ni/nipzmeth.h b/src/maths/ni/nipzmeth.h
deleted file mode 100644
index 06114964c..000000000
--- a/src/maths/ni/nipzmeth.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*************
- * Header file for nipzmeth.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NIPZMETH_H_INCLUDED
-#define NIPZMETH_H_INCLUDED
-
-
-#endif
diff --git a/src/maths/ni/nireinit.c b/src/maths/ni/nireinit.c
index cda0e45f5..cc14aee53 100644
--- a/src/maths/ni/nireinit.c
+++ b/src/maths/ni/nireinit.c
@@ -13,7 +13,6 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/cktdefs.h"
 #include "ngspice/smpdefs.h"
 #include "ngspice/sperror.h"
-#include "nireinit.h"
 
 
 #define CKALLOC(ptr,size,type) if(( ckt->ptr =\
diff --git a/src/maths/ni/nireinit.h b/src/maths/ni/nireinit.h
deleted file mode 100644
index f082a8653..000000000
--- a/src/maths/ni/nireinit.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*************
- * Header file for nireinit.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NIREINIT_H_INCLUDED
-#define NIREINIT_H_INCLUDED
-
-
-#endif
diff --git a/src/maths/ni/nisenre.c b/src/maths/ni/nisenre.c
index 343139cfe..31cdc2e94 100644
--- a/src/maths/ni/nisenre.c
+++ b/src/maths/ni/nisenre.c
@@ -15,7 +15,6 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/cktdefs.h"
 #include "ngspice/smpdefs.h"
 #include "ngspice/sperror.h"
-#include "nisenre.h"
 
 
 #define CKALLOC(ptr,size,type) if(( ckt->ptr =\
diff --git a/src/maths/ni/nisenre.h b/src/maths/ni/nisenre.h
deleted file mode 100644
index e7cf164c0..000000000
--- a/src/maths/ni/nisenre.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*************
- * Header file for nisenre.c
- * 1999 E. Rouat
- ************/
-
-#ifndef NISENRE_H_INCLUDED
-#define NISENRE_H_INCLUDED
-
-
-#endif
diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c
index 71cb61eed..13973dd55 100644
--- a/src/spicelib/analysis/noisean.c
+++ b/src/spicelib/analysis/noisean.c
@@ -17,7 +17,6 @@ Modified: 2001 AlansFixes
 #include "ngspice/sperror.h"
 #include "vsrc/vsrcdefs.h"
 #include "isrc/isrcdefs.h"
-#include "../maths/ni/niniter.h" /* va, NInzIter */
 
 
 int
diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj
index edd92c317..52a99d641 100644
--- a/visualc/vngspice.vcproj
+++ b/visualc/vngspice.vcproj
@@ -2548,58 +2548,10 @@
 				RelativePath="..\src\include\ngspice\ngspice.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\maths\ni\niaciter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\maths\ni\nicomcof.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\maths\ni\niconv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\maths\ni\nidest.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\maths\ni\niditer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\maths\ni\niinit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\maths\ni\niinteg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\maths\ni\niiter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\maths\ni\niniter.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\maths\ni\nipred.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\maths\ni\nipzmeth.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\maths\ni\nireinit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\maths\ni\nisenre.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\include\ngspice\noisedef.h"
 				>