14 files changed, 34 insertions, 26 deletions
diff --git a/source3/librpc/gen_ndr/eventlog.h b/source3/librpc/gen_ndr/eventlog.h
index 0ddc9cc346..6b5bdf1b89 100644
--- a/source3/librpc/gen_ndr/eventlog.h
+++ b/source3/librpc/gen_ndr/eventlog.h
@@ -1,10 +1,10 @@
 /* header auto-generated by pidl */
 
+#include "librpc/gen_ndr/lsa.h"
+#include "librpc/gen_ndr/security.h"
 #ifndef _HEADER_eventlog
 #define _HEADER_eventlog
 
-#include "librpc/gen_ndr/lsa.h"
-#include "librpc/gen_ndr/security.h"
 /* bitmap eventlogReadFlags */
 #define EVENTLOG_SEQUENTIAL_READ ( 0x0001 )
 #define EVENTLOG_SEEK_READ ( 0x0002 )
diff --git a/source3/librpc/gen_ndr/lsa.h b/source3/librpc/gen_ndr/lsa.h
index 87d1a5ccf2..0ffc8ed31b 100644
--- a/source3/librpc/gen_ndr/lsa.h
+++ b/source3/librpc/gen_ndr/lsa.h
@@ -1,9 +1,9 @@
 /* header auto-generated by pidl */
 
+#include "librpc/gen_ndr/security.h"
 #ifndef _HEADER_lsarpc
 #define _HEADER_lsarpc
 
-#include "librpc/gen_ndr/security.h"
 #define LSA_ENUM_TRUST_DOMAIN_MULTIPLIER	( 60 )
 #define LSA_REF_DOMAIN_LIST_MULTIPLIER	( 32 )
 #define LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER	( 82 )
diff --git a/source3/librpc/gen_ndr/netlogon.h b/source3/librpc/gen_ndr/netlogon.h
index 36058ec5aa..18c49501bf 100644
--- a/source3/librpc/gen_ndr/netlogon.h
+++ b/source3/librpc/gen_ndr/netlogon.h
@@ -1,11 +1,11 @@
 /* header auto-generated by pidl */
 
-#ifndef _HEADER_netlogon
-#define _HEADER_netlogon
-
 #include "librpc/gen_ndr/lsa.h"
 #include "librpc/gen_ndr/samr.h"
 #include "librpc/gen_ndr/security.h"
+#ifndef _HEADER_netlogon
+#define _HEADER_netlogon
+
 #define MSV1_0_CLEARTEXT_PASSWORD_ALLOWED	( 0x002 )
 #define MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT	( 0x020 )
 #define MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT	( 0x800 )
diff --git a/source3/librpc/gen_ndr/srvsvc.h b/source3/librpc/gen_ndr/srvsvc.h
index fe8c5c370a..a1519c3ba8 100644
--- a/source3/librpc/gen_ndr/srvsvc.h
+++ b/source3/librpc/gen_ndr/srvsvc.h
@@ -1,10 +1,10 @@
 /* header auto-generated by pidl */
 
+#include "librpc/gen_ndr/security.h"
+#include "librpc/gen_ndr/svcctl.h"
 #ifndef _HEADER_srvsvc
 #define _HEADER_srvsvc
 
-#include "librpc/gen_ndr/security.h"
-#include "librpc/gen_ndr/svcctl.h"
 #define STYPE_TEMPORARY	( 0x40000000 )
 #define STYPE_HIDDEN	( 0x80000000 )
 #define SHARE_1005_CSC_POLICY_MASK	( 0x00000030 )
diff --git a/source3/librpc/gen_ndr/unixinfo.h b/source3/librpc/gen_ndr/unixinfo.h
index 232cb935f3..8ebadc796b 100644
--- a/source3/librpc/gen_ndr/unixinfo.h
+++ b/source3/librpc/gen_ndr/unixinfo.h
@@ -1,9 +1,9 @@
 /* header auto-generated by pidl */
 
+#include "librpc/gen_ndr/security.h"
 #ifndef _HEADER_unixinfo
 #define _HEADER_unixinfo
 
-#include "librpc/gen_ndr/security.h"
 struct unixinfo_GetPWUidInfo {
 	NTSTATUS status;
 	const char * homedir;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
diff --git a/source3/librpc/gen_ndr/winreg.h b/source3/librpc/gen_ndr/winreg.h
index 2379a7493e..8b2e4c5151 100644
--- a/source3/librpc/gen_ndr/winreg.h
+++ b/source3/librpc/gen_ndr/winreg.h
@@ -1,11 +1,11 @@
 /* header auto-generated by pidl */
 
-#ifndef _HEADER_winreg
-#define _HEADER_winreg
-
 #include "librpc/gen_ndr/lsa.h"
 #include "librpc/gen_ndr/initshutdown.h"
 #include "librpc/gen_ndr/security.h"
+#ifndef _HEADER_winreg
+#define _HEADER_winreg
+
 /* bitmap winreg_AccessMask */
 
 enum winreg_Type {
diff --git a/source3/librpc/gen_ndr/wkssvc.h b/source3/librpc/gen_ndr/wkssvc.h
index 84e6d19853..a6b75920ac 100644
--- a/source3/librpc/gen_ndr/wkssvc.h
+++ b/source3/librpc/gen_ndr/wkssvc.h
@@ -1,9 +1,9 @@
 /* header auto-generated by pidl */
 
+#include "librpc/gen_ndr/srvsvc.h"
 #ifndef _HEADER_wkssvc
 #define _HEADER_wkssvc
 
-#include "librpc/gen_ndr/srvsvc.h"
 struct wkssvc_NetWkstaInfo100 {
 	uint16_t platform_id;
 	const char *server_name;/* [unique,charset(UTF16)] */
diff --git a/source3/librpc/idl/eventlog.idl b/source3/librpc/idl/eventlog.idl
index 06b9a45fa4..e088137ccf 100644
--- a/source3/librpc/idl/eventlog.idl
+++ b/source3/librpc/idl/eventlog.idl
@@ -3,9 +3,10 @@
 /*
   eventlog interface definition
 */
+import "lsa.idl", "security.idl";
+
 [ uuid("82273fdc-e32a-18c3-3f78-827929dc23ea"),
   version(0.0),
-  depends(lsa,security),
   pointer_default(unique),
   helpstring("Event Logger")
 ] interface eventlog
diff --git a/source3/librpc/idl/lsa.idl b/source3/librpc/idl/lsa.idl
index 1e941e6f3b..556ab21af4 100644
--- a/source3/librpc/idl/lsa.idl
+++ b/source3/librpc/idl/lsa.idl
@@ -4,12 +4,13 @@
   lsa interface definition
 */
 
+import "security.idl";
+
 [ uuid("12345778-1234-abcd-ef00-0123456789ab"),
   version(0.0),
   endpoint("ncacn_np:[\\pipe\\lsarpc]","ncacn_np:[\\pipe\\netlogon]","ncacn_np:[\\pipe\\lsass]", "ncacn_ip_tcp:", "ncalrpc:"),
   pointer_default(unique),
-  helpstring("Local Security Authority"),
-  depends(security)
+  helpstring("Local Security Authority")
 ] interface lsarpc
 {
 	declare bitmap security_secinfo;
diff --git a/source3/librpc/idl/netlogon.idl b/source3/librpc/idl/netlogon.idl
index f76f10fd2c..139975fe12 100644
--- a/source3/librpc/idl/netlogon.idl
+++ b/source3/librpc/idl/netlogon.idl
@@ -6,13 +6,15 @@
 
 #include "idl_types.h"
 
+import "lsa.idl", "samr.idl", "security.idl";
+
+
 [
   uuid("12345678-1234-abcd-ef00-01234567cffb"),
   version(1.0),
   endpoint("ncacn_np:[\\pipe\\netlogon]","ncacn_ip_tcp:","ncalrpc:"),
   pointer_default(unique),
-  pointer_default_top(unique),
-  depends(lsa,samr,security)
+  pointer_default_top(unique)
 ]
 
 interface netlogon
diff --git a/source3/librpc/idl/srvsvc.idl b/source3/librpc/idl/srvsvc.idl
index 3fb42c6aa5..c054dfdb45 100644
--- a/source3/librpc/idl/srvsvc.idl
+++ b/source3/librpc/idl/srvsvc.idl
@@ -4,13 +4,14 @@
   srvsvc interface definitions
 */
 
+import "security.idl", "svcctl.idl";
+
 [ uuid("4b324fc8-1670-01d3-1278-5a47bf6ee188"),
   version(3.0),
   endpoint("ncacn_np:[\\pipe\\srvsvc]", "ncacn_ip_tcp:", "ncalrpc:"),
   pointer_default(unique),
   pointer_default_top(unique),
-  helpstring("Server Service"),
-  depends(security,svcctl)
+  helpstring("Server Service")
 ] interface srvsvc
 {
 	declare bitmap svcctl_ServerType;
diff --git a/source3/librpc/idl/unixinfo.idl b/source3/librpc/idl/unixinfo.idl
index 4b12a3056a..c674329e52 100644
--- a/source3/librpc/idl/unixinfo.idl
+++ b/source3/librpc/idl/unixinfo.idl
@@ -3,12 +3,13 @@
   Unixinfo interface definition
 */
 
+import "security.idl";
+
 [ uuid("9c54e310-a955-4885-bd31-78787147dfa6"),
   version(0.0),
   endpoint("ncacn_np:[\\pipe\\unixinfo]", "ncacn_ip_tcp:", "ncalrpc:"),
   pointer_default(unique),
-  helpstring("Unixinfo specific stuff"),
-  depends(security)
+  helpstring("Unixinfo specific stuff")
 ] interface unixinfo
 {
 	/******************/
diff --git a/source3/librpc/idl/winreg.idl b/source3/librpc/idl/winreg.idl
index 13e3dcfc50..e911f47525 100644
--- a/source3/librpc/idl/winreg.idl
+++ b/source3/librpc/idl/winreg.idl
@@ -2,14 +2,15 @@
   winreg interface definition
 */
 
+import "lsa.idl", "initshutdown.idl", "security.idl";
+
 [ 
   uuid("338cd001-2244-31f1-aaaa-900038001003"),
   version(1.0),
   endpoint("ncacn_np:[\\pipe\\winreg]","ncacn_ip_tcp:","ncalrpc:"),
   pointer_default(unique),
   pointer_default_top(unique),
-  helpstring("Remote Registry Service"),
-  depends(lsa,initshutdown,security)
+  helpstring("Remote Registry Service")
 ] interface winreg
 {
 	declare bitmap security_secinfo;
diff --git a/source3/librpc/idl/wkssvc.idl b/source3/librpc/idl/wkssvc.idl
index 80fe4efa1a..98688fac46 100644
--- a/source3/librpc/idl/wkssvc.idl
+++ b/source3/librpc/idl/wkssvc.idl
@@ -2,12 +2,13 @@
   wkssvc interface definitions
 */
 
+import "srvsvc.idl";
+
 [ uuid("6bffd098-a112-3610-9833-46c3f87e345a"),
   version(1.0),
   pointer_default(unique),
   pointer_default_top(unique),
-  helpstring("Workstation Service"),
-  depends(srvsvc)
+  helpstring("Workstation Service")
 ] interface wkssvc
 {