diff --git a/src/frontend/com_ahelp.c b/src/frontend/com_ahelp.c
index 55cb852d8..f739c7071 100644
--- a/src/frontend/com_ahelp.c
+++ b/src/frontend/com_ahelp.c
@@ -1,4 +1,3 @@
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 
 #include "ngspice/bool.h"
diff --git a/src/frontend/com_asciiplot.c b/src/frontend/com_asciiplot.c
index 44ebdd2ca..85a8ef66d 100644
--- a/src/frontend/com_asciiplot.c
+++ b/src/frontend/com_asciiplot.c
@@ -1,4 +1,3 @@
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 
 #include "ngspice/bool.h"
diff --git a/src/frontend/com_dump.c b/src/frontend/com_dump.c
index b2c2f622d..092266b01 100644
--- a/src/frontend/com_dump.c
+++ b/src/frontend/com_dump.c
@@ -1,4 +1,3 @@
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/bool.h"
 #include "ngspice/wordlist.h"
diff --git a/src/frontend/com_echo.c b/src/frontend/com_echo.c
index fa316a21b..28c030f55 100644
--- a/src/frontend/com_echo.c
+++ b/src/frontend/com_echo.c
@@ -2,7 +2,6 @@
 * com_echo.c
 ************/
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/wordlist.h"
 #include "ngspice/bool.h"
diff --git a/src/frontend/com_hardcopy.c b/src/frontend/com_hardcopy.c
index 131f0e6f4..8f8552b5d 100644
--- a/src/frontend/com_hardcopy.c
+++ b/src/frontend/com_hardcopy.c
@@ -1,5 +1,3 @@
-#include "ngspice/config.h"
-
 #include "ngspice/ngspice.h"
 #include "ngspice/defines.h"
 #include "ngspice/bool.h"
diff --git a/src/frontend/com_help.c b/src/frontend/com_help.c
index 2c3038f45..1bff50266 100644
--- a/src/frontend/com_help.c
+++ b/src/frontend/com_help.c
@@ -1,4 +1,3 @@
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 
 #include "ngspice/macros.h"
diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c
index 64bb92c05..f93e25bf4 100644
--- a/src/frontend/com_measure2.c
+++ b/src/frontend/com_measure2.c
@@ -4,7 +4,6 @@
    Patches by Bill Swartz from 2009-05-18 and 2009-08-21 are included.
 */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/memory.h"
 
diff --git a/src/frontend/com_plot.c b/src/frontend/com_plot.c
index 8c8ccace4..6758dbd04 100644
--- a/src/frontend/com_plot.c
+++ b/src/frontend/com_plot.c
@@ -1,4 +1,3 @@
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 
 #include "ngspice/bool.h"
diff --git a/src/frontend/com_rehash.c b/src/frontend/com_rehash.c
index 4918c0fb4..9b19336e3 100644
--- a/src/frontend/com_rehash.c
+++ b/src/frontend/com_rehash.c
@@ -2,7 +2,6 @@
 * com_rehash.c
 ************/
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 
 #include "ngspice/wordlist.h"
diff --git a/src/frontend/com_set.c b/src/frontend/com_set.c
index dd97e0a4e..62bfa7ca9 100644
--- a/src/frontend/com_set.c
+++ b/src/frontend/com_set.c
@@ -1,4 +1,3 @@
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 
 #include "ngspice/bool.h"
diff --git a/src/frontend/com_shell.c b/src/frontend/com_shell.c
index cb892012b..8452c73ab 100644
--- a/src/frontend/com_shell.c
+++ b/src/frontend/com_shell.c
@@ -2,7 +2,6 @@
 * com_shell.c
 ************/
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/wordlist.h"
 
diff --git a/src/frontend/com_shift.c b/src/frontend/com_shift.c
index ff0e1aeff..2582e467f 100644
--- a/src/frontend/com_shift.c
+++ b/src/frontend/com_shift.c
@@ -2,7 +2,6 @@
 * com_shift.c
 ************/
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/bool.h"
 #include "ngspice/wordlist.h"
diff --git a/src/frontend/com_state.c b/src/frontend/com_state.c
index 2b68b4aed..9be385078 100644
--- a/src/frontend/com_state.c
+++ b/src/frontend/com_state.c
@@ -1,4 +1,3 @@
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/bool.h"
 #include "ngspice/wordlist.h"
diff --git a/src/frontend/com_strcmp.c b/src/frontend/com_strcmp.c
index ac9b47486..5d259cda8 100644
--- a/src/frontend/com_strcmp.c
+++ b/src/frontend/com_strcmp.c
@@ -1,4 +1,3 @@
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 
 #include "ngspice/bool.h"
diff --git a/src/frontend/com_sysinfo.c b/src/frontend/com_sysinfo.c
index 84bc8d81b..1e531d727 100644
--- a/src/frontend/com_sysinfo.c
+++ b/src/frontend/com_sysinfo.c
@@ -7,7 +7,6 @@
 
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpdefs.h"
 #include "ngspice/fteext.h"
diff --git a/src/frontend/com_unset.c b/src/frontend/com_unset.c
index 45aa1abaa..4a44052d5 100644
--- a/src/frontend/com_unset.c
+++ b/src/frontend/com_unset.c
@@ -2,7 +2,6 @@
 * com_unset.c
 ************/
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 
 #include "ngspice/macros.h"
diff --git a/src/frontend/help/help.c b/src/frontend/help/help.c
index 1371c1de1..d1cfe8693 100644
--- a/src/frontend/help/help.c
+++ b/src/frontend/help/help.c
@@ -8,7 +8,6 @@ Modified 1999 Emmanuel Rouat
  * The main entry point for the help system.
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpstd.h"
 #include "ngspice/hlpdefs.h"
diff --git a/src/frontend/help/provide.c b/src/frontend/help/provide.c
index 377e31f6c..ab0f55c71 100644
--- a/src/frontend/help/provide.c
+++ b/src/frontend/help/provide.c
@@ -12,7 +12,6 @@ Modified 1999 Emmanuel Rouat
  * Toss the help window up on the screen, and deal with the graph...
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpstd.h"
 #include "ngspice/hlpdefs.h"
diff --git a/src/frontend/help/readhelp.c b/src/frontend/help/readhelp.c
index 9ded1bbe7..a14cfc896 100644
--- a/src/frontend/help/readhelp.c
+++ b/src/frontend/help/readhelp.c
@@ -11,7 +11,6 @@ Modified 1999 Emmanuel Rouat
  * when a complete match is not found - additional code based on code in MacSpice.
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpstd.h"
 #include "ngspice/hlpdefs.h"
diff --git a/src/frontend/help/x11disp.c b/src/frontend/help/x11disp.c
index c00f82963..dbb1f77e3 100644
--- a/src/frontend/help/x11disp.c
+++ b/src/frontend/help/x11disp.c
@@ -4,7 +4,6 @@ Author: Jeffrey M. Hsu
 Modified 1999 Emmanuel Rouat
 **********/
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 
 #ifndef X_DISPLAY_MISSING
diff --git a/src/frontend/help/xdisplay.c b/src/frontend/help/xdisplay.c
index 4cab073eb..236ae9e76 100644
--- a/src/frontend/help/xdisplay.c
+++ b/src/frontend/help/xdisplay.c
@@ -4,7 +4,6 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
 Modified 1999 Emmanuel Rouat
 **********/
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpstd.h"
 #include "ngspice/hlpdefs.h"
diff --git a/src/frontend/parser/backq.c b/src/frontend/parser/backq.c
index b2cc5c42d..3dfe75bdf 100644
--- a/src/frontend/parser/backq.c
+++ b/src/frontend/parser/backq.c
@@ -7,7 +7,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Do backquote substitution on a word list.
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpdefs.h"
 #include "backq.h"
diff --git a/src/frontend/parser/complete.c b/src/frontend/parser/complete.c
index dcf9006b5..8601a2f2a 100644
--- a/src/frontend/parser/complete.c
+++ b/src/frontend/parser/complete.c
@@ -13,7 +13,6 @@ Modified: 1999 Paolo Nenzi
  * filename completion.
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/fteext.h"
 #include "ngspice/cpdefs.h"
diff --git a/src/frontend/parser/glob.c b/src/frontend/parser/glob.c
index ab30e183e..6d39025f4 100644
--- a/src/frontend/parser/glob.c
+++ b/src/frontend/parser/glob.c
@@ -7,7 +7,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Expand global characters.
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpdefs.h"
 #include "glob.h"
diff --git a/src/frontend/parser/input.c b/src/frontend/parser/input.c
index a953e2a4a..697c078b2 100644
--- a/src/frontend/parser/input.c
+++ b/src/frontend/parser/input.c
@@ -6,7 +6,6 @@ Author: 1988 Jeffrey M. Hsu
 /*
  * Stand-alone input routine.
  */
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 
 #include <errno.h>
diff --git a/src/frontend/parser/lexical.c b/src/frontend/parser/lexical.c
index 6d4f71cdf..926ba1dd4 100644
--- a/src/frontend/parser/lexical.c
+++ b/src/frontend/parser/lexical.c
@@ -7,7 +7,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Initial lexer.
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpdefs.h"
 
diff --git a/src/frontend/parser/numparse.c b/src/frontend/parser/numparse.c
index 81cdb34c6..c4644f353 100644
--- a/src/frontend/parser/numparse.c
+++ b/src/frontend/parser/numparse.c
@@ -5,7 +5,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 
 /* This routine parses a number.  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/bool.h"
 #include "ngspice/ftedefs.h"
diff --git a/src/frontend/parser/std.c b/src/frontend/parser/std.c
index 160d721c2..3baec4841 100644
--- a/src/frontend/parser/std.c
+++ b/src/frontend/parser/std.c
@@ -8,7 +8,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Most moved to MISC/
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpstd.h"
 
diff --git a/src/frontend/parser/unixcom.c b/src/frontend/parser/unixcom.c
index e3b2f9c04..313857c03 100644
--- a/src/frontend/parser/unixcom.c
+++ b/src/frontend/parser/unixcom.c
@@ -7,7 +7,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Routines to do execution of unix commands.
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpdefs.h"
 #include "unixcom.h"
diff --git a/src/frontend/plotting/plotit.c b/src/frontend/plotting/plotit.c
index db506eb82..ce66be129 100644
--- a/src/frontend/plotting/plotit.c
+++ b/src/frontend/plotting/plotit.c
@@ -1,5 +1,4 @@
 #include "ngspice/ngspice.h"
-#include "ngspice/config.h"
 #include "ngspice/bool.h"
 #include "ngspice/wordlist.h"
 #include "ngspice/graph.h"
diff --git a/src/frontend/resource.c b/src/frontend/resource.c
index dcbd5e748..e839fc83e 100644
--- a/src/frontend/resource.c
+++ b/src/frontend/resource.c
@@ -12,7 +12,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Others: Use original code with sbrk(0) and some "ugly hacks"
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpdefs.h"
 #include "ngspice/ftedefs.h"
diff --git a/src/frontend/streams.c b/src/frontend/streams.c
index 66f9c7974..8906fd33c 100644
--- a/src/frontend/streams.c
+++ b/src/frontend/streams.c
@@ -2,7 +2,6 @@
  * streams.c
  ************/
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/wordlist.h"
 #include "ngspice/bool.h"
diff --git a/src/frontend/terminal.c b/src/frontend/terminal.c
index f74991869..ec9dbf880 100644
--- a/src/frontend/terminal.c
+++ b/src/frontend/terminal.c
@@ -9,7 +9,6 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
  * can be written for every possible machine...
  */
 #include "ngspice/ngspice.h"
-#include "ngspice/config.h"
 
 #include <stdarg.h>
 
diff --git a/src/frontend/variable.c b/src/frontend/variable.c
index 7be9792a0..5503e0128 100644
--- a/src/frontend/variable.c
+++ b/src/frontend/variable.c
@@ -3,8 +3,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 **********/
 
-#include "ngspice/config.h"
-
 #include "ngspice/ngspice.h"
 #include "ngspice/bool.h"
 #include "ngspice/wordlist.h"
diff --git a/src/maths/poly/interpolate.c b/src/maths/poly/interpolate.c
index e1c5877db..ccd34aad3 100644
--- a/src/maths/poly/interpolate.c
+++ b/src/maths/poly/interpolate.c
@@ -1,4 +1,3 @@
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpdefs.h"
 
diff --git a/src/misc/dup2.c b/src/misc/dup2.c
index 2514f44c2..ae93b887d 100644
--- a/src/misc/dup2.c
+++ b/src/misc/dup2.c
@@ -1,5 +1,4 @@
 /* Modified: 2000 AlansFixes */
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "dup2.h"
 
diff --git a/src/misc/misc_time.c b/src/misc/misc_time.c
index ca281dd21..7ee2b0c1d 100644
--- a/src/misc/misc_time.c
+++ b/src/misc/misc_time.c
@@ -6,7 +6,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
  * Date and time utility functions
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include <string.h>
 #include "misc_time.h"
diff --git a/src/misc/wlist.c b/src/misc/wlist.c
index 0b7702f1f..28dcf9938 100644
--- a/src/misc/wlist.c
+++ b/src/misc/wlist.c
@@ -5,7 +5,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 
 /* Wordlist manipulation stuff.  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/bool.h"
 #include "ngspice/wordlist.h"
diff --git a/src/nghelp.c b/src/nghelp.c
index b01cd84b8..70abe4835 100644
--- a/src/nghelp.c
+++ b/src/nghelp.c
@@ -7,7 +7,6 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
  * The main routine for the help system in stand-alone mode.
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/cpdefs.h"
 #include "ngspice/hlpdefs.h"
diff --git a/src/ngproc2mod.c b/src/ngproc2mod.c
index dc509dc7a..4bc13c1bc 100644
--- a/src/ngproc2mod.c
+++ b/src/ngproc2mod.c
@@ -3,7 +3,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 **********/
 /* convert .process file to set of .model cards */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/spicelib/analysis/dcpss.c b/src/spicelib/analysis/dcpss.c
index e636d24c7..939a6a681 100644
--- a/src/spicelib/analysis/dcpss.c
+++ b/src/spicelib/analysis/dcpss.c
@@ -19,7 +19,6 @@
 #include "../../frontend/fourier.h"
 #include "../../frontend/variable.h"
 
-#include "ngspice/config.h"
 #include "cktaccept.h"
 #include "ngspice/trandefs.h"
 #include "ngspice/fteext.h"
diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c
index 0dfeaab4e..71c3b96c3 100644
--- a/src/spicelib/analysis/dctran.c
+++ b/src/spicelib/analysis/dctran.c
@@ -8,7 +8,6 @@ Modified: 2000  AlansFixes
         --- ONLY, unlike spice2 routine with the same name! */
 
 #include "ngspice/ngspice.h"
-#include "ngspice/config.h"
 #include "ngspice/cktdefs.h"
 #include "cktaccept.h"
 #include "ngspice/trandefs.h"
diff --git a/src/spicelib/devices/cktask.c b/src/spicelib/devices/cktask.c
index 5e7c6f979..b4e45b19c 100644
--- a/src/spicelib/devices/cktask.c
+++ b/src/spicelib/devices/cktask.c
@@ -8,7 +8,6 @@ Author: 1985 Thomas L. Quarles
  * Ask questions about a specified device.  */
 
 #include "ngspice/ngspice.h"
-#include "ngspice/config.h"
 #include "ngspice/devdefs.h"
 #include "ngspice/sperror.h"
 
diff --git a/src/spicelib/devices/cktbindnode.c b/src/spicelib/devices/cktbindnode.c
index 430ee3317..0da37e6c6 100644
--- a/src/spicelib/devices/cktbindnode.c
+++ b/src/spicelib/devices/cktbindnode.c
@@ -9,7 +9,6 @@ Author: 1985 Thomas L. Quarles
  * in the specified circuit.  */
 
 #include "ngspice/ngspice.h"
-#include "ngspice/config.h"
 #include <stdio.h>
 #include "ngspice/devdefs.h"
 #include "ngspice/sperror.h"
diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c
index 8e16310f4..eb50dce90 100644
--- a/src/spicelib/devices/dev.c
+++ b/src/spicelib/devices/dev.c
@@ -28,7 +28,6 @@
  * ENHANCEMENTS, OR MODIFICATIONS. */
 
 #include "ngspice/ngspice.h"
-#include "ngspice/config.h"
 #include "assert.h"
 
 #include "ngspice/devdefs.h"
diff --git a/src/spicelib/parser/inppas1.c b/src/spicelib/parser/inppas1.c
index 20b97ad03..57146ddc0 100644
--- a/src/spicelib/parser/inppas1.c
+++ b/src/spicelib/parser/inppas1.c
@@ -3,7 +3,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 
 #include "inppas1.h"
diff --git a/src/spicelib/parser/inppas3.c b/src/spicelib/parser/inppas3.c
index 33eb7d405..a451dfca3 100644
--- a/src/spicelib/parser/inppas3.c
+++ b/src/spicelib/parser/inppas3.c
@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 Modified: AlansFixes
 **********/
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include "ngspice/iferrmsg.h"
 #include "ngspice/ifsim.h"
diff --git a/src/spicelib/parser/ptfuncs.c b/src/spicelib/parser/ptfuncs.c
index 6b23a8ebd..90bd2a2b0 100644
--- a/src/spicelib/parser/ptfuncs.c
+++ b/src/spicelib/parser/ptfuncs.c
@@ -8,7 +8,6 @@ Author: 1987 Wayne A. Christopher, U. C. Berkeley CAD Group
  * if their argument is out of range.
  */
 
-#include "ngspice/config.h"
 #include "ngspice/ngspice.h"
 #include <stdio.h>
 #include "ngspice/fteext.h"