7 files changed, 10 insertions, 0 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 5a43fbe0b1..421a5866d3 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -6,6 +6,7 @@ MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = Network Data Representation Core Library
 PUBLIC_HEADERS = ndr/libndr.h
+PRIVATE_PROTO_HEADER = ndr/libndr_proto.h
 OBJ_FILES = \
 		ndr/ndr.o \
 		ndr/ndr_basic.o \
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 3d8bdf9f36..86962bd563 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -280,3 +280,6 @@ typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, cons
 
 extern const struct dcerpc_syntax_id ndr_transfer_syntax;
 extern const struct dcerpc_syntax_id ndr64_transfer_syntax;
+
+#include "librpc/gen_ndr/misc.h"
+#include "librpc/ndr/libndr_proto.h"
diff --git a/source4/librpc/rpc/config.mk b/source4/librpc/rpc/config.mk
index 564e6f61e6..7206d2f651 100644
--- a/source4/librpc/rpc/config.mk
+++ b/source4/librpc/rpc/config.mk
@@ -1,6 +1,7 @@
 ################################################
 # Start SUBSYSTEM RPC_RAW
 [SUBSYSTEM::RPC_RAW]
+PRIVATE_PROTO_HEADER = dcerpc_proto.h
 OBJ_FILES = \
 		dcerpc.o \
 		dcerpc_auth.o \
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 9e585f9612..e9c479a9cd 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "libcli/composite/composite.h"
+#include "auth/gensec/gensec.h"
 
 static void dcerpc_ship_next_request(struct dcerpc_connection *c);
 
diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 058bef1ddf..b120933517 100644
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -239,3 +239,5 @@ struct rpc_request {
 		void *private;
 	} async;
 };
+
+#include "librpc/rpc/dcerpc_proto.h"
diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c
index c66384a3cf..bffa994abe 100644
--- a/source4/librpc/rpc/dcerpc_auth.c
+++ b/source4/librpc/rpc/dcerpc_auth.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "auth/gensec/gensec.h"
 
 /*
   do a non-athenticated dcerpc bind
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index 03a408de79..7ab90fbbf7 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -32,6 +32,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "libcli/smb2/smb2.h"
 
 
 struct dcerpc_pipe_connect;