r3428: switched to using minimal includes for the auto-generated RPC code.

The thing that finally convinced me that minimal includes was worth
pursuing for rpc was a compiler (tcc) that failed to build Samba due
to reaching internal limits of the size of include files. Also the
fact that includes.h.gch was 16MB, which really seems excessive. This
patch brings it back to 12M, which is still too large, but
better. Note that this patch speeds up compile times for both the pch
and non-pch case.

This change also includes the addition iof a "depends()" option in our
IDL files, allowing you to specify that one IDL file depends on
another. This capability was needed for the auto-includes generation.
(This used to be commit b8f5fa8ac8e8725f3d321004f0aedf4246fc6b49)

source4/auth/auth_sam.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

source4/auth/auth_util.c

@@ -22,6 +22,8 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

source4/auth/auth_winbind.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

source4/build/pidl/header.pm

@@ -320,6 +320,13 @@ sub HeaderInterface($)
     $res .= "#ifndef _HEADER_NDR_$interface->{NAME}\n";
     $res .= "#define _HEADER_NDR_$interface->{NAME}\n\n";
 
+    if (defined $interface->{PROPERTIES}->{depends}) {
+	    my @d = split / /, $interface->{PROPERTIES}->{depends};
+	    foreach my $i (@d) {
+		    $res .= "#include \"librpc/gen_ndr/ndr_$i\.h\"\n";
+	    }
+    }
+
     if (defined $interface->{PROPERTIES}->{uuid}) {
 	    my $name = uc $interface->{NAME};
 	    $res .= "#define DCERPC_$name\_UUID " . 

source4/build/pidl/parser.pm

@@ -1563,11 +1563,18 @@ sub Parse($$)
 {
 	my($idl) = shift;
 	my($filename) = shift;
+	my $h_filename = $filename;
+
+	if ($h_filename =~ /(.*)\.c/) {
+		$h_filename = "$1.h";
+	}
 
 	open(OUT, ">$filename") || die "can't open $filename";    
 
 	pidl "/* parser auto-generated by pidl */\n\n";
-	pidl "#include \"includes.h\"\n\n";
+	pidl "#include \"includes.h\"\n";
+	pidl "#include \"$h_filename\"\n\n";
+
 	foreach my $x (@{$idl}) {
 		if ($x->{TYPE} eq "INTERFACE") { 
 			needed::BuildNeeded($x);

source4/build/pidl/tables.pl

@@ -42,6 +42,14 @@ if ($opt_help) {
 }
 
 
+###################################
+# add include lines to tables.c
+sub process_include($)
+{
+	my $name = shift;
+	print TABLEC "#include \"$name\"\n";
+}
+
 ###################################
 # extract table entries from 1 file
 sub process_file($)
@@ -49,11 +57,10 @@ sub process_file($)
 	my $filename = shift;
 	open(FILE, $filename) || die "unable to open $filename\n";
 
-	print TABLEH "#include \"$filename\"\n";
-
 	while (my $line = <FILE>) {
-		if ($line =~ /extern const struct dcerpc_interface_table (\w+);/) {
-			print TABLEC "\t&$1,\n";
+		if ($line =~ /extern const struct dcerpc_interface_table dcerpc_table_(\w+);/) {
+			print TABLEC "\t&dcerpc_table_$1,\n";
+			print TABLEH "NTSTATUS dcerpc_$1\_init(void);\n";
 		}
 	}
 
@@ -70,7 +77,14 @@ open(TABLEC, ">$opt_output.c") || die "failed to open $opt_output.c\n";
 
 print TABLEC "
 #include \"includes.h\"
+";
 
+foreach my $filename (@ARGV) {
+	process_include($filename);
+}
+
+
+print TABLEC "
 /*
   generated by pidl IDL table generator
 */

source4/client/client.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "libcli/raw/libcliraw.h"
 
 #ifndef REGISTER

source4/gtk/common/select.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "gtk-smb.h"
 
 /* GtkSelectDomainDialog */

source4/gtk/tools/gepdump.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
 #include "gtk/common/gtk-smb.h"
 
 /* 

source4/gtk/tools/gwcrontab.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_atsvc.h"
 #include "gtk/common/gtk-smb.h"
 
 struct dcerpc_pipe *at_pipe = NULL;

source4/gtk/tools/gwsam.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "gtk/common/gtk-smb.h"
 
 struct policy_handle sam_handle;

source4/include/includes.h

@@ -658,11 +658,12 @@ extern int errno;
 
 #include "mutex.h"
 
+#include "structs.h"
 #include "librpc/ndr/libndr.h"
+#include "librpc/ndr/ndr_sec.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/rpc/dcerpc.h"
-#include "librpc/ndr/ndr_sec.h"
 #include "librpc/gen_ndr/tables.h"
 
 #include "libcli/auth/ntlmssp.h"

source4/include/structs.h

@@ -0,0 +1,50 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Copyright (C) Andrew Tridgell 2004
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/*
+  this file contains pre-declarations of private structures to avoid the
+  "scope is only this definition or declaration" warning
+*/
+
+union spoolss_PrinterInfo;
+union spoolss_FormInfo;
+union spoolss_JobInfo;
+union spoolss_DriverInfo;
+union spoolss_PortInfo;
+
+struct MULTI_QI;
+struct COSERVERINFO;
+
+
+struct epm_floor;
+struct epm_tower;
+
+struct drsuapi_DsCrackNames;
+
+struct samr_ChangePasswordUser;
+struct samr_OemChangePasswordUser2;
+struct samr_ChangePasswordUser3;
+struct samr_ChangePasswordUser2;
+struct samr_CryptPassword;
+struct samr_CryptPasswordEx;
+
+struct netr_SamInfo3;
+struct netr_Authenticator;
+

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 "librpc/gen_ndr/ndr_winreg.h"
 
 /**
  * This is the RPC backend for the registry library.

source4/libcli/auth/gensec_krb5.c

@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_krb5pac.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

source4/libnet/libnet_passwd.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 
 /*
  * do a password change using DCERPC/SAMR calls

source4/libnet/libnet_time.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
 
 /*
  * get the remote time of a server via srvsvc_NetRemoteTOD

source4/librpc/idl/misc.idl

@@ -37,7 +37,16 @@ interface misc
 	const string SID_BUILTIN_BACKUP_OPERATORS  = "S-1-5-32-551";
 	const string SID_BUILTIN_REPLICATOR        = "S-1-5-32-552";
 
-	typedef [public,noprint] struct {
+	/* server roles */
+	typedef enum {
+		ROLE_STANDALONE    = 0,
+		ROLE_DOMAIN_MEMBER = 1,
+		ROLE_DOMAIN_BDC    = 2,
+		ROLE_DOMAIN_PDC    = 3
+	} samr_Role;
+
+
+	typedef [public,noprint,gensize] struct {
 		uint32 time_low;
 		uint16 time_mid;
 		uint16 time_hi_and_version;
@@ -123,4 +132,22 @@ interface misc
 	typedef [public, flag(NDR_PAHEX)] struct {
 		uint8 hash[16];
 	} samr_Password;
+
+	typedef [public,flag(NDR_PAHEX)] struct {
+		uint8 key[16];
+	} netr_UserSessionKey;
+
+	typedef [public,flag(NDR_PAHEX)] struct {
+		uint8 key[8];
+	} netr_LMSessionKey;
+
+	typedef [public, flag(NDR_PAHEX)] struct {
+		uint8 data[8];
+	} netr_Credential;
+
+	typedef [public] struct {
+		netr_Credential cred;
+		time_t timestamp;
+	} netr_Authenticator;
+
 }

source4/librpc/idl/netlogon.idl

@@ -10,12 +10,18 @@
   uuid("12345678-1234-abcd-ef00-01234567cffb"),
   version(1.0),
   endpoint("ncacn_np:[\\pipe\\netlogon]","ncacn_ip_tcp:","ncalrpc:"),
-  pointer_default(unique)
+  pointer_default(unique),
+  depends(lsa,samr)
 ]
 
 interface netlogon
 {
-
+	typedef [public] struct {
+		[value(strlen_m(r->string)*2)]  uint16 size;
+		[value(r->size)]                uint16 length;
+		unistr_noterm *string;
+	} netr_String;
+	
 	/*****************/
 	/* Function 0x00 */
 
@@ -65,16 +71,6 @@ interface netlogon
 	/*****************/
 	/* Function 0x02 */
 
-	typedef [flag(NDR_PAHEX)] struct {
-		uint8 data[8];
-	} netr_Credential;
-
-	typedef struct {
-		[value(strlen_m(r->string)*2)]  uint16 size;
-		[value(r->size)]                uint16 length;
-		unistr_noterm *string;
-	} netr_String;
-	
 	/* in netr_AcctLockStr size seems to be be 24, and rrenard thinks 
 	   that the structure of the bindata looks like this:
 
@@ -128,25 +124,12 @@ interface netlogon
 		[case(6)] netr_NetworkInfo  *network;
 	} netr_LogonLevel;
 
-	typedef struct {
-		netr_Credential cred;
-		time_t timestamp;
-	} netr_Authenticator;
-
-	typedef struct {
+	typedef [public] struct {
 		uint32 rid;
 		uint32 attributes;
 	} netr_GroupMembership;
 
-	typedef [flag(NDR_PAHEX)] struct {
-		uint8 key[16];
-	} netr_UserSessionKey;
-
-	typedef [flag(NDR_PAHEX)] struct {
-		uint8 key[8];
-	} netr_LMSessionKey;
-
-	typedef struct {
+	typedef [public] struct {
 		NTTIME last_logon;
 		NTTIME last_logoff;
 		NTTIME acct_expiry;
@@ -175,11 +158,11 @@ interface netlogon
 		uint32 unknown[7];
 	} netr_SamBaseInfo;
 
-	typedef struct {
+	typedef [public] struct {
 		netr_SamBaseInfo base;
 	} netr_SamInfo2;
 
-	typedef struct {
+	typedef [public] struct {
 		dom_sid2 *sid;
 		uint32 attribute;
 	} netr_SidAttr;

source4/librpc/idl/oxidresolver.idl

@@ -16,7 +16,8 @@
 	uuid("99fcfec4-5260-101b-bbcb-00aa0021347a"),
 	helpstring("Object Exporter ID Resolver"),
 	endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", "ncalrpc:"),
-	pointer_default(unique)
+	pointer_default(unique),
+	depends(dcom)
 ]
 interface IOXIDResolver
 {

source4/librpc/idl/remact.idl

@@ -10,7 +10,8 @@
 
 [
 	uuid("4d9f4ab8-7d1c-11cf-861e-0020af6e7c57"),
-	pointer_default(unique)
+	pointer_default(unique),
+	depends(dcom)
 ]
 interface IRemoteActivation
 {

source4/librpc/idl/samr.idl

@@ -11,7 +11,8 @@
 [ uuid("12345778-1234-abcd-ef00-0123456789ac"),
   version(1.0),
   endpoint("ncacn_np:[\\pipe\\samr]","ncacn_ip_tcp:", "ncalrpc:"),
-  pointer_default(unique)
+  pointer_default(unique),
+  depends(lsa)
 ] interface samr
 {
 	/* account control (acct_flags) bits */
@@ -126,14 +127,6 @@
 	/************************/
 	/* Function    0x08     */
 
-	/* server roles */
-	typedef enum {
-		ROLE_STANDALONE    = 0,
-		ROLE_DOMAIN_MEMBER = 1,
-		ROLE_DOMAIN_BDC    = 2,
-		ROLE_DOMAIN_PDC    = 3
-	} samr_Role;
-
 	typedef struct {
 		uint16 min_password_len;
 		uint16 password_history;

source4/librpc/idl/schannel.idl

@@ -4,6 +4,9 @@
   schannel structures
 */
 
+[
+	depends(netlogon)
+]
 interface schannel
 {
 	/*

source4/librpc/idl/winreg.idl

@@ -8,7 +8,8 @@
   version(1.0),
   endpoint("ncacn_np:[\\pipe\\winreg]","ncacn_ip_tcp:","ncalrpc:"),
   pointer_default(unique),
-  helpstring("Remote Registry Service")
+  helpstring("Remote Registry Service"),
+  depends(lsa)
 ] interface winreg
 {
 	typedef struct {

source4/librpc/ndr/ndr_spoolss_buf.c

@@ -23,6 +23,7 @@
 
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_spoolss.h"
 
 NTSTATUS pull_spoolss_PrinterInfoArray(DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
 				       uint32_t level, uint32_t count,

source4/librpc/rpc/dcerpc.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
 
 /* initialise a dcerpc pipe. */
 struct dcerpc_pipe *dcerpc_pipe_init(void)

source4/librpc/rpc/dcerpc_schannel.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_schannel.h"
 
 enum schannel_position {
 	DCERPC_SCHANNEL_STATE_START = 0,

source4/librpc/rpc/dcerpc_sock.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
 
 #define MIN_HDR_SIZE 16
 

source4/librpc/rpc/dcerpc_util.c

@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-
+#include "librpc/gen_ndr/ndr_epmapper.h"
 
 /*
   find the pipe name for a local IDL interface

source4/param/loadparm.c

@@ -53,6 +53,7 @@
  */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_svcctl.h"
 
 BOOL in_client = False;		/* Not in the client by default */
 static BOOL bLoaded = False;

source4/rpc_server/dcerpc_server.c

@@ -22,6 +22,9 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/ndr_dcom.h"
+#include "librpc/gen_ndr/ndr_oxidresolver.h"
 
 /*
   see if two endpoints match

source4/rpc_server/dcom/oxidresolver.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_oxidresolver.h"
 
 
 /* 

source4/rpc_server/drsuapi/dcesrv_drsuapi.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "rpc_server/common/common.h"
 #include "rpc_server/drsuapi/dcesrv_drsuapi.h"
 

source4/rpc_server/drsuapi/drsuapi_cracknames.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "rpc_server/common/common.h"
 #include "rpc_server/drsuapi/dcesrv_drsuapi.h"
 

source4/rpc_server/echo/rpc_echo.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_echo.h"
 
 
 static NTSTATUS echo_AddOne(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_AddOne *r)

source4/rpc_server/epmapper/rpc_epmapper.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
 #include "rpc_server/common/common.h"
 
 typedef uint32_t error_status_t;

source4/rpc_server/lsa/dcesrv_lsa.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_server/common/common.h"
 
 /*

source4/rpc_server/netlogon/dcerpc_netlogon.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "rpc_server/common/common.h"
 
 struct server_pipe_state {

source4/rpc_server/samr/dcesrv_samr.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "rpc_server/common/common.h"
 #include "rpc_server/samr/dcesrv_samr.h"
 

source4/rpc_server/samr/samr_password.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "rpc_server/common/common.h"
 #include "rpc_server/samr/dcesrv_samr.h"
 

source4/rpc_server/samr/samr_utils.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 
 /* 
 translated the ACB_CTRL Flags to UserFlags (userAccountControl) 

source4/rpc_server/spoolss/dcesrv_spoolss.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_spoolss.h"
 #include "rpc_server/common/common.h"
 #include "rpc_server/spoolss/dcesrv_spoolss.h"
 

source4/rpc_server/srvsvc/dcesrv_srvsvc.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "rpc_server/common/common.h"
 
 /* 

source4/rpc_server/winreg/rpc_winreg.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_winreg.h"
 #include "rpc_server/common/common.h"
 
 enum handle_types { HTYPE_REGVAL, HTYPE_REGKEY };

source4/rpc_server/wkssvc/dcesrv_wkssvc.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_wkssvc.h"
 #include "rpc_server/common/common.h"
 
 /* 

source4/torture/local/binding_string.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
 
 static BOOL test_BindingString(TALLOC_CTX *mem_ctx, const char *binding)
 {

source4/torture/rpc/atsvc.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_atsvc.h"
 
 static BOOL test_JobGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint32_t job_id)
 {

source4/torture/rpc/autoidl.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_drsuapi.h"
 
 
 #if 1

source4/torture/rpc/bind.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 
 /*
   This test is 'bogus' in that it doesn't actually perform to the

source4/torture/rpc/dcom.c

@@ -20,6 +20,8 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_dcom.h"
+#include "librpc/gen_ndr/ndr_oxidresolver.h"
 
 BOOL torture_rpc_dcom(void)
 {

source4/torture/rpc/dfs.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_dfs.h"
 
 
 static BOOL test_GetManagerVersion(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)

source4/torture/rpc/drsuapi.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_drsuapi.h"
 
 static BOOL test_DsBind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
 		      struct policy_handle *bind_handle)

source4/torture/rpc/echo.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_echo.h"
 
 
 /*

source4/torture/rpc/epmapper.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
 
 
 /*

source4/torture/rpc/eventlog.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_eventlog.h"
 
 static void init_eventlog_String(struct eventlog_String *name, const char *s)
 {

source4/torture/rpc/lsa.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 
 static void init_lsa_Name(struct lsa_Name *name, const char *s)
 {

source4/torture/rpc/mgmt.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_mgmt.h"
 
 
 /*

source4/torture/rpc/netlogon.c

@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 
 
 static const char *machine_password;

source4/torture/rpc/oxidresolve.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_oxidresolver.h"
 
 static int test_SimplePing(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, HYPER_T setid)
 {

source4/torture/rpc/remact.c

@@ -20,6 +20,8 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_remact.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
 
 #define CLSID_TEST "00000316-0000-0000-C000-000000000046"
 #define CLSID_SIMPLE "5e9ddec7-5767-11cf-beab-00aa006c3606"

source4/torture/rpc/samr.c

@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 
 #define TEST_ACCOUNT_NAME "samrtorturetest"
 #define TEST_ALIASNAME "samrtorturetestalias"

source4/torture/rpc/scanner.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_mgmt.h"
 
 /*
   work out how many calls there are for an interface

source4/torture/rpc/schannel.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 
 #define TEST_MACHINE_NAME "schanneltest"
 

source4/torture/rpc/spoolss.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_spoolss.h"
 
 static BOOL test_GetPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		     struct policy_handle *handle)

source4/torture/rpc/srvsvc.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
 
 /**************************/
 /* srvsvc_NetCharDev      */

source4/torture/rpc/svcctl.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_svcctl.h"
 
 static BOOL test_EnumServicesStatus(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *h)
 {

source4/torture/rpc/testjoin.c

@@ -26,6 +26,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 
 struct test_join {
 	struct dcerpc_pipe *p;

source4/torture/rpc/winreg.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_winreg.h"
 
 static void init_winreg_String(struct winreg_String *name, const char *s)
 {

source4/torture/rpc/wkssvc.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_wkssvc.h"
 
 
 static BOOL test_NetWkstaGetInfo(struct dcerpc_pipe *p,