diff --git a/src/include/complex.h b/src/include/complex.h
index 3a083d4f0..175228ebb 100644
--- a/src/include/complex.h
+++ b/src/include/complex.h
@@ -57,15 +57,16 @@ typedef struct {
 
 #define spREAL  double
 
-// /* Begin `realNumber'. */
-// typedef  spREAL  realNumber, *realVector;
-
-// /* Begin `ComplexNumber'. */
-// typedef  struct
-// {   RealNumber  Real;
-//    RealNumber  Imag;
-// } ComplexNumber, *ComplexVector;
+#if 0 /* Can this be deleted? */
+ /* Begin `realNumber'. */
+ typedef  spREAL  realNumber, *realVector;
 
+ /* Begin `ComplexNumber'. */
+ typedef  struct
+ {   RealNumber  Real;
+    RealNumber  Imag;
+ } ComplexNumber, *ComplexVector;
+#endif
 
 /* Some defines used mainly in cmath.c. */
 #define FTEcabs(d)  (((d) < 0.0) ? - (d) : (d))
diff --git a/src/include/fteext.h b/src/include/fteext.h
index d92efd305..fc2d02523 100644
--- a/src/include/fteext.h
+++ b/src/include/fteext.h
@@ -454,7 +454,6 @@ extern struct variable *if_getstat();
 
 extern struct line *inp_deckcopy();
 extern struct line *inp_subcktexpand();
-extern int inp_numnodes(char);
 
 /* types.c */
 
diff --git a/src/include/ngspice.h b/src/include/ngspice.h
index 5e5b63959..5f87ba3c6 100644
--- a/src/include/ngspice.h
+++ b/src/include/ngspice.h
@@ -106,17 +106,17 @@ struct timeb timebegin;
 #   define strchr index
 #   define strrchr rindex
 #else /* va: no index, but strchr */
-    #ifdef HAVE_STRCHR
-        #define index  strchr
-        #define rindex strrchr
-    #endif /* va: no index, but strchr */
+#    ifdef HAVE_STRCHR
+#        define index  strchr
+#        define rindex strrchr
+#    endif /* va: no index, but strchr */
 #endif
 
 #ifdef HAS_TIME_H
 #include <time.h>
 #endif
 
-// added for CYGWIN
+/* added for CYGWIN */
 #ifndef HUGE
 #define HUGE HUGE_VAL
 #endif
diff --git a/src/include/sperror.h b/src/include/sperror.h
index 90ff028b3..8c6af59c6 100644
--- a/src/include/sperror.h
+++ b/src/include/sperror.h
@@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
 #ifndef _SPERROR_H
 #define _SPERROR_H
 
-//#include "ngspice.h"
 #include "iferrmsg.h"
 
 /*