diff --git a/lib/bind/irs/getprotoent.c b/lib/bind/irs/getprotoent.c
index e15437911a..73a62d2e91 100644
--- a/lib/bind/irs/getprotoent.c
+++ b/lib/bind/irs/getprotoent.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: getprotoent.c,v 1.1 2001/03/29 06:31:47 marka Exp $";
+static const char rcsid[] = "$Id: getprotoent.c,v 1.2 2001/06/27 12:29:38 marka Exp $";
 #endif
 
 /* Imports */
@@ -33,6 +33,7 @@ static const char rcsid[] = "$Id: getprotoent.c,v 1.1 2001/03/29 06:31:47 marka
 #include <errno.h>
 #include <resolv.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <irs.h>
 
diff --git a/lib/bind/irs/getservent.c b/lib/bind/irs/getservent.c
index 56cc107596..d334f507eb 100644
--- a/lib/bind/irs/getservent.c
+++ b/lib/bind/irs/getservent.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: getservent.c,v 1.1 2001/03/29 06:31:47 marka Exp $";
+static const char rcsid[] = "$Id: getservent.c,v 1.2 2001/06/27 12:29:40 marka Exp $";
 #endif
 
 /* Imports */
@@ -33,6 +33,7 @@ static const char rcsid[] = "$Id: getservent.c,v 1.1 2001/03/29 06:31:47 marka E
 #include <errno.h>
 #include <resolv.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <irs.h>
 
diff --git a/lib/bind/isc/tree.c b/lib/bind/isc/tree.c
index ea4753dc9a..4080824d04 100644
--- a/lib/bind/isc/tree.c
+++ b/lib/bind/isc/tree.c
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Id: tree.c,v 1.1 2001/03/29 06:31:55 marka Exp $";
+static const char rcsid[] = "$Id: tree.c,v 1.2 2001/06/27 12:29:41 marka Exp $";
 #endif
 
 /*
@@ -101,7 +101,7 @@ tree_init(tree **ppr_tree) {
 }
 	
 tree_t
-tree_srch(tree **ppr_tree, int (*pfi_compare)(), tree_t	p_user) {
+tree_srch(tree **ppr_tree, int (*pfi_compare)(tree_t, tree_t), tree_t	p_user) {
 	ENTER("tree_srch")
 
 	if (*ppr_tree) {
@@ -128,7 +128,7 @@ tree_srch(tree **ppr_tree, int (*pfi_compare)(), tree_t	p_user) {
 }
 
 tree_t
-tree_add(tree **ppr_tree, int (*pfi_compare)(),
+tree_add(tree **ppr_tree, int (*pfi_compare)(tree_t, tree_t),
 	 tree_t p_user, void (*pfv_uar)())
 {
 	int i_balance = FALSE;
@@ -140,7 +140,7 @@ tree_add(tree **ppr_tree, int (*pfi_compare)(),
 }
 
 int
-tree_delete(tree **ppr_p, int (*pfi_compare)(),
+tree_delete(tree **ppr_p, int (*pfi_compare)(tree_t, tree_t),
 	    tree_t p_user, void	(*pfv_uar)())
 {
 	int i_balance = FALSE, i_uar_called = FALSE;
@@ -151,7 +151,7 @@ tree_delete(tree **ppr_p, int (*pfi_compare)(),
 }
 
 int
-tree_trav(tree **ppr_tree, int (*pfi_uar)()) {
+tree_trav(tree **ppr_tree, int (*pfi_uar)(tree_t)) {
 	ENTER("tree_trav")
 
 	if (!*ppr_tree)
@@ -167,7 +167,7 @@ tree_trav(tree **ppr_tree, int (*pfi_uar)()) {
 }
 
 void
-tree_mung(tree **ppr_tree, void	(*pfv_uar)()) {
+tree_mung(tree **ppr_tree, void	(*pfv_uar)(tree_t)) {
 	ENTER("tree_mung")
 	if (*ppr_tree) {
 		tree_mung(&(**ppr_tree).left, pfv_uar);
@@ -182,7 +182,7 @@ tree_mung(tree **ppr_tree, void	(*pfv_uar)()) {
 
 static tree *
 sprout(tree **ppr, tree_t p_data, int *pi_balance,
-       int (*pfi_compare)(), void (*pfv_delete)())
+       int (*pfi_compare)(tree_t, tree_t), void (*pfv_delete)(tree_t))
 {
 	tree *p1, *p2, *sub;
 	int cmp;
@@ -335,8 +335,8 @@ sprout(tree **ppr, tree_t p_data, int *pi_balance,
 }
 
 static int
-delete(tree **ppr_p, int (*pfi_compare)(), tree_t p_user,
-       void (*pfv_uar)(), int *pi_balance, int *pi_uar_called)
+delete(tree **ppr_p, int (*pfi_compare)(tree_t, tree_t), tree_t p_user,
+       void (*pfv_uar)(tree_t), int *pi_balance, int *pi_uar_called)
 {
 	tree *pr_q;
 	int i_comp, i_ret;
@@ -390,7 +390,7 @@ delete(tree **ppr_p, int (*pfi_compare)(), tree_t p_user,
 
 static void
 del(tree **ppr_r, int *pi_balance, tree **ppr_q,
-    void (*pfv_uar)(), int *pi_uar_called)
+    void (*pfv_uar)(tree_t), int *pi_uar_called)
 {
 	ENTER("del")
 
diff --git a/lib/bind/port_after.h.in b/lib/bind/port_after.h.in
index ca2b46d40c..ace2683004 100644
--- a/lib/bind/port_after.h.in
+++ b/lib/bind/port_after.h.in
@@ -179,10 +179,6 @@ char * strsep(char **stringp, const char *delim);
 #define ALIGN(p) (((unsigned int)(p) + (sizeof(int) - 1)) & ~(sizeof(int) - 1))
 #endif
 
-/* forward declarations */
-struct group;
-struct passwd;
-
 #ifdef NEED_SETGROUPENT
 int setgroupent(int stayopen);
 #endif
@@ -298,8 +294,6 @@ int setpassent(int stayopen);
 #endif
 
 #define gettimeofday isc__gettimeofday
-struct timeval;		/* silence warning */
-struct timezone;	/* silence warning */
 int isc__gettimeofday(struct timeval *tp, struct timezone *tzp);
 
 int getnetgrent(const char **machinep, const char **userp,
diff --git a/lib/bind/port_before.h.in b/lib/bind/port_before.h.in
index 5faf276f92..f8e5644968 100644
--- a/lib/bind/port_before.h.in
+++ b/lib/bind/port_before.h.in
@@ -1,6 +1,12 @@
 #ifndef port_before_h
 #define port_before_h
 #include <config.h>
+
+struct group;           /* silence warning */
+struct passwd;          /* silence warning */
+struct timeval;         /* silence warning */
+struct timezone;        /* silence warning */
+
 #ifdef HAVE_SYS_TIMERS_H
 #include <sys/timers.h>
 #endif