ldb: use #include <ldb.h> for ldb

thi ensures we are using the header corresponding to the version of
ldb we're linking against. Otherwise we could use the system ldb for
link and the in-tree one for include

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

lib/util/util_ldb.c

@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "../lib/util/util_ldb.h"
 
 /*

libcli/ldap/ldap_message.h

@@ -25,7 +25,7 @@
 #if _SAMBA_BUILD_ == 3
 #include "lib/ldb_compat.h"
 #else
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #endif
 
 enum ldap_request_tag {

libcli/ldap/ldap_ndr.c

@@ -24,7 +24,7 @@
 #if _SAMBA_BUILD_ == 3
 #include "lib/ldb_compat.h"
 #else
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #endif
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"

source4/auth/credentials/credentials_secrets.c

@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "param/secrets.h"
 #include "system/filesys.h"

source4/auth/gensec/gensec_gssapi.c

@@ -27,7 +27,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "auth/auth_sam.h"
 #include "librpc/rpc/dcerpc.h"
 #include "auth/credentials/credentials.h"

source4/auth/kerberos/kerberos_pac.c

@@ -28,7 +28,7 @@
 #include "auth/auth.h"
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "auth/auth_sam_reply.h"
 
 krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx,

source4/auth/ntlm/auth_sam.c

@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "system/time.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "libcli/ldap/ldap_ndr.h"
 #include "libcli/security/security.h"
 #include "auth/auth.h"

source4/cldap_server/cldap_server.c

@@ -27,8 +27,8 @@
 #include "cldap_server/cldap_server.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "dsdb/samdb/samdb.h"
 #include "ldb_wrap.h"
 #include "auth/auth.h"

source4/cldap_server/netlogon.c

@@ -21,8 +21,8 @@
 */
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "lib/events/events.h"
 #include "smbd/service_task.h"
 #include "cldap_server/cldap_server.h"

source4/cldap_server/rootdse.c

@@ -21,8 +21,8 @@
 
 #include "includes.h"
 #include <tevent.h>
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "smbd/service_task.h"
 #include "cldap_server/cldap_server.h"
 #include "librpc/gen_ndr/ndr_misc.h"

source4/dsdb/common/dsdb_dn.c

@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb_module.h>
 #include "librpc/ndr/libndr.h"
 #include "libcli/security/dom_sid.h"
 

source4/dsdb/common/tests/dsdb_dn.c

@@ -21,8 +21,8 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"

source4/dsdb/kcc/kcc_connection.c

@@ -27,7 +27,7 @@
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_service.h"
 #include "dsdb/kcc/kcc_connection.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/kcc/kcc_deleted.c

@@ -28,7 +28,7 @@
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_connection.h"
 #include "dsdb/kcc/kcc_service.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/kcc/kcc_drs_replica_info.c

@@ -28,7 +28,7 @@
 #include "lib/events/events.h"
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_service.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/kcc/kcc_periodic.c

@@ -28,7 +28,7 @@
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_connection.h"
 #include "dsdb/kcc/kcc_service.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/kcc/kcc_service.c

@@ -28,7 +28,7 @@
 #include "lib/events/events.h"
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_service.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/repl/drepl_notify.c

@@ -27,7 +27,7 @@
 #include "auth/auth.h"
 #include "smbd/service.h"
 #include "dsdb/repl/drepl_service.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/repl/drepl_out_helpers.c

@@ -25,7 +25,7 @@
 #include "smbd/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/repl/drepl_out_pull.c

@@ -25,7 +25,7 @@
 #include "smbd/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/repl/drepl_partitions.c

@@ -25,7 +25,7 @@
 #include "smbd/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/repl/drepl_periodic.c

@@ -25,7 +25,7 @@
 #include "auth/auth.h"
 #include "smbd/service.h"
 #include "dsdb/repl/drepl_service.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/repl/drepl_service.c

@@ -26,7 +26,7 @@
 #include "smbd/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/repl/replicated_objects.c

@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

source4/dsdb/samdb/cracknames.c

@@ -25,8 +25,8 @@
 #include "librpc/gen_ndr/drsuapi.h"
 #include "lib/events/events.h"
 #include "rpc_server/common/common.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
 #include "libcli/ldap/ldap_ndr.h"

source4/dsdb/samdb/ldb_modules/extended_dn_in.c

@@ -30,9 +30,9 @@
  */
 
 #include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_errors.h"
-#include "ldb/include/ldb_module.h"
+#include <ldb.h>
+#include <ldb_errors.h>
+#include <ldb_module.h>
 
 /*
   TODO: if relax is not set then we need to reject the fancy RMD_* and

source4/dsdb/samdb/ldb_modules/extended_dn_out.c

@@ -32,9 +32,9 @@
  */
 
 #include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_errors.h"
-#include "ldb/include/ldb_module.h"
+#include <ldb.h>
+#include <ldb_errors.h>
+#include <ldb_module.h>
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_security.h"

source4/dsdb/samdb/ldb_modules/extended_dn_store.c

@@ -36,9 +36,9 @@
  */
 
 #include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_errors.h"
-#include "ldb/include/ldb_module.h"
+#include <ldb.h>
+#include <ldb_errors.h>
+#include <ldb_module.h>
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/security/security.h"

source4/dsdb/samdb/ldb_modules/partition.h

@@ -18,9 +18,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb.h>
+#include <ldb_errors.h>
+#include <ldb_module.h>
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "system/locale.h"

source4/dsdb/samdb/ldb_modules/rootdse.c

@@ -21,8 +21,8 @@
 */
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb.h>
+#include <ldb_module.h>
 #include "system/time.h"
 #include "dsdb/samdb/samdb.h"
 #include "version.h"

source4/dsdb/samdb/ldb_modules/samba_dsdb.c

@@ -31,9 +31,9 @@
  */
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb.h>
+#include <ldb_errors.h>
+#include <ldb_module.h>
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/ndr/libndr.h"

source4/dsdb/samdb/ldb_modules/samba_secrets.c

@@ -30,9 +30,9 @@
  */
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb.h>
+#include <ldb_errors.h>
+#include <ldb_module.h>
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "dsdb/samdb/samdb.h"
 

source4/dsdb/samdb/ldb_modules/schema_util.c

@@ -25,7 +25,7 @@
 #include "dsdb/common/util.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/samdb/ldb_modules/util.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb_module.h>
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "param/param.h"

source4/dsdb/samdb/ldb_modules/show_deleted.c

@@ -32,7 +32,7 @@
  */
 
 #include "includes.h"
-#include "ldb/include/ldb_module.h"
+#include <ldb_module.h>
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/samdb/ldb_modules/util.h"
 

source4/dsdb/samdb/ldb_modules/simple_ldap_map.c

@@ -27,7 +27,7 @@
 */
 
 #include "includes.h"
-#include "ldb/include/ldb_module.h"
+#include <ldb_module.h>
 #include "ldb/ldb_map/ldb_map.h"
 
 #include "librpc/gen_ndr/ndr_misc.h"

source4/dsdb/samdb/samdb.c

@@ -26,8 +26,8 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/events/events.h"
 #include "lib/ldb-samba/ldb_wrap.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/ldap/ldap_ndr.h"

source4/dsdb/samdb/samdb.h

@@ -30,7 +30,7 @@ struct loadparm_context;
 struct tevent_context;
 
 #include "librpc/gen_ndr/security.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "librpc/gen_ndr/samr.h"
 #include "librpc/gen_ndr/drsuapi.h"

source4/dsdb/schema/dsdb_dn.c

@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb_module.h>
 #include "librpc/ndr/libndr.h"
 #include "libcli/security/dom_sid.h"
 

source4/dsdb/schema/schema_filtered.c

@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/util.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "param/param.h"
 

source4/dsdb/schema/schema_info_attr.c

@@ -23,7 +23,7 @@
 #include "dsdb/common/util.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/samdb/ldb_modules/util.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb_module.h>
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "param/param.h"

source4/dsdb/schema/schema_init.c

@@ -23,13 +23,13 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/util.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "param/param.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb_module.h>
 #include "../lib/util/asn1.h"
 
 

source4/dsdb/schema/schema_set.c

@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "lib/util/dlinklist.h"
 #include "dsdb/samdb/samdb.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb_module.h>
 #include "param/param.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_misc.h"

source4/dsdb/schema/schema_syntax.c

@@ -25,8 +25,8 @@
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "system/time.h"
 #include "../lib/util/charset/charset.h"
 #include "librpc/ndr/libndr.h"

source4/dsdb/schema/tests/schema_syntax.c

@@ -21,8 +21,8 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"

source4/kdc/pac-glue.c

@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "../libds/common/flags.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "auth/auth.h"
 #include "auth/auth_sam_reply.h"
 #include "kdc/kdc-glue.h"

source4/ldap_server/ldap_backend.c

@@ -26,8 +26,8 @@
 #include "param/param.h"
 #include "smbd/service_stream.h"
 #include "dsdb/samdb/samdb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb_errors.h>
+#include <ldb_module.h>
 #include "ldb_wrap.h"
 
 #define VALID_DN_SYNTAX(dn) do {\

source4/ldap_server/ldap_bind.c

@@ -21,8 +21,8 @@
 #include "ldap_server/ldap_server.h"
 #include "auth/auth.h"
 #include "smbd/service.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "dsdb/samdb/samdb.h"
 #include "auth/gensec/gensec.h"
 #include "auth/gensec/gensec_tstream.h"

source4/ldap_server/ldap_server.c

@@ -36,8 +36,8 @@
 #include "smbd/process_model.h"
 #include "lib/tls/tls.h"
 #include "lib/messaging/irpc.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "libcli/ldap/ldap_proto.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"

source4/lib/ldb-samba/ldb_wrap.c

@@ -28,8 +28,8 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"

source4/lib/ldb-samba/ldif_handlers.c

@@ -23,8 +23,8 @@
 */
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb.h>
+#include <ldb_module.h>
 #include "ldb_handlers.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/gen_ndr/ndr_security.h"

source4/lib/policy/gp_ldap.c

@@ -19,7 +19,7 @@
  */
 #include "includes.h"
 #include "param/param.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "lib/ldb-samba/ldb_wrap.h"
 #include "auth/credentials/credentials.h"
 #include "../librpc/gen_ndr/nbt.h"

source4/lib/registry/ldb.c

@@ -20,8 +20,8 @@
 
 #include "includes.h"
 #include "registry.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "ldb_wrap.h"
 #include "librpc/gen_ndr/winreg.h"
 #include "param/param.h"

source4/libnet/libnet.h

@@ -60,7 +60,7 @@ struct libnet_context {
 };
 
 
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "libnet/composite.h"
 #include "libnet/userman.h"
 #include "libnet/userinfo.h"

source4/libnet/libnet_become_dc.c

@@ -21,8 +21,8 @@
 #include "libnet/libnet.h"
 #include "libcli/composite/composite.h"
 #include "libcli/cldap/cldap.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"
 #include "../libds/common/flags.h"

source4/libnet/libnet_join.c

@@ -22,8 +22,8 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "dsdb/samdb/samdb.h"
 #include "ldb_wrap.h"
 #include "libcli/security/security.h"

source4/libnet/libnet_site.c

@@ -20,8 +20,8 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "libcli/cldap/cldap.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "libcli/resolve/resolve.h"
 #include "param/param.h"
 #include "lib/tsocket/tsocket.h"

source4/libnet/libnet_unbecome_dc.c

@@ -21,8 +21,8 @@
 #include "libnet/libnet.h"
 #include "libcli/composite/composite.h"
 #include "libcli/cldap/cldap.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"
 #include "../libds/common/flags.h"

source4/libnet/libnet_vampire.c

@@ -27,8 +27,8 @@
 #include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
 #include "../lib/util/dlinklist.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"

source4/nbt_server/dgram/netlogon.c

@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "lib/socket/socket.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "param/param.h"

source4/nbt_server/wins/wins_ldb.c

@@ -31,7 +31,7 @@
 #include "lib/events/events.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsdb.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb_module.h>
 #include "system/network.h"
 #include "lib/socket/netif.h"
 #include "param/param.h"

source4/nbt_server/wins/winsdb.c

@@ -23,8 +23,8 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsdb.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "system/time.h"
 #include "ldb_wrap.h"

source4/nbt_server/wins/winsserver.c

@@ -32,7 +32,7 @@
 #include "system/network.h"
 #include "lib/socket/socket.h"
 #include "lib/socket/netif.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
 #include "lib/util/util_net.h"

source4/ntp_signd/ntp_signd.c

@@ -35,8 +35,8 @@
 #include "auth/auth.h"
 #include "libcli/security/security.h"
 #include "libcli/ldap/ldap_ndr.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "../lib/crypto/md5.h"
 #include "system/network.h"
 #include "system/passwd.h"

source4/ntptr/simple_ldb/ntptr_simple_ldb.c

@@ -30,7 +30,7 @@
 #include "includes.h"
 #include "ntptr/ntptr.h"
 #include "librpc/gen_ndr/ndr_spoolss.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
 #include "ldb_wrap.h"

source4/param/secrets.c

@@ -27,7 +27,7 @@
 #include "system/filesys.h"
 #include "tdb_wrap.h"
 #include "lib/ldb-samba/ldb_wrap.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "../lib/util/util_tdb.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "dsdb/samdb/samdb.h"

source4/param/share_ldb.c

@@ -20,8 +20,8 @@
 */
 
 #include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "auth/auth.h"
 #include "ldb_wrap.h"
 #include "param/share.h"

source4/rpc_server/lsa/lsa.h

@@ -26,7 +26,7 @@
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/ldap/ldap_ndr.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
 #include "param/secrets.h"

source4/rpc_server/samr/dcesrv_samr.c

@@ -28,8 +28,8 @@
 #include "rpc_server/common/common.h"
 #include "rpc_server/samr/dcesrv_samr.h"
 #include "system/time.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "../libds/common/flags.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/util.h"

source4/samba_tool/gpo.c

@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "samba_tool/samba_tool.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "auth/auth.h"
 #include "param/param.h"
 #include "libcli/security/sddl.h"

source4/samba_tool/samba_tool.c

@@ -45,7 +45,7 @@
 #include "includes.h"
 #include "samba_tool/samba_tool.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "librpc/rpc/dcerpc.h"
 #include "param/param.h"
 #include "lib/events/events.h"

source4/torture/drs/unit/schemainfo_tests.c

@@ -25,7 +25,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "ldb_wrap.h"
-#include "lib/ldb/include/ldb_module.h"
+#include <ldb_module.h>
 #include "torture/rpc/drsuapi.h"
 #include "librpc/ndr/libndr.h"
 #include "param/param.h"

source4/torture/ldap/ldap_sort.c

@@ -22,8 +22,8 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "ldb_wrap.h"
 #include "param/param.h"
 #include "lib/cmdline/popt_common.h" 

source4/torture/ldb/ldb.c

@@ -21,8 +21,8 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"

source4/torture/local/dbspeed.c

@@ -22,8 +22,8 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "../tdb/include/tdb.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "ldb_wrap.h"
 #include "lib/tdb_wrap.h"
 #include "torture/smbtorture.h"

source4/torture/rpc/drsuapi_cracknames.c

@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "torture/rpc/torture_rpc.h"
-#include "ldb/include/ldb.h"
+#include <ldb.h>
 #include "libcli/security/security.h"
 
 struct DsCrackNamesPrivate {

source4/torture/rpc/netlogon.c

@@ -32,7 +32,7 @@
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "param/param.h"
 #include "libcli/security/security.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "lib/util/util_ldb.h"
 #include "ldb_wrap.h"
 #include "lib/replace/system/network.h"

source4/utils/ntlm_auth.c

@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "auth/auth.h"

source4/winbind/idmap.c

@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "ldb_wrap.h"
 #include "param/param.h"
 #include "winbind/idmap.h"

source4/wrepl_server/wrepl_in_call.c

@@ -28,8 +28,8 @@
 #include "wrepl_server/wrepl_server.h"
 #include "libcli/composite/composite.h"
 #include "nbt_server/wins/winsdb.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "system/time.h"
 #include "lib/util/tsort.h"
 #include "param/param.h"

source4/wrepl_server/wrepl_scavenging.c

@@ -23,8 +23,8 @@
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "nbt_server/wins/winsdb.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "system/time.h"
 #include "smbd/service_task.h"
 #include "lib/messaging/irpc.h"

source4/wrepl_server/wrepl_server.c

@@ -27,8 +27,8 @@
 #include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "nbt_server/wins/winsdb.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "auth/auth.h"
 #include "ldb_wrap.h"
 #include "param/param.h"