3 files changed, 5 insertions, 16 deletions
diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl
index 855fbfce8f..b4ce03e5aa 100644
--- a/source4/librpc/idl/dcom.idl
+++ b/source4/librpc/idl/dcom.idl
@@ -159,10 +159,10 @@ interface IRemUnknown : IUnknown
 	interface ISystemActivator : IClassActivator
 {
 	WERROR ISystemActivatorRemoteCreateInstance([in] hyper unknown1,  /* OXID ? */
-											  [in] MInterfacePointer iface,
+											  [in] MInterfacePointer iface1,
 											  [in] hyper unknown2,
 											  [out] uint32 unknown3, 
-											  [out] MInterfacePointer iface);
+											  [out] MInterfacePointer iface2);
 }
 
 
@@ -270,7 +270,7 @@ object,
 	object
 ] interface ICoffeeMachine : IUnknown
 {
-	[helpstring("method MakeCoffee")] WERROR MakeCoffee(BSTR *flavor);
+	[helpstring("method MakeCoffee")] WERROR MakeCoffee(unistr *flavor);
 }
 
 [
diff --git a/source4/librpc/idl/rot.idl b/source4/librpc/idl/rot.idl
index 28aae60036..aa257dcf2f 100644
--- a/source4/librpc/idl/rot.idl
+++ b/source4/librpc/idl/rot.idl
@@ -4,6 +4,7 @@
 	uuid("b9e79e60-3d52-11ce-aaa1-00006901293f"),
 	version(0.2),
     pointer_default(unique),
+	depends(orpc),
  	endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", 
 		  "ncalrpc:[EPMAPPER]", "ncacn_unix_stream:[/tmp/epmapper]")
 ] interface rot
@@ -42,16 +43,3 @@
 					   [out] MInterfacePointer *EnumMoniker
 					   );
 }
-
-/*
-[
-	object,
-] interface IRotData : IUnknown
-{
-	WERROR irotdata_getdata(
-							[out,size_is(max),length_is(ret)] uint8 *data, 
-							[in] uint32 max,
-							[out] uint32 ret
-						   );
-}
-*/
diff --git a/source4/librpc/ndr/ndr_orpc.c b/source4/librpc/ndr/ndr_orpc.c
index 2a28db4178..ccfd48e099 100644
--- a/source4/librpc/ndr/ndr_orpc.c
+++ b/source4/librpc/ndr/ndr_orpc.c
@@ -22,6 +22,7 @@
 
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_orpc.h"
 
 NTSTATUS ndr_pull_DUALSTRINGARRAY(struct ndr_pull *ndr, int ndr_flags, struct DUALSTRINGARRAY *ar)
 {