diff --git a/ChangeLog b/ChangeLog
index 003d78f53..098661983 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-11  Paolo Nenzi <p.nenzi@ieee.org>
+
+	*   src/spicelib/analysis/*: Removed redundant includes. File stdio.h
+	    is already included via ngspice.h.
+
 2004-01-10  Paolo Nenzi <p.nenzi@ieee.org>
 
 	*   configure.in: changed version to rework-15pre2.
diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c
index e6138b21d..11299c45d 100644
--- a/src/spicelib/analysis/acan.c
+++ b/src/spicelib/analysis/acan.c
@@ -5,7 +5,6 @@ Modified 2001: AlansFixes
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "acdefs.h"
 #include "devdefs.h"
diff --git a/src/spicelib/analysis/acaskq.c b/src/spicelib/analysis/acaskq.c
index cf2136187..af659d165 100644
--- a/src/spicelib/analysis/acaskq.c
+++ b/src/spicelib/analysis/acaskq.c
@@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "acdefs.h"
diff --git a/src/spicelib/analysis/acsetp.c b/src/spicelib/analysis/acsetp.c
index 23e12de43..d6da75a33 100644
--- a/src/spicelib/analysis/acsetp.c
+++ b/src/spicelib/analysis/acsetp.c
@@ -4,8 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
-
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "acdefs.h"
diff --git a/src/spicelib/analysis/cktacct.c b/src/spicelib/analysis/cktacct.c
index 3c83d6565..8a62d7a26 100644
--- a/src/spicelib/analysis/cktacct.c
+++ b/src/spicelib/analysis/cktacct.c
@@ -15,7 +15,6 @@ Author: 1985 Thomas L. Quarles
 #include "const.h"
 #include "optdefs.h"
 #include "ifsim.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "spmatrix.h"
 
diff --git a/src/spicelib/analysis/cktacdum.c b/src/spicelib/analysis/cktacdum.c
index 041382c78..e7c8cf23c 100644
--- a/src/spicelib/analysis/cktacdum.c
+++ b/src/spicelib/analysis/cktacdum.c
@@ -9,7 +9,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "smpdefs.h"
 #include "cktdefs.h"
 #include "iferrmsg.h"
diff --git a/src/spicelib/analysis/cktaskaq.c b/src/spicelib/analysis/cktaskaq.c
index dbeb8690c..1c6bcda3d 100644
--- a/src/spicelib/analysis/cktaskaq.c
+++ b/src/spicelib/analysis/cktaskaq.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "tskdefs.h"
 #include "jobdefs.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/cktbkdum.c b/src/spicelib/analysis/cktbkdum.c
index 41df6e80d..abe1fd8a0 100644
--- a/src/spicelib/analysis/cktbkdum.c
+++ b/src/spicelib/analysis/cktbkdum.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 
 
diff --git a/src/spicelib/analysis/cktclrbk.c b/src/spicelib/analysis/cktclrbk.c
index 7d224bf6e..f6786593d 100644
--- a/src/spicelib/analysis/cktclrbk.c
+++ b/src/spicelib/analysis/cktclrbk.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "sperror.h"
 
diff --git a/src/spicelib/analysis/cktdelt.c b/src/spicelib/analysis/cktdelt.c
index baa39e850..b40293940 100644
--- a/src/spicelib/analysis/cktdelt.c
+++ b/src/spicelib/analysis/cktdelt.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "tskdefs.h"
 #include "jobdefs.h"
 #include "ifsim.h"
diff --git a/src/spicelib/analysis/cktdest.c b/src/spicelib/analysis/cktdest.c
index 3e87fee42..bb52ad1d0 100644
--- a/src/spicelib/analysis/cktdest.c
+++ b/src/spicelib/analysis/cktdest.c
@@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "devdefs.h"
 #include "ifsim.h"
diff --git a/src/spicelib/analysis/cktdisto.c b/src/spicelib/analysis/cktdisto.c
index 71f45c42d..ceaf699b0 100644
--- a/src/spicelib/analysis/cktdisto.c
+++ b/src/spicelib/analysis/cktdisto.c
@@ -16,7 +16,6 @@ Author: 1988 Jaijeet S Roychowdhury
 #include "iferrmsg.h"
 #include "distodef.h"
 #include "sperror.h"
-#include <stdio.h>
 
 
 int
diff --git a/src/spicelib/analysis/cktdlti.c b/src/spicelib/analysis/cktdlti.c
index ac07253c8..4e6ff0593 100644
--- a/src/spicelib/analysis/cktdlti.c
+++ b/src/spicelib/analysis/cktdlti.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"
diff --git a/src/spicelib/analysis/cktdltm.c b/src/spicelib/analysis/cktdltm.c
index 17e763da6..e59e71c69 100644
--- a/src/spicelib/analysis/cktdltm.c
+++ b/src/spicelib/analysis/cktdltm.c
@@ -8,7 +8,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"
diff --git a/src/spicelib/analysis/cktfbran.c b/src/spicelib/analysis/cktfbran.c
index 518462be7..ad7b657c7 100644
--- a/src/spicelib/analysis/cktfbran.c
+++ b/src/spicelib/analysis/cktfbran.c
@@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "devdefs.h"
 
diff --git a/src/spicelib/analysis/cktfnda.c b/src/spicelib/analysis/cktfnda.c
index 5e23e4544..210c870b0 100644
--- a/src/spicelib/analysis/cktfnda.c
+++ b/src/spicelib/analysis/cktfnda.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "jobdefs.h"
 #include "tskdefs.h"
diff --git a/src/spicelib/analysis/cktfndm.c b/src/spicelib/analysis/cktfndm.c
index adee2262b..f852b47c4 100644
--- a/src/spicelib/analysis/cktfndm.c
+++ b/src/spicelib/analysis/cktfndm.c
@@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"
diff --git a/src/spicelib/analysis/cktfnode.c b/src/spicelib/analysis/cktfnode.c
index b8b9082fe..45663f209 100644
--- a/src/spicelib/analysis/cktfnode.c
+++ b/src/spicelib/analysis/cktfnode.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/cktftask.c b/src/spicelib/analysis/cktftask.c
index d5186845b..aa048fe9c 100644
--- a/src/spicelib/analysis/cktftask.c
+++ b/src/spicelib/analysis/cktftask.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"
diff --git a/src/spicelib/analysis/cktgrnd.c b/src/spicelib/analysis/cktgrnd.c
index 6c838ab9e..3343a0969 100644
--- a/src/spicelib/analysis/cktgrnd.c
+++ b/src/spicelib/analysis/cktgrnd.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"
diff --git a/src/spicelib/analysis/ckti2nod.c b/src/spicelib/analysis/ckti2nod.c
index 3adef7552..003842d52 100644
--- a/src/spicelib/analysis/ckti2nod.c
+++ b/src/spicelib/analysis/ckti2nod.c
@@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"
@@ -49,6 +48,12 @@ CKTinst2Node(void *ckt, void *instPtr, int terminal, void **node, IFuid *nodeNam
             case 5:
                 nodenum = ((GENinstance *)instPtr)->GENnode5;
                 break;
+	    case 6:
+                nodenum = ((GENinstance *)instPtr)->GENnode6;
+                break;
+	    case 7:
+                nodenum = ((GENinstance *)instPtr)->GENnode7;
+                break;	
         }
         /* ok, now we know its number, so we just have to find it.*/
         for(here = ((CKTcircuit*)ckt)->CKTnodes;here;here = here->next) {
diff --git a/src/spicelib/analysis/cktic.c b/src/spicelib/analysis/cktic.c
index 8fbb70c66..dcd595f6a 100644
--- a/src/spicelib/analysis/cktic.c
+++ b/src/spicelib/analysis/cktic.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "smpdefs.h"
 #include "sperror.h"
diff --git a/src/spicelib/analysis/cktlnkeq.c b/src/spicelib/analysis/cktlnkeq.c
index ae9f65286..1e05da52a 100644
--- a/src/spicelib/analysis/cktlnkeq.c
+++ b/src/spicelib/analysis/cktlnkeq.c
@@ -9,7 +9,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "smpdefs.h"
diff --git a/src/spicelib/analysis/cktmapn.c b/src/spicelib/analysis/cktmapn.c
index e01131dde..4d5633bb0 100644
--- a/src/spicelib/analysis/cktmapn.c
+++ b/src/spicelib/analysis/cktmapn.c
@@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/cktmask.c b/src/spicelib/analysis/cktmask.c
index d2659037e..520b0f5e3 100644
--- a/src/spicelib/analysis/cktmask.c
+++ b/src/spicelib/analysis/cktmask.c
@@ -8,7 +8,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "devdefs.h"
diff --git a/src/spicelib/analysis/cktmcrt.c b/src/spicelib/analysis/cktmcrt.c
index b1b210fed..c126d8ef4 100644
--- a/src/spicelib/analysis/cktmcrt.c
+++ b/src/spicelib/analysis/cktmcrt.c
@@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "devdefs.h"
 #include "cktdefs.h"
 #include "sperror.h"
diff --git a/src/spicelib/analysis/cktmkcur.c b/src/spicelib/analysis/cktmkcur.c
index 1c5d4b834..91193301b 100644
--- a/src/spicelib/analysis/cktmkcur.c
+++ b/src/spicelib/analysis/cktmkcur.c
@@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/cktmkvol.c b/src/spicelib/analysis/cktmkvol.c
index 72b15484c..ceee5573b 100644
--- a/src/spicelib/analysis/cktmkvol.c
+++ b/src/spicelib/analysis/cktmkvol.c
@@ -4,12 +4,11 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 /* CKTmkVolt
- *  make the given name a 'node' of type current in the 
+ *  make the given name a 'node' of type voltage in the 
  * specified circuit
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/cktmpar.c b/src/spicelib/analysis/cktmpar.c
index 192aadbe1..b6e3ea429 100644
--- a/src/spicelib/analysis/cktmpar.c
+++ b/src/spicelib/analysis/cktmpar.c
@@ -8,7 +8,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "devdefs.h"
diff --git a/src/spicelib/analysis/cktnames.c b/src/spicelib/analysis/cktnames.c
index d3faa336b..1e0a9b349 100644
--- a/src/spicelib/analysis/cktnames.c
+++ b/src/spicelib/analysis/cktnames.c
@@ -10,7 +10,6 @@ Author: 1988 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "iferrmsg.h"
diff --git a/src/spicelib/analysis/cktncdump.c b/src/spicelib/analysis/cktncdump.c
index 4ff075b43..30b216aa2 100644
--- a/src/spicelib/analysis/cktncdump.c
+++ b/src/spicelib/analysis/cktncdump.c
@@ -4,9 +4,7 @@ Author: 1999 Alan Gillespie
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
-#include "cktdefs.h"


-#include "suffix.h"
+#include "cktdefs.h"
#include "suffix.h"
 
 void
 CKTncDump(ckt) 
diff --git a/src/spicelib/analysis/cktnewan.c b/src/spicelib/analysis/cktnewan.c
index d8900884e..330a426b9 100644
--- a/src/spicelib/analysis/cktnewan.c
+++ b/src/spicelib/analysis/cktnewan.c
@@ -4,8 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
-
 #include "tskdefs.h"
 #include "jobdefs.h"
 #include "ifsim.h"
diff --git a/src/spicelib/analysis/cktneweq.c b/src/spicelib/analysis/cktneweq.c
index 0e597dd72..e86854cf4 100644
--- a/src/spicelib/analysis/cktneweq.c
+++ b/src/spicelib/analysis/cktneweq.c
@@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "smpdefs.h"
diff --git a/src/spicelib/analysis/cktnewn.c b/src/spicelib/analysis/cktnewn.c
index 450dcf760..5b24cec67 100644
--- a/src/spicelib/analysis/cktnewn.c
+++ b/src/spicelib/analysis/cktnewn.c
@@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "smpdefs.h"
diff --git a/src/spicelib/analysis/cktnodn.c b/src/spicelib/analysis/cktnodn.c
index 95cf75f0d..36cfc5e73 100644
--- a/src/spicelib/analysis/cktnodn.c
+++ b/src/spicelib/analysis/cktnodn.c
@@ -12,11 +12,9 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 
 
-
 IFuid
 CKTnodName(CKTcircuit *ckt, int nodenum)
 {
diff --git a/src/spicelib/analysis/cktnoise.c b/src/spicelib/analysis/cktnoise.c
index bc6e92b60..05f17af4a 100644
--- a/src/spicelib/analysis/cktnoise.c
+++ b/src/spicelib/analysis/cktnoise.c
@@ -13,7 +13,6 @@ Author: 1987 Gary W. Ng
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "devdefs.h"
 #include "iferrmsg.h"
diff --git a/src/spicelib/analysis/cktnum2n.c b/src/spicelib/analysis/cktnum2n.c
index 4869e7677..dafc2c675 100644
--- a/src/spicelib/analysis/cktnum2n.c
+++ b/src/spicelib/analysis/cktnum2n.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/cktop.c b/src/spicelib/analysis/cktop.c
index f318a8a5c..1fab10816 100644
--- a/src/spicelib/analysis/cktop.c
+++ b/src/spicelib/analysis/cktop.c
@@ -5,7 +5,6 @@ Modified: 2000  AlansFixes
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "devdefs.h"
 #include "sperror.h"
diff --git a/src/spicelib/analysis/cktparam.c b/src/spicelib/analysis/cktparam.c
index b77e57daa..a76129272 100644
--- a/src/spicelib/analysis/cktparam.c
+++ b/src/spicelib/analysis/cktparam.c
@@ -8,7 +8,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "devdefs.h"
diff --git a/src/spicelib/analysis/cktpartn.c b/src/spicelib/analysis/cktpartn.c
index 300be2f72..19ae2e130 100644
--- a/src/spicelib/analysis/cktpartn.c
+++ b/src/spicelib/analysis/cktpartn.c
@@ -9,7 +9,6 @@ Author: 1992 David A. Gates, UC Berkeley CADgroup
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "smpdefs.h"
 #include "cktdefs.h"
 #include "const.h"
diff --git a/src/spicelib/analysis/cktpmnam.c b/src/spicelib/analysis/cktpmnam.c
index 6c8d35518..c7ff4ec4b 100644
--- a/src/spicelib/analysis/cktpmnam.c
+++ b/src/spicelib/analysis/cktpmnam.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "devdefs.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/cktpname.c b/src/spicelib/analysis/cktpname.c
index 6be5178c3..27f8809cf 100644
--- a/src/spicelib/analysis/cktpname.c
+++ b/src/spicelib/analysis/cktpname.c
@@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "devdefs.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/cktsetap.c b/src/spicelib/analysis/cktsetap.c
index b6f9d75fc..758c18852 100644
--- a/src/spicelib/analysis/cktsetap.c
+++ b/src/spicelib/analysis/cktsetap.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "tskdefs.h"
 #include "jobdefs.h"
 #include "ifsim.h"
diff --git a/src/spicelib/analysis/cktsetbk.c b/src/spicelib/analysis/cktsetbk.c
index ec93909cc..2ebc29839 100644
--- a/src/spicelib/analysis/cktsetbk.c
+++ b/src/spicelib/analysis/cktsetbk.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"
diff --git a/src/spicelib/analysis/cktsetnp.c b/src/spicelib/analysis/cktsetnp.c
index db4c86010..8cdabc3c1 100644
--- a/src/spicelib/analysis/cktsetnp.c
+++ b/src/spicelib/analysis/cktsetnp.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/ckttemp.c b/src/spicelib/analysis/ckttemp.c
index a21877ce0..11aa073f3 100644
--- a/src/spicelib/analysis/ckttemp.c
+++ b/src/spicelib/analysis/ckttemp.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "smpdefs.h"
 #include "cktdefs.h"
 #include "const.h"
diff --git a/src/spicelib/analysis/cktterr.c b/src/spicelib/analysis/cktterr.c
index ef45889fd..35d359948 100644
--- a/src/spicelib/analysis/cktterr.c
+++ b/src/spicelib/analysis/cktterr.c
@@ -4,13 +4,11 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 
-
-
 #define ccap (qcap+1)
 
+
 void
 CKTterr(int qcap, CKTcircuit *ckt, double *timeStep)
 { 
diff --git a/src/spicelib/analysis/ckttroub.c b/src/spicelib/analysis/ckttroub.c
index dfa892731..afc83b9ad 100644
--- a/src/spicelib/analysis/ckttroub.c
+++ b/src/spicelib/analysis/ckttroub.c
@@ -3,7 +3,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "trandefs.h"
 #include "cktdefs.h"
 #include "devdefs.h"
diff --git a/src/spicelib/analysis/ckttrunc.c b/src/spicelib/analysis/ckttrunc.c
index 23ef03afa..137fb1e56 100644
--- a/src/spicelib/analysis/ckttrunc.c
+++ b/src/spicelib/analysis/ckttrunc.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "smpdefs.h"
 #include "devdefs.h"
diff --git a/src/spicelib/analysis/daskq.c b/src/spicelib/analysis/daskq.c
index 7433fad71..200860fab 100644
--- a/src/spicelib/analysis/daskq.c
+++ b/src/spicelib/analysis/daskq.c
@@ -3,8 +3,7 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1988 Jaijeet S Roychowdhury
 **********/
 
-
-#include <stdio.h>
+#include "ngspice.h"
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/dcoaskq.c b/src/spicelib/analysis/dcoaskq.c
index 67fd67c83..370dae1b7 100644
--- a/src/spicelib/analysis/dcoaskq.c
+++ b/src/spicelib/analysis/dcoaskq.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "opdefs.h"
diff --git a/src/spicelib/analysis/dcop.c b/src/spicelib/analysis/dcop.c
index 0f72e1082..d6c49a241 100644
--- a/src/spicelib/analysis/dcop.c
+++ b/src/spicelib/analysis/dcop.c
@@ -5,7 +5,6 @@ Modified: 2000  AlansFixes
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "sperror.h"
 #include "ifsim.h"
diff --git a/src/spicelib/analysis/dcosetp.c b/src/spicelib/analysis/dcosetp.c
index bcf174223..dd6ded202 100644
--- a/src/spicelib/analysis/dcosetp.c
+++ b/src/spicelib/analysis/dcosetp.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/dctaskq.c b/src/spicelib/analysis/dctaskq.c
index 9748a61bf..0a186add6 100644
--- a/src/spicelib/analysis/dctaskq.c
+++ b/src/spicelib/analysis/dctaskq.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "trcvdefs.h"
diff --git a/src/spicelib/analysis/dctsetp.c b/src/spicelib/analysis/dctsetp.c
index a596e9445..621ab3856 100644
--- a/src/spicelib/analysis/dctsetp.c
+++ b/src/spicelib/analysis/dctsetp.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "trcvdefs.h"
diff --git a/src/spicelib/analysis/distoan.c b/src/spicelib/analysis/distoan.c
index a14b015b9..218060323 100644
--- a/src/spicelib/analysis/distoan.c
+++ b/src/spicelib/analysis/distoan.c
@@ -4,7 +4,6 @@ Author: 1988 Jaijeet S Roychowdhury
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "distodef.h"
 #include "sperror.h"
diff --git a/src/spicelib/analysis/dsetparm.c b/src/spicelib/analysis/dsetparm.c
index e04d21ed5..1884d41ff 100644
--- a/src/spicelib/analysis/dsetparm.c
+++ b/src/spicelib/analysis/dsetparm.c
@@ -4,7 +4,6 @@ Author: 1988 Jaijeet S Roychowdhury
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/naskq.c b/src/spicelib/analysis/naskq.c
index 9138819b7..c56e3f980 100644
--- a/src/spicelib/analysis/naskq.c
+++ b/src/spicelib/analysis/naskq.c
@@ -4,7 +4,6 @@ Author: 1987 Gary W. Ng
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "iferrmsg.h"
diff --git a/src/spicelib/analysis/ninteg.c b/src/spicelib/analysis/ninteg.c
index 4eeccab80..871715cad 100644
--- a/src/spicelib/analysis/ninteg.c
+++ b/src/spicelib/analysis/ninteg.c
@@ -18,7 +18,6 @@ Author: 1987 Gary W. Ng
  *   Hence, the reason for the constant 'N_INTUSELOG'.
  */
 
-#include <stdio.h>
 #include "ngspice.h"
 #include "noisedef.h"
 
diff --git a/src/spicelib/analysis/nsetparm.c b/src/spicelib/analysis/nsetparm.c
index 0e6ef3f7c..af1175ada 100644
--- a/src/spicelib/analysis/nsetparm.c
+++ b/src/spicelib/analysis/nsetparm.c
@@ -4,7 +4,6 @@ Author: 1987 Gary W. Ng
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "iferrmsg.h"
diff --git a/src/spicelib/analysis/pzaskq.c b/src/spicelib/analysis/pzaskq.c
index c1f41c42d..c44fb44c3 100644
--- a/src/spicelib/analysis/pzaskq.c
+++ b/src/spicelib/analysis/pzaskq.c
@@ -4,7 +4,7 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 
-#include <stdio.h>
+#include "ngspice.h"
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "pzdefs.h"
diff --git a/src/spicelib/analysis/pzsetp.c b/src/spicelib/analysis/pzsetp.c
index 6b1e95e6a..c5d27c192 100644
--- a/src/spicelib/analysis/pzsetp.c
+++ b/src/spicelib/analysis/pzsetp.c
@@ -4,7 +4,7 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 
-#include <stdio.h>
+#include "ngspice.h"
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "pzdefs.h"
diff --git a/src/spicelib/analysis/sensaskq.c b/src/spicelib/analysis/sensaskq.c
index 6cf457c8e..26deb597f 100644
--- a/src/spicelib/analysis/sensaskq.c
+++ b/src/spicelib/analysis/sensaskq.c
@@ -3,7 +3,6 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/senssetp.c b/src/spicelib/analysis/senssetp.c
index cf5ee8a21..cbcf92d03 100644
--- a/src/spicelib/analysis/senssetp.c
+++ b/src/spicelib/analysis/senssetp.c
@@ -3,7 +3,6 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"
diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c
index 24b27681f..a75571cba 100644
--- a/src/spicelib/analysis/tfanal.c
+++ b/src/spicelib/analysis/tfanal.c
@@ -6,7 +6,6 @@ Author: 1988 Thomas L. Quarles
 /* subroutine to do DC Transfer Function analysis     */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"
diff --git a/src/spicelib/analysis/tfaskq.c b/src/spicelib/analysis/tfaskq.c
index 1a51786e2..75a2450cd 100644
--- a/src/spicelib/analysis/tfaskq.c
+++ b/src/spicelib/analysis/tfaskq.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "trcvdefs.h"
diff --git a/src/spicelib/analysis/tfsetp.c b/src/spicelib/analysis/tfsetp.c
index 2d8952e72..329460386 100644
--- a/src/spicelib/analysis/tfsetp.c
+++ b/src/spicelib/analysis/tfsetp.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "tfdefs.h"
diff --git a/src/spicelib/analysis/tranaskq.c b/src/spicelib/analysis/tranaskq.c
index 2f2bd7b2c..964960b8a 100644
--- a/src/spicelib/analysis/tranaskq.c
+++ b/src/spicelib/analysis/tranaskq.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "trandefs.h"
diff --git a/src/spicelib/analysis/transetp.c b/src/spicelib/analysis/transetp.c
index a911bb268..b3a4d553d 100644
--- a/src/spicelib/analysis/transetp.c
+++ b/src/spicelib/analysis/transetp.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "trandefs.h"