r19591: Use `import' and `include' in the IDL and regenerate.

(This used to be commit 68fc15a5e025348dee4bf14aa4498e20905cb377)

7 files changed, 21 insertions, 13 deletions

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
 {