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

(This used to be commit 68fc15a5e025348dee4bf14aa4498e20905cb377)

7 files changed, 13 insertions, 13 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)] */