diff --git a/doc/man/man5/slapd.access.5 b/doc/man/man5/slapd.access.5
index dd27eb6faf..c4189526b5 100644
--- a/doc/man/man5/slapd.access.5
+++ b/doc/man/man5/slapd.access.5
@@ -448,6 +448,11 @@ The optional parameters
 and
 .B <attrname>
 define the objectClass and the member attributeType of the group entry.
+The defaults are
+.B groupOfNames
+and
+.BR member ,
+respectively.
 The optional style qualifier
 .B <style>
 can be
diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 15abb211fc..c88ad94cc2 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -25,6 +25,10 @@
 #include <ac/ctype.h>
 #include <ac/unistd.h>
 
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
 #include "ldap-int.h"
 
 #ifdef HAVE_CYRUS_SASL
diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 8ecda40f41..89d5db8a0d 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -23,7 +23,9 @@
 #include <ac/ctype.h>
 #include <ac/time.h>
 
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #include "ldap-int.h"
 #include "ldap_defaults.h"
diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 407c1a3f99..dd97afa22f 100644
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -19,7 +19,9 @@
 #include "portable.h"
 
 #include <stdio.h>
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #include <ac/stdlib.h>
 
diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index c6ef075ac0..2441e6a7c9 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -26,7 +26,9 @@
 #include "portable.h"
 
 #include <stdio.h>
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #include <ac/socket.h>
 #include <ac/errno.h>
diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 112e37dcfd..091a7d2139 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -16,6 +16,10 @@
 #include "portable.h"
 
 #include <stdio.h>
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
 #include <ac/stdlib.h>
 #include <ac/string.h>
 
@@ -24,8 +28,6 @@
 
 #include "slap.h"
 
-#include <limits.h>
-
 #ifdef HAVE_CYRUS_SASL
 # ifdef HAVE_SASL_SASL_H
 #  include <sasl/sasl.h>
diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index a30340e31a..a69961b89e 100644
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -17,6 +17,9 @@
 #include "portable.h"
 
 #include <stdio.h>
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
 
 #include <ac/stdlib.h>
 #include <ac/string.h>
@@ -24,8 +27,6 @@
 
 #include "slap.h"
 
-#include <limits.h>
-
 #include "lutil.h"
 
 #define SASLREGEX_REPLACE 10
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 90f2fb7647..8d3feb8874 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -17,7 +17,9 @@
 #include "portable.h"
 
 #include <stdio.h>
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #include <ac/ctype.h>
 #include <ac/errno.h>