diff --git a/servers/lloadd/config.c b/servers/lloadd/config.c
index b77ee246fd..ba827bfe2b 100644
--- a/servers/lloadd/config.c
+++ b/servers/lloadd/config.c
@@ -45,7 +45,7 @@
 #include "lload.h"
 #include "lutil.h"
 #include "lutil_ldap.h"
-#include "config.h"
+#include "lload-config.h"
 
 #ifdef _WIN32
 #define LUTIL_ATOULX lutil_atoullx
diff --git a/servers/lloadd/config.h b/servers/lloadd/lload-config.h
similarity index 92%
rename from servers/lloadd/config.h
rename to servers/lloadd/lload-config.h
index b9d4d94435..f8d677692a 100644
--- a/servers/lloadd/config.h
+++ b/servers/lloadd/lload-config.h
@@ -1,4 +1,4 @@
-/* config.h - configuration abstraction structure */
+/* lload-config.h - configuration abstraction structure */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
@@ -18,7 +18,7 @@
 #define LLOAD_CONFIG_H
 
 #include <ac/string.h>
-#include "../slapd/config.h"
+#include "../slapd/slap-config.h"
 
 LDAP_BEGIN_DECL
 
diff --git a/servers/lloadd/module_init.c b/servers/lloadd/module_init.c
index 4bfdf42757..0a30d18827 100644
--- a/servers/lloadd/module_init.c
+++ b/servers/lloadd/module_init.c
@@ -33,7 +33,7 @@
 #include <ac/time.h>
 
 #include "../servers/slapd/slap.h"
-#include "../servers/slapd/config.h"
+#include "../servers/slapd/slap-config.h"
 
 #include "lload.h"
 #include "lber_pvt.h"
diff --git a/servers/lloadd/monitor.c b/servers/lloadd/monitor.c
index 6422cdb368..a9ee85bdee 100644
--- a/servers/lloadd/monitor.c
+++ b/servers/lloadd/monitor.c
@@ -36,7 +36,7 @@
 #include "lber_pvt.h"
 
 #include "ldap_rq.h"
-#include "config.h"
+#include "lload-config.h"
 #include "../slapd/back-monitor/back-monitor.h"
 
 #define LLOAD_MONITOR_BALANCER_NAME "Load Balancer"
diff --git a/servers/slapd/back-asyncmeta/config.c b/servers/slapd/back-asyncmeta/config.c
index 7264bdf346..0a695664dc 100644
--- a/servers/slapd/back-asyncmeta/config.c
+++ b/servers/slapd/back-asyncmeta/config.c
@@ -29,7 +29,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "ldif.h"
 #include "../back-ldap/back-ldap.h"
diff --git a/servers/slapd/back-asyncmeta/init.c b/servers/slapd/back-asyncmeta/init.c
index 7ae784f67c..1a2accf731 100644
--- a/servers/slapd/back-asyncmeta/init.c
+++ b/servers/slapd/back-asyncmeta/init.c
@@ -28,7 +28,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "../back-ldap/back-ldap.h"
 #include "back-asyncmeta.h"
 
diff --git a/servers/slapd/back-dnssrv/init.c b/servers/slapd/back-dnssrv/init.c
index e9d4dc72d1..c28db31268 100644
--- a/servers/slapd/back-dnssrv/init.c
+++ b/servers/slapd/back-dnssrv/init.c
@@ -28,7 +28,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "proto-dnssrv.h"
 
 int
diff --git a/servers/slapd/back-ldap/chain.c b/servers/slapd/back-ldap/chain.c
index a7a90bee80..8901bf3e50 100644
--- a/servers/slapd/back-ldap/chain.c
+++ b/servers/slapd/back-ldap/chain.c
@@ -30,7 +30,7 @@
 #include "lutil.h"
 #include "slap.h"
 #include "back-ldap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
 #define SLAP_CHAINING_DEFAULT				LDAP_CHAINING_PREFERRED
diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 44233ef662..1f83635566 100644
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -30,7 +30,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "back-ldap.h"
 #include "lutil.h"
 #include "ldif.h"
diff --git a/servers/slapd/back-ldap/distproc.c b/servers/slapd/back-ldap/distproc.c
index 06f381e363..ed7b6dab9e 100644
--- a/servers/slapd/back-ldap/distproc.c
+++ b/servers/slapd/back-ldap/distproc.c
@@ -33,7 +33,7 @@
 
 #include "back-ldap.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 /*
  * From <draft-sermersheim-ldap-distproc>
diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 8acb73ca5d..394fffb2f5 100644
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -29,7 +29,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "back-ldap.h"
 
 static const ldap_extra_t ldap_extra = {
diff --git a/servers/slapd/back-ldap/monitor.c b/servers/slapd/back-ldap/monitor.c
index 129b4a004d..e96dbeff06 100644
--- a/servers/slapd/back-ldap/monitor.c
+++ b/servers/slapd/back-ldap/monitor.c
@@ -32,7 +32,7 @@
 #include "lutil.h"
 #include "back-ldap.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 static ObjectClass		*oc_olmLDAPDatabase;
 static ObjectClass		*oc_olmLDAPConnection;
diff --git a/servers/slapd/back-ldap/pbind.c b/servers/slapd/back-ldap/pbind.c
index 8fbc024935..0476b692d0 100644
--- a/servers/slapd/back-ldap/pbind.c
+++ b/servers/slapd/back-ldap/pbind.c
@@ -29,7 +29,7 @@
 #include "lutil.h"
 #include "slap.h"
 #include "back-ldap.h"
-#include "config.h"
+#include "slap-config.h"
 
 static BackendInfo	*lback;
 
diff --git a/servers/slapd/back-ldif/ldif.c b/servers/slapd/back-ldif/ldif.c
index 5b57892d6c..0def1980e7 100644
--- a/servers/slapd/back-ldif/ldif.c
+++ b/servers/slapd/back-ldif/ldif.c
@@ -29,7 +29,7 @@
 #include <ac/unistd.h>
 #include "slap.h"
 #include "lutil.h"
-#include "config.h"
+#include "slap-config.h"
 
 struct ldif_tool {
 	Entry	**entries;			/* collected by bi_tool_entry_first() */
diff --git a/servers/slapd/back-mdb/attr.c b/servers/slapd/back-mdb/attr.c
index 48ce3d909f..446b9a4b05 100644
--- a/servers/slapd/back-mdb/attr.c
+++ b/servers/slapd/back-mdb/attr.c
@@ -23,7 +23,7 @@
 
 #include "slap.h"
 #include "back-mdb.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 
 /* Find the ad, return -1 if not found,
diff --git a/servers/slapd/back-mdb/config.c b/servers/slapd/back-mdb/config.c
index 669944d040..54fed1383f 100644
--- a/servers/slapd/back-mdb/config.c
+++ b/servers/slapd/back-mdb/config.c
@@ -24,7 +24,7 @@
 #include "back-mdb.h"
 #include "idl.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 #include "ldap_rq.h"
diff --git a/servers/slapd/back-mdb/init.c b/servers/slapd/back-mdb/init.c
index 7bee68e10a..867559a9db 100644
--- a/servers/slapd/back-mdb/init.c
+++ b/servers/slapd/back-mdb/init.c
@@ -25,7 +25,7 @@
 #include "back-mdb.h"
 #include <lutil.h>
 #include <ldap_rq.h>
-#include "config.h"
+#include "slap-config.h"
 
 static const struct berval mdmi_databases[] = {
 	BER_BVC("ad2i"),
diff --git a/servers/slapd/back-mdb/monitor.c b/servers/slapd/back-mdb/monitor.c
index aeea4963ce..5121256c97 100644
--- a/servers/slapd/back-mdb/monitor.c
+++ b/servers/slapd/back-mdb/monitor.c
@@ -27,7 +27,7 @@
 
 #include "../back-monitor/back-monitor.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 static ObjectClass		*oc_olmMDBDatabase;
 
diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 66f47614c3..626c936748 100644
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -29,7 +29,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "ldif.h"
 #include "../back-ldap/back-ldap.h"
diff --git a/servers/slapd/back-meta/init.c b/servers/slapd/back-meta/init.c
index fa46bcaf99..63481dfc72 100644
--- a/servers/slapd/back-meta/init.c
+++ b/servers/slapd/back-meta/init.c
@@ -23,7 +23,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "../back-ldap/back-ldap.h"
 #include "back-meta.h"
 
diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index edb201e58d..e7a9b903d2 100644
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -26,11 +26,11 @@
 
 #include <lutil.h>
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lber_pvt.h"
 #include "back-monitor.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #undef INTEGRATE_CORE_SCHEMA
 
diff --git a/servers/slapd/back-ndb/config.cpp b/servers/slapd/back-ndb/config.cpp
index 9c0dd23549..14ff8311e6 100644
--- a/servers/slapd/back-ndb/config.cpp
+++ b/servers/slapd/back-ndb/config.cpp
@@ -23,7 +23,7 @@
 
 #include "back-ndb.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 extern "C" {
 	static ConfigDriver ndb_cf_gen;
diff --git a/servers/slapd/back-ndb/init.cpp b/servers/slapd/back-ndb/init.cpp
index bd9392a1dc..9435950f8a 100644
--- a/servers/slapd/back-ndb/init.cpp
+++ b/servers/slapd/back-ndb/init.cpp
@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include "back-ndb.h"
 #include <lutil.h>
-#include "config.h"
+#include "slap-config.h"
 
 extern "C" {
 	static BI_db_init ndb_db_init;
diff --git a/servers/slapd/back-null/null.c b/servers/slapd/back-null/null.c
index a45888f577..41149a6653 100644
--- a/servers/slapd/back-null/null.c
+++ b/servers/slapd/back-null/null.c
@@ -24,7 +24,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 typedef struct null_info {
 	int	ni_bind_allowed;
diff --git a/servers/slapd/back-passwd/config.c b/servers/slapd/back-passwd/config.c
index 3a72d373cb..a4d8b9563e 100644
--- a/servers/slapd/back-passwd/config.c
+++ b/servers/slapd/back-passwd/config.c
@@ -38,7 +38,7 @@
 
 #include "slap.h"
 #include "back-passwd.h"
-#include "config.h"
+#include "slap-config.h"
 
 static ConfigTable passwdcfg[] = {
 	{ "file", "filename", 2, 2, 0,
diff --git a/servers/slapd/back-perl/close.c b/servers/slapd/back-perl/close.c
index 6a645239e6..c0ae4828ee 100644
--- a/servers/slapd/back-perl/close.c
+++ b/servers/slapd/back-perl/close.c
@@ -16,7 +16,7 @@
  */
 
 #include "perl_back.h"
-#include "../config.h"
+#include "../slap-config.h"
 /**********************************************************
  *
  * Close
diff --git a/servers/slapd/back-perl/config.c b/servers/slapd/back-perl/config.c
index 646d9a96fb..0ea1baefdb 100644
--- a/servers/slapd/back-perl/config.c
+++ b/servers/slapd/back-perl/config.c
@@ -16,7 +16,7 @@
  */
 
 #include "perl_back.h"
-#include "../config.h"
+#include "../slap-config.h"
 
 static ConfigDriver perl_cf;
 
diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index f33420d48c..963a2bea39 100644
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -16,7 +16,7 @@
  */
 
 #include "perl_back.h"
-#include "../config.h"
+#include "../slap-config.h"
 
 #ifdef PERL_SYS_INIT3
 #include <ac/unistd.h>		/* maybe get environ */
diff --git a/servers/slapd/back-relay/init.c b/servers/slapd/back-relay/init.c
index 282fc3ed05..c2434f5d15 100644
--- a/servers/slapd/back-relay/init.c
+++ b/servers/slapd/back-relay/init.c
@@ -25,7 +25,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "back-relay.h"
 
 static ConfigDriver relay_back_cf;
diff --git a/servers/slapd/back-shell/config.c b/servers/slapd/back-shell/config.c
index 3b99e359ca..44dc3f2f86 100644
--- a/servers/slapd/back-shell/config.c
+++ b/servers/slapd/back-shell/config.c
@@ -37,7 +37,7 @@
 
 #include "slap.h"
 #include "shell.h"
-#include "config.h"
+#include "slap-config.h"
 
 static ConfigDriver shell_cf;
 
diff --git a/servers/slapd/back-shell/init.c b/servers/slapd/back-shell/init.c
index e60cd6e85a..e975549852 100644
--- a/servers/slapd/back-shell/init.c
+++ b/servers/slapd/back-shell/init.c
@@ -36,7 +36,7 @@
 
 #include "slap.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #include "shell.h"
 
diff --git a/servers/slapd/back-sock/config.c b/servers/slapd/back-sock/config.c
index a340239630..15caaddc9a 100644
--- a/servers/slapd/back-sock/config.c
+++ b/servers/slapd/back-sock/config.c
@@ -26,7 +26,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "back-sock.h"
 
 static ConfigDriver bs_cf_gen;
diff --git a/servers/slapd/back-sql/config.c b/servers/slapd/back-sql/config.c
index 56baafb071..52171ea6c2 100644
--- a/servers/slapd/back-sql/config.c
+++ b/servers/slapd/back-sql/config.c
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "ldif.h"
 #include "lutil.h"
 #include "proto-sql.h"
diff --git a/servers/slapd/back-sql/init.c b/servers/slapd/back-sql/init.c
index 140e28ee72..120fe75c61 100644
--- a/servers/slapd/back-sql/init.c
+++ b/servers/slapd/back-sql/init.c
@@ -27,7 +27,7 @@
 #include "ac/string.h"
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "proto-sql.h"
 
 int
diff --git a/servers/slapd/back-wt/add.c b/servers/slapd/back-wt/add.c
index 639415d53e..5b9e83da3e 100644
--- a/servers/slapd/back-wt/add.c
+++ b/servers/slapd/back-wt/add.c
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int
 wt_add( Operation *op, SlapReply *rs )
diff --git a/servers/slapd/back-wt/attr.c b/servers/slapd/back-wt/attr.c
index bdebea0d57..3aac12ff5e 100644
--- a/servers/slapd/back-wt/attr.c
+++ b/servers/slapd/back-wt/attr.c
@@ -20,7 +20,7 @@
  */
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 /* Find the ad, return -1 if not found,
  * set point for insertion if ins is non-NULL
diff --git a/servers/slapd/back-wt/bind.c b/servers/slapd/back-wt/bind.c
index 18b4407cf1..c3908a161c 100644
--- a/servers/slapd/back-wt/bind.c
+++ b/servers/slapd/back-wt/bind.c
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int
 wt_bind( Operation *op, SlapReply *rs )
diff --git a/servers/slapd/back-wt/compare.c b/servers/slapd/back-wt/compare.c
index 7d233d8963..1d13af7406 100644
--- a/servers/slapd/back-wt/compare.c
+++ b/servers/slapd/back-wt/compare.c
@@ -25,7 +25,7 @@
 #include <ac/string.h>
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int
 wt_compare( Operation *op, SlapReply *rs )
diff --git a/servers/slapd/back-wt/config.c b/servers/slapd/back-wt/config.c
index 158344b737..ed8ef395c0 100644
--- a/servers/slapd/back-wt/config.c
+++ b/servers/slapd/back-wt/config.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 #include "ldap_rq.h"
diff --git a/servers/slapd/back-wt/ctx.c b/servers/slapd/back-wt/ctx.c
index 765e48cd30..6f09801d1e 100644
--- a/servers/slapd/back-wt/ctx.c
+++ b/servers/slapd/back-wt/ctx.c
@@ -20,7 +20,7 @@
  */
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 wt_ctx *
 wt_ctx_init(struct wt_info *wi)
diff --git a/servers/slapd/back-wt/delete.c b/servers/slapd/back-wt/delete.c
index fe918cf4a3..20f06b2f15 100644
--- a/servers/slapd/back-wt/delete.c
+++ b/servers/slapd/back-wt/delete.c
@@ -25,7 +25,7 @@
 #include <ac/string.h>
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int
 wt_delete( Operation *op, SlapReply *rs )
diff --git a/servers/slapd/back-wt/dn2entry.c b/servers/slapd/back-wt/dn2entry.c
index f6e06e2d6a..c180e44596 100644
--- a/servers/slapd/back-wt/dn2entry.c
+++ b/servers/slapd/back-wt/dn2entry.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 /*
  * dn2entry - look up dn in the db and return the corresponding entry.
diff --git a/servers/slapd/back-wt/dn2id.c b/servers/slapd/back-wt/dn2id.c
index 5134fcc55d..5251203a0c 100644
--- a/servers/slapd/back-wt/dn2id.c
+++ b/servers/slapd/back-wt/dn2id.c
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 #include "idl.h"
 
 char *
diff --git a/servers/slapd/back-wt/id2entry.c b/servers/slapd/back-wt/id2entry.c
index 89970bfca8..4240ac90a9 100644
--- a/servers/slapd/back-wt/id2entry.c
+++ b/servers/slapd/back-wt/id2entry.c
@@ -20,7 +20,7 @@
  */
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 static int wt_id2entry_put(
 	Operation *op,
diff --git a/servers/slapd/back-wt/index.c b/servers/slapd/back-wt/index.c
index 39cc20254b..06624591d3 100644
--- a/servers/slapd/back-wt/index.c
+++ b/servers/slapd/back-wt/index.c
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 static char presence_keyval[] = {0,0};
 static struct berval presence_key = BER_BVC(presence_keyval);
diff --git a/servers/slapd/back-wt/init.c b/servers/slapd/back-wt/init.c
index a273b23bac..015d8566a9 100644
--- a/servers/slapd/back-wt/init.c
+++ b/servers/slapd/back-wt/init.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 static int
 wt_db_init( BackendDB *be, ConfigReply *cr )
diff --git a/servers/slapd/back-wt/key.c b/servers/slapd/back-wt/key.c
index 58f95479ea..4b5fd8d184 100644
--- a/servers/slapd/back-wt/key.c
+++ b/servers/slapd/back-wt/key.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 #include "idl.h"
 
 /* read a key */
diff --git a/servers/slapd/back-wt/modify.c b/servers/slapd/back-wt/modify.c
index a2ad658302..3fa687a473 100644
--- a/servers/slapd/back-wt/modify.c
+++ b/servers/slapd/back-wt/modify.c
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 static struct berval scbva[] = {
 	BER_BVC("glue"),
diff --git a/servers/slapd/back-wt/nextid.c b/servers/slapd/back-wt/nextid.c
index d40d245c5c..e2ae082654 100644
--- a/servers/slapd/back-wt/nextid.c
+++ b/servers/slapd/back-wt/nextid.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int wt_next_id(BackendDB *be, ID *out){
     struct wt_info *wi = (struct wt_info *) be->be_private;
diff --git a/servers/slapd/back-wt/operational.c b/servers/slapd/back-wt/operational.c
index e85b2763a7..c5e8438471 100644
--- a/servers/slapd/back-wt/operational.c
+++ b/servers/slapd/back-wt/operational.c
@@ -25,7 +25,7 @@
 #include <ac/string.h>
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int
 wt_hasSubordinates(
diff --git a/servers/slapd/back-wt/tools.c b/servers/slapd/back-wt/tools.c
index bd5f2d7526..846edc091a 100644
--- a/servers/slapd/back-wt/tools.c
+++ b/servers/slapd/back-wt/tools.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 typedef struct dn_id {
     ID id;
diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 2e2e5ea8a9..324e0e44f0 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "lber_pvt.h"
 
diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 1bd418022f..64ba9e0797 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -36,7 +36,7 @@
 #define SLAPD_TOOLS
 #include "slap.h"
 #include "lutil.h"
-#include "config.h"
+#include "slap-config.h"
 
 typedef struct gluenode {
 	BackendDB *gn_be;
diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 446babc25b..100327a7ec 100644
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -25,7 +25,7 @@
 
 #define SLAPD_TOOLS
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 static slap_overinst *overlays;
 
diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 8f8cc484d6..d1974cce84 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -36,7 +36,7 @@
 #include <ldif.h>
 #include <lutil.h>
 
-#include "config.h"
+#include "slap-config.h"
 
 #define	CONFIG_RDN	"cn=config"
 #define	SCHEMA_RDN	"cn=schema"
diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index cc5dd458f3..f081de89de 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -49,7 +49,7 @@
 #include "lutil.h"
 #include "lutil_ldap.h"
 #include "ldif.h"
-#include "config.h"
+#include "slap-config.h"
 
 #ifdef _WIN32
 #define	LUTIL_ATOULX	lutil_atoullx
diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c
index 3861b27ea3..c38ea9c114 100644
--- a/servers/slapd/oidm.c
+++ b/servers/slapd/oidm.c
@@ -24,7 +24,7 @@
 
 #include "slap.h"
 #include "lutil.h"
-#include "config.h"
+#include "slap-config.h"
 
 static LDAP_STAILQ_HEAD(OidMacroList, OidMacro) om_list
 	= LDAP_STAILQ_HEAD_INITIALIZER(om_list);
diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 3aa2979f9a..2ef09ab5db 100644
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -29,7 +29,7 @@
 #include <ac/ctype.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "ldap_rq.h"
 
diff --git a/servers/slapd/overlays/auditlog.c b/servers/slapd/overlays/auditlog.c
index aae7d913d9..189229c84e 100644
--- a/servers/slapd/overlays/auditlog.c
+++ b/servers/slapd/overlays/auditlog.c
@@ -29,7 +29,7 @@
 #include <ac/ctype.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "ldif.h"
 
 typedef struct auditlog_data {
diff --git a/servers/slapd/overlays/autoca.c b/servers/slapd/overlays/autoca.c
index 4532d402be..1ab6ab07c1 100644
--- a/servers/slapd/overlays/autoca.c
+++ b/servers/slapd/overlays/autoca.c
@@ -30,7 +30,7 @@
 
 #include "lutil.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
diff --git a/servers/slapd/overlays/collect.c b/servers/slapd/overlays/collect.c
index 2de430afcc..189c88c4ed 100644
--- a/servers/slapd/overlays/collect.c
+++ b/servers/slapd/overlays/collect.c
@@ -29,7 +29,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 
diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c
index 4260b15b81..d52372c415 100644
--- a/servers/slapd/overlays/constraint.c
+++ b/servers/slapd/overlays/constraint.c
@@ -29,7 +29,7 @@
 
 #include "lutil.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 /*
  * This overlay limits the values which can be placed into an
diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c
index 59f16ecee6..4081813d42 100644
--- a/servers/slapd/overlays/dds.c
+++ b/servers/slapd/overlays/dds.c
@@ -31,7 +31,7 @@
 #include "lutil.h"
 #include "ldap_rq.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #define	DDS_RF2589_MAX_TTL		(31557600)	/* 1 year + 6 hours */
 #define	DDS_RF2589_DEFAULT_TTL		(86400)		/* 1 day */
diff --git a/servers/slapd/overlays/deref.c b/servers/slapd/overlays/deref.c
index 2cbbe5228c..4ee4822cf0 100644
--- a/servers/slapd/overlays/deref.c
+++ b/servers/slapd/overlays/deref.c
@@ -29,7 +29,7 @@
 #include "ac/socket.h"
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 
diff --git a/servers/slapd/overlays/dyngroup.c b/servers/slapd/overlays/dyngroup.c
index 2562e93fa8..2501bd258d 100644
--- a/servers/slapd/overlays/dyngroup.c
+++ b/servers/slapd/overlays/dyngroup.c
@@ -30,7 +30,7 @@
 
 #include "lutil.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 /* This overlay extends the Compare operation to detect members of a
  * dynamic group. It has no effect on any other operations. It must
diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 33278a3e7f..4222f33bf6 100644
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -33,7 +33,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 
 static AttributeDescription *ad_dgIdentity, *ad_dgAuthz;
diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 8e159bc2f3..95c1d8d9bb 100644
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -28,7 +28,7 @@
 #include "ac/socket.h"
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 
 /*
diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 3566fe7702..ca0feb0f98 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -35,7 +35,7 @@
 
 #include "../back-monitor/back-monitor.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 /*
  * Control that allows to access the private DB
diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index dfa8b0dc17..468b20583c 100644
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -39,7 +39,7 @@
 #include <ac/time.h>
 #include <ac/string.h>
 #include <ac/ctype.h>
-#include "config.h"
+#include "slap-config.h"
 
 #ifndef MODULE_NAME_SZ
 #define MODULE_NAME_SZ 256
diff --git a/servers/slapd/overlays/refint.c b/servers/slapd/overlays/refint.c
index 5cd4799c45..838147432c 100644
--- a/servers/slapd/overlays/refint.c
+++ b/servers/slapd/overlays/refint.c
@@ -38,7 +38,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "ldap_rq.h"
 
 static slap_overinst refint;
diff --git a/servers/slapd/overlays/retcode.c b/servers/slapd/overlays/retcode.c
index 6512be3a10..488aefd43e 100644
--- a/servers/slapd/overlays/retcode.c
+++ b/servers/slapd/overlays/retcode.c
@@ -31,7 +31,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "ldif.h"
 
diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 3749feaffa..00ff2606c7 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -24,7 +24,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "rwm.h"
 
diff --git a/servers/slapd/overlays/seqmod.c b/servers/slapd/overlays/seqmod.c
index 1a0418fabd..a24879b2da 100644
--- a/servers/slapd/overlays/seqmod.c
+++ b/servers/slapd/overlays/seqmod.c
@@ -22,7 +22,7 @@
 #ifdef SLAPD_OVER_SEQMOD
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 /* This overlay serializes concurrent attempts to modify a single entry */
 
diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index 07d6bbfd42..a06d220390 100644
--- a/servers/slapd/overlays/sssvlv.c
+++ b/servers/slapd/overlays/sssvlv.c
@@ -33,7 +33,7 @@
 
 #include "slap.h"
 #include "lutil.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include "../../../libraries/liblber/lber-int.h"	/* ber_rewind */
 
diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 0935e6e3ba..328bafaa82 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -25,7 +25,7 @@
 #include <ac/string.h>
 #include "lutil.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "ldap_rq.h"
 
 #ifdef LDAP_DEVEL
diff --git a/servers/slapd/overlays/translucent.c b/servers/slapd/overlays/translucent.c
index 60fa091bfa..e7481fa1e6 100644
--- a/servers/slapd/overlays/translucent.c
+++ b/servers/slapd/overlays/translucent.c
@@ -31,7 +31,7 @@
 #include "slap.h"
 #include "lutil.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 /* config block */
 typedef struct translucent_info {
diff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c
index 12442c7aaa..e8efb9fc8f 100644
--- a/servers/slapd/overlays/unique.c
+++ b/servers/slapd/overlays/unique.c
@@ -31,7 +31,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #define UNIQUE_DEFAULT_URI ("ldap:///??sub")
 
diff --git a/servers/slapd/overlays/valsort.c b/servers/slapd/overlays/valsort.c
index b4f6fdb2e0..e47eec10a9 100644
--- a/servers/slapd/overlays/valsort.c
+++ b/servers/slapd/overlays/valsort.c
@@ -33,7 +33,7 @@
 #include <ac/ctype.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 
 #define	VALSORT_ASCEND	0
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 998ae4a5d1..7df070b741 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -31,8 +31,8 @@
 
 LDAP_BEGIN_DECL
 
-struct config_args_s;	/* config.h */
-struct config_reply_s;	/* config.h */
+struct config_args_s;	/* slap-config.h */
+struct config_reply_s;	/* slap-config.h */
 
 /*
  * aci.c
diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 2a926d589d..e66b4787f6 100644
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -28,7 +28,7 @@
 #include "slap.h"
 
 #include "lutil.h"
-#include "config.h"
+#include "slap-config.h"
 
 #define SASLREGEX_REPLACE 10
 
diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 0b604f4e7e..3ac759cf4c 100644
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -24,7 +24,7 @@
 
 #include "slap.h"
 #include "ldap_schema.h"
-#include "config.h"
+#include "slap-config.h"
 
 static void		oc_usage(void); 
 static void		at_usage(void);
diff --git a/servers/slapd/config.h b/servers/slapd/slap-config.h
similarity index 99%
rename from servers/slapd/config.h
rename to servers/slapd/slap-config.h
index 01ea824bb8..a42a21f599 100644
--- a/servers/slapd/config.h
+++ b/servers/slapd/slap-config.h
@@ -1,4 +1,4 @@
-/* config.h - configuration abstraction structure */
+/* slap-config.h - configuration abstraction structure */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 90109f8191..41b4008893 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1786,7 +1786,7 @@ LDAP_TAILQ_HEAD( be_pcl, slap_csn_entry );
 #define	SLAP_MAX_CIDS	32	/* Maximum number of supported controls */
 #endif
 
-struct ConfigOCs;	/* config.h */
+struct ConfigOCs;	/* slap-config.h */
 
 struct BackendDB {
 	BackendInfo	*bd_info;	/* pointer to shared backend info */
@@ -2007,7 +2007,7 @@ typedef int (BI_config) LDAP_P((BackendInfo *bi,
 	const char *fname, int lineno,
 	int argc, char **argv));
 
-typedef struct config_reply_s ConfigReply; /* config.h */
+typedef struct config_reply_s ConfigReply; /* slap-config.h */
 typedef int (BI_db_func) LDAP_P((Backend *bd, ConfigReply *cr));
 typedef BI_db_func BI_db_init;
 typedef BI_db_func BI_db_open;
diff --git a/servers/slapd/slapi/plugin.c b/servers/slapd/slapi/plugin.c
index 65055516a0..a0cb5fdb11 100644
--- a/servers/slapd/slapi/plugin.c
+++ b/servers/slapd/slapi/plugin.c
@@ -23,7 +23,7 @@
 #include "portable.h"
 #include "ldap_pvt_thread.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "slapi.h"
 #include "lutil.h"
 
diff --git a/servers/slapd/slapi/slapi_overlay.c b/servers/slapd/slapi/slapi_overlay.c
index 1b124b67f4..02c6b27469 100644
--- a/servers/slapd/slapi/slapi_overlay.c
+++ b/servers/slapd/slapi/slapi_overlay.c
@@ -27,7 +27,7 @@
 
 #include "slap.h"
 #include "slapi.h"
-#include "config.h"
+#include "slap-config.h"
 
 #ifdef LDAP_SLAPI
 
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 4ee3203890..129a14d24d 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -27,7 +27,7 @@
 #include "slap.h"
 #include "lutil_ldap.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #include "ldap_rq.h"