include <ac/string.h> as needed (not in rewrite.h)

include/rewrite.h

@@ -25,10 +25,6 @@
 #ifndef REWRITE_H
 #define REWRITE_H
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
 LDAP_BEGIN_DECL
 
 /*
@@ -84,7 +80,8 @@ LDAP_BEGIN_DECL
  * Rewrite info
  */
 struct rewrite_info;
-struct berval;
+
+struct berval; /* avoid include */
 
 /*
  * Inits the info
@@ -223,4 +220,3 @@ rewrite_param_destroy(
 LDAP_END_DECL
 
 #endif /* REWRITE_H */
-

libraries/librewrite/config.c

@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 #include "rewrite-map.h"
 

libraries/librewrite/context.c

@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*

libraries/librewrite/info.c

@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*

libraries/librewrite/ldapmap.c

@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 #include "rewrite-map.h"
 

libraries/librewrite/map.c

@@ -24,6 +24,7 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
 #include <pwd.h>
 
 #include "rewrite-int.h"

libraries/librewrite/params.c

@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*

libraries/librewrite/rewrite.c

@@ -30,6 +30,7 @@
 #include <ac/socket.h>
 #include <ac/unistd.h>
 #include <ac/ctype.h>
+#include <ac/string.h>
 
 #include <rewrite.h>
 

libraries/librewrite/rule.c

@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*

libraries/librewrite/session.c

@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*

libraries/librewrite/var.c

@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*