r3464: split out registry.h, rap.h and ldap_server.h

(This used to be commit 70d2090f6bf2c7e0caf1e9c020f330de88871f8e)

23 files changed, 30 insertions, 3 deletions

diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index c2ae043892..10d9a127c4 100644
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 0721ef4879..86222679e4 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -225,9 +225,6 @@ extern int errno;
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
-#include "registry.h"
-#include "rap.h"
-#include "ldap_server/ldap_server.h"
 
 #include "libnet/libnet.h"
 #include "utils/net/net.h"
diff --git a/source4/include/structs.h b/source4/include/structs.h
index 4820551b25..c6b8125939 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -68,3 +68,12 @@ typedef NTSTATUS (*gensec_password_callback)(struct gensec_security *gensec_secu
 
 struct asn1_data;
 
+struct ldapsrv_call;
+struct ldapsrv_connection;
+struct rw_buffer;
+struct registry_context;
+struct registry_key;
+struct registry_value;
+
+struct rap_NetShareEnum;
+struct rap_NetServerEnum2;
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index c4d44888c4..8a26c3fd8f 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "ldap_server/ldap_server.h"
 #include "dlinklist.h"
 
 
diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c
index 840ff5d4e8..b87919628f 100644
--- a/source4/ldap_server/ldap_bind.c
+++ b/source4/ldap_server/ldap_bind.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "ldap_server/ldap_server.h"
 
 
 static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call)
diff --git a/source4/ldap_server/ldap_rootdse.c b/source4/ldap_server/ldap_rootdse.c
index 4bbbdad71f..db8be05467 100644
--- a/source4/ldap_server/ldap_rootdse.c
+++ b/source4/ldap_server/ldap_rootdse.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "ldap_server/ldap_server.h"
 #include "system/time.h"
 
 #define ATTR_BLOB_CONST(val) data_blob_talloc(mem_ctx, val, sizeof(val)-1)
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 0ef3a523e8..c9812d1d2f 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -23,6 +23,7 @@
 #include "auth/auth.h"
 #include "dlinklist.h"
 #include "asn_1.h"
+#include "ldap_server/ldap_server.h"
 
 /*
   close the socket and shutdown a server_context
diff --git a/source4/ldap_server/ldap_simple_ldb.c b/source4/ldap_server/ldap_simple_ldb.c
index e368d4bd52..8f40636a5c 100644
--- a/source4/ldap_server/ldap_simple_ldb.c
+++ b/source4/ldap_server/ldap_simple_ldb.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "ldap_server/ldap_server.h"
 #include "ldap_parse.h"
 
 /* TODO: samdb_context is not a pulblic struct */
diff --git a/source4/lib/registry/common/reg_interface.c b/source4/lib/registry/common/reg_interface.c
index 76a1d04b08..b2d659258d 100644
--- a/source4/lib/registry/common/reg_interface.c
+++ b/source4/lib/registry/common/reg_interface.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "registry.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source4/lib/registry/common/reg_util.c b/source4/lib/registry/common/reg_util.c
index c7354fe909..052ccc347b 100644
--- a/source4/lib/registry/common/reg_util.c
+++ b/source4/lib/registry/common/reg_util.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source4/lib/registry/reg_backend_dir/reg_backend_dir.c b/source4/lib/registry/reg_backend_dir/reg_backend_dir.c
index 2273a86771..247d723252 100644
--- a/source4/lib/registry/reg_backend_dir/reg_backend_dir.c
+++ b/source4/lib/registry/reg_backend_dir/reg_backend_dir.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "system/dir.h"
 
 static WERROR reg_dir_add_key(TALLOC_CTX *mem_ctx, struct registry_key *parent, const char *name, uint32_t access_mask, SEC_DESC *desc, struct registry_key **result)
diff --git a/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c b/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
index bd3afbdedf..22c81018c7 100644
--- a/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
+++ b/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 
 static char *reg_path_to_ldb(TALLOC_CTX *mem_ctx, const char *path, const char *add)
 {
diff --git a/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c b/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c
index a8d1752070..c1b9b43445 100644
--- a/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c
+++ b/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c
@@ -304,6 +304,7 @@ Hope this helps....  (Although it was "fun" for me to uncover this things,
 *************************************************************************/
 
 #include "includes.h"
+#include "registry.h"
 #include "system/shmem.h"
 
 #define REG_KEY_LIST_SIZE 10
diff --git a/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c b/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c
index f90b123bfc..954e7684bb 100644
--- a/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c
+++ b/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c
@@ -18,6 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
+#include "registry.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
 
 /**
diff --git a/source4/lib/registry/reg_backend_w95/reg_backend_w95.c b/source4/lib/registry/reg_backend_w95/reg_backend_w95.c
index 448af66eec..72ec882b8a 100644
--- a/source4/lib/registry/reg_backend_w95/reg_backend_w95.c
+++ b/source4/lib/registry/reg_backend_w95/reg_backend_w95.c
@@ -20,6 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
+#include "registry.h"
 #include "system/shmem.h"
 
 /**
diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index 1d69734f21..c1b8d2949e 100644
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "lib/cmdline/popt_common.h"
 
 static void writediff(struct registry_key *oldkey, struct registry_key *newkey, FILE *out)
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 298a922fbf..ae4d331e3c 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "lib/cmdline/popt_common.h"
 
 /*
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index fcc7204423..583624fbab 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "system/time.h"
 
diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index 64948b06fe..8fd73aef85 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "lib/cmdline/popt_common.h"
 
 static void print_tree(int l, struct registry_key *p, int fullpath, int novals)
diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c
index 840c389d6c..4fc5e182ca 100644
--- a/source4/ntvfs/ipc/ipc_rap.c
+++ b/source4/ntvfs/ipc/ipc_rap.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "rap.h"
 
 #define NERR_Success 0
 #define NERR_badpass 86
diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c
index b414b40d7e..70b65442ff 100644
--- a/source4/ntvfs/ipc/rap_server.c
+++ b/source4/ntvfs/ipc/rap_server.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "rap.h"
 
 /* At this moment these are just dummy functions, but you might get the
  * idea. */
diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c
index 39e5fe7ee5..c0242f8072 100644
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
 #include "rpc_server/common/common.h"
 
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 1ae92a6034..d7cbd9f750 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "rap.h"
 
 struct rap_call {
 	TALLOC_CTX *mem_ctx;