diff --git a/lib-src/yow.c b/lib-src/yow.c
index 4efe8153415..e141b9141e2 100644
--- a/lib-src/yow.c
+++ b/lib-src/yow.c
@@ -10,9 +10,26 @@
  * With dynamic memory allocation.
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <ctype.h>
-#include <../src/epaths.h>      /* For PATH_DATA.  */
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include "epaths.h"		/* For PATH_DATA.  */
 
 #define BUFSIZE  80
 #define SEP      '\0'
@@ -33,7 +50,9 @@
     &res;})
 #endif
 
-char *malloc(), *realloc();
+#ifndef HAVE_STDLIB_H
+char *malloc __P ((size_t size))), *realloc __P ((POINTER_TYPE *ptr, size_t size));
+#endif
 
 void yow();
 void setup_yow();