3 files changed, 23 insertions, 28 deletions
diff --git a/tools/lib/io_timer.h b/tools/lib/io_timer.h
index 0269b93..75db660 100644
--- a/tools/lib/io_timer.h
+++ b/tools/lib/io_timer.h
@@ -16,18 +16,15 @@
 
 #include "hdf5.h"
 
-#if defined(H5_TIME_WITH_SYS_TIME)
-#include <sys/time.h>
 #include <time.h>
-#elif defined(H5_HAVE_SYS_TIME_H)
+
+#ifdef H5_HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
-#include <time.h>
 #endif
 
 #ifdef H5_HAVE_WINSOCK2_H
 #include <winsock2.h>
-#endif /* H5_HAVE_WINSOCK2_H */
+#endif
 
 /* The different types of timers we can have */
 typedef enum timer_type_ {
diff --git a/tools/test/perform/direct_write_perf.c b/tools/test/perform/direct_write_perf.c
index df29fc9..371c4f9 100644
--- a/tools/test/perform/direct_write_perf.c
+++ b/tools/test/perform/direct_write_perf.c
@@ -28,23 +28,22 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-
-#ifdef H5_HAVE_UNISTD_H
-#include <sys/types.h>
-#include <unistd.h>
-#endif
+#include <time.h>
 
 #ifdef H5_HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 
-#if defined(H5_TIME_WITH_SYS_TIME)
-#include <sys/time.h>
-#include <time.h>
-#elif defined(H5_HAVE_SYS_TIME_H)
+#ifdef H5_HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
-#include <time.h>
+#endif
+
+#ifdef H5_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef H5_HAVE_UNISTD_H
+#include <unistd.h>
 #endif
 
 const char *FILENAME[] = {"direct_write", "unix.raw", NULL};
diff --git a/tools/test/perform/perf.c b/tools/test/perform/perf.c
index a19e5d5..875f932 100644
--- a/tools/test/perform/perf.c
+++ b/tools/test/perform/perf.c
@@ -31,23 +31,22 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#ifdef H5_HAVE_UNISTD_H
-#include <sys/types.h>
-#include <unistd.h>
-#endif
+#include <time.h>
 
 #ifdef H5_HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 
-#if defined(H5_TIME_WITH_SYS_TIME)
-#include <sys/time.h>
-#include <time.h>
-#elif defined(H5_HAVE_SYS_TIME_H)
+#ifdef H5_HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
-#include <time.h>
+#endif
+
+#ifdef H5_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef H5_HAVE_UNISTD_H
+#include <unistd.h>
 #endif
 
 #include <mpi.h>