Move include <slapi.h> behind #ifdef

servers/slapd/add.c

@@ -24,9 +24,9 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
-#include "slapi.h"
 
 #ifdef LDAP_SLAPI
+#include "slapi.h"
 static Slapi_PBlock *initAddPlugin( Backend *be, Connection *conn, Operation *op,
 	struct berval *dn, Entry *e, int manageDSAit );
 static int doPreAddPluginFNs( Backend *be, Slapi_PBlock *pb );

servers/slapd/back-monitor/database.c

@@ -36,10 +36,10 @@
 #include <stdio.h>
 
 #include "slap.h"
-#include "slapi.h"
 #include "back-monitor.h"
 
 #if defined(LDAP_SLAPI)
+#include "slapi.h"
 static int monitor_back_add_plugin( Backend *be, Entry *e );
 #endif /* defined(LDAP_SLAPI) */
 

servers/slapd/backend.c

@@ -15,10 +15,13 @@
 #include <sys/stat.h>
 
 #include "slap.h"
-#include "slapi.h"
 #include "lutil.h"
 #include "lber_pvt.h"
 
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
 /*
  * If a module is configured as dynamic, its header should not
  * get included into slapd. While this is a general rule and does

servers/slapd/bind.c

@@ -26,7 +26,9 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 
 int

servers/slapd/compare.c

@@ -22,7 +22,9 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 static int compare_entry(
 	Connection *conn,

servers/slapd/config.c

@@ -18,7 +18,9 @@
 #include "lutil.h"
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 #define ARGS_STEP	512
 

servers/slapd/delete.c

@@ -24,7 +24,10 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 int
 do_delete(

servers/slapd/extended.c

@@ -33,9 +33,12 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "slapi.h"
 #include "lber_pvt.h"
 
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
 #define UNSUPPORTED_EXTENDEDOP "unsupported extended operation"
 
 static struct extop_list {

servers/slapd/main.c

@@ -17,10 +17,13 @@
 #include "ldap_pvt.h"
 
 #include "slap.h"
-#include "slapi.h"
 #include "lutil.h"
 #include "ldif.h"
 
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
 #ifdef LDAP_SIGCHLD
 static RETSIGTYPE wait4child( int sig );
 #endif

servers/slapd/modify.c

@@ -27,7 +27,9 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 int
 do_modify(

servers/slapd/modrdn.c

@@ -37,7 +37,9 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 int
 do_modrdn(

servers/slapd/operation.c

@@ -13,7 +13,10 @@
 #include <ac/socket.h>
 
 #include "slap.h"
+
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 
 void

servers/slapd/result.c

@@ -17,7 +17,10 @@
 #include <ac/unistd.h>
 
 #include "slap.h"
+
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 static char *v2ref( BerVarray ref, const char *text )
 {

servers/slapd/root_dse.c

@@ -17,10 +17,13 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "slapi.h"
 #include <ldif.h>
 #include "lber_pvt.h"
 
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
 static struct berval supportedFeatures[] = {
 	BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */
 	BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */

servers/slapd/search.c

@@ -25,9 +25,9 @@
 #include "ldap_pvt.h"
 #include "lutil.h"
 #include "slap.h"
-#include "slapi.h"
 
 #ifdef LDAP_SLAPI
+#include "slapi.h"
 static char **anlist2charray( AttributeName *an );
 static Slapi_PBlock *initSearchPlugin( Backend *be, Connection *conn, Operation *op,
 	struct berval *base, int scope, int deref, int sizelimit, int timelimit,