From: Bruno Haible <bruno@clisp.org>
Date: Sun, 21 Jan 2001 16:12:24 +0000 (+0000)
Subject: Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
X-Git-Tag: v0.10.36~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2769926e6e7cac7d7020bd38be90ff2fd4cbb602;p=thirdparty%2Fgettext.git

Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
---

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 5837d2e33..dad9a5b0d 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,22 @@
+2001-01-07  Bruno Haible  <haible@clisp.cons.org>
+
+	Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
+	* intlh.inst.in: Likewise.
+	* libgettext.h: Likewise.
+	* gettextP.h: Likewise.
+	* bindtextdom.c: Likewise.
+	* dcigettext.c: Likewise.
+	* dgettext.c: Likewise.
+	* dngettext.c: Likewise.
+	* explodename.c: Likewise.
+	* finddomain.c: Likewise.
+	* gettext.c: Likewise.
+	* l10nflist.c: Likewise.
+	* loadmsgcat.c: Likewise.
+	* localealias.c: Likewise.
+	* ngettext.c: Likewise.
+	* textdomain.c: Likewise.
+
 2001-01-06  Bruno Haible  <haible@clisp.cons.org>
 
 	Remove catgets fallback code.
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 1d5c561c0..795ab485f 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -19,27 +19,9 @@
 # include <config.h>
 #endif
 
-#if defined HAVE_STDDEF_H || defined _LIBC
-# include <stddef.h>
-#endif
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef _LIBC
 # include <libintl.h>
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 545a12fdc..71ebc35c5 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -53,25 +53,10 @@ extern int errno;
 # define __set_errno(val) errno = (val)
 #endif
 
-#if defined HAVE_STDDEF_H || defined _LIBC
-# include <stddef.h>
-#endif
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
+#include <stddef.h>
+#include <stdlib.h>
 
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
@@ -82,9 +67,7 @@ void free ();
 # include <unistd.h>
 #endif
 
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
+#include <locale.h>
 
 #if defined HAVE_SYS_PARAM_H || defined _LIBC
 # include <sys/param.h>
diff --git a/intl/dgettext.c b/intl/dgettext.c
index 515bf6c21..11ed70aa3 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dgettext(3) function.
-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 # include <config.h>
 #endif
 
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
+#include <locale.h>
 
 #ifdef _LIBC
 # include <libintl.h>
diff --git a/intl/dngettext.c b/intl/dngettext.c
index ab293211d..c9623a4d1 100644
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dngettext(3) function.
-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 # include <config.h>
 #endif
 
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
+#include <locale.h>
 
 #include "gettext.h"
 #include "gettextP.h"
diff --git a/intl/explodename.c b/intl/explodename.c
index 6253c48f6..c4ddcc41a 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -19,15 +19,8 @@
 # include <config.h>
 #endif
 
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 
 #include "loadinfo.h"
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 967e24697..a1fdf9421 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -22,25 +22,8 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
diff --git a/intl/gettext.c b/intl/gettext.c
index 9f2679331..50d594c84 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -23,15 +23,7 @@
 # define __need_NULL
 # include <stddef.h>
 #else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>		/* Just for NULL.  */
-# else
-#  ifdef HAVE_STRING_H
-#   include <string.h>
-#  else
-#   define NULL ((void *) 0)
-#  endif
-# endif
+# include <stdlib.h>		/* Just for NULL.  */
 #endif
 
 #ifdef _LIBC
diff --git a/intl/gettextP.h b/intl/gettextP.h
index daba98aba..27c04e4ca 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -19,9 +19,7 @@
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H
 
-#if defined HAVE_STDDEF_H || defined _LIBC
-# include <stddef.h>		/* Get size_t.  */
-#endif
+#include <stddef.h>		/* Get size_t.  */
 
 #ifdef _LIBC
 # include "../iconv/gconv_int.h"
diff --git a/intl/intlh.inst.in b/intl/intlh.inst.in
index fe8281fec..dee490654 100644
--- a/intl/intlh.inst.in
+++ b/intl/intlh.inst.in
@@ -18,7 +18,7 @@
 #ifndef _LIBINTL_H
 #define _LIBINTL_H	1
 
-@INCLUDE_LOCALE_H@
+#include <locale.h>
 
 /* We define an additional symbol to signal that we use the GNU
    implementation of gettext.  */
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 2da1ba2e9..0ded3ce4a 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -26,15 +26,7 @@
 # include <config.h>
 #endif
 
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
+#include <string.h>
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
@@ -46,10 +38,7 @@
 #endif
 #include <ctype.h>
 #include <sys/types.h>
-
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #include "loadinfo.h"
 
diff --git a/intl/libgettext.h b/intl/libgettext.h
index 644d727a6..3834a08db 100644
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@@ -31,10 +31,7 @@
 #define __USE_GNU_GETTEXT 1
 
 #include <sys/types.h>
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include <locale.h>
 
 
 #ifdef __cplusplus
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 6462daa2c..34f1e661a 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -49,15 +49,8 @@ char *alloca ();
 # endif
 #endif
 
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
diff --git a/intl/localealias.c b/intl/localealias.c
index cdda88aeb..e55d0c096 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -47,25 +47,9 @@ char *alloca ();
 # endif
 #endif
 
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
+#include <stdlib.h>
 
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
+#include <string.h>
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
diff --git a/intl/ngettext.c b/intl/ngettext.c
index aeb8db709..571000745 100644
--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -23,15 +23,7 @@
 # define __need_NULL
 # include <stddef.h>
 #else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>		/* Just for NULL.  */
-# else
-#  ifdef HAVE_STRING_H
-#   include <string.h>
-#  else
-#   define NULL ((void *) 0)
-#  endif
-# endif
+# include <stdlib.h>		/* Just for NULL.  */
 #endif
 
 #include "gettext.h"
diff --git a/intl/textdomain.c b/intl/textdomain.c
index 55bb55015..99650d6a3 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -19,18 +19,8 @@
 # include <config.h>
 #endif
 
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef _LIBC
 # include <libintl.h>
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 474adce61..8be3a5d54 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-07  Bruno Haible  <haible@clisp.cons.org>
+
+	* system.h: Assume <stdlib.h>, <string.h> exist.
+	* fstrcmp.c: Likewise.
+	* vasprintf.c: Likewise.
+
 2001-01-05  Bruno Haible  <haible@clisp.cons.org>
 
 	* basename.c: Include <stdio.h>, needed by assert on SunOS4.
diff --git a/lib/fstrcmp.c b/lib/fstrcmp.c
index b1f597127..dd1a1af68 100644
--- a/lib/fstrcmp.c
+++ b/lib/fstrcmp.c
@@ -1,5 +1,5 @@
 /* Functions to make fuzzy comparisons between strings
-   Copyright (C) 1988, 1989, 1992, 1993, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1988-1989, 1992-1993, 1995, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,12 +34,7 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
+#include <string.h>
 #include <stdio.h>
 
 #ifdef HAVE_LIMITS_H
diff --git a/lib/system.h b/lib/system.h
index f938d7614..10c2faf95 100644
--- a/lib/system.h
+++ b/lib/system.h
@@ -1,5 +1,5 @@
 /* Header for GNU gettext libiberty
-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -53,13 +53,9 @@ extern int strncasecmp PARAMS ((const char *__s1, const char *__s2,
 				size_t __n));
 extern char *strstr PARAMS ((const char *__str, const char *__sub));
 
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-#else
-# include <strings.h>
+#include <string.h>
+#if !STDC_HEADERS && HAVE_MEMORY_H
+# include <memory.h>
 #endif
 #if !HAVE_MEMCPY
 # ifndef memcpy
diff --git a/lib/vasprintf.c b/lib/vasprintf.c
index becc34a3c..cd833ec83 100644
--- a/lib/vasprintf.c
+++ b/lib/vasprintf.c
@@ -22,13 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 #include <string.h>
-
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-extern unsigned long strtoul ();
-extern char *malloc ();
-#endif
+#include <stdlib.h>
 
 #if __STDC__
 # include <stdarg.h>
diff --git a/m4/ChangeLog b/m4/ChangeLog
index dcab5ef2a..12a0b8878 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-07  Bruno Haible  <haible@clisp.cons.org>
+
+	* gettext.m4 (AM_GNU_GETTEXT): Assume <locale.h> exists.
+	* setlocale.m4 (gt_SETLOCALE): Likewise.
+
 2001-01-06  Bruno Haible  <haible@clisp.cons.org>
 
 	Remove catgets fallback code.
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index b0bf2690d..bc7b944b6 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -230,17 +230,6 @@ __argz_count __argz_stringify __argz_next])
      fi
    fi
 
-   dnl The reference to <locale.h> in the installed <libintl.h> file
-   dnl must be resolved because we cannot expect the users of this
-   dnl to define HAVE_LOCALE_H.
-   if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-   fi
-   AC_SUBST(INCLUDE_LOCALE_H)
-
    dnl In the intl/Makefile.in we have a special dependency which makes
    dnl only sense for gettext.  We comment this out for non-gettext
    dnl packages.
diff --git a/m4/setlocale.m4 b/m4/setlocale.m4
index 3b400ca62..ad183107f 100644
--- a/m4/setlocale.m4
+++ b/m4/setlocale.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2
 
 # Check for setlocale declaration.
 
@@ -8,9 +8,7 @@ AC_MSG_CHECKING([for setlocale declaration])
 AC_CACHE_VAL(gt_cv_proto_setlocale, [
 AC_TRY_COMPILE([
 #include <stdlib.h>
-#ifdef HAVE_LOCALE_H
 #include <locale.h>
-#endif
 #if defined(__STDC__) || defined(__cplusplus)
 char* setlocale (int category, char* locale);
 #else
diff --git a/src/ChangeLog b/src/ChangeLog
index 5272f638b..e761eca0f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2001-01-07  Bruno Haible  <haible@clisp.cons.org>
+
+	Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
+	* dir-list.c: Likewise.
+	* gettextp.c: Likewise.
+	* message.c: Likewise.
+	* msgcmp.c: Likewise.
+	* msgcomm.c: Likewise.
+	* msgfmt.c: Likewise.
+	* msgmerge.c: Likewise.
+	* msgunfmt.c: Likewise.
+	* open-po.c: Likewise.
+	* po.c: Likewise.
+	* setlocale.c: Likewise.
+	* str-list.h: Likewise.
+	* xget-lex.c: Likewise.
+	* xgettext.c: Likewise.
+
 2001-01-06  Bruno Haible  <haible@clisp.cons.org>
 
 	* Makefile.am (datadir): Assume DATADIRNAME = share.
diff --git a/src/dir-list.c b/src/dir-list.c
index 9173bb539..f1e5fe49b 100644
--- a/src/dir-list.c
+++ b/src/dir-list.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1996, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -22,9 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #endif
 
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #include "system.h"
 #include "dir-list.h"
diff --git a/src/gettextp.c b/src/gettextp.c
index 6b6d10792..e7475676d 100644
--- a/src/gettextp.c
+++ b/src/gettextp.c
@@ -1,5 +1,5 @@
 /* gettext - retrieve text string from message catalog and print it.
-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, May 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -22,16 +22,8 @@
 
 #include <getopt.h>
 #include <stdio.h>
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *getenv ();
-#endif
-
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include <stdlib.h>
+#include <locale.h>
 
 #include "error.h"
 #include "system.h"
diff --git a/src/message.c b/src/message.c
index 5749a6e21..4d527422b 100644
--- a/src/message.c
+++ b/src/message.c
@@ -29,13 +29,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <limits.h>
 #endif
 
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <locale.h>
+#include <stdlib.h>
 
 #include "fstrcmp.h"
 #include "message.h"
diff --git a/src/msgcmp.c b/src/msgcmp.c
index 059849e04..9be13bbea 100644
--- a/src/msgcmp.c
+++ b/src/msgcmp.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
    This program is free software; you can redistribute it and/or modify
@@ -22,14 +22,8 @@
 
 #include <getopt.h>
 #include <stdio.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include <stdlib.h>
+#include <locale.h>
 
 #include "dir-list.h"
 #include "error.h"
diff --git a/src/msgcomm.c b/src/msgcomm.c
index 95d7c8840..8dcc4e2cc 100644
--- a/src/msgcomm.c
+++ b/src/msgcomm.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2000, 2001 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -25,18 +25,13 @@
 #include <getopt.h>
 #include <stdio.h>
 #include <sys/types.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #ifdef HAVE_LIMITS_H
 # include <limits.h>
 #endif
 
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include <locale.h>
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
diff --git a/src/msgfmt.c b/src/msgfmt.c
index 97a76b832..46ace8e7b 100644
--- a/src/msgfmt.c
+++ b/src/msgfmt.c
@@ -26,14 +26,8 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/types.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include <stdlib.h>
+#include <locale.h>
 
 #include "hash.h"
 
diff --git a/src/msgmerge.c b/src/msgmerge.c
index 4f38857f9..1732c186b 100644
--- a/src/msgmerge.c
+++ b/src/msgmerge.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
    This program is free software; you can redistribute it and/or modify
@@ -23,20 +23,9 @@
 #include <getopt.h>
 #include <limits.h>
 #include <stdio.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
+#include <locale.h>
 
 #include "dir-list.h"
 #include "error.h"
diff --git a/src/msgunfmt.c b/src/msgunfmt.c
index 48f41a5ae..6842a08a1 100644
--- a/src/msgunfmt.c
+++ b/src/msgunfmt.c
@@ -26,14 +26,8 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/types.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include <stdlib.h>
+#include <locale.h>
 
 #include "hash.h"
 
diff --git a/src/open-po.c b/src/open-po.c
index 1954b0203..0bf4379bc 100644
--- a/src/open-po.c
+++ b/src/open-po.c
@@ -1,5 +1,5 @@
 /* open-po - search for .po file along search path list and open for reading
-   Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2000, 2001 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
 This program is free software; you can redistribute it and/or modify
@@ -23,16 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #include "open-po.h"
 #include "dir-list.h"
diff --git a/src/po.c b/src/po.c
index a74fda97a..0e1ab8653 100644
--- a/src/po.c
+++ b/src/po.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995, 1996, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 1998, 2000, 2001 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -24,10 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <ctype.h>
 #include <stdio.h>
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #include "po.h"
 #include "po-hash.h"
diff --git a/src/setlocale.c b/src/setlocale.c
index eed05a12d..71d2637ce 100644
--- a/src/setlocale.c
+++ b/src/setlocale.c
@@ -19,22 +19,9 @@
 # include <config.h>
 #endif
 
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# endif
-extern char *getenv ();
-#endif
-
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <locale.h>
+#include <string.h>
 
 /* Return string representation of locale CATEGORY.  */
 static const char *
@@ -103,10 +90,8 @@ setlocale (category, locale)
      int category;
      SETLOCALE_CONST char *locale;
 {
-  char *retval;
   static char C_string[] = "C";
   static char *current_locale = C_string;
-#ifdef HAVE_LOCALE_H
   struct list
   {
     int category;
@@ -115,6 +100,7 @@ setlocale (category, locale)
   };
   static struct list *facets = NULL;
   struct list *facetp;
+  char *retval;
 
   if (locale != NULL)
     {
@@ -162,17 +148,6 @@ setlocale (category, locale)
 	retval = facetp->current_locale;
 	break;
       }
-#else
-  if (locale != NULL)
-    {
-      if (current_locale != C_string)
-	free (current_locale);
-      current_locale = (char *) malloc (strlen (locale) + 1);
-      strcpy (current_locale, locale);
-    }
-
-  retval = current_locale;
-#endif
 
   if (retval[0] == '\0')
     {
diff --git a/src/str-list.h b/src/str-list.h
index cecee4895..def4f52f5 100644
--- a/src/str-list.h
+++ b/src/str-list.h
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995, 1996, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -21,12 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define SRC_STR_LIST_H 1
 
 /* Get size_t and NULL.  */
-#ifdef HAVE_STDDEF_H
-# include <stddef.h>
-#else
-# include <sys/types.h>
-# include <stdio.h>
-#endif
+#include <stddef.h>
 
 /* Type describing list of immutable strings,
    implemented using a dynamic array.  */
diff --git a/src/xget-lex.c b/src/xget-lex.c
index b86fbd041..6aa5ae398 100644
--- a/src/xget-lex.c
+++ b/src/xget-lex.c
@@ -24,10 +24,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #include "dir-list.h"
 #include "error.h"
diff --git a/src/xgettext.c b/src/xgettext.c
index 0ccabd44a..e4da03f10 100644
--- a/src/xgettext.c
+++ b/src/xgettext.c
@@ -28,14 +28,8 @@
 #include <stdio.h>
 #include <time.h>
 #include <sys/types.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include <stdlib.h>
+#include <locale.h>
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 74660c7fe..9740a3a4a 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-07  Bruno Haible  <haible@clisp.cons.org>
+
+	* plural-1-prg.c: Assume <locale.h> exists.
+
 2001-01-06  Bruno Haible  <haible@clisp.cons.org>
 
 	Translations are now disabled in C locale.
diff --git a/tests/plural-1-prg.c b/tests/plural-1-prg.c
index daaa580b7..033eaa988 100644
--- a/tests/plural-1-prg.c
+++ b/tests/plural-1-prg.c
@@ -6,12 +6,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#else
-extern char *setlocale ();
-#endif
+#include <locale.h>
 
 /* Make sure we use the included libintl, not the system's one. */
 #if 0