--- lib/ext2fs/dirhash.c
+++ lib/ext2fs/dirhash.c
@@ -13,6 +13,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "ext2_fs.h"
 #include "ext2fs.h"
--- lib/ext2fs/ext2fs.h
+++ lib/ext2fs/ext2fs.h
@@ -59,6 +59,7 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <string.h>
 
--- resize/resize2fs.h
+++ resize/resize2fs.h
@@ -21,9 +21,18 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
 #endif
+                                                                                                    
 #if HAVE_ERRNO_H
 #include <errno.h>
 #endif