Use autoconf headers.

clients/tools/ldapdelete.c

 /* ldapdelete.c - simple program to delete an entry using LDAP */
 
+#define DISABLE_BRIDGE
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
+#include <ac/string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <ac/time.h>
+
 #include <lber.h>
 #include <ldap.h>
 
 #include "ldapconfig.h"
 
 static char	*binddn = LDAPDELETE_BINDDN;
+static char	*passwd = LDAPDELETE_BIND_CRED;
 static char	*base = LDAPDELETE_BASE;
-static char	*passwd = NULL;
 static char	*ldaphost = LDAPHOST;
 static int	ldapport = LDAP_PORT;
 static int	not, verbose, contoper;

clients/tools/ldapmodify.c

@@ -11,9 +11,8 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <fcntl.h>
-#ifndef VMS
-#include <unistd.h>
-#endif /* VMS */
+
+#include <ac/unistd.h>
 
 #include <lber.h>
 #include <ldap.h>

clients/tools/ldapmodrdn.c

 /* ldapmodrdn.c - generic program to modify an entry's RDN using LDAP */
 
+#define DISABLE_BRIDGE
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
+#include <ac/string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <ac/time.h>
+
 #include <lber.h>
 #include <ldap.h>
 
 #include "ldapconfig.h"
 
 static char	*binddn = LDAPMODRDN_BINDDN;
+static char	*passwd = LDAPMODRDN_BIND_CRED;
 static char	*base = LDAPMODRDN_BASE;
-static char	*passwd = NULL;
 static char	*ldaphost = LDAPHOST;
 static int	ldapport = LDAP_PORT;
 static int	not, verbose, contoper;

clients/tools/ldapsearch.c

+#define DISABLE_BRIDGE
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
+#include <ac/string.h>
 #include <ctype.h>
+#include <ac/time.h>
+
 #include <lber.h>
 #include <ldap.h>
 #include <ldif.h>
@@ -52,7 +57,7 @@ char	*s;
 }
 
 static char	*binddn = LDAPSEARCH_BINDDN;
-static char	*passwd = NULL;
+static char	*passwd = LDAPSEARCH_BIND_CRED;
 static char	*base = LDAPSEARCH_BASE;
 static char	*ldaphost = LDAPHOST;
 static int	ldapport = LDAP_PORT;