r5307: removed db_wrap.h from includes.h

(This used to be commit 826baec7b348814a7bbdcdbec8c8526514f25da1)

14 files changed, 13 insertions, 1 deletions

diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index 1af80c12bd..9c05e26f22 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -25,6 +25,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "db_wrap.h"
 
 /*
   connect to the SAM database
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 3387102393..32a1946e51 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -113,7 +113,6 @@ extern int errno;
 #include "lib/talloc/talloc.h"
 #include "nt_status.h"
 #include "structs.h"
-#include "db_wrap.h"
 #include "trans2.h"
 #include "nterr.h"
 #include "charset.h"
diff --git a/source4/include/structs.h b/source4/include/structs.h
index 034ad20b64..bccbe36efb 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -136,6 +136,7 @@ struct netr_LMSessionKey;
 
 struct ldb_val;
 struct ldb_message;
+struct ldb_context;
 
 struct dom_sid;
 struct security_token;
diff --git a/source4/ldap_server/ldap_hacked_ldb.c b/source4/ldap_server/ldap_hacked_ldb.c
index cb0ca50ca3..419a00c458 100644
--- a/source4/ldap_server/ldap_hacked_ldb.c
+++ b/source4/ldap_server/ldap_hacked_ldb.c
@@ -27,6 +27,7 @@
 #include "ldap_parse.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "db_wrap.h"
 
 
 #define VALID_DN_SYNTAX(dn,i) do {\
diff --git a/source4/ldap_server/ldap_simple_ldb.c b/source4/ldap_server/ldap_simple_ldb.c
index 41431e091b..7fd86269cc 100644
--- a/source4/ldap_server/ldap_simple_ldb.c
+++ b/source4/ldap_server/ldap_simple_ldb.c
@@ -23,6 +23,7 @@
 #include "ldap_server/ldap_server.h"
 #include "ldap_parse.h"
 #include "lib/ldb/include/ldb.h"
+#include "db_wrap.h"
 
 #define VALID_DN_SYNTAX(dn,i) do {\
 	if (!(dn)) {\
diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c
index 6028159377..0ec1e378e6 100644
--- a/source4/lib/db_wrap.c
+++ b/source4/lib/db_wrap.c
@@ -31,6 +31,7 @@
 #include "dlinklist.h"
 #include "lib/tdb/include/tdb.h"
 #include "lib/ldb/include/ldb.h"
+#include "db_wrap.h"
 
 static struct ldb_wrap *ldb_list;
 static struct tdb_wrap *tdb_list;
diff --git a/source4/lib/gencache.c b/source4/lib/gencache.c
index 1a6159942d..b6d62977ad 100644
--- a/source4/lib/gencache.c
+++ b/source4/lib/gencache.c
@@ -25,6 +25,7 @@
 #include "lib/tdb/include/tdbutil.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "db_wrap.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_TDB
diff --git a/source4/lib/registry/reg_backend_ldb.c b/source4/lib/registry/reg_backend_ldb.c
index c7b7bf587f..9f44f92888 100644
--- a/source4/lib/registry/reg_backend_ldb.c
+++ b/source4/lib/registry/reg_backend_ldb.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "lib/ldb/include/ldb.h"
+#include "db_wrap.h"
 
 struct ldb_key_data 
 {
diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index e693d57ca0..5e404768e0 100644
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -29,6 +29,7 @@
 #include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
 #include "messages.h"
+#include "db_wrap.h"
 
 /*
   in this module a "DATA_BLOB *file_key" is a blob that uniquely identifies
diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c
index 231576b3d5..4109992bc0 100644
--- a/source4/ntvfs/common/opendb.c
+++ b/source4/ntvfs/common/opendb.c
@@ -43,6 +43,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "messages.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "db_wrap.h"
 
 struct odb_context {
 	struct tdb_wrap *w;
diff --git a/source4/ntvfs/posix/xattr_tdb.c b/source4/ntvfs/posix/xattr_tdb.c
index 29971ebeb5..f488569ca5 100644
--- a/source4/ntvfs/posix/xattr_tdb.c
+++ b/source4/ntvfs/posix/xattr_tdb.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "lib/tdb/include/tdb.h"
+#include "db_wrap.h"
 
 #define XATTR_LIST_ATTR ".xattr_list"
 
diff --git a/source4/passdb/secrets.c b/source4/passdb/secrets.c
index afc26aed46..d202326d5c 100644
--- a/source4/passdb/secrets.c
+++ b/source4/passdb/secrets.c
@@ -27,6 +27,7 @@
 #include "secrets.h"
 #include "system/filesys.h"
 #include "pstring.h"
+#include "db_wrap.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index c23bbe94d0..a8f2af12ed 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -29,6 +29,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
 #include "system/time.h"
+#include "db_wrap.h"
 
 /*
   this type allows us to distinguish handle types
diff --git a/source4/rpc_server/netlogon/schannel_state.c b/source4/rpc_server/netlogon/schannel_state.c
index a0bffcce06..8f5f80e256 100644
--- a/source4/rpc_server/netlogon/schannel_state.c
+++ b/source4/rpc_server/netlogon/schannel_state.c
@@ -24,6 +24,7 @@
 #include "system/time.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
+#include "db_wrap.h"
 
 /* a reasonable amount of time to keep credentials live */
 #define SCHANNEL_CREDENTIALS_EXPIRY 600