--- ./src/system.h.01	2010-01-10 14:38:29.000000000 +0100
+++ ./src/system.h	2010-01-10 14:38:47.000000000 +0100
@@ -61,16 +61,7 @@
 #include "pathmax.h"
 #include "localedir.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
+#include <time.h>
 
 /* Since major is a function on SVR4, we can't use `ifndef major'.  */
 #if MAJOR_IN_MKDEV
@@ -674,15 +665,15 @@
 #endif
 
 #if !HAVE_DECL_MALLOC
-char *malloc ();
+void *malloc ();
 #endif
 
 #if !HAVE_DECL_MEMCHR
-char *memchr ();
+void *memchr ();
 #endif
 
 #if !HAVE_DECL_REALLOC
-char *realloc ();
+void *realloc ();
 #endif
 
 #if !HAVE_DECL_STPCPY