Move `#include "ldap_defaults.h"' into slap.h, which #ifdefs on it.

servers/slapd/attr.c

@@ -23,7 +23,6 @@
 #endif
 
 #include "ldap_pvt.h"
-#include "ldap_defaults.h"
 #include "slap.h"
 
 #ifdef LDAP_DEBUG

servers/slapd/back-bdb2/dbcache.c

@@ -15,7 +15,6 @@
 #include <sys/param.h>
 #endif
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-bdb2.h"
 

servers/slapd/back-bdb2/idl.c

@@ -7,7 +7,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-bdb2.h"
 

servers/slapd/back-bdb2/startup.c

@@ -15,7 +15,6 @@
 #include <direct.h>
 #endif
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-bdb2.h"
 

servers/slapd/back-bdb2/txn.h

@@ -16,7 +16,6 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-bdb2.h"
 

servers/slapd/back-ldbm/dbcache.c

@@ -19,7 +19,6 @@
 #include <sys/param.h>
 #endif
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-ldbm.h"
 

servers/slapd/back-ldbm/idl.c

@@ -11,7 +11,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-ldbm.h"
 

servers/slapd/back-ldbm/startup.c

@@ -12,7 +12,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-ldbm.h"
 

servers/slapd/backend.c

@@ -17,8 +17,6 @@
 #include "slap.h"
 #include "lutil.h"
 
-#include "ldap_defaults.h"
-
 #ifdef SLAPD_LDAP
 #include "back-ldap/external.h"
 #endif

servers/slapd/config.c

@@ -16,7 +16,6 @@
 #include <ac/socket.h>
 
 #include "ldap_pvt.h"
-#include "ldap_defaults.h"
 #include "slap.h"
 
 #define MAXARGS	100

servers/slapd/configinfo.c

@@ -21,7 +21,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 #if defined( SLAPD_CONFIG_DN )

servers/slapd/daemon.c

@@ -16,7 +16,6 @@
 #include <ac/unistd.h>
 
 #include "ldap_pvt.h"
-#include "ldap_defaults.h"
 #include "lutil.h"
 #include "slap.h"
 

servers/slapd/main.c

@@ -15,7 +15,6 @@
 #include <ac/signal.h>
 #include <ac/errno.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "lutil.h"
 

servers/slapd/monitor.c

@@ -22,7 +22,6 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 #if defined( SLAPD_MONITOR_DN )

servers/slapd/nt_svc.c

@@ -4,7 +4,6 @@
 
 #include <ac/string.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 ldap_pvt_thread_cond_t	started_event,		stopped_event;

servers/slapd/result.c

@@ -12,7 +12,6 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 /* we need LBER internals */

servers/slapd/root_dse.c

@@ -15,7 +15,6 @@
 
 #include <ac/string.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 void

servers/slapd/schema.c

@@ -12,7 +12,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 static char *	oc_check_required(Entry *e, char *ocname);

servers/slapd/search.c

@@ -17,7 +17,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 

servers/slapd/slap.h

@@ -7,6 +7,8 @@
 #ifndef _SLDAPD_H_
 #define _SLDAPD_H_
 
+#include "ldap_defaults.h"
+
 #include <ac/stdlib.h>
 
 #include <sys/types.h>

servers/slapd/tools/ldbmtest.c

@@ -31,7 +31,6 @@
 #include <io.h>
 #endif
 
-#include "ldap_defaults.h"
 #include "../slap.h"
 #include "../back-ldbm/back-ldbm.h"
 

servers/slapd/tools/slapcommon.h

@@ -8,7 +8,6 @@
 #define SLAPCOMMON_H_ 1
 
 #define SLAPD_TOOLS 1
-#include "ldap_defaults.h"
 #include "../slap.h"
 
 enum slaptool {