# HG changeset patch
# User Eric Blake <ebb9@byu.net>
# Date 1180370981 0
# Node ID 633babea5f623fd1b29da6894ae21278c1ea9990
# Parent  576d3e4f31c2766769f7b329b9668737d503f2f7
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.

diff --git a/ChangeLog b/ChangeLog
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
 
   return 0;
 }
-
diff --git a/tests/test-argp.c b/tests/test-argp.c
--- 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 @@
   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 @@
     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 @@
 };
 
 
-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 @@
 };
 
 
-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 @@
     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 @@
 };
 
 
-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 @@
   "",
   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 @@
 {
   struct test_args *args = state->input;
   int i;
-  
+
   switch (key)
     {
     case ARGP_KEY_INIT:
@@ -237,7 +235,7 @@
     case 't':
       args->test = 1;
       break;
-      
+
     default:
       return ARGP_ERR_UNKNOWN;
     }
@@ -403,7 +401,7 @@
   INIT_TEST2 (10, "--optional", "ARG");
   test_optional(argp, argc, argv, &test_args, NULL, "ARG");
 }
-  
+
 void
 test11(struct argp *argp)
 {
@@ -416,7 +414,7 @@
 {
   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 @@
   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 @@
 
   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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"