r14542: Remove librpc, libndr and libnbt from includes.h

(This used to be commit 51b4270513752d2eafbe77f9de598de16ef84a1f)

18 files changed, 18 insertions, 3 deletions

diff --git a/source4/torture/com/simple.c b/source4/torture/com/simple.c
index d2bb4ad4e3..e4a18d7cbd 100644
--- a/source4/torture/com/simple.c
+++ b/source4/torture/com/simple.c
@@ -24,6 +24,7 @@
 #include "lib/com/dcom/dcom.h"
 #include "librpc/gen_ndr/com_dcom.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/torture.h"
 
 #define DEFAULT_TRANS 4096
diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c
index 6011d5492c..eed8541f9a 100644
--- a/source4/torture/libnet/libnet_lookup.c
+++ b/source4/torture/libnet/libnet_lookup.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/nbt.h"
 
 
 BOOL torture_lookup(void)
diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index 4f9348ee4b..b3efa35b46 100644
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -24,6 +24,7 @@
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/rpc/dcerpc.h"
 
 
 static BOOL test_lsa_connect(struct libnet_context *ctx)
diff --git a/source4/torture/local/binding_string.c b/source4/torture/local/binding_string.c
index 12637608c6..2d180a09ef 100644
--- a/source4/torture/local/binding_string.c
+++ b/source4/torture/local/binding_string.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/epmapper.h"
+#include "librpc/rpc/dcerpc.h"
 
 static BOOL test_BindingString(TALLOC_CTX *mem_ctx, const char *binding)
 {
diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c
index 4a91997817..324ee489c1 100644
--- a/source4/torture/local/iconv.c
+++ b/source4/torture/local/iconv.c
@@ -25,6 +25,7 @@
 #include "torture/torture.h"
 #include "system/iconv.h"
 #include "system/time.h"
+#include "libcli/raw/libcliraw.h"
 #include "torture/util.h"
 
 #if HAVE_NATIVE_ICONV
diff --git a/source4/torture/local/ndr.c b/source4/torture/local/ndr.c
index d1570dda68..305f75f9c0 100644
--- a/source4/torture/local/ndr.c
+++ b/source4/torture/local/ndr.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "librpc/ndr/libndr.h"
 
 BOOL test_check_string_terminator(TALLOC_CTX *mem_ctx)
 {
diff --git a/source4/torture/local/sddl.c b/source4/torture/local/sddl.c
index 5f956808d1..11e6ae1fd5 100644
--- a/source4/torture/local/sddl.c
+++ b/source4/torture/local/sddl.c
@@ -21,8 +21,8 @@
 */
 
 #include "includes.h"
-#include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/proto.h"
 
 
 /*
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 78edf21820..bdc2d0d764 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -25,6 +25,7 @@
 #include "libcli/rap/rap.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
+#include "librpc/ndr/libndr.h"
 
 struct rap_call {
 	uint16_t callno;
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 237136c3f7..53b21c2829 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -28,6 +28,7 @@
 #include "libcli/security/proto.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 #include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/security.h"
 #include "torture/util.h"
diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c
index 62cfcf758d..5333dddd3e 100644
--- a/source4/torture/rpc/alter_context.c
+++ b/source4/torture/rpc/alter_context.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_dssetup.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 
 BOOL torture_rpc_alter_context(void)
diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c
index 2a6cb53979..a9ea255a02 100644
--- a/source4/torture/rpc/bind.c
+++ b/source4/torture/rpc/bind.c
@@ -25,6 +25,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 
 /*
diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c
index 8ad5241ada..1290b53dc6 100644
--- a/source4/torture/rpc/countcalls.c
+++ b/source4/torture/rpc/countcalls.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "torture/rpc/rpc.h"
 
diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c
index eb0efc906b..0dc3c38916 100644
--- a/source4/torture/rpc/lsa_lookup.c
+++ b/source4/torture/rpc/lsa_lookup.c
@@ -22,11 +22,11 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "lib/events/events.h"
-#include "libcli/security/proto.h"
 #include "libnet/libnet_join.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/proto.h"
 
 static BOOL open_policy(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p,
 			struct policy_handle **handle)
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index be3ce283cc..34bd05e008 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "auth/credentials/credentials.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 #include "torture/torture.h"
 #include "librpc/rpc/dcerpc_table.h"
diff --git a/source4/torture/rpc/rpc.h b/source4/torture/rpc/rpc.h
index e851287218..78d0860f23 100644
--- a/source4/torture/rpc/rpc.h
+++ b/source4/torture/rpc/rpc.h
@@ -25,6 +25,7 @@
 #include "auth/credentials/credentials.h"
 #include "torture/rpc/drsuapi.h"
 #include "libnet/libnet_join.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/proto.h"
 
 #endif /* __TORTURE_RPC_H__ */
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index 7472493894..10b7046375 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -22,9 +22,9 @@
 
 #include "includes.h"
 #include "smb.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
-
 #include "torture/smb2/proto.h"
 
 /*
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index e7079293f7..c2f4f84fac 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -37,6 +37,7 @@
 #include "torture/torture.h"
 #include "build.h"
 #include "dlinklist.h"
+#include "librpc/rpc/dcerpc.h"
 
 #define MAX_COLS 80 /* FIXME: Determine this at run-time */
 
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index a663a03beb..47b031f677 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -35,6 +35,7 @@
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 #include "torture/raw/proto.h"
+#include "libcli/smb2/smb2.h"
 #include "torture/smb2/proto.h"
 #include "torture/rap/proto.h"
 #include "torture/auth/proto.h"