diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1b99947db22..b53c793d6c2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-04  Richard Biener  <rguenther@suse.de>
+
+	* system.h: Include malloc.h if INCLUDE_MALLOC_H and HAVE_MALLINFO.
+	* ggc-common.c: Remove inclusion of malloc.h, define INCLUDE_MALLOC_H.
+
 2019-11-04  David Edelsohn  <dje.gcc@gmail.com>
 
 	* ggc-common.c: Include system.h before malloc.h.
diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c
index 0841a0ab6c4..a7edb1591f8 100644
--- a/gcc/ggc-common.c
+++ b/gcc/ggc-common.c
@@ -21,10 +21,8 @@ along with GCC; see the file COPYING3.  If not see
    any particular GC implementation.  */
 
 #include "config.h"
+#define INCLUDE_MALLOC_H
 #include "system.h"
-#ifdef HAVE_MALLINFO
-#include <malloc.h>
-#endif
 #include "coretypes.h"
 #include "timevar.h"
 #include "diagnostic-core.h"
diff --git a/gcc/system.h b/gcc/system.h
index 56af544b70b..3ef668f5508 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -730,6 +730,12 @@ extern int vsnprintf (char *, size_t, const char *, va_list);
 # include "unique-ptr.h"
 #endif
 
+#ifdef INCLUDE_MALLOC_H
+#ifdef HAVE_MALLINFO
+#include <malloc.h>
+#endif
+#endif
+
 /* Redefine abort to report an internal error w/o coredump, and
    reporting the location of the error in the source file.  */
 extern void fancy_abort (const char *, int, const char *)