From c0fea97ccf33a4e6b6f9116216b1634663f29474 Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@byu.net>
Date: Mon, 28 May 2007 16:49:41 +0000
Subject: [PATCH] Unconditionally include <config.h> in unit tests. *
 tests/test-alloca-opt.c: Remove #ifdef HAVE_CONFIG_H. * tests/test-allocsa.c,
 tests/test-arcfour.c, tests/test-arctwo.c, tests/test-argmatch.c,
 tests/test-argp.c, tests/test-array_list.c, tests/test-array_oset.c,
 tests/test-atexit.c, test-avltree_list.c, test-avltree_oset.c,
 test-avltreehash_list.c, test-base64.c, test-binary-io.c, test-c-ctype.c,
 test-c-strcasecmp.c, test-c-strcasestr.c, test-c-strncasecmp.c,
 test-c-strstr.c, test-canonicalize-lgpl.c, test-carray_list.c, test-crc.c,
 test-des.c, test-dirname.c, test-fflush.c, test-fprintf-posix.c,
 test-gc-arcfour.c, test-gc-arctwo.c, test-gc-des.c, test-gc-hmac-md5.c,
 test-gc-hmac-sha1.c, test-gc-md2.c, test-gc-md4.c, test-gc-md5.c,
 test-gc-pbkdf2-sha1.c, test-gc-rijndael.c, test-gc-sha1.c, test-gc.c,
 test-getpass.c, test-hmac-md5.c, test-hmac-sha1.c, test-iconv.c,
 test-linked_list.c, test-linkedhash_list.c, test-lock.c, test-mbscasecmp.c,
 test-mbscasestr1.c, test-mbscasestr2.c, test-mbscasestr3.c,
 test-mbscasestr4.c, test-mbschr.c, test-mbscspn.c, test-mbsncasecmp.c,
 test-mbspbrk.c, test-mbspcasecmp.c, test-mbsrchr.c, test-mbsspn.c,
 test-mbsstr1.c, test-mbsstr2.c, test-mbsstr3.c, test-md2.c, test-md4.c,
 test-md5.c, test-memmem.c, test-printf-posix.c, test-rbtree_list.c,
 test-rbtree_oset.c, test-rbtreehash_list.c, test-read-file.c,
 test-rijndael.c, test-snprintf-posix.c, test-snprintf.c,
 test-sprintf-posix.c, test-stdint.c, test-strcasestr.c, test-striconv.c,
 test-striconveh.c, test-striconveha.c, test-tls.c, test-vasnprintf-posix.c,
 test-vasnprintf-posix2.c, test-vasnprintf.c, test-vasprintf-posix.c,
 test-vasprintf.c, test-verify.c, test-vfprintf-posix.c, test-vprintf-posix.c,
 test-vsnprintf-posix.c, test-vsnprintf.c, test-vsprintf-posix.c,
 test-xvasprintf.c: Likewise.

---
 ChangeLog                      | 33 +++++++++++++++++++++++++++++++
 tests/test-alloca-opt.c        |  4 +---
 tests/test-allocsa.c           |  4 +---
 tests/test-arcfour.c           |  4 +---
 tests/test-arctwo.c            |  4 +---
 tests/test-argmatch.c          |  5 +----
 tests/test-argp.c              | 44 ++++++++++++++++++++----------------------
 tests/test-array_list.c        |  4 +---
 tests/test-array_oset.c        |  4 +---
 tests/test-atexit.c            |  4 +---
 tests/test-avltree_list.c      |  4 +---
 tests/test-avltree_oset.c      |  4 +---
 tests/test-avltreehash_list.c  |  4 +---
 tests/test-base64.c            |  4 +---
 tests/test-binary-io.c         |  4 +---
 tests/test-c-ctype.c           |  4 +---
 tests/test-c-strcasecmp.c      |  4 +---
 tests/test-c-strcasestr.c      |  4 +---
 tests/test-c-strncasecmp.c     |  4 +---
 tests/test-c-strstr.c          |  4 +---
 tests/test-canonicalize-lgpl.c |  4 +---
 tests/test-carray_list.c       |  4 +---
 tests/test-crc.c               |  4 +---
 tests/test-des.c               |  4 +---
 tests/test-dirname.c           |  4 +---
 tests/test-fflush.c            |  4 +---
 tests/test-fprintf-posix.c     |  4 +---
 tests/test-gc-arcfour.c        |  4 +---
 tests/test-gc-arctwo.c         |  4 +---
 tests/test-gc-des.c            |  4 +---
 tests/test-gc-hmac-md5.c       |  4 +---
 tests/test-gc-hmac-sha1.c      |  4 +---
 tests/test-gc-md2.c            |  4 +---
 tests/test-gc-md4.c            |  4 +---
 tests/test-gc-md5.c            |  4 +---
 tests/test-gc-pbkdf2-sha1.c    |  4 +---
 tests/test-gc-rijndael.c       |  4 +---
 tests/test-gc-sha1.c           |  4 +---
 tests/test-gc.c                |  4 +---
 tests/test-getpass.c           |  4 +---
 tests/test-hmac-md5.c          |  4 +---
 tests/test-hmac-sha1.c         |  4 +---
 tests/test-iconv.c             |  4 +---
 tests/test-linked_list.c       |  4 +---
 tests/test-linkedhash_list.c   |  4 +---
 tests/test-lock.c              |  4 +---
 tests/test-mbscasecmp.c        |  4 +---
 tests/test-mbscasestr1.c       |  4 +---
 tests/test-mbscasestr2.c       |  4 +---
 tests/test-mbscasestr3.c       |  4 +---
 tests/test-mbscasestr4.c       |  4 +---
 tests/test-mbschr.c            |  4 +---
 tests/test-mbscspn.c           |  4 +---
 tests/test-mbsncasecmp.c       |  4 +---
 tests/test-mbspbrk.c           |  4 +---
 tests/test-mbspcasecmp.c       |  4 +---
 tests/test-mbsrchr.c           |  4 +---
 tests/test-mbsspn.c            |  4 +---
 tests/test-mbsstr1.c           |  4 +---
 tests/test-mbsstr2.c           |  4 +---
 tests/test-mbsstr3.c           |  4 +---
 tests/test-md2.c               |  4 +---
 tests/test-md4.c               |  4 +---
 tests/test-md5.c               |  4 +---
 tests/test-memmem.c            |  4 +---
 tests/test-printf-posix.c      |  4 +---
 tests/test-rbtree_list.c       |  4 +---
 tests/test-rbtree_oset.c       |  4 +---
 tests/test-rbtreehash_list.c   |  4 +---
 tests/test-read-file.c         |  4 +---
 tests/test-rijndael.c          |  4 +---
 tests/test-snprintf-posix.c    |  4 +---
 tests/test-snprintf.c          |  4 +---
 tests/test-sprintf-posix.c     |  4 +---
 tests/test-stdint.c            |  4 +---
 tests/test-strcasestr.c        |  4 +---
 tests/test-striconv.c          |  4 +---
 tests/test-striconveh.c        |  4 +---
 tests/test-striconveha.c       |  4 +---
 tests/test-tls.c               |  4 +---
 tests/test-vasnprintf-posix.c  |  4 +---
 tests/test-vasnprintf-posix2.c |  4 +---
 tests/test-vasnprintf.c        |  4 +---
 tests/test-vasprintf-posix.c   |  4 +---
 tests/test-vasprintf.c         |  4 +---
 tests/test-verify.c            |  4 +---
 tests/test-vfprintf-posix.c    |  4 +---
 tests/test-vprintf-posix.c     |  4 +---
 tests/test-vsnprintf-posix.c   |  4 +---
 tests/test-vsnprintf.c         |  4 +---
 tests/test-vsprintf-posix.c    |  4 +---
 tests/test-xvasprintf.c        |  4 +---
 92 files changed, 144 insertions(+), 294 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0fd5a0b7b..4f95bfc6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,39 @@
 
 2007-05-28  Eric Blake  <ebb9@byu.net>
 
+	Unconditionally include <config.h> in unit tests.
+	* tests/test-alloca-opt.c: Remove #ifdef HAVE_CONFIG_H.
+	* tests/test-allocsa.c, tests/test-arcfour.c,
+	tests/test-arctwo.c, tests/test-argmatch.c, tests/test-argp.c,
+	tests/test-array_list.c, tests/test-array_oset.c,
+	tests/test-atexit.c, test-avltree_list.c, test-avltree_oset.c,
+	test-avltreehash_list.c, test-base64.c, test-binary-io.c,
+	test-c-ctype.c, test-c-strcasecmp.c, test-c-strcasestr.c,
+	test-c-strncasecmp.c, test-c-strstr.c, test-canonicalize-lgpl.c,
+	test-carray_list.c, test-crc.c, test-des.c, test-dirname.c,
+	test-fflush.c, test-fprintf-posix.c, test-gc-arcfour.c,
+	test-gc-arctwo.c, test-gc-des.c, test-gc-hmac-md5.c,
+	test-gc-hmac-sha1.c, test-gc-md2.c, test-gc-md4.c, test-gc-md5.c,
+	test-gc-pbkdf2-sha1.c, test-gc-rijndael.c, test-gc-sha1.c,
+	test-gc.c, test-getpass.c, test-hmac-md5.c, test-hmac-sha1.c,
+	test-iconv.c, test-linked_list.c, test-linkedhash_list.c,
+	test-lock.c, test-mbscasecmp.c, test-mbscasestr1.c,
+	test-mbscasestr2.c, test-mbscasestr3.c, test-mbscasestr4.c,
+	test-mbschr.c, test-mbscspn.c, test-mbsncasecmp.c, test-mbspbrk.c,
+	test-mbspcasecmp.c, test-mbsrchr.c, test-mbsspn.c, test-mbsstr1.c,
+	test-mbsstr2.c, test-mbsstr3.c, test-md2.c, test-md4.c,
+	test-md5.c, test-memmem.c, test-printf-posix.c,
+	test-rbtree_list.c, test-rbtree_oset.c, test-rbtreehash_list.c,
+	test-read-file.c, test-rijndael.c, test-snprintf-posix.c,
+	test-snprintf.c, test-sprintf-posix.c, test-stdint.c,
+	test-strcasestr.c, test-striconv.c, test-striconveh.c,
+	test-striconveha.c, test-tls.c, test-vasnprintf-posix.c,
+	test-vasnprintf-posix2.c, test-vasnprintf.c,
+	test-vasprintf-posix.c, test-vasprintf.c, test-verify.c,
+	test-vfprintf-posix.c, test-vprintf-posix.c,
+	test-vsnprintf-posix.c, test-vsnprintf.c, test-vsprintf-posix.c,
+	test-xvasprintf.c: Likewise.
+
 	* lib/allocsa.h (safe_alloca): Avoid compiler warning.
 
 2007-05-28  Bruno Haible  <bruno@clisp.org>
diff --git a/tests/test-alloca-opt.c b/tests/test-alloca-opt.c
index 65bc19f02..8b4abeeea 100644
--- a/tests/test-alloca-opt.c
+++ b/tests/test-alloca-opt.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <alloca.h>
 
diff --git a/tests/test-allocsa.c b/tests/test-allocsa.c
index 9d4144881..0f5373972 100644
--- a/tests/test-allocsa.c
+++ b/tests/test-allocsa.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "allocsa.h"
 
diff --git a/tests/test-arcfour.c b/tests/test-arcfour.c
index 9540d0141..35ac6c898 100644
--- a/tests/test-arcfour.c
+++ b/tests/test-arcfour.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-arctwo.c b/tests/test-arctwo.c
index 85df6d1bf..8d5a8c9fd 100644
--- a/tests/test-arctwo.c
+++ b/tests/test-arctwo.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-argmatch.c b/tests/test-argmatch.c
index e61b88fcc..2babc524e 100644
--- a/tests/test-argmatch.c
+++ b/tests/test-argmatch.c
@@ -18,9 +18,7 @@
 /* Written by Bruno Haible <bruno@clisp.org>, 2007, based on test code
    by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "argmatch.h"
 
@@ -104,4 +102,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
diff --git a/tests/test-argp.c b/tests/test-argp.c
index 98f507d0d..d1f005499 100644
--- a/tests/test-argp.c
+++ b/tests/test-argp.c
@@ -16,9 +16,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "argp.h"
 
@@ -45,12 +43,12 @@ struct test_args
   int group_1_1_option;
 };
 
-static struct argp_option group1_option[] = 
+static struct argp_option group1_option[] =
 {
   { NULL, 0, NULL, 0, "Option Group 1", 0},
   { "verbose", 'v', NULL, 0, "Simple option without arguments", 1 },
   { "file", 'f', "FILE", 0, "Option with a mandatory argument", 1 },
-  { "input", 0, NULL, OPTION_ALIAS, NULL, 1 }, 
+  { "input", 0, NULL, OPTION_ALIAS, NULL, 1 },
   { "hidden", 'H', "FILE", OPTION_HIDDEN, "Hidden option", 1 },
   { NULL, 0, NULL, 0, NULL, 0 }
 };
@@ -65,15 +63,15 @@ group1_parser (int key, char *arg, struct argp_state *state)
     case 'v':
       args->verbose++;
       break;
-      
+
     case 'f':
       args->file = arg;
       break;
-      
+
     case 'H':
       args->hidden = arg;
       break;
-      
+
     default:
       return ARGP_ERR_UNKNOWN;
     }
@@ -93,7 +91,7 @@ struct argp_child group1_child = {
 };
 
 
-static struct argp_option group1_1_option[] = 
+static struct argp_option group1_1_option[] =
 {
   { NULL, 0, NULL, 0, "Option Group 1.1", 0},
   { "cantiga", 'C', NULL, 0, "create a cantiga" },
@@ -130,7 +128,7 @@ struct argp_child group1_1_child = {
 };
 
 
-static struct argp_option group2_option[] = 
+static struct argp_option group2_option[] =
 {
   { NULL, 0, NULL, 0, "Option Group 2", 0},
   { "option", 'O', NULL, 0, "An option", 1 },
@@ -152,12 +150,12 @@ group2_parser (int key, char *arg, struct argp_state *state)
     case 'O':
       args->opt = 1;
       break;
-      
+
     case 'o':
       args->optional_set = 1;
       args->optional = arg;
       break;
-      
+
     default:
       return ARGP_ERR_UNKNOWN;
     }
@@ -177,7 +175,7 @@ struct argp_child group2_child = {
 };
 
 
-static struct argp_option group2_1_option[] = 
+static struct argp_option group2_1_option[] =
 {
   { NULL, 0, NULL, 0, "Option Group 2.1", 0},
   { "poem", 'p', NULL, 0, "create a poem" },
@@ -212,12 +210,12 @@ struct argp_child group2_1_child = {
   "",
   2
 };
-	  
+
 
 static struct argp_option main_options[] =
   {
     { NULL, 0, NULL, 0, "Main options", 0},
-    { "test", 't', NULL, 0, NULL, 1 }, 
+    { "test", 't', NULL, 0, NULL, 1 },
     { NULL, 0, NULL, 0, NULL, 0 }
   };
 
@@ -226,7 +224,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 {
   struct test_args *args = state->input;
   int i;
-  
+
   switch (key)
     {
     case ARGP_KEY_INIT:
@@ -237,7 +235,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case 't':
       args->test = 1;
       break;
-      
+
     default:
       return ARGP_ERR_UNKNOWN;
     }
@@ -403,7 +401,7 @@ test10(struct argp *argp)
   INIT_TEST2 (10, "--optional", "ARG");
   test_optional(argp, argc, argv, &test_args, NULL, "ARG");
 }
-  
+
 void
 test11(struct argp *argp)
 {
@@ -416,7 +414,7 @@ test12(struct argp *argp)
 {
   INIT_TEST3 (12, "--option", "--optional=OPT", "FILE");
   test_optional(argp, argc, argv, &test_args, "OPT", "FILE");
-}  
+}
 
 void
 test13(struct argp *argp)
@@ -465,7 +463,7 @@ main (int argc, char **argv)
   group2_children[0] = group2_1_child;
   group2_children[1].argp = NULL;
   group2_argp.children = group2_children;
-  
+
   argp_children[0] = group1_child;
   argp_children[1] = group2_child;
   argp_children[2].argp = NULL;
@@ -473,11 +471,11 @@ main (int argc, char **argv)
 
   if (argc > 0)
     {
-      struct test_args test_args;    
-      init_args(test_args);          
+      struct test_args test_args;
+      init_args(test_args);
       return argp_parse (&test_argp, argc, argv, 0, NULL, &test_args);
     }
-  
+
   for (fun = test_fun; *fun; fun++)
     (*fun) (&test_argp);
 
diff --git a/tests/test-array_list.c b/tests/test-array_list.c
index 1d831f9a3..7dc66b559 100644
--- a/tests/test-array_list.c
+++ b/tests/test-array_list.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_array_list.h"
 
diff --git a/tests/test-array_oset.c b/tests/test-array_oset.c
index a7d1f001d..9769cb178 100644
--- a/tests/test-array_oset.c
+++ b/tests/test-array_oset.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_array_oset.h"
 
diff --git a/tests/test-atexit.c b/tests/test-atexit.c
index 2bf482254..81e19cefb 100644
--- a/tests/test-atexit.c
+++ b/tests/test-atexit.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/tests/test-avltree_list.c b/tests/test-avltree_list.c
index 8105c8ee4..9cf71c369 100644
--- a/tests/test-avltree_list.c
+++ b/tests/test-avltree_list.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_avltree_list.h"
 
diff --git a/tests/test-avltree_oset.c b/tests/test-avltree_oset.c
index e90177450..bdcaadc93 100644
--- a/tests/test-avltree_oset.c
+++ b/tests/test-avltree_oset.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_avltree_oset.h"
 
diff --git a/tests/test-avltreehash_list.c b/tests/test-avltreehash_list.c
index 65ab49a99..28697fec5 100644
--- a/tests/test-avltreehash_list.c
+++ b/tests/test-avltreehash_list.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_avltreehash_list.h"
 
diff --git a/tests/test-base64.c b/tests/test-base64.c
index cb6ba9ff0..ea45e062b 100755
--- a/tests/test-base64.c
+++ b/tests/test-base64.c
@@ -16,9 +16,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/tests/test-binary-io.c b/tests/test-binary-io.c
index 677db703e..98fe3e192 100644
--- a/tests/test-binary-io.c
+++ b/tests/test-binary-io.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "binary-io.h"
 
diff --git a/tests/test-c-ctype.c b/tests/test-c-ctype.c
index e691ba2e6..24ee4341f 100644
--- a/tests/test-c-ctype.c
+++ b/tests/test-c-ctype.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "c-ctype.h"
 
diff --git a/tests/test-c-strcasecmp.c b/tests/test-c-strcasecmp.c
index 2fa0f5981..fa18efaa6 100644
--- a/tests/test-c-strcasecmp.c
+++ b/tests/test-c-strcasecmp.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "c-strcase.h"
 
diff --git a/tests/test-c-strcasestr.c b/tests/test-c-strcasestr.c
index 427653b54..939cf1b71 100644
--- a/tests/test-c-strcasestr.c
+++ b/tests/test-c-strcasestr.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "c-strcasestr.h"
 
diff --git a/tests/test-c-strncasecmp.c b/tests/test-c-strncasecmp.c
index 76a003e81..de6848364 100644
--- a/tests/test-c-strncasecmp.c
+++ b/tests/test-c-strncasecmp.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "c-strcase.h"
 
diff --git a/tests/test-c-strstr.c b/tests/test-c-strstr.c
index 204e0a5fe..f8d965cec 100644
--- a/tests/test-c-strstr.c
+++ b/tests/test-c-strstr.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "c-strstr.h"
 
diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c
index 738482b2b..714220175 100644
--- a/tests/test-canonicalize-lgpl.c
+++ b/tests/test-canonicalize-lgpl.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "canonicalize.h"
 
diff --git a/tests/test-carray_list.c b/tests/test-carray_list.c
index 3234baf3f..e36587044 100644
--- a/tests/test-carray_list.c
+++ b/tests/test-carray_list.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_carray_list.h"
 
diff --git a/tests/test-crc.c b/tests/test-crc.c
index 72bb25db1..3c62e289b 100644
--- a/tests/test-crc.c
+++ b/tests/test-crc.c
@@ -18,9 +18,7 @@
 
 /* Written by Simon Josefsson.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "crc.h"
 
diff --git a/tests/test-des.c b/tests/test-des.c
index d93a41bcb..af1cb653d 100644
--- a/tests/test-des.c
+++ b/tests/test-des.c
@@ -19,9 +19,7 @@
 
 /* Adapted for gnulib by Simon Josefsson, based on Libgcrypt. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-dirname.c b/tests/test-dirname.c
index 4114b7702..eac91622f 100644
--- a/tests/test-dirname.c
+++ b/tests/test-dirname.c
@@ -15,9 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirname.h"
 
diff --git a/tests/test-fflush.c b/tests/test-fflush.c
index e4468c2ea..ef43ad7df 100755
--- a/tests/test-fflush.c
+++ b/tests/test-fflush.c
@@ -17,9 +17,7 @@
 
 /* Written by Eric Blake, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/test-fprintf-posix.c b/tests/test-fprintf-posix.c
index eaf093104..b5315b734 100644
--- a/tests/test-fprintf-posix.c
+++ b/tests/test-fprintf-posix.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-gc-arcfour.c b/tests/test-gc-arcfour.c
index 9a92da40d..7ddeb5849 100644
--- a/tests/test-gc-arcfour.c
+++ b/tests/test-gc-arcfour.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-gc-arctwo.c b/tests/test-gc-arctwo.c
index 4df5c4dcd..5680a3cf6 100644
--- a/tests/test-gc-arctwo.c
+++ b/tests/test-gc-arctwo.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-gc-des.c b/tests/test-gc-des.c
index 2c1ae559f..0945512dc 100644
--- a/tests/test-gc-des.c
+++ b/tests/test-gc-des.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-gc-hmac-md5.c b/tests/test-gc-hmac-md5.c
index b8cc3bfaa..b594d9172 100644
--- a/tests/test-gc-hmac-md5.c
+++ b/tests/test-gc-hmac-md5.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-gc-hmac-sha1.c b/tests/test-gc-hmac-sha1.c
index 788076dbf..d39f3c541 100644
--- a/tests/test-gc-hmac-sha1.c
+++ b/tests/test-gc-hmac-sha1.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-gc-md2.c b/tests/test-gc-md2.c
index b52879da0..17c3410a7 100644
--- a/tests/test-gc-md2.c
+++ b/tests/test-gc-md2.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-gc-md4.c b/tests/test-gc-md4.c
index e3815c33c..206d3d218 100644
--- a/tests/test-gc-md4.c
+++ b/tests/test-gc-md4.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-gc-md5.c b/tests/test-gc-md5.c
index 01f918b8e..b5985e6b5 100644
--- a/tests/test-gc-md5.c
+++ b/tests/test-gc-md5.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-gc-pbkdf2-sha1.c b/tests/test-gc-pbkdf2-sha1.c
index d4f9dc86a..933af951e 100644
--- a/tests/test-gc-pbkdf2-sha1.c
+++ b/tests/test-gc-pbkdf2-sha1.c
@@ -18,9 +18,7 @@
 
 /* Written by Simon Josefsson.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gc.h"
 
diff --git a/tests/test-gc-rijndael.c b/tests/test-gc-rijndael.c
index eb8448d84..ab7aebdd3 100644
--- a/tests/test-gc-rijndael.c
+++ b/tests/test-gc-rijndael.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-gc-sha1.c b/tests/test-gc-sha1.c
index 6e2923be8..63c111c27 100644
--- a/tests/test-gc-sha1.c
+++ b/tests/test-gc-sha1.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-gc.c b/tests/test-gc.c
index a9e1cb2b2..204142e3f 100644
--- a/tests/test-gc.c
+++ b/tests/test-gc.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-getpass.c b/tests/test-getpass.c
index 52d2ee2fe..f8e7fb20a 100644
--- a/tests/test-getpass.c
+++ b/tests/test-getpass.c
@@ -16,9 +16,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include "getpass.h"
diff --git a/tests/test-hmac-md5.c b/tests/test-hmac-md5.c
index fd5059a35..8aca505fb 100644
--- a/tests/test-hmac-md5.c
+++ b/tests/test-hmac-md5.c
@@ -18,9 +18,7 @@
 
 /* Written by Simon Josefsson.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-hmac-sha1.c b/tests/test-hmac-sha1.c
index f24193db2..b4b492962 100644
--- a/tests/test-hmac-sha1.c
+++ b/tests/test-hmac-sha1.c
@@ -18,9 +18,7 @@
 
 /* Written by Simon Josefsson.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-iconv.c b/tests/test-iconv.c
index 520b96b5a..0a0c2aab1 100644
--- a/tests/test-iconv.c
+++ b/tests/test-iconv.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #if HAVE_ICONV
 # include <iconv.h>
diff --git a/tests/test-linked_list.c b/tests/test-linked_list.c
index 71d96c164..80c1907ef 100644
--- a/tests/test-linked_list.c
+++ b/tests/test-linked_list.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_linked_list.h"
 
diff --git a/tests/test-linkedhash_list.c b/tests/test-linkedhash_list.c
index 765811ac7..b51d9b938 100644
--- a/tests/test-linkedhash_list.c
+++ b/tests/test-linkedhash_list.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_linkedhash_list.h"
 
diff --git a/tests/test-lock.c b/tests/test-lock.c
index 2153f223e..417388eb8 100644
--- a/tests/test-lock.c
+++ b/tests/test-lock.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS
 
diff --git a/tests/test-mbscasecmp.c b/tests/test-mbscasecmp.c
index f4d8e859c..801f57a72 100644
--- a/tests/test-mbscasecmp.c
+++ b/tests/test-mbscasecmp.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbscasestr1.c b/tests/test-mbscasestr1.c
index 1e6585677..843716f13 100644
--- a/tests/test-mbscasestr1.c
+++ b/tests/test-mbscasestr1.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbscasestr2.c b/tests/test-mbscasestr2.c
index 548818756..d9d0a0ee9 100644
--- a/tests/test-mbscasestr2.c
+++ b/tests/test-mbscasestr2.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbscasestr3.c b/tests/test-mbscasestr3.c
index 24ace449b..18555dc2e 100644
--- a/tests/test-mbscasestr3.c
+++ b/tests/test-mbscasestr3.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbscasestr4.c b/tests/test-mbscasestr4.c
index 146b3fe5c..420c5c623 100644
--- a/tests/test-mbscasestr4.c
+++ b/tests/test-mbscasestr4.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbschr.c b/tests/test-mbschr.c
index bf29ee8cb..3caada69d 100644
--- a/tests/test-mbschr.c
+++ b/tests/test-mbschr.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbscspn.c b/tests/test-mbscspn.c
index 4403927a7..6088434c5 100644
--- a/tests/test-mbscspn.c
+++ b/tests/test-mbscspn.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbsncasecmp.c b/tests/test-mbsncasecmp.c
index 6170dffc6..f393e19ea 100644
--- a/tests/test-mbsncasecmp.c
+++ b/tests/test-mbsncasecmp.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbspbrk.c b/tests/test-mbspbrk.c
index a6a1404da..121d2bb47 100644
--- a/tests/test-mbspbrk.c
+++ b/tests/test-mbspbrk.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbspcasecmp.c b/tests/test-mbspcasecmp.c
index 5000dfce0..6f4bfb2c6 100644
--- a/tests/test-mbspcasecmp.c
+++ b/tests/test-mbspcasecmp.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbsrchr.c b/tests/test-mbsrchr.c
index 35b865c6c..c47afad6b 100644
--- a/tests/test-mbsrchr.c
+++ b/tests/test-mbsrchr.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbsspn.c b/tests/test-mbsspn.c
index 3170a6a94..a6d075514 100644
--- a/tests/test-mbsspn.c
+++ b/tests/test-mbsspn.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbsstr1.c b/tests/test-mbsstr1.c
index d1b079a71..ebf2e3bcc 100644
--- a/tests/test-mbsstr1.c
+++ b/tests/test-mbsstr1.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbsstr2.c b/tests/test-mbsstr2.c
index 8ce3be712..d45690f41 100644
--- a/tests/test-mbsstr2.c
+++ b/tests/test-mbsstr2.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-mbsstr3.c b/tests/test-mbsstr3.c
index 9f65520cd..92673382d 100644
--- a/tests/test-mbsstr3.c
+++ b/tests/test-mbsstr3.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-md2.c b/tests/test-md2.c
index 0cfc529af..314764b35 100644
--- a/tests/test-md2.c
+++ b/tests/test-md2.c
@@ -18,9 +18,7 @@
 
 /* Written by Simon Josefsson. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-md4.c b/tests/test-md4.c
index 25af6e38c..2bf6d730c 100644
--- a/tests/test-md4.c
+++ b/tests/test-md4.c
@@ -19,9 +19,7 @@
 
 /* Written by Simon Josefsson. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-md5.c b/tests/test-md5.c
index ba8c96621..f54e20636 100644
--- a/tests/test-md5.c
+++ b/tests/test-md5.c
@@ -19,9 +19,7 @@
 
 /* Written by Simon Josefsson. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-memmem.c b/tests/test-memmem.c
index 2308bbb54..c1a006567 100644
--- a/tests/test-memmem.c
+++ b/tests/test-memmem.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-printf-posix.c b/tests/test-printf-posix.c
index e4d5e874d..b2541d905 100644
--- a/tests/test-printf-posix.c
+++ b/tests/test-printf-posix.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-rbtree_list.c b/tests/test-rbtree_list.c
index c8cd526aa..bb6c5897c 100644
--- a/tests/test-rbtree_list.c
+++ b/tests/test-rbtree_list.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_rbtree_list.h"
 
diff --git a/tests/test-rbtree_oset.c b/tests/test-rbtree_oset.c
index 2ecb81f4a..2bf5e592e 100644
--- a/tests/test-rbtree_oset.c
+++ b/tests/test-rbtree_oset.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_rbtree_oset.h"
 
diff --git a/tests/test-rbtreehash_list.c b/tests/test-rbtreehash_list.c
index deb9cdef5..f67ff7439 100644
--- a/tests/test-rbtreehash_list.c
+++ b/tests/test-rbtreehash_list.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gl_rbtreehash_list.h"
 
diff --git a/tests/test-read-file.c b/tests/test-read-file.c
index 423b19e3a..f904e27d5 100644
--- a/tests/test-read-file.c
+++ b/tests/test-read-file.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "read-file.h"
 
diff --git a/tests/test-rijndael.c b/tests/test-rijndael.c
index e060d40f4..e31eafa3d 100644
--- a/tests/test-rijndael.c
+++ b/tests/test-rijndael.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test-snprintf-posix.c b/tests/test-snprintf-posix.c
index 563835d9c..901525646 100644
--- a/tests/test-snprintf-posix.c
+++ b/tests/test-snprintf-posix.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-snprintf.c b/tests/test-snprintf.c
index 543e02704..58e3823ea 100644
--- a/tests/test-snprintf.c
+++ b/tests/test-snprintf.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-sprintf-posix.c b/tests/test-sprintf-posix.c
index 507010624..07a556f82 100644
--- a/tests/test-sprintf-posix.c
+++ b/tests/test-sprintf-posix.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-stdint.c b/tests/test-stdint.c
index 7dbc06264..39fc51ca1 100644
--- a/tests/test-stdint.c
+++ b/tests/test-stdint.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2006.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Whether to enable pedantic checks. */
 #define DO_PEDANTIC 0
diff --git a/tests/test-strcasestr.c b/tests/test-strcasestr.c
index 3d18c06d3..6ecdb5287 100644
--- a/tests/test-strcasestr.c
+++ b/tests/test-strcasestr.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
diff --git a/tests/test-striconv.c b/tests/test-striconv.c
index 90c2ed38d..2cc96a674 100644
--- a/tests/test-striconv.c
+++ b/tests/test-striconv.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "striconv.h"
 
diff --git a/tests/test-striconveh.c b/tests/test-striconveh.c
index 8810dfe3e..f99a69934 100644
--- a/tests/test-striconveh.c
+++ b/tests/test-striconveh.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "striconveh.h"
 
diff --git a/tests/test-striconveha.c b/tests/test-striconveha.c
index e3d120cc4..fab21c34f 100644
--- a/tests/test-striconveha.c
+++ b/tests/test-striconveha.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "striconveha.h"
 
diff --git a/tests/test-tls.c b/tests/test-tls.c
index 4eda5011c..f8c971ca0 100644
--- a/tests/test-tls.c
+++ b/tests/test-tls.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS
 
diff --git a/tests/test-vasnprintf-posix.c b/tests/test-vasnprintf-posix.c
index 5db0589fa..3d20a83af 100644
--- a/tests/test-vasnprintf-posix.c
+++ b/tests/test-vasnprintf-posix.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "vasnprintf.h"
 
diff --git a/tests/test-vasnprintf-posix2.c b/tests/test-vasnprintf-posix2.c
index aa68216cd..65f3c6cfa 100644
--- a/tests/test-vasnprintf-posix2.c
+++ b/tests/test-vasnprintf-posix2.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "vasnprintf.h"
 
diff --git a/tests/test-vasnprintf.c b/tests/test-vasnprintf.c
index 80a2543bb..488e93fdf 100644
--- a/tests/test-vasnprintf.c
+++ b/tests/test-vasnprintf.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "vasnprintf.h"
 
diff --git a/tests/test-vasprintf-posix.c b/tests/test-vasprintf-posix.c
index 8cf802158..7ff05daca 100644
--- a/tests/test-vasprintf-posix.c
+++ b/tests/test-vasprintf-posix.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-vasprintf.c b/tests/test-vasprintf.c
index 70fca148a..1a3f366a3 100644
--- a/tests/test-vasprintf.c
+++ b/tests/test-vasprintf.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-verify.c b/tests/test-verify.c
index ee84c0b95..178bee907 100644
--- a/tests/test-verify.c
+++ b/tests/test-verify.c
@@ -18,9 +18,7 @@
 
 /* Written by Bruno Haible.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "verify.h"
 
diff --git a/tests/test-vfprintf-posix.c b/tests/test-vfprintf-posix.c
index 95c3017f6..1b2648456 100644
--- a/tests/test-vfprintf-posix.c
+++ b/tests/test-vfprintf-posix.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-vprintf-posix.c b/tests/test-vprintf-posix.c
index 57b674016..871adffda 100644
--- a/tests/test-vprintf-posix.c
+++ b/tests/test-vprintf-posix.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-vsnprintf-posix.c b/tests/test-vsnprintf-posix.c
index 6e7f5d326..0c3d807f8 100644
--- a/tests/test-vsnprintf-posix.c
+++ b/tests/test-vsnprintf-posix.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-vsnprintf.c b/tests/test-vsnprintf.c
index e57e982e5..08aca8868 100644
--- a/tests/test-vsnprintf.c
+++ b/tests/test-vsnprintf.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-vsprintf-posix.c b/tests/test-vsprintf-posix.c
index ecbd256e9..d0297bbff 100644
--- a/tests/test-vsprintf-posix.c
+++ b/tests/test-vsprintf-posix.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/tests/test-xvasprintf.c b/tests/test-xvasprintf.c
index 41e22e47b..236b8dd0c 100644
--- a/tests/test-xvasprintf.c
+++ b/tests/test-xvasprintf.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xvasprintf.h"
 
-- 
2.11.0