diff -ruN hdf5-1.8.16-orig/configure hdf5-1.8.16/configure
--- hdf5-1.8.16-orig/configure	2015-11-10 08:01:10.000000000 -0600
+++ hdf5-1.8.16/configure	2021-04-17 07:08:29.000000000 -0500
@@ -24936,6 +24936,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+		#include <stdlib.h>
         #include <szlib.h>
 
         int main(void)
@@ -27326,6 +27327,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+				#include <stdlib.h>
                 #include <string.h>
 
 #ifdef FC_DUMMY_MAIN
@@ -27444,6 +27446,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+				#include <stdlib.h>
                 #include <string.h>
 
 #ifdef FC_DUMMY_MAIN
@@ -27570,6 +27573,8 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <string.h>
+#include <stdlib.h>
         int main(void)
         {
             long double         ld = 20041683600089727.779961L;
@@ -27661,6 +27666,8 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+		#include <string.h>
+		#include <stdlib.h>
         int main(void)
         {
             long double         ld;
diff -ruN hdf5-1.8.16-orig/test/cache.c hdf5-1.8.16/test/cache.c
--- hdf5-1.8.16-orig/test/cache.c	2015-10-24 00:13:44.000000000 -0500
+++ hdf5-1.8.16/test/cache.c	2021-04-17 07:20:57.000000000 -0500
@@ -207,6 +207,9 @@
 /**************************************************************************/
 /**************************************************************************/
 
+hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
+    const H5C_auto_size_ctl_t *b, hbool_t compare_init);
+
 /*-------------------------------------------------------------------------
  * Function:	smoke_check_1()
  *
diff -ruN hdf5-1.8.16-orig/test/cache_api.c hdf5-1.8.16/test/cache_api.c
--- hdf5-1.8.16-orig/test/cache_api.c	2015-10-24 00:13:43.000000000 -0500
+++ hdf5-1.8.16/test/cache_api.c	2021-04-17 07:20:03.000000000 -0500
@@ -49,6 +49,9 @@
 /**************************************************************************/
 /**************************************************************************/
 
+hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
+    const H5C_auto_size_ctl_t *b, hbool_t compare_init);
+
 /*-------------------------------------------------------------------------
  * Function:	check_fapl_mdc_api_calls()
  *