Index: head/contrib/tcp_wrappers/fakelog.c
===================================================================
--- head/contrib/tcp_wrappers/fakelog.c
+++ head/contrib/tcp_wrappers/fakelog.c
@@ -17,7 +17,7 @@
 
 /* ARGSUSED */
 
-openlog(name, logopt, facility)
+void openlog(name, logopt, facility)
 char   *name;
 int     logopt;
 int     facility;
@@ -27,7 +27,7 @@
 
 /* vsyslog - format one record */
 
-vsyslog(severity, fmt, ap)
+void vsyslog(severity, fmt, ap)
 int     severity;
 char   *fmt;
 va_list ap;
@@ -43,7 +43,7 @@
 
 /* VARARGS */
 
-VARARGS(syslog, int, severity)
+void VARARGS(syslog, int, severity)
 {
     va_list ap;
     char   *fmt;
@@ -56,7 +56,7 @@
 
 /* closelog - dummy */
 
-closelog()
+void closelog()
 {
     /* void */
 }
Index: head/contrib/tcp_wrappers/inetcf.c
===================================================================
--- head/contrib/tcp_wrappers/inetcf.c
+++ head/contrib/tcp_wrappers/inetcf.c
@@ -15,13 +15,14 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <stdlib.h>
 
 extern int errno;
 extern void exit();
-extern char *malloc();
 
 #include "tcpd.h"
 #include "inetcf.h"
+#include "scaffold.h"
 
  /*
   * Network configuration files may live in unusual places. Here are some
Index: head/contrib/tcp_wrappers/scaffold.c
===================================================================
--- head/contrib/tcp_wrappers/scaffold.c
+++ head/contrib/tcp_wrappers/scaffold.c
@@ -22,6 +22,7 @@
 #include <syslog.h>
 #include <setjmp.h>
 #include <string.h>
+#include <stdlib.h>
 
 #ifndef INADDR_NONE
 #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
Index: head/contrib/tcp_wrappers/tcpdchk.c
===================================================================
--- head/contrib/tcp_wrappers/tcpdchk.c
+++ head/contrib/tcp_wrappers/tcpdchk.c
@@ -35,6 +35,8 @@
 #include <errno.h>
 #include <netdb.h>
 #include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 extern int errno;
 extern void exit();
Index: head/contrib/tcp_wrappers/tcpdmatch.c
===================================================================
--- head/contrib/tcp_wrappers/tcpdmatch.c
+++ head/contrib/tcp_wrappers/tcpdmatch.c
@@ -31,6 +31,7 @@
 #include <syslog.h>
 #include <setjmp.h>
 #include <string.h>
+#include <unistd.h>
 
 extern void exit();
 extern int optind;