--- cyrus-imapd-2.3.9/imap/tls_prune.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/tls_prune.c	2007-09-18 15:48:46.000000000 +0200
@@ -49,6 +49,7 @@
 
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "tls.h"
 #include "xmalloc.h"
 
--- cyrus-imapd-2.3.9/imap/sync_client.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_client.c	2007-09-18 15:39:44.000000000 +0200
@@ -69,6 +69,8 @@
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
--- cyrus-imapd-2.3.9/imap/protocol.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/protocol.c	2007-09-18 15:39:09.000000000 +0200
@@ -49,6 +49,8 @@
 
 #include "protocol.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 static char *imap_parsemechlist(const char *str, struct protocol_t *prot)
 {
--- cyrus-imapd-2.3.9/imap/ipurge.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/ipurge.c	2007-09-18 15:48:26.000000000 +0200
@@ -61,6 +61,7 @@
 
 /* cyrus includes */
 #include "global.h"
+#include "util.h"
 #include "sysexits.h"
 #include "exitcodes.h"
 #include "imap_err.h"
--- cyrus-imapd-2.3.9/imap/cyrdump.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/cyrdump.c	2007-09-18 15:48:30.000000000 +0200
@@ -54,6 +54,7 @@
 #include "assert.h"
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "imapd.h"
 #include "imap_err.h"
 #include "imapurl.h"
--- cyrus-imapd-2.3.9/imap/fetchnews.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/fetchnews.c	2007-09-18 15:48:50.000000000 +0200
@@ -60,10 +60,13 @@
 #include "cyrusdb.h"
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "gmtoff.h"
 #include "lock.h"
 #include "prot.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* global state */
 const int config_need_data = 0;
--- cyrus-imapd-2.3.9/imap/sync_server.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_server.c	2007-09-18 15:40:02.000000000 +0200
@@ -94,6 +94,8 @@
 #include "util.h"
 #include "version.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 #include "sync_support.h"
 #include "sync_commit.h"
--- cyrus-imapd-2.3.9/imap/ctl_mboxlist.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/ctl_mboxlist.c	2007-09-18 15:48:35.000000000 +0200
@@ -77,6 +77,7 @@
 #include "exitcodes.h"
 #include "imap_err.h"
 #include "global.h"
+#include "util.h"
 #include "libcyr_cfg.h"
 #include "mboxlist.h"
 #include "mupdate.h"
--- cyrus-imapd-2.3.9/imap/sync_support.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_support.c	2007-09-18 15:39:55.000000000 +0200
@@ -71,6 +71,8 @@
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
--- cyrus-imapd-2.3.9/imap/squatter.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/squatter.c	2007-09-18 15:48:39.000000000 +0200
@@ -84,6 +84,7 @@
 #include "assert.h"
 #include "mboxlist.h"
 #include "global.h"
+#include "util.h"
 #include "exitcodes.h"
 #include "imap_err.h"
 #include "mailbox.h"
--- cyrus-imapd-2.3.9/imap/autosieve.c.implicitdecl	2007-09-18 15:42:01.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/autosieve.c	2007-09-18 15:39:14.000000000 +0200
@@ -19,6 +19,9 @@
 
 #include "global.h"
 #include "util.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "mailbox.h"
 #include "imap_err.h"
 #include "sieve_interface.h"
--- cyrus-imapd-2.3.9/imap/arbitron.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/arbitron.c	2007-09-18 15:48:43.000000000 +0200
@@ -59,6 +59,7 @@
 
 #include "assert.h"
 #include "global.h"
+#include "util.h"
 #include "exitcodes.h"
 #include "hash.h"
 #include "imap_err.h"
--- cyrus-imapd-2.3.9/imap/mupdate.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/mupdate.c	2007-09-18 15:39:34.000000000 +0200
@@ -87,6 +87,8 @@
 #include "util.h"
 #include "version.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* Sent to clients that we can't accept a connection for. */
 static const char SERVER_UNABLE_STRING[] = "* BYE \"Server Unable\"\r\n";
--- cyrus-imapd-2.3.9/imap/make_md5.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/make_md5.c	2007-09-18 15:48:54.000000000 +0200
@@ -16,6 +16,7 @@
 #include <signal.h>
 
 #include "global.h"
+#include "util.h"
 #include "assert.h"
 #include "mboxlist.h"
 #include "exitcodes.h"
--- cyrus-imapd-2.3.9/imap/sync_commit.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_commit.c	2007-09-18 15:40:08.000000000 +0200
@@ -69,6 +69,8 @@
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
--- cyrus-imapd-2.3.9/imap/compile_sieve.c.implicitdecl	2007-09-18 15:27:37.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/compile_sieve.c	2007-09-18 15:27:48.000000000 +0200
@@ -20,6 +20,7 @@
 #include "global.h"
 
 #include "util.h"
+#include "xmalloc.h"
 #include "mailbox.h"
 #include "imap_err.h"
 #include "sieve_interface.h"
--- cyrus-imapd-2.3.9/timsieved/timsieved.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/timsieved/timsieved.c	2007-09-18 15:40:35.000000000 +0200
@@ -73,6 +73,8 @@
 #include "prot.h"
 #include "libconfig.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "exitcodes.h"
 #include "iptostring.h"
 #include "global.h"
--- cyrus-imapd-2.3.9/timsieved/actions.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/timsieved/actions.c	2007-09-18 15:40:25.000000000 +0200
@@ -69,6 +69,8 @@
 #include "global.h"
 #include "libconfig.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "sieve_interface.h"
 
 #include "codes.h"
--- cyrus-imapd-2.3.9/timsieved/parser.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/timsieved/parser.c	2007-09-18 15:40:41.000000000 +0200
@@ -64,6 +64,8 @@
 #include "mboxname.h"
 #include "mboxlist.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "prot.h"
 #include "tls.h"
 #include "lex.h"
--- cyrus-imapd-2.3.9/master/cyrusMasterMIB.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/master/cyrusMasterMIB.c	2007-09-18 15:39:06.000000000 +0200
@@ -52,6 +52,8 @@
 
 #include "master.h"
 #include "../imap/version.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* 
  * cyrusMasterMIB_variables_oid:
--- cyrus-imapd-2.3.9/sieve/interp.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/sieve/interp.c	2007-09-18 15:38:40.000000000 +0200
@@ -33,6 +33,8 @@
 #include <string.h>
 
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 #include "sieve_interface.h"
 #include "interp.h"
--- cyrus-imapd-2.3.9/sieve/addr.y.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/sieve/addr.y	2007-09-18 15:38:45.000000000 +0200
@@ -37,6 +37,8 @@
 #include "addr.h"
 #include "script.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
     
 int yyerror(char *msg);
 extern int yylex(void);
--- cyrus-imapd-2.3.9/imtest/imtest.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imtest/imtest.c	2007-09-18 15:40:14.000000000 +0200
@@ -82,6 +82,8 @@
 #include "imparse.h"
 #include "iptostring.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 #ifdef HAVE_SSL
 #include <openssl/ssl.h>
--- cyrus-imapd-2.3.9/ptclient/ptexpire.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/ptclient/ptexpire.c	2007-09-18 15:48:57.000000000 +0200
@@ -65,6 +65,7 @@
 #include "cyrusdb.h"
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "libconfig.h"
 #include "lock.h"
 #include "xmalloc.h"
--- cyrus-imapd-2.3.9/ptclient/ldap.c.implicitdecl	2007-09-18 15:49:48.000000000 +0200
+++ cyrus-imapd-2.3.9/ptclient/ldap.c	2007-09-18 15:40:19.000000000 +0200
@@ -61,6 +61,9 @@
 #include <sys/un.h>
 #include <sys/uio.h>
 
+/* Functions like ldap_bind() have been deprecated in OpenLDAP 2.3 */
+#define LDAP_DEPRECATED 1
+
 #include <ldap.h>
 #include <lber.h>
 
@@ -74,6 +77,8 @@
 #include "auth_pts.h"
 #include "strhash.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* xxx this just uses the UNIX canonicalization semantics, which is
  * most likely wrong */