--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -40,6 +40,7 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 /* end standard C headers. */
 
--- a/hl/src/H5LTanalyze.l
+++ b/hl/src/H5LTanalyze.l
@@ -16,6 +16,7 @@
 %{
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <hdf5.h>
 #include "H5LTparse.h"
 
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -702,5 +702,8 @@ void validate_mdc_config(hid_t file_id,
                          hbool_t compare_init,
                          int test_num);
 
+hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
+                                 const H5C_auto_size_ctl_t *b,
+                                 hbool_t compare_init);
 #endif /* _CACHE_COMMON_H */
 
--- a/testpar/t_span_tree.c
+++ b/testpar/t_span_tree.c
@@ -37,6 +37,9 @@
 #include "hdf5.h"
 #include "H5private.h"
 #include "testphdf5.h"
+#define H5S_PACKAGE
+#define H5S_TESTING
+#include "H5Spkg.h"
 
 
 static void coll_write_test(int chunk_factor);
