diff --git a/texinfo/ChangeLog b/texinfo/ChangeLog
index 810727a7ad1..232449fdb14 100644
--- a/texinfo/ChangeLog
+++ b/texinfo/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jun  2 00:47:03 1999  Philippe De Muyter  <phdm@macqel.be>
+
+	* acconfig.h (libintl.h): Does not include this file here because
+	it will define `NULL' before the system files have got any chance
+	to define it.
+	* intl/explodename.c (stdlib.h): Include this file only if we have it.
+
 Sun May 30 16:10:06 1999  Richard Henderson  <rth@cygnus.com>
 
 	* config.guess, config.sub: Use toplevel file.
diff --git a/texinfo/acconfig.h b/texinfo/acconfig.h
index 6c34c33acc2..d5477faedb7 100644
--- a/texinfo/acconfig.h
+++ b/texinfo/acconfig.h
@@ -40,7 +40,6 @@
 @BOTTOM@
 
 /* For gettext (NLS) */
-#include <libintl.h>
 #define _(String) gettext (String)
 #define N_(String) (String)
 
diff --git a/texinfo/intl/explodename.c b/texinfo/intl/explodename.c
index 37c46e9d7b8..5c4e09ea221 100644
--- a/texinfo/intl/explodename.c
+++ b/texinfo/intl/explodename.c
@@ -19,7 +19,9 @@
 # include <config.h>
 #endif
 
-#include <stdlib.h>
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
 #include <string.h>
 #include <sys/types.h>