diff --git a/build/build.dsp b/build/build.dsp
index 19d34394fc11c3b9b04211644baaf936e47982e2..3103133c2cc16fb8eca81a8b06001484d8f2f05b 100644
--- a/build/build.dsp
+++ b/build/build.dsp
@@ -164,5 +164,9 @@ CFG=build - Win32 DLL Debug
 
 !ENDIF 
 
+# Begin Source File
+
+SOURCE=.\build.mak
+# End Source File
 # End Target
 # End Project
diff --git a/build/main.dsw b/build/main.dsw
index 869136a6bdd7a43138b50de4cf2c208e81c5486c..5a1ba55ede12c80f39c8f070f5ed689322cdb378 100644
--- a/build/main.dsw
+++ b/build/main.dsw
@@ -356,6 +356,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name setup
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -368,6 +371,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name setup
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -380,6 +386,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name setup
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -392,6 +401,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name setup
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -404,6 +416,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name setup
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -416,6 +431,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name setup
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/clients/ud/auth.c b/clients/ud/auth.c
index 31853e7c5d129ede55b316e5a983a697ddb76935..22da8e69010cc314dc7a85c31ca836040c101939 100644
--- a/clients/ud/auth.c
+++ b/clients/ud/auth.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1991, 1992 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/edit.c b/clients/ud/edit.c
index 003ff60abf0023f9fc65aa256226c0a86f60c2f5..a6367d7909eb749cc7207b52c76182664306bf82 100644
--- a/clients/ud/edit.c
+++ b/clients/ud/edit.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1994  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/find.c b/clients/ud/find.c
index 5e8b8656030c0dd473748de940b2e03ec312b768..5efa57f1940c818cf73c82d03b951d0f9a5a113b 100644
--- a/clients/ud/find.c
+++ b/clients/ud/find.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1991, 1992, 1993 
  * Regents of the University of Michigan.  All rights reserved.
diff --git a/clients/ud/globals.c b/clients/ud/globals.c
index e37ce10fe57956306d67fa6ea50f23b7884689ac..c08cda10b2ef738624833eb68cbb3d6b1332d687 100644
--- a/clients/ud/globals.c
+++ b/clients/ud/globals.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1992, 1993, 1994  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/group.c b/clients/ud/group.c
index 9a2f283a3d56d1fcfc1e10e3046dc39a9c051c9a..16a0b6d0fecb41d83446b34f62ef6eaa7a0b2666 100644
--- a/clients/ud/group.c
+++ b/clients/ud/group.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1993, 1994  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/help.c b/clients/ud/help.c
index 027e168e41577b7fb33123cb6f3c3f4623162e9e..94a885792e9eaae22fbea360f460038df58669de 100644
--- a/clients/ud/help.c
+++ b/clients/ud/help.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1992, 1993  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/mod.c b/clients/ud/mod.c
index 40eea363167aad250e3a5e6b9102e1c11d330b93..759f3f09434735ff95649ed7fb094df93c1b4624 100644
--- a/clients/ud/mod.c
+++ b/clients/ud/mod.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1991,1993  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/print.c b/clients/ud/print.c
index 0320c9f978710b397cc0f4bc0719c4b9bf610623..1b3a50de7be96553b6bfb9e1843f6525f43a394e 100644
--- a/clients/ud/print.c
+++ b/clients/ud/print.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1991, 1993 
  * Regents of the University of Michigan.  All rights reserved.
diff --git a/clients/ud/string_to_key.c b/clients/ud/string_to_key.c
index 0ed375e92416971719a40b17a5d66e00a484a033..7431c35f9261072f1f4f4d17b9439a465ef0a287 100644
--- a/clients/ud/string_to_key.c
+++ b/clients/ud/string_to_key.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 #include "portable.h"
 
 #if defined(HAVE_KERBEROS) && !defined(openbsd)
diff --git a/clients/ud/ud.h b/clients/ud/ud.h
index fa07c3531d617de4d589c6b6d05d257385e21496..a6d15f25deafd6d67d183b80e306de42b9c89e18 100644
--- a/clients/ud/ud.h
+++ b/clients/ud/ud.h
@@ -1,12 +1,7 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
  * Copyright (c) 1991, 1992, 1993 
diff --git a/clients/ud/util.c b/clients/ud/util.c
index 24bc11c6e5b5be15d1c7f52b172da1c819a62cf3..d97d8c0c5f32f7d48ff77091db18195e20d38263 100644
--- a/clients/ud/util.c
+++ b/clients/ud/util.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1992, 1993  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/include/lber.h b/include/lber.h
index d85ec9f38b0758a512216faf16c7a96f1cb50140..be36e58bb4ff9ecae91a338707e0aeefbf53155b 100644
--- a/include/lber.h
+++ b/include/lber.h
@@ -88,7 +88,7 @@ typedef int (*BERTranslateProc) LDAP_P((
 /* LBER BerElement options */
 #define LBER_USE_DER		0x01
 #define LBER_USE_INDEFINITE_LEN	0x02
-#define LBER_TRANSLATE_STRINGS	0x04
+#define LBER_TRANSLATE_STRINGS	0x04	/* deprecated */
 
 /* get/set options for BerElement */
 #define LBER_OPT_BER_OPTIONS			0x01
diff --git a/include/lutil.h b/include/lutil.h
index 9e6336d840914325cf834f9f1df182b716ec7778..230167b876bac714f6db8919f0a5ba1aac8a8055 100644
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -53,7 +53,7 @@ lutil_detach LDAP_P((
 LIBLUTIL_F( int )
 lutil_entropy LDAP_P((
 	char *buf,
-	int nbytes ));
+	ber_len_t nbytes ));
 
 /* passwd.c */
 struct berval; /* avoid pulling in lber.h */
@@ -65,7 +65,7 @@ lutil_passwd LDAP_P((
 	const char **methods ));
 
 LIBLUTIL_F( struct berval * )
-lutil_passwd_generate LDAP_P(( int ));
+lutil_passwd_generate LDAP_P(( ber_len_t ));
 
 LIBLUTIL_F( struct berval * )
 lutil_passwd_hash LDAP_P((
diff --git a/libraries/libavl/testavl.c b/libraries/libavl/testavl.c
index 94540c304d60d8e7303fce95355dbcb113276818..1f716eacafae7a2c3d02734256b21429b509b1d4 100644
--- a/libraries/libavl/testavl.c
+++ b/libraries/libavl/testavl.c
@@ -1,5 +1,9 @@
 /* testavl.c - Test Tim Howes AVL code */
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/libraries/liblber/bprint.c b/libraries/liblber/bprint.c
index 6e347da2eb32b8e77ab26de443833e05decbf68d..5c615a129175015084aaf5d9ba5500b5a134f1af 100644
--- a/libraries/liblber/bprint.c
+++ b/libraries/liblber/bprint.c
@@ -12,9 +12,6 @@
 #include <ac/stdarg.h>
 #include <ac/string.h>
 
-#undef LDAP_F_PRE
-#define LDAP_F_PRE LDAP_F_EXPORT
-
 #include "lber-int.h"
 
 /*
diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index 57d33b9e54ed02440b08c28ba561a6743d305e64..94a1c6ea14ab6aaae5b396c7570582fe4a90b91d 100644
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -26,9 +26,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#undef LDAP_F_PRE
-#define LDAP_F_PRE LDAP_F_EXPORT
-
 #include "lber-int.h"
 
 static ber_len_t ber_getnint LDAP_P((
diff --git a/libraries/liblber/encode.c b/libraries/liblber/encode.c
index 3003ddb3300357e97ec02f3fd45bd2eb0de1bd3a..0b7fb7494e0244d93212345ecc1778b914c12d81 100644
--- a/libraries/liblber/encode.c
+++ b/libraries/liblber/encode.c
@@ -26,9 +26,6 @@
 #include <ac/socket.h>
 #include <ac/string.h>
 
-#undef LDAP_F_PRE
-#define LDAP_F_PRE LDAP_F_EXPORT
-
 #include "lber-int.h"
 
 static int ber_put_len LDAP_P((
diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index c5dc98f3a1b3faf31ba23326f68b0b880ea4bb16..96b02ad861e61eada4229ec1a724833b0e95cc16 100644
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -32,9 +32,6 @@
 #include <io.h>
 #endif
 
-#undef LDAP_F_PRE
-#define LDAP_F_PRE LDAP_F_EXPORT
-
 #include "lber-int.h"
 
 static ber_slen_t BerRead LDAP_P((
diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c
index 5e1719ca6898278ce73821583bffb666b80f3939..d45a09d0ad17335f723e9d92a39d21eb2639a3ee 100644
--- a/libraries/liblber/memory.c
+++ b/libraries/liblber/memory.c
@@ -8,9 +8,6 @@
 #include <ac/stdlib.h>
 #include <ac/string.h>
 
-#undef LDAP_F_PRE
-#define LDAP_F_PRE LDAP_F_EXPORT
-
 #include "lber-int.h"
 
 #if LDAP_MEMORY_DEBUG
diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c
index 811867810de75ab6e77c74308bc9a8c00e60ca41..03a4e3c56aae2cab66720efdf02d640092dd356f 100644
--- a/libraries/liblber/options.c
+++ b/libraries/liblber/options.c
@@ -8,9 +8,6 @@
 #include <ac/stdlib.h>
 #include <ac/string.h>
 
-#undef LDAP_F_PRE
-#define LDAP_F_PRE LDAP_F_EXPORT
-
 #include "lber-int.h"
 
 struct lber_options ber_int_options = {
diff --git a/libraries/liblber/sockbuf.c b/libraries/liblber/sockbuf.c
index 976f9aa56b32955251af18f761c46a53ca5b47c2..5bdce3efbca2e76492e0a71063463d3039c32523 100644
--- a/libraries/liblber/sockbuf.c
+++ b/libraries/liblber/sockbuf.c
@@ -27,9 +27,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#undef LDAP_F_PRE
-#define LDAP_F_PRE LDAP_F_EXPORT
-
 #include "lber-int.h"
 
 #ifdef LDAP_TEST
diff --git a/libraries/liblutil/entropy.c b/libraries/liblutil/entropy.c
index b7867839cf80e071161e507e6873a119d4eb55f9..6b7c6c9552f50c036185ed62607fd551672a0f60 100644
--- a/libraries/liblutil/entropy.c
+++ b/libraries/liblutil/entropy.c
@@ -33,9 +33,8 @@
  * This routinue should be extended to support additional sources
  * of entropy.
  */
-int lutil_entropy( char *buf, int nbytes )
+int lutil_entropy( char *buf, ber_len_t nbytes )
 {
-	if( nbytes < 0 ) return -1;
 	if( nbytes == 0 ) return 0;
 
 #ifdef URANDOM_DEVICE
@@ -91,7 +90,7 @@ int lutil_entropy( char *buf, int nbytes )
 		 * access to this counter may not be atomic.
 		 */
 		static int counter = 0;
-		int n;
+		ber_len_t n;
 
 		struct rdata_s {
 			int counter;
diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index c610c2bd101a8d95dcb79cbe6c6fb1cc5fbe9cf6..7481780025cd758669d3eb05f8cce2dcd794e69e 100644
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -250,7 +250,7 @@ lutil_passwd(
 
 }
 
-struct berval * lutil_passwd_generate( int len )
+struct berval * lutil_passwd_generate( ber_len_t len )
 {
 	struct berval *pw;
 
diff --git a/servers/slapd/back-ldbm/passwd.c b/servers/slapd/back-ldbm/passwd.c
index 7ab5e1876687f91f3efb5ef266d784c236d38b80..85bbed01b4ac3ee494df4ced101fdea2fa733560 100644
--- a/servers/slapd/back-ldbm/passwd.c
+++ b/servers/slapd/back-ldbm/passwd.c
@@ -76,7 +76,7 @@ ldbm_back_exop_passwd(
 	Debug( LDAP_DEBUG_TRACE, "passwd: \"%s\"%s\n",
 		dn, id ? " (proxy)" : "", 0 );
 
-	if( dn == NULL || dn[0] == NULL ) {
+	if( dn == NULL || dn[0] == '\0' ) {
 		*text = ch_strdup("No password is associated with the Root DSE");
 		rc = LDAP_OPERATIONS_ERROR;
 		goto done;
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index bcae0d3fb6c5b91a145a7d68a1791428af0d5ffb..56c0afe37eb9753bbb6f1e36f94e57c842f0928c 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -335,10 +335,6 @@ int slapd_daemon_init( char *urls )
 	int i, rc;
 	char **u;
 
-#ifndef HAVE_TLS
-	assert( tls_port == 0 );
-#endif
-
 	Debug( LDAP_DEBUG_ARGS, "daemon_init: %s\n",
 		urls ? urls : "<null>", 0, 0 );