--- src/fileio.c
+++ src/fileio.c	2005-04-14 11:48:08.126387433 +0000
@@ -19,6 +19,7 @@
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#undef _GNU_SOURCE
 #define _GNU_SOURCE		/* for euidaccess */
 
 #include <config.h>
--- src/sysdep.c
+++ src/sysdep.c
@@ -868,7 +868,7 @@
       if (pid == -1)
 	write (1, "Can't execute subshell", 22);
 #else   /* not WINDOWSNT */
-      execlp (sh, sh, 0);
+      execlp (sh, sh, (void*)0);
       write (1, "Can't execute subshell", 22);
       _exit (1);
 #endif  /* not WINDOWSNT */
--- src/sound.c
+++ src/sound.c	2005-04-14 11:38:45.949336705 +0000
@@ -33,6 +33,7 @@
 #include "dispextern.h"
 #include "atimer.h"
 #include <signal.h>
+#include <sys/ioctl.h>
 #include "syssignal.h"
 
 /* FreeBSD has machine/soundcard.h.  Voxware sound driver docs mention
--- lib-src/cvtmail.c
+++ lib-src/cvtmail.c	2005-04-14 11:36:08.916622298 +0000
@@ -35,10 +35,8 @@
 
 
 #include <stdio.h>
-
-char *malloc ();
-char *realloc ();
-char *getenv ();
+#include <stdlib.h>
+#include <string.h>
 
 char *xmalloc ();
 char *xrealloc ();
--- lib-src/yow.c
+++ lib-src/yow.c	2005-04-14 11:37:43.136050909 +0000
@@ -11,6 +11,9 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <ctype.h>
 #include <../src/epaths.h>      /* For PATH_DATA.  */
 
@@ -33,8 +36,6 @@
     &res;})
 #endif
 
-char *malloc(), *realloc();
-
 void yow();
 void setup_yow();
 
--- lib-src/test-distrib.c
+++ lib-src/test-distrib.c	2005-04-14 11:34:32.072599095 +0000
@@ -24,6 +24,9 @@
 #endif
 
 #include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>