From: Teemu Murtola <teemu.murtola@gmail.com>
Date: Tue, 19 Aug 2014 03:38:10 +0000 (+0300)
Subject: Remove unnecessary config.h includes
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?p=alexxy%2Fgromacs.git;a=commitdiff_plain;h=d5d2a8cb2299592d39b9f1dc708e432f1602bfc0

Remove unnecessary config.h includes

Now that all the blanket definitions that need to appear everywhere are
in gmxpre.h, remove unnecessary uses of config.h.  Kernel files left
alone for now.

Change-Id: I1e0e7b1f842c5182334687ad86afaee176e31bf2
---

diff --git a/src/gromacs/commandline/pargs.cpp b/src/gromacs/commandline/pargs.cpp
index 7b0f9ba239..d0184d1a83 100644
--- a/src/gromacs/commandline/pargs.cpp
+++ b/src/gromacs/commandline/pargs.cpp
@@ -34,13 +34,10 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-/* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
 #include "gromacs/commandline/pargs.h"
 
-#include "config.h"
-
 #include <cstdlib>
 #include <cstring>
 
diff --git a/src/gromacs/essentialdynamics/edsam.c b/src/gromacs/essentialdynamics/edsam.c
index 38c2617593..38be02d523 100644
--- a/src/gromacs/essentialdynamics/edsam.c
+++ b/src/gromacs/essentialdynamics/edsam.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
diff --git a/src/gromacs/fft/fft_fftpack.c b/src/gromacs/fft/fft_fftpack.c
index 4703911cc6..c0f412bf6e 100644
--- a/src/gromacs/fft/fft_fftpack.c
+++ b/src/gromacs/fft/fft_fftpack.c
@@ -37,8 +37,6 @@
 
 #include "gromacs/fft/fft.h"
 
-#include "config.h"
-
 #include <errno.h>
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/gromacs/fft/fft_mkl.c b/src/gromacs/fft/fft_mkl.c
index 1cf35884ca..fc9694e5eb 100644
--- a/src/gromacs/fft/fft_mkl.c
+++ b/src/gromacs/fft/fft_mkl.c
@@ -35,8 +35,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <errno.h>
 #include <stdlib.h>
 
diff --git a/src/gromacs/fft/parallel_3dfft.c b/src/gromacs/fft/parallel_3dfft.c
index b1917bd4c2..ff69a13bc8 100644
--- a/src/gromacs/fft/parallel_3dfft.c
+++ b/src/gromacs/fft/parallel_3dfft.c
@@ -35,8 +35,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/gromacs/fileio/confio.c b/src/gromacs/fileio/confio.c
index 841317695e..36dbc53312 100644
--- a/src/gromacs/fileio/confio.c
+++ b/src/gromacs/fileio/confio.c
@@ -38,8 +38,6 @@
 
 #include "confio.h"
 
-#include "config.h"
-
 #include <errno.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/src/gromacs/fileio/enxio.c b/src/gromacs/fileio/enxio.c
index 9c01b1ccad..d6dce5f4ab 100644
--- a/src/gromacs/fileio/enxio.c
+++ b/src/gromacs/fileio/enxio.c
@@ -38,8 +38,6 @@
 
 #include "enxio.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/gromacs/fileio/filenm.c b/src/gromacs/fileio/filenm.c
index d132e44d66..d8b50e526f 100644
--- a/src/gromacs/fileio/filenm.c
+++ b/src/gromacs/fileio/filenm.c
@@ -38,8 +38,6 @@
 
 #include "filenm.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/gromacs/fileio/libxdrf.c b/src/gromacs/fileio/libxdrf.c
index e93bded448..98957275c0 100644
--- a/src/gromacs/fileio/libxdrf.c
+++ b/src/gromacs/fileio/libxdrf.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <limits.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/src/gromacs/fileio/matio.cpp b/src/gromacs/fileio/matio.cpp
index c7d1dbb1e1..6d464f8c91 100644
--- a/src/gromacs/fileio/matio.cpp
+++ b/src/gromacs/fileio/matio.cpp
@@ -38,8 +38,6 @@
 
 #include "matio.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <stdio.h>
 
diff --git a/src/gromacs/fileio/mtxio.c b/src/gromacs/fileio/mtxio.c
index 99120369eb..f2a27e0eaf 100644
--- a/src/gromacs/fileio/mtxio.c
+++ b/src/gromacs/fileio/mtxio.c
@@ -38,8 +38,6 @@
 
 #include "mtxio.h"
 
-#include "config.h"
-
 /* This module provides routines to read/write sparse or full storage
  * matrices from/to files. It is normally used for the Hessian matrix
  * in normal mode analysis.
diff --git a/src/gromacs/fileio/pdbio.c b/src/gromacs/fileio/pdbio.c
index 5ca147c230..05c0cf1322 100644
--- a/src/gromacs/fileio/pdbio.c
+++ b/src/gromacs/fileio/pdbio.c
@@ -38,8 +38,6 @@
 
 #include "pdbio.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/fileio/strdb.c b/src/gromacs/fileio/strdb.c
index 47b04b99a9..21f70b014f 100644
--- a/src/gromacs/fileio/strdb.c
+++ b/src/gromacs/fileio/strdb.c
@@ -38,8 +38,6 @@
 
 #include "strdb.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/fileio/timecontrol.c b/src/gromacs/fileio/timecontrol.c
index c4c3cbbe4b..4c355ae13b 100644
--- a/src/gromacs/fileio/timecontrol.c
+++ b/src/gromacs/fileio/timecontrol.c
@@ -38,8 +38,6 @@
 
 #include "gromacs/fileio/timecontrol.h"
 
-#include "config.h"
-
 #include "thread_mpi/threads.h"
 
 #include "gromacs/utility/basedefinitions.h"
diff --git a/src/gromacs/fileio/tpxio.c b/src/gromacs/fileio/tpxio.c
index 9dd4f30ec2..5d0c85380a 100644
--- a/src/gromacs/fileio/tpxio.c
+++ b/src/gromacs/fileio/tpxio.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 /* This file is completely threadsafe - keep it that way! */
 
 #include <stdlib.h>
diff --git a/src/gromacs/fileio/trajectory_writing.c b/src/gromacs/fileio/trajectory_writing.c
index 2780a76ad8..c28a834bb5 100644
--- a/src/gromacs/fileio/trajectory_writing.c
+++ b/src/gromacs/fileio/trajectory_writing.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/utility/smalloc.h"
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/fileio/trnio.c b/src/gromacs/fileio/trnio.c
index a01cd2da6b..a85a82f3c9 100644
--- a/src/gromacs/fileio/trnio.c
+++ b/src/gromacs/fileio/trnio.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 #include "gromacs/utility/smalloc.h"
 #include "gromacs/utility/fatalerror.h"
diff --git a/src/gromacs/fileio/writeps.c b/src/gromacs/fileio/writeps.c
index 953bf4e24b..cd9d1b407f 100644
--- a/src/gromacs/fileio/writeps.c
+++ b/src/gromacs/fileio/writeps.c
@@ -38,8 +38,6 @@
 
 #include "writeps.h"
 
-#include "config.h"
-
 #include <stdio.h>
 
 #include "gromacs/utility/fatalerror.h"
diff --git a/src/gromacs/fileio/xdrd.c b/src/gromacs/fileio/xdrd.c
index 794c46ca2f..7edfe5911a 100644
--- a/src/gromacs/fileio/xdrd.c
+++ b/src/gromacs/fileio/xdrd.c
@@ -38,8 +38,6 @@
 
 #include "xdrf.h"
 
-#include "config.h"
-
 #include "gromacs/math/vectypes.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/fileio/xtcio.c b/src/gromacs/fileio/xtcio.c
index a6b39b4800..248146417a 100644
--- a/src/gromacs/fileio/xtcio.c
+++ b/src/gromacs/fileio/xtcio.c
@@ -38,8 +38,6 @@
 
 #include "xtcio.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include "gromacs/fileio/gmxfio.h"
diff --git a/src/gromacs/gmxana/anadih.c b/src/gromacs/gmxana/anadih.c
index e3daa2b289..a73525d676 100644
--- a/src/gromacs/gmxana/anadih.c
+++ b/src/gromacs/gmxana/anadih.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/autocorr.c b/src/gromacs/gmxana/autocorr.c
index 3b52f0d305..5e829a986d 100644
--- a/src/gromacs/gmxana/autocorr.c
+++ b/src/gromacs/gmxana/autocorr.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/binsearch.c b/src/gromacs/gmxana/binsearch.c
index 4228e35faa..ac5135bef4 100644
--- a/src/gromacs/gmxana/binsearch.c
+++ b/src/gromacs/gmxana/binsearch.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 
 #include "gromacs/utility/fatalerror.h"
diff --git a/src/gromacs/gmxana/cmat.c b/src/gromacs/gmxana/cmat.c
index 1015377ed8..fab169f798 100644
--- a/src/gromacs/gmxana/cmat.c
+++ b/src/gromacs/gmxana/cmat.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "cmat.h"
 #include "gromacs/utility/smalloc.h"
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/gmxana/correl.c b/src/gromacs/gmxana/correl.c
index 6860f3a1e5..b223ad0adb 100644
--- a/src/gromacs/gmxana/correl.c
+++ b/src/gromacs/gmxana/correl.c
@@ -37,8 +37,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/src/gromacs/gmxana/dens_filter.c b/src/gromacs/gmxana/dens_filter.c
index c594218956..0bf0bfc7d2 100644
--- a/src/gromacs/gmxana/dens_filter.c
+++ b/src/gromacs/gmxana/dens_filter.c
@@ -35,7 +35,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
 /* dens_filter.c
  * Routines for Filters and convolutions
  */
diff --git a/src/gromacs/gmxana/dlist.c b/src/gromacs/gmxana/dlist.c
index 0940e62715..d1e1d27a3b 100644
--- a/src/gromacs/gmxana/dlist.c
+++ b/src/gromacs/gmxana/dlist.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/edittop.c b/src/gromacs/gmxana/edittop.c
index cefa9692b7..9902937ced 100644
--- a/src/gromacs/gmxana/edittop.c
+++ b/src/gromacs/gmxana/edittop.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/topology/symtab.h"
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxana/eigio.c b/src/gromacs/gmxana/eigio.c
index d426a0a5c1..b645b777ca 100644
--- a/src/gromacs/gmxana/eigio.c
+++ b/src/gromacs/gmxana/eigio.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/utility/smalloc.h"
 #include "gromacs/math/vec.h"
 #include "eigio.h"
diff --git a/src/gromacs/gmxana/expfit.c b/src/gromacs/gmxana/expfit.c
index 116c7e3793..b9d57723a1 100644
--- a/src/gromacs/gmxana/expfit.c
+++ b/src/gromacs/gmxana/expfit.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/fitahx.c b/src/gromacs/gmxana/fitahx.c
index 16700170b2..0281600229 100644
--- a/src/gromacs/gmxana/fitahx.c
+++ b/src/gromacs/gmxana/fitahx.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "fitahx.h"
 #include "gromacs/math/vec.h"
 
diff --git a/src/gromacs/gmxana/geminate.c b/src/gromacs/gmxana/geminate.c
index 19699c0b34..273f7ae92a 100644
--- a/src/gromacs/gmxana/geminate.c
+++ b/src/gromacs/gmxana/geminate.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/src/gromacs/gmxana/gmx_anadock.c b/src/gromacs/gmxana/gmx_anadock.c
index a81a80a8f0..b0e506085c 100644
--- a/src/gromacs/gmxana/gmx_anadock.c
+++ b/src/gromacs/gmxana/gmx_anadock.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_anaeig.c b/src/gromacs/gmxana/gmx_anaeig.c
index 937d857f18..dde9815f2a 100644
--- a/src/gromacs/gmxana/gmx_anaeig.c
+++ b/src/gromacs/gmxana/gmx_anaeig.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_analyze.c b/src/gromacs/gmxana/gmx_analyze.c
index 08ecac0d83..94400867e5 100644
--- a/src/gromacs/gmxana/gmx_analyze.c
+++ b/src/gromacs/gmxana/gmx_analyze.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_angle.c b/src/gromacs/gmxana/gmx_angle.c
index 83abe0aab7..8064d062f1 100644
--- a/src/gromacs/gmxana/gmx_angle.c
+++ b/src/gromacs/gmxana/gmx_angle.c
@@ -36,7 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_bar.c b/src/gromacs/gmxana/gmx_bar.c
index 496d379b82..e366081d07 100644
--- a/src/gromacs/gmxana/gmx_bar.c
+++ b/src/gromacs/gmxana/gmx_bar.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <float.h>
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_bundle.c b/src/gromacs/gmxana/gmx_bundle.c
index 9cb602d93a..d98f7d600e 100644
--- a/src/gromacs/gmxana/gmx_bundle.c
+++ b/src/gromacs/gmxana/gmx_bundle.c
@@ -36,7 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_chi.c b/src/gromacs/gmxana/gmx_chi.c
index 3ee3ceabe0..0c5a02a21c 100644
--- a/src/gromacs/gmxana/gmx_chi.c
+++ b/src/gromacs/gmxana/gmx_chi.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_cluster.c b/src/gromacs/gmxana/gmx_cluster.c
index 1b099c411c..4632a5900a 100644
--- a/src/gromacs/gmxana/gmx_cluster.c
+++ b/src/gromacs/gmxana/gmx_cluster.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_clustsize.c b/src/gromacs/gmxana/gmx_clustsize.c
index 538d21a1d4..3800dceca9 100644
--- a/src/gromacs/gmxana/gmx_clustsize.c
+++ b/src/gromacs/gmxana/gmx_clustsize.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxana/gmx_confrms.c b/src/gromacs/gmxana/gmx_confrms.c
index 9d4e940778..c0876922bb 100644
--- a/src/gromacs/gmxana/gmx_confrms.c
+++ b/src/gromacs/gmxana/gmx_confrms.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_current.c b/src/gromacs/gmxana/gmx_current.c
index 1697d39bb0..1f41368c1a 100644
--- a/src/gromacs/gmxana/gmx_current.c
+++ b/src/gromacs/gmxana/gmx_current.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/src/gromacs/gmxana/gmx_density.c b/src/gromacs/gmxana/gmx_density.c
index 5ebf4b74dc..4282430de0 100644
--- a/src/gromacs/gmxana/gmx_density.c
+++ b/src/gromacs/gmxana/gmx_density.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/gmx_densmap.c b/src/gromacs/gmxana/gmx_densmap.c
index eec8ef0053..a71c04137f 100644
--- a/src/gromacs/gmxana/gmx_densmap.c
+++ b/src/gromacs/gmxana/gmx_densmap.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_densorder.cpp b/src/gromacs/gmxana/gmx_densorder.cpp
index 79db631c1e..79c9e68a11 100644
--- a/src/gromacs/gmxana/gmx_densorder.cpp
+++ b/src/gromacs/gmxana/gmx_densorder.cpp
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <math.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_dielectric.c b/src/gromacs/gmxana/gmx_dielectric.c
index db2607a2ef..e9c6445dd6 100644
--- a/src/gromacs/gmxana/gmx_dielectric.c
+++ b/src/gromacs/gmxana/gmx_dielectric.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/gmx_dipoles.cpp b/src/gromacs/gmxana/gmx_dipoles.cpp
index 2382a42d42..569954d341 100644
--- a/src/gromacs/gmxana/gmx_dipoles.cpp
+++ b/src/gromacs/gmxana/gmx_dipoles.cpp
@@ -36,7 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
 #include <string.h>
 #include <math.h>
 
diff --git a/src/gromacs/gmxana/gmx_disre.c b/src/gromacs/gmxana/gmx_disre.c
index 5bf8dfa13f..4852d3616b 100644
--- a/src/gromacs/gmxana/gmx_disre.c
+++ b/src/gromacs/gmxana/gmx_disre.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_dos.c b/src/gromacs/gmxana/gmx_dos.c
index 99deca2849..e353d7a3e8 100644
--- a/src/gromacs/gmxana/gmx_dos.c
+++ b/src/gromacs/gmxana/gmx_dos.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/gmx_dyndom.c b/src/gromacs/gmxana/gmx_dyndom.c
index 8a82998ab3..7b2ac8e499 100644
--- a/src/gromacs/gmxana/gmx_dyndom.c
+++ b/src/gromacs/gmxana/gmx_dyndom.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/topology/index.h"
 #include "gromacs/fileio/confio.h"
 #include "gromacs/math/units.h"
diff --git a/src/gromacs/gmxana/gmx_editconf.c b/src/gromacs/gmxana/gmx_editconf.c
index a17427cff3..c710ecfd15 100644
--- a/src/gromacs/gmxana/gmx_editconf.c
+++ b/src/gromacs/gmxana/gmx_editconf.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_eneconv.c b/src/gromacs/gmxana/gmx_eneconv.c
index 9dd61c8d94..34dea59357 100644
--- a/src/gromacs/gmxana/gmx_eneconv.c
+++ b/src/gromacs/gmxana/gmx_eneconv.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_enemat.c b/src/gromacs/gmxana/gmx_enemat.c
index 4633ca3fe3..8abd1f3abc 100644
--- a/src/gromacs/gmxana/gmx_enemat.c
+++ b/src/gromacs/gmxana/gmx_enemat.c
@@ -36,7 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
 #include <string.h>
 #include <math.h>
 
diff --git a/src/gromacs/gmxana/gmx_energy.c b/src/gromacs/gmxana/gmx_energy.c
index c5c8447dc7..cc3958fda1 100644
--- a/src/gromacs/gmxana/gmx_energy.c
+++ b/src/gromacs/gmxana/gmx_energy.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_filter.c b/src/gromacs/gmxana/gmx_filter.c
index a16c630b6d..4b1909c8a3 100644
--- a/src/gromacs/gmxana/gmx_filter.c
+++ b/src/gromacs/gmxana/gmx_filter.c
@@ -36,7 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_genion.c b/src/gromacs/gmxana/gmx_genion.c
index 494514571d..fc1ac0e8e8 100644
--- a/src/gromacs/gmxana/gmx_genion.c
+++ b/src/gromacs/gmxana/gmx_genion.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_genpr.c b/src/gromacs/gmxana/gmx_genpr.c
index c0a983c441..a883f697a8 100644
--- a/src/gromacs/gmxana/gmx_genpr.c
+++ b/src/gromacs/gmxana/gmx_genpr.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_gyrate.c b/src/gromacs/gmxana/gmx_gyrate.c
index 4408617022..f8bb1f3758 100644
--- a/src/gromacs/gmxana/gmx_gyrate.c
+++ b/src/gromacs/gmxana/gmx_gyrate.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_h2order.c b/src/gromacs/gmxana/gmx_h2order.c
index ca338f9015..314f20c46a 100644
--- a/src/gromacs/gmxana/gmx_h2order.c
+++ b/src/gromacs/gmxana/gmx_h2order.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_helix.c b/src/gromacs/gmxana/gmx_helix.c
index b6af91893c..70c24752fb 100644
--- a/src/gromacs/gmxana/gmx_helix.c
+++ b/src/gromacs/gmxana/gmx_helix.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_helixorient.c b/src/gromacs/gmxana/gmx_helixorient.c
index c8504946ef..b42a518b1d 100644
--- a/src/gromacs/gmxana/gmx_helixorient.c
+++ b/src/gromacs/gmxana/gmx_helixorient.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxana/gmx_hydorder.c b/src/gromacs/gmxana/gmx_hydorder.c
index 284a99bc31..af7ecb739e 100644
--- a/src/gromacs/gmxana/gmx_hydorder.c
+++ b/src/gromacs/gmxana/gmx_hydorder.c
@@ -35,8 +35,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_lie.c b/src/gromacs/gmxana/gmx_lie.c
index 290f3d2b84..250256d475 100644
--- a/src/gromacs/gmxana/gmx_lie.c
+++ b/src/gromacs/gmxana/gmx_lie.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/gmx_make_edi.c b/src/gromacs/gmxana/gmx_make_edi.c
index 1825f5803c..7c1ec8411c 100644
--- a/src/gromacs/gmxana/gmx_make_edi.c
+++ b/src/gromacs/gmxana/gmx_make_edi.c
@@ -38,8 +38,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/src/gromacs/gmxana/gmx_make_ndx.c b/src/gromacs/gmxana/gmx_make_ndx.c
index 3415ff59db..be16251aef 100644
--- a/src/gromacs/gmxana/gmx_make_ndx.c
+++ b/src/gromacs/gmxana/gmx_make_ndx.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_mdmat.c b/src/gromacs/gmxana/gmx_mdmat.c
index 6b24575bca..cc0a6e2bec 100644
--- a/src/gromacs/gmxana/gmx_mdmat.c
+++ b/src/gromacs/gmxana/gmx_mdmat.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_mindist.c b/src/gromacs/gmxana/gmx_mindist.c
index adc023494e..3b732ffe0a 100644
--- a/src/gromacs/gmxana/gmx_mindist.c
+++ b/src/gromacs/gmxana/gmx_mindist.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_mk_angndx.c b/src/gromacs/gmxana/gmx_mk_angndx.c
index 6cc12dcc5b..1b1ceeead6 100644
--- a/src/gromacs/gmxana/gmx_mk_angndx.c
+++ b/src/gromacs/gmxana/gmx_mk_angndx.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxana/gmx_morph.c b/src/gromacs/gmxana/gmx_morph.c
index a4bf81f835..8e77699e89 100644
--- a/src/gromacs/gmxana/gmx_morph.c
+++ b/src/gromacs/gmxana/gmx_morph.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/fileio/confio.h"
 #include "gromacs/legacyheaders/viewit.h"
diff --git a/src/gromacs/gmxana/gmx_msd.c b/src/gromacs/gmxana/gmx_msd.c
index e5fb4cd24e..701f412114 100644
--- a/src/gromacs/gmxana/gmx_msd.c
+++ b/src/gromacs/gmxana/gmx_msd.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_nmeig.c b/src/gromacs/gmxana/gmx_nmeig.c
index f27e781c8b..63fb24daa3 100644
--- a/src/gromacs/gmxana/gmx_nmeig.c
+++ b/src/gromacs/gmxana/gmx_nmeig.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_nmens.c b/src/gromacs/gmxana/gmx_nmens.c
index 949ca6c48d..a734478f8d 100644
--- a/src/gromacs/gmxana/gmx_nmens.c
+++ b/src/gromacs/gmxana/gmx_nmens.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_nmtraj.c b/src/gromacs/gmxana/gmx_nmtraj.c
index 5633baebef..661caf2749 100644
--- a/src/gromacs/gmxana/gmx_nmtraj.c
+++ b/src/gromacs/gmxana/gmx_nmtraj.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_options.c b/src/gromacs/gmxana/gmx_options.c
index 874d4082d0..4a98b8348a 100644
--- a/src/gromacs/gmxana/gmx_options.c
+++ b/src/gromacs/gmxana/gmx_options.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/commandline/pargs.h"
diff --git a/src/gromacs/gmxana/gmx_order.c b/src/gromacs/gmxana/gmx_order.c
index 5decb2224f..0c6e723316 100644
--- a/src/gromacs/gmxana/gmx_order.c
+++ b/src/gromacs/gmxana/gmx_order.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_polystat.c b/src/gromacs/gmxana/gmx_polystat.c
index 5cccbf9463..b98fdaf12a 100644
--- a/src/gromacs/gmxana/gmx_polystat.c
+++ b/src/gromacs/gmxana/gmx_polystat.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_potential.c b/src/gromacs/gmxana/gmx_potential.c
index 989eadad95..54ddc2ac8a 100644
--- a/src/gromacs/gmxana/gmx_potential.c
+++ b/src/gromacs/gmxana/gmx_potential.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <math.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_principal.c b/src/gromacs/gmxana/gmx_principal.c
index b4828409b5..5be044744a 100644
--- a/src/gromacs/gmxana/gmx_principal.c
+++ b/src/gromacs/gmxana/gmx_principal.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_rama.c b/src/gromacs/gmxana/gmx_rama.c
index 037517f158..f5db3dfada 100644
--- a/src/gromacs/gmxana/gmx_rama.c
+++ b/src/gromacs/gmxana/gmx_rama.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_rdf.c b/src/gromacs/gmxana/gmx_rdf.c
index ca54a4def4..db06a91279 100644
--- a/src/gromacs/gmxana/gmx_rdf.c
+++ b/src/gromacs/gmxana/gmx_rdf.c
@@ -37,8 +37,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxana/gmx_rms.c b/src/gromacs/gmxana/gmx_rms.c
index 468cc3f377..24af686324 100644
--- a/src/gromacs/gmxana/gmx_rms.c
+++ b/src/gromacs/gmxana/gmx_rms.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/src/gromacs/gmxana/gmx_rmsdist.c b/src/gromacs/gmxana/gmx_rmsdist.c
index b7fdfca625..504ba2abc2 100644
--- a/src/gromacs/gmxana/gmx_rmsdist.c
+++ b/src/gromacs/gmxana/gmx_rmsdist.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/gmxana/gmx_rmsf.c b/src/gromacs/gmxana/gmx_rmsf.c
index 535feb5c7b..de56950586 100644
--- a/src/gromacs/gmxana/gmx_rmsf.c
+++ b/src/gromacs/gmxana/gmx_rmsf.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxana/gmx_rotacf.c b/src/gromacs/gmxana/gmx_rotacf.c
index 073d131e51..18f4f33a9d 100644
--- a/src/gromacs/gmxana/gmx_rotacf.c
+++ b/src/gromacs/gmxana/gmx_rotacf.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_rotmat.c b/src/gromacs/gmxana/gmx_rotmat.c
index 54f012416d..e4606039b4 100644
--- a/src/gromacs/gmxana/gmx_rotmat.c
+++ b/src/gromacs/gmxana/gmx_rotmat.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_saltbr.c b/src/gromacs/gmxana/gmx_saltbr.c
index 440769985d..23381e2db7 100644
--- a/src/gromacs/gmxana/gmx_saltbr.c
+++ b/src/gromacs/gmxana/gmx_saltbr.c
@@ -36,7 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/gmx_saxs.c b/src/gromacs/gmxana/gmx_saxs.c
index 9b23bde984..73ab9694db 100644
--- a/src/gromacs/gmxana/gmx_saxs.c
+++ b/src/gromacs/gmxana/gmx_saxs.c
@@ -37,8 +37,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/gmxana/gmx_sham.c b/src/gromacs/gmxana/gmx_sham.c
index 85837ed108..c2a0ae7423 100644
--- a/src/gromacs/gmxana/gmx_sham.c
+++ b/src/gromacs/gmxana/gmx_sham.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_sigeps.c b/src/gromacs/gmxana/gmx_sigeps.c
index 559e16c233..a4860c8d70 100644
--- a/src/gromacs/gmxana/gmx_sigeps.c
+++ b/src/gromacs/gmxana/gmx_sigeps.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 
diff --git a/src/gromacs/gmxana/gmx_sorient.c b/src/gromacs/gmxana/gmx_sorient.c
index 5c963b771a..5a66da9cfa 100644
--- a/src/gromacs/gmxana/gmx_sorient.c
+++ b/src/gromacs/gmxana/gmx_sorient.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/macros.h"
 #include "gstat.h"
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/gmxana/gmx_spatial.c b/src/gromacs/gmxana/gmx_spatial.c
index 01fccfc1d9..4eb86003d4 100644
--- a/src/gromacs/gmxana/gmx_spatial.c
+++ b/src/gromacs/gmxana/gmx_spatial.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/src/gromacs/gmxana/gmx_spol.c b/src/gromacs/gmxana/gmx_spol.c
index c9b160be13..9642214a43 100644
--- a/src/gromacs/gmxana/gmx_spol.c
+++ b/src/gromacs/gmxana/gmx_spol.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/macros.h"
 #include "gstat.h"
 #include "gromacs/legacyheaders/viewit.h"
diff --git a/src/gromacs/gmxana/gmx_tcaf.c b/src/gromacs/gmxana/gmx_tcaf.c
index 9c66c0a781..cf72122974 100644
--- a/src/gromacs/gmxana/gmx_tcaf.c
+++ b/src/gromacs/gmxana/gmx_tcaf.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_traj.c b/src/gromacs/gmxana/gmx_traj.c
index 6b1297e122..2c20807355 100644
--- a/src/gromacs/gmxana/gmx_traj.c
+++ b/src/gromacs/gmxana/gmx_traj.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_trjcat.c b/src/gromacs/gmxana/gmx_trjcat.c
index fcfce74a3e..5a011c992c 100644
--- a/src/gromacs/gmxana/gmx_trjcat.c
+++ b/src/gromacs/gmxana/gmx_trjcat.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_trjorder.c b/src/gromacs/gmxana/gmx_trjorder.c
index 0a13b11410..bdf5cb3569 100644
--- a/src/gromacs/gmxana/gmx_trjorder.c
+++ b/src/gromacs/gmxana/gmx_trjorder.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_vanhove.c b/src/gromacs/gmxana/gmx_vanhove.c
index bef1db6432..781fc5cf1f 100644
--- a/src/gromacs/gmxana/gmx_vanhove.c
+++ b/src/gromacs/gmxana/gmx_vanhove.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/gmx_velacc.c b/src/gromacs/gmxana/gmx_velacc.c
index 0130410ab2..b6567a4813 100644
--- a/src/gromacs/gmxana/gmx_velacc.c
+++ b/src/gromacs/gmxana/gmx_velacc.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_wheel.c b/src/gromacs/gmxana/gmx_wheel.c
index 73d9de4759..d990df1180 100644
--- a/src/gromacs/gmxana/gmx_wheel.c
+++ b/src/gromacs/gmxana/gmx_wheel.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/gmx_xpm2ps.c b/src/gromacs/gmxana/gmx_xpm2ps.c
index 779313cc70..0e2bd1f676 100644
--- a/src/gromacs/gmxana/gmx_xpm2ps.c
+++ b/src/gromacs/gmxana/gmx_xpm2ps.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/src/gromacs/gmxana/hxprops.c b/src/gromacs/gmxana/hxprops.c
index c47fca8dbf..bad612044a 100644
--- a/src/gromacs/gmxana/hxprops.c
+++ b/src/gromacs/gmxana/hxprops.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxana/levenmar.c b/src/gromacs/gmxana/levenmar.c
index 99e06dabe3..c84f103bc0 100644
--- a/src/gromacs/gmxana/levenmar.c
+++ b/src/gromacs/gmxana/levenmar.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/nrama.c b/src/gromacs/gmxana/nrama.c
index edd6d73137..a69fc8a3bd 100644
--- a/src/gromacs/gmxana/nrama.c
+++ b/src/gromacs/gmxana/nrama.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/src/gromacs/gmxana/polynomials.c b/src/gromacs/gmxana/polynomials.c
index e0be0a32f9..91cd15ff89 100644
--- a/src/gromacs/gmxana/polynomials.c
+++ b/src/gromacs/gmxana/polynomials.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <math.h>
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxana/powerspect.c b/src/gromacs/gmxana/powerspect.c
index 91936a56b2..071e50afad 100644
--- a/src/gromacs/gmxana/powerspect.c
+++ b/src/gromacs/gmxana/powerspect.c
@@ -35,8 +35,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/utility/smalloc.h"
 #include "gromacs/fft/fft.h"
 #include "gromacs/utility/fatalerror.h"
diff --git a/src/gromacs/gmxana/pp2shift.c b/src/gromacs/gmxana/pp2shift.c
index 9ad592fb62..4c7fdb951d 100644
--- a/src/gromacs/gmxana/pp2shift.c
+++ b/src/gromacs/gmxana/pp2shift.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <math.h>
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxana/princ.c b/src/gromacs/gmxana/princ.c
index b202935ecb..e3906590a4 100644
--- a/src/gromacs/gmxana/princ.c
+++ b/src/gromacs/gmxana/princ.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxana/sfactor.c b/src/gromacs/gmxana/sfactor.c
index ff62732e7a..8d027fe4a5 100644
--- a/src/gromacs/gmxana/sfactor.c
+++ b/src/gromacs/gmxana/sfactor.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/utility/smalloc.h"
 #include "gromacs/utility/futil.h"
 #include "gromacs/math/utilities.h"
diff --git a/src/gromacs/gmxlib/calcgrid.c b/src/gromacs/gmxlib/calcgrid.c
index 9e1f1704d3..62d25e1ce8 100644
--- a/src/gromacs/gmxlib/calcgrid.c
+++ b/src/gromacs/gmxlib/calcgrid.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxlib/chargegroup.c b/src/gromacs/gmxlib/chargegroup.c
index f291d1f3af..00dbf09dcf 100644
--- a/src/gromacs/gmxlib/chargegroup.c
+++ b/src/gromacs/gmxlib/chargegroup.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/gmxlib/conformation-utilities.c b/src/gromacs/gmxlib/conformation-utilities.c
index 5b78f1b89b..59f433fa5d 100644
--- a/src/gromacs/gmxlib/conformation-utilities.c
+++ b/src/gromacs/gmxlib/conformation-utilities.c
@@ -39,8 +39,6 @@
 
 #include "conformation-utilities.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/gmxlib/cuda_tools/copyrite_gpu.cu b/src/gromacs/gmxlib/cuda_tools/copyrite_gpu.cu
index 364c1597c7..76f9222412 100644
--- a/src/gromacs/gmxlib/cuda_tools/copyrite_gpu.cu
+++ b/src/gromacs/gmxlib/cuda_tools/copyrite_gpu.cu
@@ -35,8 +35,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <cuda.h>
 #include <cuda_runtime_api.h>
diff --git a/src/gromacs/gmxlib/ewald_util.c b/src/gromacs/gmxlib/ewald_util.c
index 56215773bc..44dc2271f3 100644
--- a/src/gromacs/gmxlib/ewald_util.c
+++ b/src/gromacs/gmxlib/ewald_util.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <math.h>
 #include "gromacs/math/utilities.h"
diff --git a/src/gromacs/gmxlib/ifunc.c b/src/gromacs/gmxlib/ifunc.c
index 342058cb5a..e27b78aa22 100644
--- a/src/gromacs/gmxlib/ifunc.c
+++ b/src/gromacs/gmxlib/ifunc.c
@@ -37,9 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
-
 #include "gromacs/bonded/bonded.h"
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/disre.h"
diff --git a/src/gromacs/gmxlib/inputrec.c b/src/gromacs/gmxlib/inputrec.c
index 43283e1025..d55f8e4ed5 100644
--- a/src/gromacs/gmxlib/inputrec.c
+++ b/src/gromacs/gmxlib/inputrec.c
@@ -36,9 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/legacyheaders/inputrec.h"
diff --git a/src/gromacs/gmxlib/md_logging.c b/src/gromacs/gmxlib/md_logging.c
index 5dc7866d4e..36eb06d964 100644
--- a/src/gromacs/gmxlib/md_logging.c
+++ b/src/gromacs/gmxlib/md_logging.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdarg.h>
 #include "gromacs/legacyheaders/types/commrec.h"
diff --git a/src/gromacs/gmxlib/mvdata.c b/src/gromacs/gmxlib/mvdata.c
index 9db70030d2..8885b13c0e 100644
--- a/src/gromacs/gmxlib/mvdata.c
+++ b/src/gromacs/gmxlib/mvdata.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxlib/names.c b/src/gromacs/gmxlib/names.c
index a72b2a1d74..0e048d42db 100644
--- a/src/gromacs/gmxlib/names.c
+++ b/src/gromacs/gmxlib/names.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/names.h"
 
diff --git a/src/gromacs/gmxlib/nonbonded/nb_free_energy.c b/src/gromacs/gmxlib/nonbonded/nb_free_energy.c
index fc6ca9bc67..35175bc217 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_free_energy.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_free_energy.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/gmxlib/nonbonded/nb_generic.c b/src/gromacs/gmxlib/nonbonded/nb_generic.c
index 54a7d3af71..dca18ad4fa 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_generic.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_generic.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/types/simple.h"
diff --git a/src/gromacs/gmxlib/nonbonded/nb_generic_adress.c b/src/gromacs/gmxlib/nonbonded/nb_generic_adress.c
index 5c4d0013bb..eedffd8645 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_generic_adress.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_generic_adress.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/types/simple.h"
diff --git a/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c b/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c
index 85c32b473e..97c43c2b0b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/types/simple.h"
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel.c b/src/gromacs/gmxlib/nonbonded/nb_kernel.c
index 158dc5eef8..60f73652a2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel.c
@@ -34,9 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel.h b/src/gromacs/gmxlib/nonbonded/nb_kernel.h
index 9f28c063b5..c5d489949a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel.h
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel.h
@@ -35,9 +35,6 @@
 #ifndef _nb_kernel_h_
 #define _nb_kernel_h_
 
-#include "config.h"
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/gromacs/gmxlib/nrnb.c b/src/gromacs/gmxlib/nrnb.c
index bd3078ee11..54925d85ed 100644
--- a/src/gromacs/gmxlib/nrnb.c
+++ b/src/gromacs/gmxlib/nrnb.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxlib/orires.c b/src/gromacs/gmxlib/orires.c
index 52ca63071c..3c4f3e5db5 100644
--- a/src/gromacs/gmxlib/orires.c
+++ b/src/gromacs/gmxlib/orires.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/types/commrec.h"
 #include "gromacs/legacyheaders/network.h"
diff --git a/src/gromacs/gmxlib/rbin.c b/src/gromacs/gmxlib/rbin.c
index 5d71c14628..5ef4d5d229 100644
--- a/src/gromacs/gmxlib/rbin.c
+++ b/src/gromacs/gmxlib/rbin.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/network.h"
 #include "gromacs/legacyheaders/rbin.h"
diff --git a/src/gromacs/gmxlib/readinp.c b/src/gromacs/gmxlib/readinp.c
index ff55b9dc7b..0f2e4196d7 100644
--- a/src/gromacs/gmxlib/readinp.c
+++ b/src/gromacs/gmxlib/readinp.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxlib/splitter.c b/src/gromacs/gmxlib/splitter.c
index 98ab01916f..b9557b54a7 100644
--- a/src/gromacs/gmxlib/splitter.c
+++ b/src/gromacs/gmxlib/splitter.c
@@ -38,8 +38,6 @@
 
 #include "gromacs/legacyheaders/splitter.h"
 
-#include "config.h"
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxlib/txtdump.c b/src/gromacs/gmxlib/txtdump.c
index dbda154892..b8d3088c73 100644
--- a/src/gromacs/gmxlib/txtdump.c
+++ b/src/gromacs/gmxlib/txtdump.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 /* This file is completely threadsafe - please keep it that way! */
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxlib/typedefs.c b/src/gromacs/gmxlib/typedefs.c
index a1508fc9b8..134f8c0ca5 100644
--- a/src/gromacs/gmxlib/typedefs.c
+++ b/src/gromacs/gmxlib/typedefs.c
@@ -39,8 +39,6 @@
 
 #include "gromacs/legacyheaders/typedefs.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/gmxlib/warninp.c b/src/gromacs/gmxlib/warninp.c
index bdf882dafd..9d9b5b79b6 100644
--- a/src/gromacs/gmxlib/warninp.c
+++ b/src/gromacs/gmxlib/warninp.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxpreprocess/add_par.c b/src/gromacs/gmxpreprocess/add_par.c
index 15971725d1..26926a91d4 100644
--- a/src/gromacs/gmxpreprocess/add_par.c
+++ b/src/gromacs/gmxpreprocess/add_par.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxpreprocess/addconf.c b/src/gromacs/gmxpreprocess/addconf.c
index 57928b5f64..b2d1f3a751 100644
--- a/src/gromacs/gmxpreprocess/addconf.c
+++ b/src/gromacs/gmxpreprocess/addconf.c
@@ -38,8 +38,6 @@
 
 #include "addconf.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxpreprocess/calc_verletbuf.c b/src/gromacs/gmxpreprocess/calc_verletbuf.c
index 29cd01d86a..8d1313a408 100644
--- a/src/gromacs/gmxpreprocess/calc_verletbuf.c
+++ b/src/gromacs/gmxpreprocess/calc_verletbuf.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxpreprocess/calch.c b/src/gromacs/gmxpreprocess/calch.c
index 4eff9edc42..dfab85b064 100644
--- a/src/gromacs/gmxpreprocess/calch.c
+++ b/src/gromacs/gmxpreprocess/calch.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/macros.h"
 #include "calch.h"
 #include "gromacs/math/utilities.h"
diff --git a/src/gromacs/gmxpreprocess/compute_io.c b/src/gromacs/gmxpreprocess/compute_io.c
index a9ff5768a2..8de74782b7 100644
--- a/src/gromacs/gmxpreprocess/compute_io.c
+++ b/src/gromacs/gmxpreprocess/compute_io.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <signal.h>
 #include <stdlib.h>
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxpreprocess/convparm.c b/src/gromacs/gmxpreprocess/convparm.c
index 8369a030c5..3ae40c2a84 100644
--- a/src/gromacs/gmxpreprocess/convparm.c
+++ b/src/gromacs/gmxpreprocess/convparm.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxpreprocess/fflibutil.h b/src/gromacs/gmxpreprocess/fflibutil.h
index ca09f47a80..f49d96327b 100644
--- a/src/gromacs/gmxpreprocess/fflibutil.h
+++ b/src/gromacs/gmxpreprocess/fflibutil.h
@@ -36,8 +36,6 @@
 #ifndef GMX_GMXPREPROCESS_FFLIBUTIL_H
 #define GMX_GMXPREPROCESS_FFLIBUTIL_H
 
-#include "config.h"
-
 #include <stdio.h>
 #include "gromacs/legacyheaders/typedefs.h"
 
diff --git a/src/gromacs/gmxpreprocess/gen_ad.c b/src/gromacs/gmxpreprocess/gen_ad.c
index b5c55421c1..c110bc7a3e 100644
--- a/src/gromacs/gmxpreprocess/gen_ad.c
+++ b/src/gromacs/gmxpreprocess/gen_ad.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxpreprocess/gen_maxwell_velocities.c b/src/gromacs/gmxpreprocess/gen_maxwell_velocities.c
index ee0d106f64..609650f4a1 100644
--- a/src/gromacs/gmxpreprocess/gen_maxwell_velocities.c
+++ b/src/gromacs/gmxpreprocess/gen_maxwell_velocities.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/random/random.h"
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxpreprocess/gen_vsite.c b/src/gromacs/gmxpreprocess/gen_vsite.c
index 30dace6b29..9743f690a6 100644
--- a/src/gromacs/gmxpreprocess/gen_vsite.c
+++ b/src/gromacs/gmxpreprocess/gen_vsite.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxpreprocess/genhydro.c b/src/gromacs/gmxpreprocess/genhydro.c
index 50be75ef54..9ac5b4d444 100644
--- a/src/gromacs/gmxpreprocess/genhydro.c
+++ b/src/gromacs/gmxpreprocess/genhydro.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 #include <time.h>
 
diff --git a/src/gromacs/gmxpreprocess/gmxcpp.c b/src/gromacs/gmxpreprocess/gmxcpp.c
index edfb7d8249..81795e9805 100644
--- a/src/gromacs/gmxpreprocess/gmxcpp.c
+++ b/src/gromacs/gmxpreprocess/gmxcpp.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxpreprocess/gpp_atomtype.c b/src/gromacs/gmxpreprocess/gpp_atomtype.c
index 3a12a4dd82..8ef380fd04 100644
--- a/src/gromacs/gmxpreprocess/gpp_atomtype.c
+++ b/src/gromacs/gmxpreprocess/gpp_atomtype.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxpreprocess/gpp_bond_atomtype.c b/src/gromacs/gmxpreprocess/gpp_bond_atomtype.c
index a8e949e3da..905308b3be 100644
--- a/src/gromacs/gmxpreprocess/gpp_bond_atomtype.c
+++ b/src/gromacs/gmxpreprocess/gpp_bond_atomtype.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/macros.h"
 #include "gpp_bond_atomtype.h"
 
diff --git a/src/gromacs/gmxpreprocess/gpp_bond_atomtype.h b/src/gromacs/gmxpreprocess/gpp_bond_atomtype.h
index 592ed8f575..cd88c07a81 100644
--- a/src/gromacs/gmxpreprocess/gpp_bond_atomtype.h
+++ b/src/gromacs/gmxpreprocess/gpp_bond_atomtype.h
@@ -38,8 +38,6 @@
 #ifndef GMX_GMXPREPROCESS_GPP_BONDATOMTYPE_H
 #define GMX_GMXPREPROCESS_GPP_BONDATOMTYPE_H
 
-#include "config.h"
-
 #include <stdio.h>
 #include "gromacs/legacyheaders/typedefs.h"
 
diff --git a/src/gromacs/gmxpreprocess/gpp_nextnb.c b/src/gromacs/gmxpreprocess/gpp_nextnb.c
index a5002347d0..ff7bbaff4e 100644
--- a/src/gromacs/gmxpreprocess/gpp_nextnb.c
+++ b/src/gromacs/gmxpreprocess/gpp_nextnb.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 
 /* #define DEBUG_NNB */
diff --git a/src/gromacs/gmxpreprocess/grompp.c b/src/gromacs/gmxpreprocess/grompp.c
index 0f47a5a612..d8cde70d4e 100644
--- a/src/gromacs/gmxpreprocess/grompp.c
+++ b/src/gromacs/gmxpreprocess/grompp.c
@@ -38,8 +38,6 @@
 
 #include "grompp.h"
 
-#include "config.h"
-
 #include <sys/types.h>
 #include <math.h>
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/h_db.c b/src/gromacs/gmxpreprocess/h_db.c
index 398a53689e..85bacf8a3f 100644
--- a/src/gromacs/gmxpreprocess/h_db.c
+++ b/src/gromacs/gmxpreprocess/h_db.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxpreprocess/hackblock.c b/src/gromacs/gmxpreprocess/hackblock.c
index e80b140b38..ff7f0fdf2e 100644
--- a/src/gromacs/gmxpreprocess/hackblock.c
+++ b/src/gromacs/gmxpreprocess/hackblock.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 #include "hackblock.h"
 #include "gromacs/utility/cstringutil.h"
diff --git a/src/gromacs/gmxpreprocess/hizzie.c b/src/gromacs/gmxpreprocess/hizzie.c
index 936a434fee..e7b637a21b 100644
--- a/src/gromacs/gmxpreprocess/hizzie.c
+++ b/src/gromacs/gmxpreprocess/hizzie.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxpreprocess/insert-molecules.cpp b/src/gromacs/gmxpreprocess/insert-molecules.cpp
index f1fd79b704..32d5908987 100644
--- a/src/gromacs/gmxpreprocess/insert-molecules.cpp
+++ b/src/gromacs/gmxpreprocess/insert-molecules.cpp
@@ -38,8 +38,6 @@
 
 #include "insert-molecules.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/math/utilities.h"
 #include "gromacs/fileio/confio.h"
diff --git a/src/gromacs/gmxpreprocess/nm2type.c b/src/gromacs/gmxpreprocess/nm2type.c
index e7fe17388d..d4b01a884d 100644
--- a/src/gromacs/gmxpreprocess/nm2type.c
+++ b/src/gromacs/gmxpreprocess/nm2type.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include "gromacs/math/utilities.h"
diff --git a/src/gromacs/gmxpreprocess/pdb2gmx.c b/src/gromacs/gmxpreprocess/pdb2gmx.c
index ec26e5f22c..0a1aeb20d4 100644
--- a/src/gromacs/gmxpreprocess/pdb2gmx.c
+++ b/src/gromacs/gmxpreprocess/pdb2gmx.c
@@ -38,8 +38,6 @@
 
 #include "pdb2gmx.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/pdb2top.cpp b/src/gromacs/gmxpreprocess/pdb2top.cpp
index 9dfbfdffbb..ec4f8927ce 100644
--- a/src/gromacs/gmxpreprocess/pdb2top.cpp
+++ b/src/gromacs/gmxpreprocess/pdb2top.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <math.h>
 #include <ctype.h>
diff --git a/src/gromacs/gmxpreprocess/pgutil.c b/src/gromacs/gmxpreprocess/pgutil.c
index 811360c522..1cebc523b6 100644
--- a/src/gromacs/gmxpreprocess/pgutil.c
+++ b/src/gromacs/gmxpreprocess/pgutil.c
@@ -38,7 +38,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
 #include "gromacs/utility/cstringutil.h"
 #include "pgutil.h"
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/protonate.c b/src/gromacs/gmxpreprocess/protonate.c
index 86c87d6826..5f1d99f6fc 100644
--- a/src/gromacs/gmxpreprocess/protonate.c
+++ b/src/gromacs/gmxpreprocess/protonate.c
@@ -38,8 +38,6 @@
 
 #include "protonate.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxpreprocess/readir.c b/src/gromacs/gmxpreprocess/readir.c
index 7fcd21cd9f..b12714eb78 100644
--- a/src/gromacs/gmxpreprocess/readir.c
+++ b/src/gromacs/gmxpreprocess/readir.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxpreprocess/readpull.c b/src/gromacs/gmxpreprocess/readpull.c
index 687ae35ef3..70e484aae6 100644
--- a/src/gromacs/gmxpreprocess/readpull.c
+++ b/src/gromacs/gmxpreprocess/readpull.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/gromacs/gmxpreprocess/readrot.c b/src/gromacs/gmxpreprocess/readrot.c
index 3ed1bdb01e..527aca8764 100644
--- a/src/gromacs/gmxpreprocess/readrot.c
+++ b/src/gromacs/gmxpreprocess/readrot.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/math/vec.h"
 #include "gromacs/utility/smalloc.h"
 #include "readir.h"
diff --git a/src/gromacs/gmxpreprocess/resall.c b/src/gromacs/gmxpreprocess/resall.c
index a80bcd6231..b363023b1d 100644
--- a/src/gromacs/gmxpreprocess/resall.c
+++ b/src/gromacs/gmxpreprocess/resall.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/solvate.cpp b/src/gromacs/gmxpreprocess/solvate.cpp
index 46fd66c06d..421a49a207 100644
--- a/src/gromacs/gmxpreprocess/solvate.cpp
+++ b/src/gromacs/gmxpreprocess/solvate.cpp
@@ -38,8 +38,6 @@
 
 #include "solvate.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxpreprocess/sortwater.c b/src/gromacs/gmxpreprocess/sortwater.c
index aea7ac8d3e..43dcda6c5d 100644
--- a/src/gromacs/gmxpreprocess/sortwater.c
+++ b/src/gromacs/gmxpreprocess/sortwater.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxpreprocess/specbond.c b/src/gromacs/gmxpreprocess/specbond.c
index 60baa77405..208092882b 100644
--- a/src/gromacs/gmxpreprocess/specbond.c
+++ b/src/gromacs/gmxpreprocess/specbond.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <math.h>
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/ter_db.c b/src/gromacs/gmxpreprocess/ter_db.c
index e55ec6d115..4817b27942 100644
--- a/src/gromacs/gmxpreprocess/ter_db.c
+++ b/src/gromacs/gmxpreprocess/ter_db.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxpreprocess/tomorse.c b/src/gromacs/gmxpreprocess/tomorse.c
index 16110bdbca..a326f16f0a 100644
--- a/src/gromacs/gmxpreprocess/tomorse.c
+++ b/src/gromacs/gmxpreprocess/tomorse.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/gromacs/gmxpreprocess/tomorse.h b/src/gromacs/gmxpreprocess/tomorse.h
index fb66103033..e24817c829 100644
--- a/src/gromacs/gmxpreprocess/tomorse.h
+++ b/src/gromacs/gmxpreprocess/tomorse.h
@@ -38,8 +38,6 @@
 #ifndef GMX_GMXPREPROCESS_TOMORSE_H
 #define GMX_GMXPREPROCESS_TOMORSE_H
 
-#include "config.h"
-
 #include <stdio.h>
 #include "gromacs/legacyheaders/typedefs.h"
 
diff --git a/src/gromacs/gmxpreprocess/topdirs.c b/src/gromacs/gmxpreprocess/topdirs.c
index 9435cb36e0..d46b6922a8 100644
--- a/src/gromacs/gmxpreprocess/topdirs.c
+++ b/src/gromacs/gmxpreprocess/topdirs.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdarg.h>
 
diff --git a/src/gromacs/gmxpreprocess/topio.c b/src/gromacs/gmxpreprocess/topio.c
index e96195737b..f7efad094c 100644
--- a/src/gromacs/gmxpreprocess/topio.c
+++ b/src/gromacs/gmxpreprocess/topio.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/src/gromacs/gmxpreprocess/toppush.c b/src/gromacs/gmxpreprocess/toppush.c
index 53616ab2a6..fdefac9f14 100644
--- a/src/gromacs/gmxpreprocess/toppush.c
+++ b/src/gromacs/gmxpreprocess/toppush.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <assert.h>
 #include <ctype.h>
 #include <math.h>
diff --git a/src/gromacs/gmxpreprocess/topshake.c b/src/gromacs/gmxpreprocess/topshake.c
index 3428638542..66a1036bdc 100644
--- a/src/gromacs/gmxpreprocess/topshake.c
+++ b/src/gromacs/gmxpreprocess/topshake.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <math.h>
 
diff --git a/src/gromacs/gmxpreprocess/toputil.c b/src/gromacs/gmxpreprocess/toputil.c
index 9c4da0eb1b..a407b711df 100644
--- a/src/gromacs/gmxpreprocess/toputil.c
+++ b/src/gromacs/gmxpreprocess/toputil.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <assert.h>
 #include <math.h>
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/vsite_parm.c b/src/gromacs/gmxpreprocess/vsite_parm.c
index 0671ee4027..edeab6fe4b 100644
--- a/src/gromacs/gmxpreprocess/vsite_parm.c
+++ b/src/gromacs/gmxpreprocess/vsite_parm.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/src/gromacs/gmxpreprocess/x2top.c b/src/gromacs/gmxpreprocess/x2top.c
index 4157453f26..f0ae9ad8d8 100644
--- a/src/gromacs/gmxpreprocess/x2top.c
+++ b/src/gromacs/gmxpreprocess/x2top.c
@@ -38,8 +38,6 @@
 
 #include "x2top.h"
 
-#include "config.h"
-
 #include <assert.h>
 
 #include "gromacs/legacyheaders/copyrite.h"
diff --git a/src/gromacs/gmxpreprocess/xlate.c b/src/gromacs/gmxpreprocess/xlate.c
index 5cbf20e8ed..d8dfc594f8 100644
--- a/src/gromacs/gmxpreprocess/xlate.c
+++ b/src/gromacs/gmxpreprocess/xlate.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/gromacs/mdlib/calcmu.c b/src/gromacs/mdlib/calcmu.c
index 34a95d1dc1..618b9cf0a2 100644
--- a/src/gromacs/mdlib/calcmu.c
+++ b/src/gromacs/mdlib/calcmu.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/gromacs/mdlib/calcvir.c b/src/gromacs/mdlib/calcvir.c
index 61345f9fbe..19d27411a1 100644
--- a/src/gromacs/mdlib/calcvir.c
+++ b/src/gromacs/mdlib/calcvir.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/force.h"
 #include "gromacs/legacyheaders/macros.h"
 
diff --git a/src/gromacs/mdlib/clincs.c b/src/gromacs/mdlib/clincs.c
index 6bb939a41f..2b45442554 100644
--- a/src/gromacs/mdlib/clincs.c
+++ b/src/gromacs/mdlib/clincs.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/src/gromacs/mdlib/constr.c b/src/gromacs/mdlib/constr.c
index ca4c898e68..7b9addc389 100644
--- a/src/gromacs/mdlib/constr.c
+++ b/src/gromacs/mdlib/constr.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/src/gromacs/mdlib/coupling.c b/src/gromacs/mdlib/coupling.c
index 2519f11141..7583da1381 100644
--- a/src/gromacs/mdlib/coupling.c
+++ b/src/gromacs/mdlib/coupling.c
@@ -36,7 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
 #include <assert.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/csettle.c b/src/gromacs/mdlib/csettle.c
index fe270bff09..44920009a9 100644
--- a/src/gromacs/mdlib/csettle.c
+++ b/src/gromacs/mdlib/csettle.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 
diff --git a/src/gromacs/mdlib/domdec_box.c b/src/gromacs/mdlib/domdec_box.c
index 5a30255b7d..89fc97c820 100644
--- a/src/gromacs/mdlib/domdec_box.c
+++ b/src/gromacs/mdlib/domdec_box.c
@@ -35,8 +35,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/pbcutil/pbc.h"
diff --git a/src/gromacs/mdlib/domdec_con.c b/src/gromacs/mdlib/domdec_con.c
index ba6baf6fbc..e83c16930e 100644
--- a/src/gromacs/mdlib/domdec_con.c
+++ b/src/gromacs/mdlib/domdec_con.c
@@ -35,7 +35,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
 #include <assert.h>
 
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/mdlib/domdec_setup.c b/src/gromacs/mdlib/domdec_setup.c
index a8c4443f2c..5caa68a9b5 100644
--- a/src/gromacs/mdlib/domdec_setup.c
+++ b/src/gromacs/mdlib/domdec_setup.c
@@ -35,8 +35,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <assert.h>
 #include "gromacs/legacyheaders/domdec.h"
diff --git a/src/gromacs/mdlib/domdec_top.c b/src/gromacs/mdlib/domdec_top.c
index 2e752241d5..8360e45540 100644
--- a/src/gromacs/mdlib/domdec_top.c
+++ b/src/gromacs/mdlib/domdec_top.c
@@ -35,8 +35,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/ebin.c b/src/gromacs/mdlib/ebin.c
index 8dbebee9de..33a0742130 100644
--- a/src/gromacs/mdlib/ebin.c
+++ b/src/gromacs/mdlib/ebin.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/mdlib/ewald.c b/src/gromacs/mdlib/ewald.c
index e4b789df76..bcf1865df3 100644
--- a/src/gromacs/mdlib/ewald.c
+++ b/src/gromacs/mdlib/ewald.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/gromacs/mdlib/expanded.c b/src/gromacs/mdlib/expanded.c
index 0da2966100..be1ea75c67 100644
--- a/src/gromacs/mdlib/expanded.c
+++ b/src/gromacs/mdlib/expanded.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 
diff --git a/src/gromacs/mdlib/genborn.c b/src/gromacs/mdlib/genborn.c
index 23caa377f5..f3a8973262 100644
--- a/src/gromacs/mdlib/genborn.c
+++ b/src/gromacs/mdlib/genborn.c
@@ -37,8 +37,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/mdlib/genborn_allvsall.c b/src/gromacs/mdlib/genborn_allvsall.c
index fe9d4c8e6c..b294cbbf5e 100644
--- a/src/gromacs/mdlib/genborn_allvsall.c
+++ b/src/gromacs/mdlib/genborn_allvsall.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/legacyheaders/types/simple.h"
 
diff --git a/src/gromacs/mdlib/genborn_allvsall.h b/src/gromacs/mdlib/genborn_allvsall.h
index 9ef56e08ab..1f91757d16 100644
--- a/src/gromacs/mdlib/genborn_allvsall.h
+++ b/src/gromacs/mdlib/genborn_allvsall.h
@@ -37,8 +37,6 @@
 #ifndef _GENBORN_ALLVSALL_H
 #define _GENBORN_ALLVSALL_H
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/types/simple.h"
 #include "gromacs/legacyheaders/typedefs.h"
 
diff --git a/src/gromacs/mdlib/genborn_allvsall_sse2_double.c b/src/gromacs/mdlib/genborn_allvsall_sse2_double.c
index 7484cdd182..4816c10133 100644
--- a/src/gromacs/mdlib/genborn_allvsall_sse2_double.c
+++ b/src/gromacs/mdlib/genborn_allvsall_sse2_double.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/legacyheaders/types/simple.h"
 
diff --git a/src/gromacs/mdlib/genborn_allvsall_sse2_double.h b/src/gromacs/mdlib/genborn_allvsall_sse2_double.h
index 8ba9cb00f7..045f5eb8a8 100644
--- a/src/gromacs/mdlib/genborn_allvsall_sse2_double.h
+++ b/src/gromacs/mdlib/genborn_allvsall_sse2_double.h
@@ -37,8 +37,6 @@
 #ifndef _GENBORN_ALLVSALL_SSE2_DOUBLE_H
 #define _GENBORN_ALLVSALL_SSE2_DOUBLE_H
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/types/simple.h"
 #include "gromacs/legacyheaders/typedefs.h"
 
diff --git a/src/gromacs/mdlib/genborn_allvsall_sse2_single.c b/src/gromacs/mdlib/genborn_allvsall_sse2_single.c
index 938b6c16a2..b574baea47 100644
--- a/src/gromacs/mdlib/genborn_allvsall_sse2_single.c
+++ b/src/gromacs/mdlib/genborn_allvsall_sse2_single.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/legacyheaders/types/simple.h"
 
diff --git a/src/gromacs/mdlib/genborn_allvsall_sse2_single.h b/src/gromacs/mdlib/genborn_allvsall_sse2_single.h
index 00d3ec68b6..784b127a40 100644
--- a/src/gromacs/mdlib/genborn_allvsall_sse2_single.h
+++ b/src/gromacs/mdlib/genborn_allvsall_sse2_single.h
@@ -37,8 +37,6 @@
 #ifndef _GENBORN_ALLVSALL_SSE2_SINGLE_H
 #define _GENBORN_ALLVSALL_SSE2_SINGLE_H
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/types/simple.h"
 #include "gromacs/legacyheaders/typedefs.h"
 
diff --git a/src/gromacs/mdlib/genborn_sse2_double.c b/src/gromacs/mdlib/genborn_sse2_double.c
index c8836ae5f5..54eca2fe79 100644
--- a/src/gromacs/mdlib/genborn_sse2_double.c
+++ b/src/gromacs/mdlib/genborn_sse2_double.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/mdlib/genborn_sse2_double.h b/src/gromacs/mdlib/genborn_sse2_double.h
index 0deaf83451..0bf4ea9d69 100644
--- a/src/gromacs/mdlib/genborn_sse2_double.h
+++ b/src/gromacs/mdlib/genborn_sse2_double.h
@@ -37,8 +37,6 @@
 #ifndef _genborn_sse2_double_h
 #define _genborn_sse2_double_h
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 
 int
diff --git a/src/gromacs/mdlib/genborn_sse2_single.c b/src/gromacs/mdlib/genborn_sse2_single.c
index f71b22075a..bd5d6097dd 100644
--- a/src/gromacs/mdlib/genborn_sse2_single.c
+++ b/src/gromacs/mdlib/genborn_sse2_single.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/mdlib/genborn_sse2_single.h b/src/gromacs/mdlib/genborn_sse2_single.h
index 9dfc676b8d..6753e0e17f 100644
--- a/src/gromacs/mdlib/genborn_sse2_single.h
+++ b/src/gromacs/mdlib/genborn_sse2_single.h
@@ -37,8 +37,6 @@
 #ifndef _genborn_sse_h
 #define _genborn_sse_h
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 
 float
diff --git a/src/gromacs/mdlib/groupcoord.c b/src/gromacs/mdlib/groupcoord.c
index 6b6c44bb02..17d3f713b1 100644
--- a/src/gromacs/mdlib/groupcoord.c
+++ b/src/gromacs/mdlib/groupcoord.c
@@ -36,9 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
-
 #include "groupcoord.h"
 #include "gromacs/legacyheaders/network.h"
 #include "gromacs/pbcutil/pbc.h"
diff --git a/src/gromacs/mdlib/groupcoord.h b/src/gromacs/mdlib/groupcoord.h
index 7ec6e3e712..90f4de536e 100644
--- a/src/gromacs/mdlib/groupcoord.h
+++ b/src/gromacs/mdlib/groupcoord.h
@@ -47,8 +47,6 @@
  * \inlibraryapi
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/types/commrec.h"
diff --git a/src/gromacs/mdlib/init.c b/src/gromacs/mdlib/init.c
index 98b72dda5f..6b44531834 100644
--- a/src/gromacs/mdlib/init.c
+++ b/src/gromacs/mdlib/init.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/fileio/tpxio.h"
diff --git a/src/gromacs/mdlib/iteratedconstraints.c b/src/gromacs/mdlib/iteratedconstraints.c
index c7e6cc0800..a53633db6f 100644
--- a/src/gromacs/mdlib/iteratedconstraints.c
+++ b/src/gromacs/mdlib/iteratedconstraints.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/utility/fatalerror.h"
diff --git a/src/gromacs/mdlib/md_support.cpp b/src/gromacs/mdlib/md_support.cpp
index 5e2b4702a7..9e1abb9f1f 100644
--- a/src/gromacs/mdlib/md_support.cpp
+++ b/src/gromacs/mdlib/md_support.cpp
@@ -39,8 +39,6 @@
 
 #include <algorithm>
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/mdrun.h"
 #include "gromacs/legacyheaders/domdec.h"
diff --git a/src/gromacs/mdlib/mdatom.c b/src/gromacs/mdlib/mdatom.c
index a3d29d00ce..ea59275ec1 100644
--- a/src/gromacs/mdlib/mdatom.c
+++ b/src/gromacs/mdlib/mdatom.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/mdebin.c b/src/gromacs/mdlib/mdebin.c
index 755671ad7e..84f24ac438 100644
--- a/src/gromacs/mdlib/mdebin.c
+++ b/src/gromacs/mdlib/mdebin.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <float.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/mdlib/mdebin_bar.c b/src/gromacs/mdlib/mdebin_bar.c
index d65fd5bd1d..a6bf3745ca 100644
--- a/src/gromacs/mdlib/mdebin_bar.c
+++ b/src/gromacs/mdlib/mdebin_bar.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 #include <float.h>
 #include <math.h>
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.c b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.c
index 01ac896878..ba8f2f0140 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/pbcutil/ishift.h"
 
 #include "nbnxn_kernel_common.h"
diff --git a/src/gromacs/mdlib/nlistheuristics.c b/src/gromacs/mdlib/nlistheuristics.c
index a7c4e38930..abe5815555 100644
--- a/src/gromacs/mdlib/nlistheuristics.c
+++ b/src/gromacs/mdlib/nlistheuristics.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/types/nlistheuristics.h"
 
diff --git a/src/gromacs/mdlib/ns.c b/src/gromacs/mdlib/ns.c
index c48134c8d5..8eb8a70d62 100644
--- a/src/gromacs/mdlib/ns.c
+++ b/src/gromacs/mdlib/ns.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/mdlib/nsgrid.c b/src/gromacs/mdlib/nsgrid.c
index 392c68c8e7..8ad27efc6c 100644
--- a/src/gromacs/mdlib/nsgrid.c
+++ b/src/gromacs/mdlib/nsgrid.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/perf_est.c b/src/gromacs/mdlib/perf_est.c
index 305fac80d2..29010b067a 100644
--- a/src/gromacs/mdlib/perf_est.c
+++ b/src/gromacs/mdlib/perf_est.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/mdlib/qm_orca.c b/src/gromacs/mdlib/qm_orca.c
index 3b967db012..f5f85e4f8d 100644
--- a/src/gromacs/mdlib/qm_orca.c
+++ b/src/gromacs/mdlib/qm_orca.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/gromacs/mdlib/rf_util.c b/src/gromacs/mdlib/rf_util.c
index 3db4e4dce7..ee68bd8ee0 100644
--- a/src/gromacs/mdlib/rf_util.c
+++ b/src/gromacs/mdlib/rf_util.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/force.h"
 #include "gromacs/legacyheaders/names.h"
diff --git a/src/gromacs/mdlib/shakef.c b/src/gromacs/mdlib/shakef.c
index a14538b115..fba6074500 100644
--- a/src/gromacs/mdlib/shakef.c
+++ b/src/gromacs/mdlib/shakef.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/shellfc.c b/src/gromacs/mdlib/shellfc.c
index e5b7a3d75f..ad3f4d5c6e 100644
--- a/src/gromacs/mdlib/shellfc.c
+++ b/src/gromacs/mdlib/shellfc.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/gromacs/mdlib/stat.c b/src/gromacs/mdlib/stat.c
index 246728091d..e0d2ee19c6 100644
--- a/src/gromacs/mdlib/stat.c
+++ b/src/gromacs/mdlib/stat.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 #include <stdio.h>
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/tables.c b/src/gromacs/mdlib/tables.c
index 5a45deedb3..5f5d9d58fd 100644
--- a/src/gromacs/mdlib/tables.c
+++ b/src/gromacs/mdlib/tables.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/math/utilities.h"
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/tgroup.c b/src/gromacs/mdlib/tgroup.c
index 7e7816e1e7..db9a9bb988 100644
--- a/src/gromacs/mdlib/tgroup.c
+++ b/src/gromacs/mdlib/tgroup.c
@@ -37,9 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
-
 #include <math.h>
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/mdlib/tpi.c b/src/gromacs/mdlib/tpi.c
index 6c4c0294d5..39ebeaf237 100644
--- a/src/gromacs/mdlib/tpi.c
+++ b/src/gromacs/mdlib/tpi.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/mdlib/update.c b/src/gromacs/mdlib/update.c
index 8287d12c58..68c30a18e2 100644
--- a/src/gromacs/mdlib/update.c
+++ b/src/gromacs/mdlib/update.c
@@ -36,9 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
-
 #include <stdio.h>
 #include <math.h>
 
diff --git a/src/gromacs/mdlib/vcm.c b/src/gromacs/mdlib/vcm.c
index 8a6267009a..c6d3b2a310 100644
--- a/src/gromacs/mdlib/vcm.c
+++ b/src/gromacs/mdlib/vcm.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/legacyheaders/vcm.h"
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/mdlib/vsite.c b/src/gromacs/mdlib/vsite.c
index a2aa461351..a9df773ec2 100644
--- a/src/gromacs/mdlib/vsite.c
+++ b/src/gromacs/mdlib/vsite.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/wall.c b/src/gromacs/mdlib/wall.c
index be08c6bb63..38f26e3c1c 100644
--- a/src/gromacs/mdlib/wall.c
+++ b/src/gromacs/mdlib/wall.c
@@ -37,8 +37,6 @@
 
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/mdlib/wnblist.c b/src/gromacs/mdlib/wnblist.c
index da8f9a2470..62aa867b6b 100644
--- a/src/gromacs/mdlib/wnblist.c
+++ b/src/gromacs/mdlib/wnblist.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 #include "gromacs/legacyheaders/force.h"
diff --git a/src/gromacs/pbcutil/mshift.cpp b/src/gromacs/pbcutil/mshift.cpp
index 0c94f2321a..94dc35bd2b 100644
--- a/src/gromacs/pbcutil/mshift.cpp
+++ b/src/gromacs/pbcutil/mshift.cpp
@@ -38,8 +38,6 @@
 
 #include "gromacs/pbcutil/mshift.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include <algorithm>
diff --git a/src/gromacs/pbcutil/pbc.c b/src/gromacs/pbcutil/pbc.c
index 41a4256f4e..cfdc3be419 100644
--- a/src/gromacs/pbcutil/pbc.c
+++ b/src/gromacs/pbcutil/pbc.c
@@ -38,8 +38,6 @@
 
 #include "gromacs/pbcutil/pbc.h"
 
-#include "config.h"
-
 #include <assert.h>
 #include <math.h>
 
diff --git a/src/gromacs/pbcutil/rmpbc.c b/src/gromacs/pbcutil/rmpbc.c
index fd732c653d..09f10c043c 100644
--- a/src/gromacs/pbcutil/rmpbc.c
+++ b/src/gromacs/pbcutil/rmpbc.c
@@ -38,8 +38,6 @@
 
 #include "gromacs/pbcutil/rmpbc.h"
 
-#include "config.h"
-
 #include "gromacs/fileio/trx.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/pbcutil/mshift.h"
diff --git a/src/gromacs/pulling/pull.c b/src/gromacs/pulling/pull.c
index 1e084858bb..e84ad19714 100644
--- a/src/gromacs/pulling/pull.c
+++ b/src/gromacs/pulling/pull.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/gromacs/pulling/pullutil.c b/src/gromacs/pulling/pullutil.c
index 3d90b1ae9c..57bc3401c5 100644
--- a/src/gromacs/pulling/pullutil.c
+++ b/src/gromacs/pulling/pullutil.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 
 #include "gromacs/utility/futil.h"
diff --git a/src/gromacs/simd/tests/base.cpp b/src/gromacs/simd/tests/base.cpp
index 5ac13acd8d..fed7848045 100644
--- a/src/gromacs/simd/tests/base.cpp
+++ b/src/gromacs/simd/tests/base.cpp
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "testutils/testoptions.h"
diff --git a/src/gromacs/simd/tests/bootstrap_loadstore.cpp b/src/gromacs/simd/tests/bootstrap_loadstore.cpp
index 8cc0295bab..824a831e18 100644
--- a/src/gromacs/simd/tests/bootstrap_loadstore.cpp
+++ b/src/gromacs/simd/tests/bootstrap_loadstore.cpp
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 /*! \internal \file
  * \brief
  * Separate test of SIMD load/store, before we use them in the SIMD test classes.
diff --git a/src/gromacs/simd/tests/simd.cpp b/src/gromacs/simd/tests/simd.cpp
index c8429f729f..a53c78999e 100644
--- a/src/gromacs/simd/tests/simd.cpp
+++ b/src/gromacs/simd/tests/simd.cpp
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "simd.h"
 
 namespace gmx
diff --git a/src/gromacs/simd/tests/simd4.cpp b/src/gromacs/simd/tests/simd4.cpp
index 79ff7783d8..23fead9a2b 100644
--- a/src/gromacs/simd/tests/simd4.cpp
+++ b/src/gromacs/simd/tests/simd4.cpp
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "simd4.h"
 
 namespace gmx
diff --git a/src/gromacs/simd/tests/simd4_floatingpoint.cpp b/src/gromacs/simd/tests/simd4_floatingpoint.cpp
index 5d7a92251e..c51c71532f 100644
--- a/src/gromacs/simd/tests/simd4_floatingpoint.cpp
+++ b/src/gromacs/simd/tests/simd4_floatingpoint.cpp
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/math/utilities.h"
 
diff --git a/src/gromacs/simd/tests/simd4_vector_operations.cpp b/src/gromacs/simd/tests/simd4_vector_operations.cpp
index 5ed13a05c7..17a070b25e 100644
--- a/src/gromacs/simd/tests/simd4_vector_operations.cpp
+++ b/src/gromacs/simd/tests/simd4_vector_operations.cpp
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/simd/simd.h"
 #include "gromacs/simd/vector_operations.h"
diff --git a/src/gromacs/simd/tests/simd_floatingpoint.cpp b/src/gromacs/simd/tests/simd_floatingpoint.cpp
index 78584b72c9..f0d07034a3 100644
--- a/src/gromacs/simd/tests/simd_floatingpoint.cpp
+++ b/src/gromacs/simd/tests/simd_floatingpoint.cpp
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/math/utilities.h"
 
diff --git a/src/gromacs/simd/tests/simd_integer.cpp b/src/gromacs/simd/tests/simd_integer.cpp
index e3142f656a..9535c82a30 100644
--- a/src/gromacs/simd/tests/simd_integer.cpp
+++ b/src/gromacs/simd/tests/simd_integer.cpp
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include "simd.h"
 
 /* Some notes on the setup of these tests:
diff --git a/src/gromacs/simd/tests/simd_vector_operations.cpp b/src/gromacs/simd/tests/simd_vector_operations.cpp
index 68d09637ae..58c1e6f2af 100644
--- a/src/gromacs/simd/tests/simd_vector_operations.cpp
+++ b/src/gromacs/simd/tests/simd_vector_operations.cpp
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include "gromacs/simd/simd.h"
 #include "gromacs/simd/vector_operations.h"
diff --git a/src/gromacs/statistics/statistics.c b/src/gromacs/statistics/statistics.c
index 24ba98b3af..d77c231f61 100644
--- a/src/gromacs/statistics/statistics.c
+++ b/src/gromacs/statistics/statistics.c
@@ -38,7 +38,6 @@
 
 #include "statistics.h"
 
-#include "config.h"
 #include <math.h>
 
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/statistics/statistics_test.c b/src/gromacs/statistics/statistics_test.c
index 28a26925e9..7baff7bfac 100644
--- a/src/gromacs/statistics/statistics_test.c
+++ b/src/gromacs/statistics/statistics_test.c
@@ -38,8 +38,6 @@
 
 #include "statistics.h"
 
-#include "config.h"
-
 #include <stdio.h>
 
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/swap/swapcoords.c b/src/gromacs/swap/swapcoords.c
index 0fe76d3b1f..734b13b5e7 100644
--- a/src/gromacs/swap/swapcoords.c
+++ b/src/gromacs/swap/swapcoords.c
@@ -41,8 +41,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/tools/check.c b/src/gromacs/tools/check.c
index bc0df3faad..ceb5ec2173 100644
--- a/src/gromacs/tools/check.c
+++ b/src/gromacs/tools/check.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/gromacs/tools/compare.c b/src/gromacs/tools/compare.c
index a46b8e51c1..7dfe7a93d6 100644
--- a/src/gromacs/tools/compare.c
+++ b/src/gromacs/tools/compare.c
@@ -37,8 +37,6 @@
 /* This file is completely threadsafe - keep it that way! */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/gromacs/tools/convert_tpr.c b/src/gromacs/tools/convert_tpr.c
index 58921b2cc2..c70e194488 100644
--- a/src/gromacs/tools/convert_tpr.c
+++ b/src/gromacs/tools/convert_tpr.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 
 #include "gromacs/legacyheaders/types/inputrec.h"
diff --git a/src/gromacs/topology/atomprop.cpp b/src/gromacs/topology/atomprop.cpp
index 91b860b70f..864c285590 100644
--- a/src/gromacs/topology/atomprop.cpp
+++ b/src/gromacs/topology/atomprop.cpp
@@ -38,8 +38,6 @@
 
 #include "gromacs/topology/atomprop.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/gromacs/topology/index.cpp b/src/gromacs/topology/index.cpp
index b4440fc13c..615c38a1bf 100644
--- a/src/gromacs/topology/index.cpp
+++ b/src/gromacs/topology/index.cpp
@@ -38,8 +38,6 @@
 
 #include "gromacs/topology/index.h"
 
-#include "config.h"
-
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/src/gromacs/topology/mtop_util.c b/src/gromacs/topology/mtop_util.c
index 9f707ebbc4..622d4e46fe 100644
--- a/src/gromacs/topology/mtop_util.c
+++ b/src/gromacs/topology/mtop_util.c
@@ -36,8 +36,6 @@
 
 #include "gromacs/topology/mtop_util.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/gromacs/topology/symtab.cpp b/src/gromacs/topology/symtab.cpp
index 27b3a0c11e..35134a5134 100644
--- a/src/gromacs/topology/symtab.cpp
+++ b/src/gromacs/topology/symtab.cpp
@@ -38,8 +38,6 @@
 
 #include "symtab.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/gromacs/topology/topsort.c b/src/gromacs/topology/topsort.c
index 05d3faa3e0..8f1a007831 100644
--- a/src/gromacs/topology/topsort.c
+++ b/src/gromacs/topology/topsort.c
@@ -38,8 +38,6 @@
 
 #include "gromacs/topology/topsort.h"
 
-#include "config.h"
-
 #include <stdio.h>
 
 #include "gromacs/legacyheaders/types/ifunc.h"
diff --git a/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp b/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
index e67418744d..d826b870a8 100644
--- a/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
+++ b/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
@@ -43,8 +43,6 @@
 
 #include "cmdlinerunner.h"
 
-#include "config.h"
-
 #include "gromacs/analysisdata/paralleloptions.h"
 #include "gromacs/commandline/cmdlinehelpcontext.h"
 #include "gromacs/commandline/cmdlinehelpwriter.h"
diff --git a/src/gromacs/trajectoryanalysis/modules/nsc.c b/src/gromacs/trajectoryanalysis/modules/nsc.c
index c73d05273a..ffc58420e3 100644
--- a/src/gromacs/trajectoryanalysis/modules/nsc.c
+++ b/src/gromacs/trajectoryanalysis/modules/nsc.c
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/gromacs/trajectoryanalysis/runnercommon.cpp b/src/gromacs/trajectoryanalysis/runnercommon.cpp
index 6ab20735e1..bf610b3827 100644
--- a/src/gromacs/trajectoryanalysis/runnercommon.cpp
+++ b/src/gromacs/trajectoryanalysis/runnercommon.cpp
@@ -43,8 +43,6 @@
 
 #include "runnercommon.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include "gromacs/legacyheaders/oenv.h"
diff --git a/src/programs/mdrun/membed.c b/src/programs/mdrun/membed.c
index d6d41aae34..758a5acc47 100644
--- a/src/programs/mdrun/membed.c
+++ b/src/programs/mdrun/membed.c
@@ -34,8 +34,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <signal.h>
 #include <stdlib.h>
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/programs/view/buttons.cpp b/src/programs/view/buttons.cpp
index 74b2ec0321..680471fdea 100644
--- a/src/programs/view/buttons.cpp
+++ b/src/programs/view/buttons.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/programs/view/fgrid.cpp b/src/programs/view/fgrid.cpp
index ae840e1f00..a087852e53 100644
--- a/src/programs/view/fgrid.cpp
+++ b/src/programs/view/fgrid.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/programs/view/filter.cpp b/src/programs/view/filter.cpp
index ccd6763ca8..590e5c8bdb 100644
--- a/src/programs/view/filter.cpp
+++ b/src/programs/view/filter.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include <algorithm>
diff --git a/src/programs/view/logo.cpp b/src/programs/view/logo.cpp
index 89424d59d6..fdab4e5233 100644
--- a/src/programs/view/logo.cpp
+++ b/src/programs/view/logo.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/programs/view/molps.cpp b/src/programs/view/molps.cpp
index 9975baf1f3..03c0d21513 100644
--- a/src/programs/view/molps.cpp
+++ b/src/programs/view/molps.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/programs/view/nleg.cpp b/src/programs/view/nleg.cpp
index 53cb169be0..0783bb6c84 100644
--- a/src/programs/view/nleg.cpp
+++ b/src/programs/view/nleg.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include <algorithm>
diff --git a/src/programs/view/nmol.cpp b/src/programs/view/nmol.cpp
index fc80cdfe93..26fc5bd5fc 100644
--- a/src/programs/view/nmol.cpp
+++ b/src/programs/view/nmol.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/programs/view/popup.cpp b/src/programs/view/popup.cpp
index c2d02e1b2f..4af8526f2c 100644
--- a/src/programs/view/popup.cpp
+++ b/src/programs/view/popup.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/src/programs/view/pulldown.cpp b/src/programs/view/pulldown.cpp
index 6d340e5680..d010cfdcdc 100644
--- a/src/programs/view/pulldown.cpp
+++ b/src/programs/view/pulldown.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string.h>
 
 #include <algorithm>
diff --git a/src/programs/view/x11.cpp b/src/programs/view/x11.cpp
index c068628815..add052b006 100644
--- a/src/programs/view/x11.cpp
+++ b/src/programs/view/x11.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/programs/view/xdlg.cpp b/src/programs/view/xdlg.cpp
index dfdadc2a8b..86feef1e69 100644
--- a/src/programs/view/xdlg.cpp
+++ b/src/programs/view/xdlg.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/programs/view/xdlghi.cpp b/src/programs/view/xdlghi.cpp
index aeeb9089c2..aaf393ae5e 100644
--- a/src/programs/view/xdlghi.cpp
+++ b/src/programs/view/xdlghi.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/programs/view/xdlgitem.cpp b/src/programs/view/xdlgitem.cpp
index 5a043422ad..4890f8fa38 100644
--- a/src/programs/view/xdlgitem.cpp
+++ b/src/programs/view/xdlgitem.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/programs/view/xmb.cpp b/src/programs/view/xmb.cpp
index 2cbd4a4688..6072f6d3d0 100644
--- a/src/programs/view/xmb.cpp
+++ b/src/programs/view/xmb.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/programs/view/xutil.cpp b/src/programs/view/xutil.cpp
index d567c4b6b9..39b4074ec7 100644
--- a/src/programs/view/xutil.cpp
+++ b/src/programs/view/xutil.cpp
@@ -36,8 +36,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>