diff --git a/ChangeLog b/ChangeLog
index 047261e39..17a1fd949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-02-20  Pavel Roskin  <proski@gnu.org>
 
+	* gtkedit/edit.h: Only include malloc.h if STDC_HEADERS is not
+	defined to prevent warnings on OpenBSD 2.7.
+	* slang/jdmacros.h: Likewise.
+	* src/mad.h: Likewise.
+	* src/poptalloca.h: Likewise.
+
 	* configure.in: Check for sys/time.h and sys/timeb.h. Use
 	AC_HEADER_TIME.
 
diff --git a/gtkedit/edit.h b/gtkedit/edit.h
index c708a6953..601e2bb0a 100644
--- a/gtkedit/edit.h
+++ b/gtkedit/edit.h
@@ -45,7 +45,7 @@
 #    include <fcntl.h>
 
 #    include <stdlib.h>
-#    ifdef HAVE_MALLOC_H
+#    if !defined(STDC_HEADERS) && defined(HAVE_MALLOC_H)
 #	 include <malloc.h>
 #    endif
 
diff --git a/slang/jdmacros.h b/slang/jdmacros.h
index e822b3bbb..b94eae4fd 100644
--- a/slang/jdmacros.h
+++ b/slang/jdmacros.h
@@ -9,7 +9,7 @@
 # include <stdlib.h>
 #endif
 
-#ifdef HAVE_MALLOC_H
+#if !defined(STDC_HEADERS) && defined(HAVE_MALLOC_H)
 # include <malloc.h>
 #endif
 
diff --git a/src/mad.h b/src/mad.h
index ad4a25677..8706aba8c 100644
--- a/src/mad.h
+++ b/src/mad.h
@@ -3,7 +3,7 @@
 
 /* To prevent molesting these files with the malloc/calloc/free macros.  */
 #include <stdlib.h>
-#ifdef HAVE_MALLOC_H
+#if !defined(STDC_HEADERS) && defined(HAVE_MALLOC_H)
 #   include <malloc.h>
 #endif
 
diff --git a/src/poptalloca.h b/src/poptalloca.h
index 3c3f1c397..0864555a5 100644
--- a/src/poptalloca.h
+++ b/src/poptalloca.h
@@ -37,7 +37,7 @@ char *alloca ();
 
 #ifndef HAVE_ALLOCA
 #    include <stdlib.h>
-#    ifdef HAVE_MALLOC_H
+#    if !defined(STDC_HEADERS) && defined(HAVE_MALLOC_H)
 #        include <malloc.h>
 #    endif
 #    define alloca malloc