s/<stdlib.h>/<ac/stdlib.h>/

clients/fax500/main.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/errno.h>

clients/fax500/rp500.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/signal.h>

clients/finger/main.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/signal.h>

clients/gopher/go500.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/signal.h>

clients/gopher/go500gw.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/signal.h>

clients/mail500/main.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/signal.h>

clients/rcpt500/cmds.c

@@ -8,7 +8,7 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 #include "rcpt500.h"
 
 struct command cmds[] = {

clients/rcpt500/main.c

@@ -9,7 +9,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/signal.h>

clients/rcpt500/query.c

@@ -9,7 +9,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

clients/tools/ldapdelete.c

@@ -3,8 +3,9 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
+
+#include <ac/stdlib.h>
+#include <ac/ctype.h>
 
 #include <ac/signal.h>
 #include <ac/string.h>

clients/tools/ldapmodify.c

@@ -7,7 +7,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/signal.h>

clients/tools/ldapmodrdn.c

@@ -15,7 +15,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/signal.h>

clients/tools/ldappasswd.c

@@ -16,7 +16,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/signal.h>

clients/tools/ldapsearch.c

@@ -1,7 +1,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/signal.h>

clients/ud/auth.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/krb.h>

clients/ud/edit.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/signal.h>
 #include <ac/string.h>

clients/ud/find.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

clients/ud/main.c

@@ -23,7 +23,9 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
+
 #include <setjmp.h>
 
 #ifdef HAVE_PWD_H

clients/ud/mod.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

clients/ud/util.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/errno.h>

contrib/saucer/main.c

@@ -20,7 +20,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #ifdef HAVE_READLINE
 #  include <readline/readline.h>

contrib/web_ldap/util.c

@@ -15,10 +15,9 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
+
+#include <ac/stdlib.h>
+#include <ac/time.h>
 
 #include <ac/string.h>
 #include <ac/ctype.h>

contrib/web_ldap/web_ldap.c

@@ -7,15 +7,15 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <time.h>
 
-#include <ac/unistd.h>
+#include <ac/stdlib.h>
 #include <ac/string.h>
+#include <ac/time.h>
+#include <ac/unistd.h>
 
 #include <lber.h>
 #include <ldap.h>

libraries/libavl/avl.c

@@ -19,7 +19,7 @@ static char avl_version[] = "AVL library version 1.0\n";
 #endif
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #define AVL_INTERNAL
 #include "avl.h"

libraries/libavl/testavl.c

@@ -3,8 +3,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 
+#include <ac/stdlib.h>
 #include <ac/string.h>
 
 #define AVL_INTERNAL

libraries/liblber/decode.c

@@ -18,10 +18,10 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/stdarg.h>
-
 #include <ac/string.h>
 #include <ac/socket.h>
 

libraries/liblber/dtest.c

@@ -18,8 +18,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 
+#include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/socket.h>
 #include <ac/unistd.h>

libraries/liblber/encode.c

@@ -18,7 +18,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/stdarg.h>
 #include <ac/socket.h>

libraries/liblber/etest.c

@@ -11,7 +11,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>

libraries/liblber/idtest.c

@@ -18,7 +18,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #ifdef HAVE_PSAP_H
 #include <psap.h>

libraries/liblber/io.c

@@ -18,7 +18,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/errno.h>

libraries/liblber/memory.c

@@ -4,7 +4,7 @@
  */
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 #include <ac/string.h>
 
 #include "lber-int.h"

libraries/liblber/options.c

@@ -4,7 +4,7 @@
  */
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 #include <ac/string.h>
 
 #include "lber-int.h"

libraries/liblber/sockbuf.c

@@ -7,7 +7,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/errno.h>

libraries/libldap/abandon.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>

libraries/libldap/addentry.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>

libraries/libldap/apitest.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include "lber.h"
 #include "ldap.h"

libraries/libldap/bind.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>

libraries/libldap/cache.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>

libraries/libldap/charset.c

@@ -14,7 +14,8 @@
 #ifdef STR_TRANSLATION
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>
@@ -147,7 +148,7 @@ ldap_translate_to_t61( LDAP *ld, char **bufp, unsigned long *lenp,
 
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 #include <ac/string.h>
 
 /* Character set used: ISO 8859-1, ISO 8859-2, ISO 8859-3, ... */

libraries/libldap/cldap.c

@@ -14,7 +14,8 @@
 #ifdef LDAP_CONNECTIONLESS
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/socket.h>

libraries/libldap/controls.c

@@ -8,7 +8,7 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/time.h>
 #include <ac/string.h>

libraries/libldap/disptmpl.c

@@ -20,7 +20,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

libraries/libldap/dsparse.c

@@ -22,7 +22,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

libraries/libldap/error.c

@@ -6,7 +6,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>

libraries/libldap/extended.c

@@ -6,7 +6,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>

libraries/libldap/free.c

@@ -13,7 +13,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

libraries/libldap/friendly.c

@@ -12,7 +12,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/errno.h>

libraries/libldap/getattr.c

@@ -12,7 +12,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>

libraries/libldap/getdn.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>

libraries/libldap/getdxbyname.c

@@ -14,7 +14,7 @@
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>

libraries/libldap/getentry.c

@@ -12,7 +12,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>

libraries/libldap/getfilter.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/errno.h>

libraries/libldap/getvalues.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>

libraries/libldap/init.c

@@ -5,7 +5,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>

libraries/libldap/kbind.c

@@ -14,7 +14,7 @@
 #ifdef HAVE_KERBEROS
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/krb.h>
 #include <ac/socket.h>

libraries/libldap/messages.c

@@ -9,7 +9,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>

libraries/libldap/open.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>

libraries/libldap/options.c

@@ -6,7 +6,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>

libraries/libldap/os-ip.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/socket.h>

libraries/libldap/references.c

@@ -9,7 +9,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>

libraries/libldap/request.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/socket.h>

libraries/libldap/result.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/socket.h>

libraries/libldap/schema.c

@@ -9,7 +9,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

libraries/libldap/search.c

@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>

libraries/libldap/sort.c

@@ -19,7 +19,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

libraries/libldap/srchpref.c

@@ -20,7 +20,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

libraries/libldap/string.c

@@ -5,7 +5,7 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/time.h>
 

libraries/libldap/test.c

@@ -6,7 +6,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>

libraries/libldap/tmplout.c

@@ -10,7 +10,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

libraries/libldap/tmpltest.c

@@ -5,7 +5,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/time.h>

libraries/libldap/ufn.c

@@ -12,11 +12,12 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <ac/string.h>
-#include <ctype.h>
-#include <stdlib.h>
 
+#include <ac/stdlib.h>
+
+#include <ac/ctype.h>
 #include <ac/socket.h>
+#include <ac/string.h>
 #include <ac/time.h>
 
 #include "ldap-int.h"

libraries/libldap/unbind.c

@@ -12,7 +12,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>

libraries/libldap/url.c

@@ -24,7 +24,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>

libraries/libldap/util-int.c

@@ -22,7 +22,7 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/socket.h>

libraries/libldap_r/rdwr.c

@@ -17,7 +17,7 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/string.h>

libraries/libldap_r/thr_sleep.c

@@ -30,7 +30,7 @@
 #if !defined( HAVE_LWP )
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 #include <ac/unistd.h>			/* get sleep() */
 
 #include "ldap_pvt_thread.h"

libraries/libldbm/ldbm.c

@@ -12,7 +12,8 @@
 #ifdef SLAPD_LDBM
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/errno.h>
 
@@ -552,8 +553,8 @@ ldbm_errno( LDBM ldbm )
 
 /* MMAPED DBM HASHING DATABASE */
 
-#include <alloca.h>
-#include <string.h>
+#include <ac/alloca.h>
+#include <ac/string.h>
 
 /* #define MDBM_DEBUG */
 

libraries/libldif/line64.c

@@ -3,8 +3,9 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
+
+#include <ac/stdlib.h>
+#include <ac/ctype.h>
 
 #include <ac/string.h>
 #include <ac/socket.h>

libraries/liblutil/base64.c

@@ -46,10 +46,8 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
-#include <stddef.h>
-#include <ctype.h>
-
+#include <ac/stdlib.h>
+#include <ac/ctype.h>
 #include <ac/string.h>
 
 /* include socket.h to get sys/types.h and/or winsock2.h */

libraries/liblutil/getpass.c

@@ -15,7 +15,8 @@
 #ifndef HAVE_GETPASS
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/errno.h>

libraries/liblutil/passwd.c

@@ -10,7 +10,7 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/string.h>
 #include <ac/unistd.h>

libraries/liblutil/setproctitle.c

@@ -3,7 +3,8 @@
 #ifndef HAVE_SETPROCTITLE
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/setproctitle.h>
 #include <ac/string.h>

libraries/liblutil/sha1.c

@@ -200,7 +200,7 @@ static char rcsid[] = "$OpenBSD: sha1hl.c,v 1.1 1997/07/12 20:06:03 millert Exp
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/unistd.h>

libraries/liblutil/tempnam.c

@@ -3,7 +3,8 @@
 #ifndef HAVE_TEMPNAM
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
 

servers/slapd/back-bdb2/alias.c

@@ -13,8 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <ac/socket.h>		/* Get struct sockaddr for slap.h */
+#include <ac/string.h>
+#include <ac/socket.h>
 #include "slap.h"
 #include "back-bdb2.h"
 #include "proto-back-bdb2.h"

servers/slapd/back-bdb2/txn.h

@@ -7,8 +7,8 @@
 
 #include <stdio.h>
 #include <sys/stat.h>
-#include <dirent.h>
 
+#include <ac/dirent.h>
 #include <ac/errno.h>
 #include <ac/signal.h>
 #include <ac/socket.h>

servers/slapd/back-ldbm/alias.c

@@ -13,8 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <ac/socket.h>		/* Get struct sockaddr for slap.h */
+#include <ac/string.h>
+#include <ac/socket.h>
 #include "slap.h"
 #include "back-ldbm.h"
 #include "proto-back-ldbm.h"

servers/slapd/back-shell/abandon.c

@@ -3,8 +3,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <signal.h>
 
+#include <ac/signal.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 

servers/slapd/ch_malloc.c

@@ -3,7 +3,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/string.h>
 #include <ac/socket.h>

servers/slapd/proto-slap.h

@@ -249,7 +249,7 @@ void schema_info LDAP_P((Connection *conn, Operation *op, char **attrs, int attr
 void parse_oc_old LDAP_P(( Backend *be, char *fname, int lineno, int argc, char **argv ));
 void parse_oc LDAP_P(( char *fname, int lineno, char * line ));
 void parse_at LDAP_P(( char *fname, int lineno, char *line ));
-
+char *scherr2str LDAP_P((int code));
 /*
  * str2filter.c
  */

servers/slapd/shell-backends/passwd-shell.c

@@ -16,7 +16,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/string.h>
 #include <ac/unistd.h>

servers/slapd/shell-backends/shellutil.c

@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 #include <ac/stdarg.h>
 
 #include <pwd.h>

servers/slapd/slap.h

@@ -3,12 +3,12 @@
 #ifndef _SLDAPD_H_
 #define _SLDAPD_H_
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <sys/types.h>
 #include <ac/syslog.h>
 #include <ac/regex.h>
-#include <ac/socket.h>			/* needed by LDAP_CONNECTIONLESS */
+#include <ac/socket.h>
 #include <ldap_schema.h>
 
 #include "avl.h"

servers/slapd/suffixalias.c

@@ -19,8 +19,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <ac/socket.h>		/* Get struct sockaddr for slap.h */
+#include <ac/string.h>
+#include <ac/socket.h>
 #include "slap.h"
 
 /* 

servers/slapd/tools/centipede.c

@@ -3,7 +3,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

servers/slapd/tools/chlog2replog.c

@@ -19,7 +19,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>
@@ -413,7 +413,7 @@ print_as(Attr_Sequence as, int modtype, FILE *ofp)
 	    }
 	    if ( obuf != NULL ) {
 		fputs( obuf, ofp );
-		free( obuf );
+		ber_memfree( obuf );
 	    }
 	}
 	if ( modtype != 0 ) {

servers/slapd/tools/edb2ldif.c

@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/errno.h>

servers/slapd/tools/ldapsyntax.c

@@ -123,7 +123,7 @@ av2ldif( FILE *outfp, AV_Sequence av, DN dn, short syntax, char *attrname,
 	    if ( fputs( buf, outfp ) == EOF ) {
 		rc = -1;
 	    }
-	    free( buf );
+	    ber_memfree( buf );
 	}
     }
 

servers/slapd/tools/ldbmtest.c

@@ -1,9 +1,9 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <limits.h>
 
+#include <ac/stdlib.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/ctype.h>