--- X11/20201008/GCCcore-10.2.0/libXfont2-2.0.4/src/util/replace.h.orig	2019-09-14 20:41:35.000000000 +0200
+++ X11/20201008/GCCcore-10.2.0/libXfont2-2.0.4/src/util/replace.h	2020-12-03 09:18:56.893607669 +0100
@@ -30,25 +30,13 @@
 #endif
 
 #include <X11/Xfuncproto.h>
-
-#include <stdlib.h>
-#if defined(HAVE_LIBBSD) && defined(HAVE_REALLOCARRAY)
 #include <bsd/stdlib.h>       /* for reallocarray */
-#endif
-
-#ifndef HAVE_REALLOCARRAY
-extern _X_HIDDEN void *
-reallocarray(void *optr, size_t nmemb, size_t size);
-#endif
 
 #ifndef mallocarray
 #define mallocarray(n, s)	reallocarray(NULL, n, s)
 #endif
 
-#include <string.h>
-#if defined(HAVE_LIBBSD) && defined(HAVE_STRLCPY)
 #include <bsd/string.h>       /* for strlcpy, strlcat */
-#endif
 
 #ifndef HAVE_STRLCPY
 extern _X_HIDDEN size_t