Move shared DCE/RPC IDL files to root IDL dir.

30 files changed, 3 insertions, 4628 deletions

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 51b4de7714..28259335fd 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -364,7 +364,7 @@ NDR_WINBIND_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winbind.o
 #PUBLIC_HEADERS += $(gen_ndrsrcdir)/winbind.h
 
 $(librpcsrcdir)/idl-deps:
-	$(PERL) $(librpcsrcdir)/idl-deps.pl $(librpcsrcdir)/idl/*.idl >$@
+	$(PERL) $(librpcsrcdir)/idl-deps.pl $(librpcsrcdir)/idl/*.idl ../librpc/idl/*.idl >$@
 
 clean:: 
 	rm -f $(librpcsrcdir)/idl-deps
@@ -745,9 +745,9 @@ $(IDL_HEADER_FILES) $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \
 	$(IDL_NDR_PY_C_FILES) $(IDL_NDR_PY_H_FILES): idl
 
 idl_full:: $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/lib/Parse/Pidl/Expr.pm 
-	@CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh FULL $(librpcsrcdir)/gen_ndr $(librpcsrcdir)/idl/*.idl
+	@CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh FULL $(librpcsrcdir)/gen_ndr $(librpcsrcdir)/idl/*.idl ../librpc/idl/*.idl
 
 idl:: $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/lib/Parse/Pidl/Expr.pm 
-	@CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh PARTIAL $(librpcsrcdir)/gen_ndr $(librpcsrcdir)/idl/*.idl
+	@CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh PARTIAL $(librpcsrcdir)/gen_ndr $(librpcsrcdir)/idl/*.idl ../librpc/idl/*.idl
 
 
diff --git a/source4/librpc/idl/atsvc.idl b/source4/librpc/idl/atsvc.idl
deleted file mode 100644
index 75e1daa882..0000000000
--- a/source4/librpc/idl/atsvc.idl
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-  atsvc interface definition
-*/
-
-[ uuid("1ff70682-0a51-30e8-076d-740be8cee98b"),
-  version(1.0),
-  pointer_default(unique),
-  helpstring("Microsoft AT-Scheduler Service"),
-  endpoint("ncacn_np:[\\pipe\\atsvc]", "ncalrpc:")
-] interface atsvc
-{
-	typedef [bitmap32bit] bitmap {
-                First           =       0x00000001,
-                Second          =       0x00000002,
-                Third           =       0x00000004,
-                Fourth          =       0x00000008,
-                Fifth           =       0x00000010,
-                Sixth           =       0x00000020,
-                Seventh         =       0x00000040,
-                Eight           =       0x00000080,
-                Ninth           =       0x00000100,
-                Tenth           =       0x00000200,
-                Eleventh        =       0x00000400,
-                Twelfth         =       0x00000800,
-                Thitteenth      =       0x00001000,
-                Fourteenth      =       0x00002000,
-                Fifteenth       =       0x00004000,
-                Sixteenth       =       0x00008000,
-                Seventeenth     =       0x00010000,
-                Eighteenth      =       0x00020000,
-                Ninteenth       =       0x00040000,
-                Twentyth        =       0x00080000,
-                Twentyfirst     =       0x00100000,
-                Twentysecond    =       0x00200000,
-                Twentythird     =       0x00400000,
-                Twentyfourth    =       0x00800000,
-                Twentyfifth     =       0x01000000,
-                Twentysixth     =       0x02000000,
-                Twentyseventh   =       0x04000000,
-                Twentyeighth    =       0x08000000,
-                Twentyninth     =       0x10000000,
-                Thirtieth       =       0x20000000,
-                Thirtyfirst     =       0x40000000
-        } atsvc_DaysOfMonth;
-
-        typedef [bitmap8bit] bitmap {
-                JOB_RUN_PERIODICALLY    = 0x01,
-                JOB_EXEC_ERROR          = 0x02,
-                JOB_RUNS_TODAY          = 0x04,
-                JOB_ADD_CURRENT_DATE    = 0x08,
-                JOB_NONINTERACTIVE      = 0x10
-        } atsvc_Flags;
-
-	typedef [bitmap8bit] bitmap {
-		DAYSOFWEEK_MONDAY    = 0x01,
-		DAYSOFWEEK_TUESDAY   = 0x02,
-		DAYSOFWEEK_WEDNESDAY = 0x04,
-		DAYSOFWEEK_THURSDAY  = 0x08,
-		DAYSOFWEEK_FRIDAY    = 0x10,
-		DAYSOFWEEK_SATURDAY  = 0x20,
-		DAYSOFWEEK_SUNDAY    = 0x40
-	} atsvc_DaysOfWeek;
-	
-	typedef struct {
-		uint32 job_time;
-		atsvc_DaysOfMonth days_of_month;
-		atsvc_DaysOfWeek days_of_week;
-		atsvc_Flags flags;
-		[string,charset(UTF16)] uint16 *command;
-	} atsvc_JobInfo;
-
-	/******************/
-	/* Function: 0x00 */
-	[public] NTSTATUS atsvc_JobAdd(
-		[in,unique,string,charset(UTF16)] uint16 *servername,
-		[in] atsvc_JobInfo *job_info,
-		[out,ref]	 uint32 *job_id
-	);
-
-	/******************/
-	/* Function: 0x01 */
-	[public] NTSTATUS atsvc_JobDel(
-		[in,unique,string,charset(UTF16)] uint16 *servername,
-		[in]	uint32 min_job_id,
-		[in]	uint32 max_job_id
-	);
-
-	typedef struct {
-		uint32 job_id;
-		uint32 job_time;
-		atsvc_DaysOfMonth days_of_month;
-		atsvc_DaysOfWeek days_of_week;
-		atsvc_Flags flags;
-		[string,charset(UTF16)] uint16 *command;
-	} atsvc_JobEnumInfo;
-
-	typedef struct {
-		uint32 entries_read;
-		[size_is(entries_read)] atsvc_JobEnumInfo *first_entry;
-	} atsvc_enum_ctr;
-
-	/******************/
-	/* Function: 0x02 */
-	[public] NTSTATUS atsvc_JobEnum(
-		[in,unique,string,charset(UTF16)] uint16 *servername,
-		[in,out] 	 atsvc_enum_ctr *ctr,
-		[in]	     uint32 preferred_max_len,
-		[out,ref]	     uint32 *total_entries,
-		[in,out,unique]     uint32 *resume_handle
-	);
-
-	/******************/
-	/* Function: 0x03 */
-	[public] NTSTATUS atsvc_JobGetInfo(
-		[in,unique,string,charset(UTF16)]	uint16 *servername,
-		[in]	uint32 job_id,
-		[out]	atsvc_JobInfo **job_info
-	);
-}
diff --git a/source4/librpc/idl/audiosrv.idl b/source4/librpc/idl/audiosrv.idl
deleted file mode 100644
index 1b059868ff..0000000000
--- a/source4/librpc/idl/audiosrv.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-	uuid("0a74ef1c-41a4-4e06-83ae-dc74fb1cdd53"),
-	version(1.0),
-	pointer_default(unique),
-	helpstring("Audio Server")
-] interface audiosrv
-{
-	[todo] void audiosrv_CreatezoneFactoriesList();
-	[todo] void audiosrv_CreateGfxFactoriesList();
-	[todo] void audiosrv_CreateGfxList();
-	[todo] void audiosrv_RemoveGfx();
-	[todo] void audiosrv_AddGfx();
-	[todo] void audiosrv_ModifyGfx();
-	[todo] void audiosrv_OpenGfx();
-	[todo] void audiosrv_Logon();
-	[todo] void audiosrv_Logoff();
-	[todo] void audiosrv_RegisterSessionNotificationEvent();
-	[todo] void audiosrv_UnregisterSessionNotificationEvent();
-	[todo] void audiosrv_SessionConnectState();
-	[todo] void audiosrv_DriverOpenDrvRegKey();
-	[todo] void audiosrv_AdvisePreferredDeviceChange();
-	[todo] void audiosrv_GetPnpInfo();
-}
diff --git a/source4/librpc/idl/browser.idl b/source4/librpc/idl/browser.idl
deleted file mode 100644
index 5b05be9cbb..0000000000
--- a/source4/librpc/idl/browser.idl
+++ /dev/null
@@ -1,58 +0,0 @@
-[ 
-  uuid("6bffd098-a112-3610-9833-012892020162"),
-  version(0.0), 
-  helpstring("Browsing"),
-  pointer_default(unique),
-  endpoint("ncacn_np:[\\pipe\\browser]", "ncacn_ip_tcp:", "ncalrpc:")
-] 
-interface browser
-{
-	/******************/
-	/* Function  0x00 */
-	[todo] NTSTATUS BrowserrServerEnum();
-
-	/******************/
-	/* Function  0x01 */
-	[todo] NTSTATUS BrowserrDebugCall();
-
-	/******************/
-	/* Function  0x02 */
-	[todo] NTSTATUS BrowserrQueryOtherDomains();
-
-	/******************/
-	/* Function  0x03 */
-	[todo] NTSTATUS BrowserrResetNetlogonState();
-
-	/******************/
-	/* Function  0x04 */
-	[todo] NTSTATUS BrowserrDebugTrace();
-
-	/******************/
-	/* Function  0x05 */
-	[todo] NTSTATUS BrowserrQueryStatistics();
-
-	/******************/
-	/* Function  0x06 */
-	[todo] NTSTATUS BrowserResetStatistics();
-
-	/******************/
-	/* Function  0x07 */
-	[todo] NTSTATUS NetrBrowserStatisticsClear();
-
-	/******************/
-	/* Function  0x08 */
-	[todo] NTSTATUS NetrBrowserStatisticsGet();
-
-	/******************/
-	/* Function  0x09 */
-	[todo] NTSTATUS BrowserrSetNetlogonState();
-
-	/******************/
-	/* Function  0x0a */
-	[todo] NTSTATUS BrowserrQueryEmulatedDomains();
-
-	/******************/
-	/* Function  0x0b */
-	[todo] NTSTATUS BrowserrServerEnumEx();
-
-}
diff --git a/source4/librpc/idl/dbgidl.idl b/source4/librpc/idl/dbgidl.idl
deleted file mode 100644
index 0712392f00..0000000000
--- a/source4/librpc/idl/dbgidl.idl
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-	uuid("1d55b526-c137-46c5-ab79-638f2a68e869"),
-	version(1.0),
-   	pointer_default(unique),
-	helpstring("Remote IDL debugger")
-] interface dbgidl 
-{
-	void dummy_dbgidl();
-}
diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl
deleted file mode 100644
index 977c7ed86a..0000000000
--- a/source4/librpc/idl/dcom.idl
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
-  DCOM interfaces
-  http://www.ietf.org/internet-drafts/draft-brown-dcom-v1-spec-04.txt
- */
-
-import "misc.idl";
-
-[
-	uuid("18f70770-8e64-11cf-9af1-0020af6e72f4"),
-	pointer_default(unique),
-	version(0.0)
-] interface dcom_Unknown
-{
-	void UseProtSeq();
-	void GetCustomProtseqInfo();
-	void UpdateResolverBindings();
-}
-
-[
-	object,
-	uuid("00000000-0000-0000-C000-000000000046"),
-	pointer_default(unique),
-	helpstring("Base interface for all COM interfaces")
-]
-interface IUnknown
-{
-	/*****************/
-	/* Function 0x00 */
-	/* Returns the interface with the specified IID 
-	   if implemented by this object */
-	[local] WERROR QueryInterface([in,unique] GUID *iid,
-	   [out,iid_is(riid)] IUnknown **data);
-
-	/*****************/
-	/* Function 0x01 */
-	[local] uint32 AddRef();
-
-	/*****************/
-	/* Function 0x02 */
-	[local] uint32 Release();
-}
-
-
-[
-	object,
-	uuid("00000001-0000-0000-C000-000000000046"),
-	pointer_default(unique)
-] interface IClassFactory : IUnknown
-{
-	[local] WERROR CreateInstance([in,unique] MInterfacePointer *pUnknown, 
-			       [in,unique] GUID *iid,
-			       [out, iid_is(riid),unique] MInterfacePointer *ppv);
-
-	[call_as(CreateInstance)] WERROR RemoteCreateInstance();
-
-	/* Set lock to TRUE when you want to do a lock
-	and set it to FALSE when you want to unlock */
-	[local] WERROR LockServer([in] uint8 lock);
-
-	[call_as(LockServer)] WERROR RemoteLockServer();
-}
-
-/* The remote version of IUnknown. This interface exists on every */
-/* OXID (whether an OXID represents either a thread or a process is */
-/* implementation specific). It is used by clients to query for new */
-/* interfaces, get additional references (for marshaling), and release */
-/* outstanding references. */
-/* This interface is passed along during OXID resolution. */
-/* */
-[
-	uuid("00000131-0000-0000-C000-000000000046"),
-	object,
-	pointer_default(unique),
-	helpstring("Remote version of IUnknown")
-]
-interface IRemUnknown : IUnknown
-{
-	typedef [public] struct 
-	{
-		WERROR hResult; /* result of call */
-		STDOBJREF std; /* data for returned interface */
-	}
-	REMQIRESULT;
-
-	[call_as(QueryInterface)] WERROR RemQueryInterface (
-		[in,unique] GUID *ripid, /* interface to QI on */
-		[in] uint32 cRefs, /* count of AddRefs requested */
-		[in] uint16 cIids, /* count of IIDs that follow */
-		[in, unique, size_is(cIids)] GUID *iids, /* IIDs to QI for */
-		[out, size_is(cIids), unique] MInterfacePointer *ip
-		);
-
-	typedef struct 
-	{
-		GUID ipid; /* ipid to AddRef/Release */
-		uint32 cPublicRefs;
-		uint32 cPrivateRefs;
-	} REMINTERFACEREF;
-
-	[call_as(AddRef)] WERROR RemAddRef (
-		 [in] uint16 cInterfaceRefs,
-		 [in, size_is(cInterfaceRefs)] REMINTERFACEREF InterfaceRefs[],
-		 [out, size_is(cInterfaceRefs), unique] WERROR *pResults
-		);
-
-	[call_as(Release)] WERROR RemRelease (
-		 [in] uint16 cInterfaceRefs,
-		 [in, size_is(cInterfaceRefs)] REMINTERFACEREF InterfaceRefs[]
-		);
-}
-
-[
-	uuid("00000140-0000-0000-c000-000000000046"),
-	pointer_default(unique),
-	object
-] interface IClassActivator : IUnknown
-{
-	void GetClassObject([in] GUID clsid, 
-		                [in] uint32 context,
-						[in] uint32 locale,
-						[in] GUID iid,
-						[out, iid_is(iid)] MInterfacePointer data);
-}
-
-[
-	uuid("00000136-0000-0000-c000-000000000046"),
-	pointer_default(unique),
-	object
-] interface ISCMLocalActivator : IClassActivator
-{
-	WERROR ISCMLocalActivator_CreateInstance( );
-}
-
-[
-	pointer_default(unique),
-	uuid("c6f3ee72-ce7e-11d1-b71e-00c04fc3111a")
-] interface IMachineLocalActivator 
-{
-	WERROR IMachineLocalActivator_foo();
-}
-
-[
-	pointer_default(unique),
-	uuid("e60c73e6-88f9-11cf-9af1-0020af6e72f4")
-] interface ILocalObjectExporter
-{
-	WERROR ILocalObjectExporter_Foo();
-}
-
-/* Looks like this is the equivalent of .NET's 
-   System.Activator class */
-[
-	uuid("000001a0-0000-0000-c000-000000000046"),
-	pointer_default(unique),
-	object
-]
-	interface ISystemActivator : IClassActivator
-{
-	WERROR ISystemActivatorRemoteCreateInstance([in] hyper unknown1,  /* OXID ? */
-											  [in] MInterfacePointer iface1,
-											  [in] hyper unknown2,
-											  [out] uint32 unknown3, 
-											  [out] MInterfacePointer iface2);
-}
-
-
-
-/* Derived from IRemUnknown, this interface supports Remote Query interface */
-/* for objects that supply additional data beyond the STDOBJREF in their */
-/* marshaled interface packets. */
-[
-	object,
-	pointer_default(unique),
-	uuid("00000143-0000-0000-C000-000000000046")
-]
-
-interface IRemUnknown2 : IRemUnknown
-{
-	[call_as(QueryInterface2)] WERROR RemQueryInterface2 (
-		 [in, unique] GUID *ripid,
-		 [in] uint16 cIids,
-		 [in, size_is(cIids), unique] GUID *iids,
-		 [out, size_is(cIids), unique] WERROR *phr,
-		 [out, size_is(cIids), unique] MInterfacePointer *ppMIF
-		);
-}
-
-[
-	object,
-	pointer_default(unique),
-	uuid("00020400-0000-0000-C000-000000000046")
-] interface IDispatch : IUnknown
-{
-	/*****************/
-	/* Function 0x03 */
-	WERROR GetTypeInfoCount(
-			[out, unique] uint16 *pctinfo);
-
-	typedef struct {
-	} REF_ITypeInfo;
-
-	/*****************/
-	/* Function 0x04 */
-	WERROR GetTypeInfo (
-			[in] uint16 iTInfo,
-			[in] uint32 lcid,
-			[out, unique] REF_ITypeInfo *ppTInfo);
-
-	/*****************/
-	/* Function 0x05 */
-	WERROR GetIDsOfNames(
-			[in, unique] GUID *riid,
-			/*FIXME[in,size_is(cNames)] OLESTR *rgszNames[], */
-			[in] uint16 cNames,
-			[in] uint32 lcid,
-			[out,size_is(cNames), unique] uint32 *rgDispId);
-
-	typedef struct {
-		uint16 vartype;
-		uint16 FIXME;
-	} VARIANT;
-
-	typedef struct {
-		uint16 FIXME;
-	} DISPPARAMS;
-
-	/* Exception ? */
-	typedef struct {
-		uint16 FIXME;
-	} EXCEPINFO;
-
-	/*****************/
-	/* Function 0x06 */
-	WERROR Invoke(
-			[in] uint32 dispIdMember,
-			[in, unique] GUID *riid,
-			[in] uint32 lcid,
-			[in] uint16 wFlags,
-			[out,in, unique] DISPPARAMS *pDispParams,
-			[out, unique] VARIANT *pVarResult,
-			[out, unique] EXCEPINFO *pExcepInfo,
-			[out, unique] uint16 *puArgErr);
-}
-
-[
-	object,
-	local,
-	uuid("00000003-0000-0000-C000-000000000046")
-] interface IMarshal : IUnknown
-{
-	WERROR MarshalInterface();
-	WERROR UnMarshalInterface();
-}
-
-[
-	uuid(DA23F6DB-6F45-466C-9EED-0B65286F2D78),
-	helpstring("ICoffeeMachine Interface"),
-	pointer_default(unique),
-	object
-] interface ICoffeeMachine : IUnknown
-{
-	WERROR MakeCoffee([in,string,charset(UTF16)] uint16 *flavor);
-}
-
-[
-	uuid("db7c21f8-fe33-4c11-aea5-ceb56f076fbb"),
-	helpstring("coffeemachine class")
-] coclass coffeemachine
-{
-	interface icoffeemachine;
-}
-
-[
-	object,
-	pointer_default(unique),
-	uuid("0000000C-0000-0000-C000-000000000046"),
-	helpstring("Stream")
-]
-interface IStream : IUnknown
-{
-	WERROR Read(
-				[out, size_is(num_requested), length_is(num_read)] uint8 pv[],
-				[in] uint32 num_requested, 
-				[in, unique] uint32 *num_readx,
-				[out] uint32 num_read
-				);
-
-	WERROR Write(
-				[in,size_is(num_requested),unique] uint8 *data,
-				 [in] uint32 num_requested,
-				 [out] uint32 num_written);
-}
-
-[
-	uuid("5e9ddec7-5767-11cf-beab-00aa006c3606"),
-	progid("Samba.Simple"),
-	helpstring("simple class"),
-	internal
-] coclass simple 
-{
-	interface IStream;
-}
diff --git a/source4/librpc/idl/dfs.idl b/source4/librpc/idl/dfs.idl
deleted file mode 100644
index 1b145f3dfa..0000000000
--- a/source4/librpc/idl/dfs.idl
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
-  dfs interface definition
-*/
-
-import "misc.idl";
-
-[ uuid("4fc742e0-4a10-11cf-8273-00aa004ae673"),
-  version(3.0),
-  pointer_default(unique),
-  helpstring("Settings for Microsoft Distributed File System"),
-  endpoint("ncacn_np:[\\pipe\\netdfs]", "ncacn_ip_tcp:", "ncalrpc:")
-] interface netdfs
-{
-	/******************/
-	/* Function: 0x00 */
-	typedef [v1_enum] enum {
-		DFS_MANAGER_VERSION_NT4		= 1,
-		DFS_MANAGER_VERSION_W2K		= 2,
-		DFS_MANAGER_VERSION_W2K3	= 4,
-		DFS_MANAGER_VERSION_W2K8	= 6
-	} dfs_ManagerVersion;
-
-	[public] void dfs_GetManagerVersion(
-		[out]		dfs_ManagerVersion *version
-		);
-
-
-	/******************/
-	/* Function: 0x01 */
-	WERROR dfs_Add (
-		[in]		[string,charset(UTF16)] uint16 *path,
-		[in]		[string,charset(UTF16)] uint16 *server,
-		[in,unique]	[string,charset(UTF16)] uint16 *share,
-		[in,unique]	[string,charset(UTF16)] uint16 *comment,
-		[in]		uint32 flags
-		);
-
-	/******************/
-	/* Function: 0x02 */
-	WERROR dfs_Remove (
-		[in]		[string,charset(UTF16)] uint16 *dfs_entry_path,
-		[in,unique]	[string,charset(UTF16)] uint16 *servername,
-		[in,unique]	[string,charset(UTF16)] uint16 *sharename
-		);
-
-	/******************/
-	/* Function: 0x03 */
-
-	typedef struct {
-	} dfs_Info0;
-
-	typedef struct {
-		[string,charset(UTF16)] uint16 *path;
-	} dfs_Info1;
-
-	typedef [public,bitmap32bit] bitmap {
-		DFS_VOLUME_STATE_OK 		= 0x1,
-		DFS_VOLUME_STATE_INCONSISTENT 	= 0x2,
-		DFS_VOLUME_STATE_OFFLINE 	= 0x3,
-		DFS_VOLUME_STATE_ONLINE		= 0x4,
-		DFS_VOLUME_STATE_STANDALONE	= DFS_VOLUME_FLAVOR_STANDALONE,
-		DFS_VOLUME_STATE_AD_BLOB	= DFS_VOLUME_FLAVOR_AD_BLOB
-	} dfs_VolumeState;
-
-	typedef struct {
-		[string,charset(UTF16)] uint16 *path;
-		[string,charset(UTF16)] uint16 *comment;
-		dfs_VolumeState state;
-		uint32 num_stores;
-	} dfs_Info2;
-
-	const int DFS_STORAGE_STATES = 0xf;
-
-	/* yes, this is a bitmap */
-	typedef [public,bitmap32bit] bitmap {
-		DFS_STORAGE_STATE_OFFLINE 	= 1,
-		DFS_STORAGE_STATE_ONLINE 	= 2,
-		DFS_STORAGE_STATE_ACTIVE 	= 4
-	} dfs_StorageState;
-
-	typedef struct {
-		dfs_StorageState state;
-		[string,charset(UTF16)] uint16 *server;
-		[string,charset(UTF16)] uint16 *share;
-	} dfs_StorageInfo;
-
-	typedef struct {
-		[string,charset(UTF16)] uint16 *path;
-		[string,charset(UTF16)] uint16 *comment;
-		dfs_VolumeState state;
-		uint32 num_stores;
-		[size_is(num_stores)] dfs_StorageInfo *stores;
-	} dfs_Info3;
-
-	typedef struct {
-		[string,charset(UTF16)] uint16 *path;
-		[string,charset(UTF16)] uint16 *comment;
-		dfs_VolumeState state;
-		uint32 timeout;
-		GUID   guid;
-		uint32 num_stores;
-		[size_is(num_stores)] dfs_StorageInfo *stores;
-	} dfs_Info4;
-
-	/* verified with dfsutil */
-	typedef [public,bitmap32bit] bitmap {
-		DFS_PROPERTY_FLAG_INSITE_REFERRALS	= 0x01,
-		DFS_PROPERTY_FLAG_ROOT_SCALABILITY	= 0x02,
-		DFS_PROPERTY_FLAG_SITE_COSTING 		= 0x04,
-		DFS_PROPERTY_FLAG_TARGET_FAILBACK	= 0x08,
-		DFS_PROPERTY_FLAG_CLUSTER_ENABLED	= 0x10	/* untested */
-	} dfs_PropertyFlags;
-
-	typedef struct {
-		[string,charset(UTF16)] uint16 *path;
-		[string,charset(UTF16)] uint16 *comment;
-		dfs_VolumeState state;
-		uint32 timeout;
-		GUID   guid;
-		dfs_PropertyFlags flags;
-		uint32 pktsize;
-		uint32 num_stores;
-	} dfs_Info5;
-
-	typedef [v1_enum] enum {
-		DFS_INVALID_PRIORITY_CLASS	 	= -1,
-		DFS_SITE_COST_NORMAL_PRIORITY_CLASS	= 0,
-		DFS_GLOBAL_HIGH_PRIORITY_CLASS		= 1,
-		DFS_SITE_COST_HIGH_PRIORITY_CLASS	= 2,
-		DFS_SITE_COST_LOW_PRIORITY_CLASS	= 3,
-		DFS_GLOBAL_LOW_PRIORITY_CLASS		= 4
-	} dfs_Target_PriorityClass;
-
-	typedef struct {
-		dfs_Target_PriorityClass target_priority_class;
-		uint16 target_priority_rank;
-		uint16 reserved;
-	} dfs_Target_Priority;
-
-	typedef struct {
-		dfs_StorageInfo info;
-		dfs_Target_Priority target_priority;
-	} dfs_StorageInfo2;
-
-	typedef struct {
-		[string,charset(UTF16)] uint16 *entry_path;
-		[string,charset(UTF16)] uint16 *comment;
-		dfs_VolumeState state;
-		uint32 timeout;
-		GUID   guid;
-		dfs_PropertyFlags flags;
-		uint32 pktsize;
-		uint16 num_stores;
-		[size_is(num_stores)] dfs_StorageInfo2 *stores;
-	} dfs_Info6;
-
-	typedef struct {
-		GUID  generation_guid;
-	} dfs_Info7;
-
-	typedef struct {
-		[string,charset(UTF16)] uint16 *comment;
-	} dfs_Info100;
-
-	typedef struct {
-		dfs_StorageState state;
-	} dfs_Info101;
-
-	typedef struct {
-		uint32 timeout;
-	} dfs_Info102;
-
-	typedef struct {
-		dfs_PropertyFlags flags;
-	} dfs_Info103;
-
-	typedef struct {
-		dfs_Target_Priority priority;
-	} dfs_Info104;
-
-	typedef struct {
-		[string,charset(UTF16)] uint16 *comment;
-		dfs_VolumeState state;
-		uint32 timeout;
-		uint32 property_flag_mask;
-		uint32 property_flags;
-	} dfs_Info105;
-
-	typedef struct {
-		dfs_StorageState state;
-		dfs_Target_Priority priority;
-	} dfs_Info106;
-
-	typedef struct {
-		[string,charset(UTF16)] uint16 *dom_root;
-	} dfs_Info200;
-
-        typedef enum {
-		DFS_VOLUME_FLAVOR_STANDALONE = 0x100,
-		DFS_VOLUME_FLAVOR_AD_BLOB = 0x200
-	} dfs_VolumeFlavor;
-
-	typedef struct {
-		dfs_VolumeFlavor flavor;
-		[string,charset(UTF16)] uint16 *dom_root;
-	} dfs_Info300;
-
-	typedef union {
-		[case(0)]   dfs_Info0 *info0;
-		[case(1)]   dfs_Info1 *info1;
-		[case(2)]   dfs_Info2 *info2;
-		[case(3)]   dfs_Info3 *info3;
-		[case(4)]   dfs_Info4 *info4;
-		[case(5)]   dfs_Info5 *info5;
-		[case(6)]   dfs_Info6 *info6;
-		[case(7)]   dfs_Info7 *info7;
-		[case(100)] dfs_Info100 *info100;
-		[case(101)] dfs_Info101 *info101;
-		[case(102)] dfs_Info102 *info102;
-		[case(103)] dfs_Info103 *info103;
-		[case(104)] dfs_Info104 *info104;
-		[case(105)] dfs_Info105 *info105;
-		[case(106)] dfs_Info106 *info106;
-	} dfs_Info;
-
-	WERROR dfs_SetInfo (
-		[in]	 	[string,charset(UTF16)] uint16 dfs_entry_path[],
-		[in,unique]	[string,charset(UTF16)] uint16 *servername,
-		[in,unique]	[string,charset(UTF16)] uint16 *sharename,
-		[in]		uint32 level,
-		[in,ref,switch_is(level)] dfs_Info *info
-		);
-
-	/******************/
-	/* Function: 0x04 */
-	WERROR dfs_GetInfo (
-		[in]		[string,charset(UTF16)] uint16 dfs_entry_path[],
-		[in,unique]	[string,charset(UTF16)] uint16 *servername,
-		[in,unique]	[string,charset(UTF16)] uint16 *sharename,
-		[in]		uint32 level,
-		[out,switch_is(level)] dfs_Info *info
-		);
-
-	/******************/
-	/* Function: 0x05 */
-
-	typedef struct {
-		uint32 count;
-		[size_is(count)] dfs_Info1 *s;
-	} dfs_EnumArray1;
-
-	typedef struct {
-		uint32 count;
-		[size_is(count)] dfs_Info2 *s;
-	} dfs_EnumArray2;
-
-	typedef struct {
-		uint32 count;
-		[size_is(count)] dfs_Info3 *s;
-	} dfs_EnumArray3;
-
-	typedef struct {
-		uint32 count;
-		[size_is(count)] dfs_Info4 *s;
-	} dfs_EnumArray4;
-
-	typedef struct {
-		uint32 count;
-		[size_is(count)] dfs_Info5 *s;
-	} dfs_EnumArray5;
-
-	typedef struct {
-		uint32 count;
-		[size_is(count)] dfs_Info6 *s;
-	} dfs_EnumArray6;
-
-	typedef struct {
-		uint32 count;
-		[size_is(count)] dfs_Info200 *s;
-	} dfs_EnumArray200;
-
-	typedef struct {
-		uint32 count;
-		[size_is(count)] dfs_Info300 *s;
-	} dfs_EnumArray300;
-
-
-	typedef union {
-		[case(1)] dfs_EnumArray1 *info1;
-		[case(2)] dfs_EnumArray2 *info2;
-		[case(3)] dfs_EnumArray3 *info3;
-		[case(4)] dfs_EnumArray4 *info4;
-		[case(5)] dfs_EnumArray5 *info5;
-		[case(6)] dfs_EnumArray6 *info6;
-		[case(200)] dfs_EnumArray200 *info200;
-		[case(300)] dfs_EnumArray300 *info300;
-	} dfs_EnumInfo;
-
-	typedef struct {
-		uint32 level;
-		[switch_is(level)] dfs_EnumInfo e;
-	} dfs_EnumStruct;
-
-	WERROR dfs_Enum (
-		[in]		uint32 level,
-		[in]		uint32 bufsize,
-		[in,out,unique]	dfs_EnumStruct *info,
-		[in,out,unique]	uint32 *total
-		);
-
-	/* Function 0x06 */
-	[todo] WERROR dfs_Rename();
-
-	/* Function 0x07 */
-	[todo] WERROR dfs_Move();
-
-	/* Function 0x08 */
-	[todo] WERROR dfs_ManagerGetConfigInfo();
-
-	/* Function 0x09 */
-	[todo] WERROR dfs_ManagerSendSiteInfo();
-
-	/* Function 0x0a */
-	typedef struct {
-		uint32 unknown1;
-		[string,charset(UTF16)] uint16 *unknown2;
-	} dfs_UnknownStruct;
-
-	WERROR dfs_AddFtRoot(
-		[in]		[string,charset(UTF16)] uint16 servername[],
-		[in]		[string,charset(UTF16)] uint16 dns_servername[],
-		[in]		[string,charset(UTF16)] uint16 dfsname[],
-		[in]		[string,charset(UTF16)] uint16 rootshare[],
-		[in]		[string,charset(UTF16)] uint16 comment[],
-		[in]		[string,charset(UTF16)] uint16 dfs_config_dn[],
-		[in]		uint8 unknown1,
-		[in]		uint32 flags,
-		[in,out,unique]	dfs_UnknownStruct **unknown2
-		);
-
-	/* Function 0x0b */
-	WERROR dfs_RemoveFtRoot(
-		[in]		[string,charset(UTF16)] uint16 servername[],
-		[in]		[string,charset(UTF16)] uint16 dns_servername[],
-		[in]		[string,charset(UTF16)] uint16 dfsname[],
-		[in]		[string,charset(UTF16)] uint16 rootshare[],
-		[in]		uint32 flags,
-		[in,out,unique]	dfs_UnknownStruct **unknown
-		);
-
-	/* Function 0x0c */ 
-	WERROR dfs_AddStdRoot(
-		[in]		[string,charset(UTF16)] uint16 servername[],
-		[in]		[string,charset(UTF16)] uint16 rootshare[],
-		[in]		[string,charset(UTF16)] uint16 comment[],
-		[in]		uint32 flags
-		);
- 
-	/* Function 0x0d */
-	WERROR dfs_RemoveStdRoot(
-		[in]		[string,charset(UTF16)] uint16 servername[],
-		[in]		[string,charset(UTF16)] uint16 rootshare[],
-		[in]		uint32 flags
-		);
- 
-	/* Function 0x0e */
-	WERROR dfs_ManagerInitialize(
-		[in]		[string,charset(UTF16)] uint16 *servername,
-		[in]		uint32 flags
-		);
-
-	/* Function 0x0f */
-	WERROR dfs_AddStdRootForced(
-		[in]		[string,charset(UTF16)] uint16 servername[],
-		[in]		[string,charset(UTF16)] uint16 rootshare[],
-		[in]		[string,charset(UTF16)] uint16 comment[],
-		[in]		[string,charset(UTF16)] uint16 store[] /* C:\\whatever */
-		);
-
-	/* Function 0x10 */
-	WERROR dfs_GetDcAddress(
-		[in]		[string,charset(UTF16)] uint16 servername[],
-		[in,out,ref]	[string,charset(UTF16)] uint16 **server_fullname,
-		[in,out,ref] 	boolean8 *is_root,
-		[in,out,ref] 	uint32 *ttl
-		);
-
-	/* Function 0x11 */
-	WERROR dfs_SetDcAddress(
-		[in]		[string,charset(UTF16)] uint16 servername[],
-		[in]		[string,charset(UTF16)] uint16 server_fullname[],
-		[in]		uint32	flags,
-		[in]		uint32	ttl
-		);
-
-	/* Function 0x12 */
-	WERROR dfs_FlushFtTable(
-		[in]		[string,charset(UTF16)] uint16 servername[],
-		[in]		[string,charset(UTF16)] uint16 rootshare[]
-		);
-
-	/* Function 0x13 */
-	[todo] WERROR dfs_Add2();
-
-	/* Function 0x14 */
-	[todo] WERROR dfs_Remove2();
-
-	/* Function 0x15 */
-	[public] WERROR dfs_EnumEx(
-		[in]		[string,charset(UTF16)] uint16 dfs_name[],
-		[in]		uint32 level,
-		[in]		uint32 bufsize,
-		[in,out,unique]	dfs_EnumStruct *info,
-		[in,out,unique]	uint32 *total
-	);
-
-	/* Function 0x16 */
-	[todo] WERROR dfs_SetInfo2();
-}
diff --git a/source4/librpc/idl/dnsserver.idl b/source4/librpc/idl/dnsserver.idl
deleted file mode 100644
index 86a8a14f13..0000000000
--- a/source4/librpc/idl/dnsserver.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-  dnsserver interface definition
-*/
-
-[ uuid("50abc2a4-574d-40b3-9d66-ee4fd5fba076"),
-  version(5.0),
-  pointer_default(unique),
-  helpstring("DNS Server")
-] interface dnsserver
-{
-	void dnsserver_foo();
-}
diff --git a/source4/librpc/idl/dsbackup.idl b/source4/librpc/idl/dsbackup.idl
deleted file mode 100644
index 72e8bf9c2b..0000000000
--- a/source4/librpc/idl/dsbackup.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-	uuid("ecec0d70-a603-11d0-96b1-00a0c91ece30"),
-	version(1.0),
-	pointer_default(unique),
-	helpstring("Backup support for Active Directory")
-] interface ad_backup
-{
-	[todo] void HrRBackupPrepare();
-	[todo] void HrRBackupEnd();
-	[todo] void HrRBackupGetAttachmentInformation();
-	[todo] void HrRBackupOpenFile();
-	[todo] void HrRBackupRead();
-	[todo] void HrRBackupClose();
-	[todo] void HrRBackupGetBackupLogs();
-	[todo] void HrRBackupTruncateLogs();
-	[todo] void HrRBackupPing();
-}
-
-[
-	uuid("16e0cf3a-a604-11d0-96b1-00a0c91ece30"),
-	version(1.0),
-    	pointer_default(unique),
-	helpstring("Restoring Active Directory backups")
-] interface ad_restore
-{
-	[todo] void HrRIsNTDSOnline();
-	[todo] void HrRRestorePrepare();
-	[todo] void HrRRestoreRegister();
-	[todo] void HrRRestoreRegisterComplete();
-	[todo] void HrRRestoreGetDatabaseLocations();
-	[todo] void HrRRestoreEnd();
-	[todo] void HrRRestoreSetCurrentLogNumber();
-	[todo] void HrRRestoreCheckLogsForBackup();
-}
diff --git a/source4/librpc/idl/dssetup.idl b/source4/librpc/idl/dssetup.idl
deleted file mode 100644
index 14de9f7633..0000000000
--- a/source4/librpc/idl/dssetup.idl
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-  dssetup interface definition
-*/
-
-import "misc.idl";
-
-[
-	uuid("3919286a-b10c-11d0-9ba8-00c04fd92ef5"),
-	version(0.0),
-	endpoint("ncacn_np:[\\pipe\\lsarpc]", "ncacn_np:[\\pipe\\lsass]", "ncacn_ip_tcp:", "ncalrpc:"),
-	pointer_default(unique),
-	helpstring("Active Directory Setup")
-] interface dssetup
-{
-	/**********************************************/
-	/* Function 0x00                              */
-
-	typedef enum {
-		DS_ROLE_STANDALONE_WORKSTATION = 0,
-		DS_ROLE_MEMBER_WORKSTATION     = 1,
-		DS_ROLE_STANDALONE_SERVER      = 2,
-		DS_ROLE_MEMBER_SERVER          = 3,
-		DS_ROLE_BACKUP_DC              = 4,
-		DS_ROLE_PRIMARY_DC             = 5
-	} dssetup_DsRole;
-
-	typedef [bitmap32bit] bitmap {
-		DS_ROLE_PRIMARY_DS_RUNNING		= 0x00000001,
-		DS_ROLE_PRIMARY_DS_MIXED_MODE		= 0x00000002,
-		DS_ROLE_UPGRADE_IN_PROGRESS		= 0x00000004,
-		DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT	= 0x01000000
-	} dssetup_DsRoleFlags;
-
-	typedef struct {
-		dssetup_DsRole		role;
-		dssetup_DsRoleFlags	flags;
-		[charset(UTF16),string] uint16			*domain;
-		[charset(UTF16),string] uint16			*dns_domain;
-		[charset(UTF16),string] uint16			*forest;
-		GUID			domain_guid;
-	} dssetup_DsRolePrimaryDomInfoBasic;
-
-	typedef [v1_enum] enum {
-		DS_ROLE_NOT_UPGRADING = 0,
-		DS_ROLE_UPGRADING     = 1
-	} dssetup_DsUpgrade;
-
-	typedef enum {
-		DS_ROLE_PREVIOUS_UNKNOWN = 0,
-		DS_ROLE_PREVIOUS_PRIMARY = 1,
-		DS_ROLE_PREVIOUS_BACKUP  = 2
-	} dssetup_DsPrevious;
-
-	typedef struct {
-		dssetup_DsUpgrade	upgrading;
-		dssetup_DsPrevious	previous_role;
-	} dssetup_DsRoleUpgradeStatus;
-
-	typedef enum {
-		DS_ROLE_OP_IDLE         = 0,
-		DS_ROLE_OP_ACTIVE       = 1,
-		DS_ROLE_OP_NEEDS_REBOOT = 2
-	} dssetup_DsRoleOp;
-
-	typedef struct {
-		dssetup_DsRoleOp status;
-	} dssetup_DsRoleOpStatus;
-
-	typedef enum {
-		DS_ROLE_BASIC_INFORMATION	= 1,
-		DS_ROLE_UPGRADE_STATUS		= 2,
-		DS_ROLE_OP_STATUS		= 3
-	} dssetup_DsRoleInfoLevel;
-
-	typedef [switch_type(dssetup_DsRoleInfoLevel)] union {
-		[case(DS_ROLE_BASIC_INFORMATION)] dssetup_DsRolePrimaryDomInfoBasic	basic;
-		[case(DS_ROLE_UPGRADE_STATUS)]    dssetup_DsRoleUpgradeStatus    	upgrade;
-		[case(DS_ROLE_OP_STATUS)]         dssetup_DsRoleOpStatus		opstatus;
-	} dssetup_DsRoleInfo;
-
-	WERROR dssetup_DsRoleGetPrimaryDomainInformation(
-		[in] dssetup_DsRoleInfoLevel level,
-		[out,switch_is(level),unique] dssetup_DsRoleInfo *info
-		);
-
-	/*
-	  w2k3 has removed all the calls below from their implementation.
-	  These stubs are left here only as a way of documenting the names
-	  of the calls in case they ever turn up on the wire.
-	*/
-	[todo] WERROR dssetup_DsRoleDnsNameToFlatName();
-	[todo] WERROR dssetup_DsRoleDcAsDc();
-	[todo] WERROR dssetup_DsRoleDcAsReplica();
-	[todo] WERROR dssetup_DsRoleDemoteDc();
-	[todo] WERROR dssetup_DsRoleGetDcOperationProgress();
-	[todo] WERROR dssetup_DsRoleGetDcOperationResults();
-	[todo] WERROR dssetup_DsRoleCancel();
-	[todo] WERROR dssetup_DsRoleServerSaveStateForUpgrade();
-	[todo] WERROR dssetup_DsRoleUpgradeDownlevelServer();
-	[todo] WERROR dssetup_DsRoleAbortDownlevelServerUpgrade();
-}
diff --git a/source4/librpc/idl/echo.idl b/source4/librpc/idl/echo.idl
deleted file mode 100644
index bf1e318674..0000000000
--- a/source4/librpc/idl/echo.idl
+++ /dev/null
@@ -1,127 +0,0 @@
-
-[
-  uuid("60a15ec5-4de8-11d7-a637-005056a20182"),
-  endpoint("ncacn_np:[\\pipe\\rpcecho]", "ncacn_ip_tcp:", "ncalrpc:"),
-  pointer_default(unique),
-  version(1.0),
-  helpstring("Simple echo pipe")
-]
-interface rpcecho
-{
-	/* Add one to an integer */
-	void echo_AddOne(
-		[in] uint32 in_data,
-		[out] uint32 *out_data
-	);
-	/* Echo an array of bytes back at the caller */
-	void echo_EchoData(
-		[in] uint32 len,
-		[in] [size_is(len)] uint8 in_data[],
-		[out] [size_is(len)] uint8 out_data[]
-	);
-	/* Sink data to the server */
-	void echo_SinkData(
-		[in] uint32 len,
-		[in,size_is(len)] uint8 data[]
-	);
-	/* Source data from server */
-	void echo_SourceData(
-		[in] uint32 len,
-		[out,size_is(len)] uint8 data[]
-	);
-
-	/* test strings */
- 	void echo_TestCall (
-		[in,string,charset(UTF16)]       uint16 *s1,
-		[out,string,charset(UTF16)]      uint16 **s2
- 		);
-
-
-	/* test some alignment issues */
-	typedef [public] struct {
-		uint8 v;
-	} echo_info1;
-
-	typedef struct {
-		uint16 v;
-	} echo_info2;
-
-	typedef struct {
-		uint32 v;
-	} echo_info3;
-
-	struct echo_info4 {
-		hyper v;
-	};
-
-	typedef struct {
-		uint8 v1;
-		hyper v2;
-	} echo_info5;
-
-	typedef struct {
-		uint8 v1;
-		echo_info1 info1;
-	} echo_info6;
-
-	typedef struct {
-		uint8 v1;
-		struct echo_info4 info4;
-	} echo_info7;
-
-	typedef [switch_type(uint16)] union {
-		[case(1)]  echo_info1 info1;
-		[case(2)]  echo_info2 info2;
-		[case(3)]  echo_info3 info3;
-		[case(4)]  struct echo_info4 info4;
-		[case(5)]  echo_info5 info5;
-		[case(6)]  echo_info6 info6;
-		[case(7)]  echo_info7 info7;
-	} echo_Info;
-
-	NTSTATUS echo_TestCall2 (
-		     [in]                    uint16 level,
-		     [out,switch_is(level)]  echo_Info *info
-		);
-
-	uint32 echo_TestSleep(
-		[in] uint32 seconds
-		);
-
-	typedef enum {
-		ECHO_ENUM1 = 1,
-		ECHO_ENUM2 = 2
-	} echo_Enum1;
-
-	typedef [v1_enum] enum {
-		ECHO_ENUM1_32 = 1,
-		ECHO_ENUM2_32 = 2
-	} echo_Enum1_32;
-
-	typedef struct {
-		echo_Enum1 e1;
-		echo_Enum1_32 e2;
-	} echo_Enum2;
-
-	typedef [switch_type(uint16)] union {
-		[case(ECHO_ENUM1)] echo_Enum1 e1;
-		[case(ECHO_ENUM2)] echo_Enum2 e2;
-	} echo_Enum3;
-
-	void echo_TestEnum(
-		[in,out,ref] echo_Enum1 *foo1,
-		[in,out,ref] echo_Enum2 *foo2,
-		[in,out,ref,switch_is(*foo1)] echo_Enum3 *foo3
-		);
-
-	typedef struct {
-		uint32 x;
-		[size_is(x)] uint16 surrounding[*];
-	} echo_Surrounding;
-
-	void echo_TestSurrounding(
-		[in,out,ref] echo_Surrounding *data
-	);
-
-	uint16 echo_TestDoublePointer([in] uint16 ***data);
-}
diff --git a/source4/librpc/idl/efs.idl b/source4/librpc/idl/efs.idl
deleted file mode 100644
index 4279b08d13..0000000000
--- a/source4/librpc/idl/efs.idl
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-	IDL definitions from original packet-dcerpc-efs.c
-        by Jean-Baptiste Marchand
-*/
-
-import "security.idl";
-
-[ 
-  uuid("c681d488-d850-11d0-8c52-00c04fd90f7e"),
-  version(1.0),
-  pointer_default(unique)
-] interface efs
-{
-
-WERROR EfsRpcOpenFileRaw(
-	[out,ref] policy_handle *pvContext,
-	[in] [charset(UTF16),string] uint16 FileName[],
-	[in] uint32 Flags
-	);
-
-[todo] WERROR EfsRpcReadFileRaw(
-	[in,ref] policy_handle *pvContext
-/* incomplete */
-);
-
-
-[todo] WERROR EfsRpcWriteFileRaw(
-	[in,ref] policy_handle *pvContext
-/* incomplete */
-);
-
-void EfsRpcCloseRaw(
-	[in,out,ref] policy_handle *pvContext
-);
-
-WERROR EfsRpcEncryptFileSrv(
-	[in] [charset(UTF16),string] uint16 Filename[]
-);
-
-WERROR EfsRpcDecryptFileSrv(
-	[in] [charset(UTF16),string] uint16 FileName[], 
-	[in] uint32 Reserved
-);
-
-typedef struct {
-	uint32 cbData;
-	[size_is(cbData), unique]  uint8  *pbData;
-} EFS_HASH_BLOB;
-
-typedef struct {
-	uint32 cbTotalLength;
-	[unique] dom_sid *pUserSid;
-	[unique] EFS_HASH_BLOB  *pHash;
-	[unique] [charset(UTF16),string] uint16 *lpDisplayInformation;
-} ENCRYPTION_CERTIFICATE_HASH;
-
-typedef struct {
-	uint32 nCert_Hash;
-	/* this is a pointer to an array of pointers */
-	[size_is(nCert_Hash)] ENCRYPTION_CERTIFICATE_HASH *pUsers[*];
-} ENCRYPTION_CERTIFICATE_HASH_LIST;
-
-WERROR EfsRpcQueryUsersOnFile(
-	[in] [charset(UTF16),string] uint16 FileName[],
-	[out,ref,unique] ENCRYPTION_CERTIFICATE_HASH_LIST **pUsers
-);
-
-WERROR EfsRpcQueryRecoveryAgents(
-	[in] [charset(UTF16),string] uint16 FileName[],
-	[out,ref,unique] ENCRYPTION_CERTIFICATE_HASH_LIST **pRecoveryAgents
-);
-
-[todo] WERROR EfsRpcRemoveUsersFromFile(
-	[in] [charset(UTF16),string] uint16 FileName[]
-	/*	[in] ENCRYPTION_CERTIFICATE_LIST Hashes*/
-);
-
-[todo] WERROR EfsRpcAddUsersToFile(
-	[in] [charset(UTF16),string] uint16 FileName[]
-	/*	[in] ENCRYPTION_CERTIFICATE_LIST Hashes*/
-);
-
-typedef struct {
-	uint32 dwCertEncodingType;
-	uint32 cbData;
-  [size_is(cbData)] [unique] uint8 *pbData;
-} EFS_CERTIFICATE_BLOB;
-
-typedef struct {
-	uint32 TotalLength;
-	[unique] dom_sid *pUserSid;
-	[unique] EFS_CERTIFICATE_BLOB *pCertBlob;
-} ENCRYPTION_CERTIFICATE;
-
-WERROR EfsRpcSetFileEncryptionKey(
-	[in] [unique] ENCRYPTION_CERTIFICATE *pEncryptionCertificate
-);
-
-[todo] WERROR EfsRpcNotSupported(
-);
-
-[todo] WERROR EfsRpcFileKeyInfo(
-);
-
-[todo] WERROR EfsRpcDuplicateEncryptionInfoFile(
-);
-
-}
diff --git a/source4/librpc/idl/frsapi.idl b/source4/librpc/idl/frsapi.idl
deleted file mode 100644
index 11593f479a..0000000000
--- a/source4/librpc/idl/frsapi.idl
+++ /dev/null
@@ -1,121 +0,0 @@
-#include "idl_types.h"
-
-import "misc.idl";
-
-[
-  uuid("d049b186-814f-11d1-9a3c-00c04fc9b232"),
-  version(1.1),
-  endpoint("ncacn_ip_tcp:", "ncalrpc:"),
-  helpstring("File Replication API"),
-  pointer_default(unique)
-]
-interface frsapi
-{
-	/****************/
-	/* Function 0x00 */
-	[todo] void FRSAPI_VERIFY_PROMOTION();
-
-	/****************/
-	/* Function 0x01 */
-	[todo] void FRSAPI_PROMOTION_STATUS();
-
-	/****************/
-	/* Function 0x02 */
-	[todo] void FRSAPI_START_DEMOTION();
-
-	/****************/
-	/* Function 0x03 */
-	[todo] void FRSAPI_COMMIT_DEMOTION();
-
-	/****************/
-	/* Function 0x04 */
-
-	/* The DsPollingLongInterval and DsPollingShortInterval attributes
-	   represent registry attributes below HKLM\System\CCS\Services\NtFrs */
-
-	WERROR frsapi_SetDsPollingIntervalW(
-		[in] uint32 CurrentInterval,
-		[in] uint32 DsPollingLongInterval,
-		[in] uint32 DsPollingShortInterval
-	);
-
-	/****************/
-	/* Function 0x05 */
-	WERROR frsapi_GetDsPollingIntervalW(
-		[out] uint32 *CurrentInterval,
-		[out] uint32 *DsPollingLongInterval,
-		[out] uint32 *DsPollingShortInterval
-	);
-
-	/****************/
-	/* Function 0x06 */
-	[todo] void FRSAPI_VERIFY_PROMOTION_W();
-
-	/****************/
-	/* Function 0x07 */
-	typedef [v1_enum] enum {
-		FRSAPI_INFO_VERSION	= 0,
-		FRSAPI_INFO_SETS	= 1,
-		FRSAPI_INFO_DS		= 2,
-		FRSAPI_INFO_MEMORY	= 3,
-		FRSAPI_INFO_IDTABLE	= 4,
-		FRSAPI_INFO_OUTLOG	= 5,
-		FRSAPI_INFO_INLOG	= 6,
-		FRSAPI_INFO_THREADS	= 7,
-		FRSAPI_INFO_STAGE	= 8,
-		FRSAPI_INFO_CONFIGTABLE	= 9
-	} frsapi_InfoEnum;
-
-	typedef struct {
-		uint32 length;
-		GUID guid;
-		uint32 length2;
-		uint32 unknown1;
-		frsapi_InfoEnum level;
-		uint32 query_counter;
-		uint32 unknown2;
-		uint32 offset;
-		uint32 blob_len;
-		/* [size_is(length-offset)] uint8 *data; */
-		[subcontext_size(length-offset),subcontext(0),flag(NDR_REMAINING)] DATA_BLOB blob;
-	} frsapi_Info;
-
-	WERROR frsapi_InfoW(
-		[in] [range(0,0x10000)] uint32 length,
-		/* [in,out] [size_is(length)] [unique] uint8 *data */
-		[in,out,unique] frsapi_Info *info
-
-	);
-
-	/****************/
-	/* Function 0x08 */
-	typedef [v1_enum] enum {
-		FRSAPI_REPLICA_SET_TYPE_0	= 0x00000000,
-		FRSAPI_REPLICA_SET_TYPE_DOMAIN	= 0x00000002,
-		FRSAPI_REPLICA_SET_TYPE_DFS	= 0x00000003
-	} frsapi_ReplicaSetType;
-
-	WERROR frsapi_IsPathReplicated(
-		[in,unique] [string,charset(UTF16)] uint16 *path,
-		[in] frsapi_ReplicaSetType replica_set_type,
-		[out] uint32 *unknown1,
-		[out] uint32 *unknown2,
-		[out] uint32 *unknown3,
-		[out] GUID *replica_set_guid
-	);
-
-	/****************/
-	/* Function 0x09 */
-	[todo] void FRSAPI_WRITER_COMMAND();
-
-	/****************/
-	/* Function 0x0a */
-	/* not supported before w2k3 sp2 */
-	WERROR frsapi_ForceReplication(
-		[in,unique] GUID *guid1,
-		[in,unique] GUID *guid2,
-		[in,unique] [charset(UTF16),string] uint16 *replica_set,
-		[in,unique] [charset(UTF16),string] uint16 *partner_name
-	);
-
-}
diff --git a/source4/librpc/idl/frsrpc.idl b/source4/librpc/idl/frsrpc.idl
deleted file mode 100644
index 1019a25b28..0000000000
--- a/source4/librpc/idl/frsrpc.idl
+++ /dev/null
@@ -1,168 +0,0 @@
-#include "idl_types.h"
-
-import "misc.idl";
-
-[
-  uuid("f5cc59b4-4264-101a-8c59-08002b2f8426"),
-  version(1.1),
-  endpoint("ncacn_ip_tcp:", "ncalrpc:"),
-  helpstring("File Replication Service"),
-  pointer_default(unique)
-] 
-interface frsrpc
-{
-	/*****************/
-	/* Function 0x00 */
-
-	/* TAG:3 this TLV contains a GUID and the name of the server sending
-	 * the call
-	 */
-	typedef struct {
-		[subcontext(4)] GUID unknown1;
-		[subcontext(4)] nstring source_server;
-	} frsrpc_FrsSendCommPktChunkDataSSRV;
-
-	/* TAG:4 this TLV contains a GUID and the name of the destination
-	 * server the PDU is sent to
-	 */
-	typedef struct {
-		[subcontext(4)] GUID unknown1;
-		[subcontext(4)] nstring dest_server;
-	} frsrpc_FrsSendCommPktChunkDataDSRV;
-
-	/* TAG:18 this TLV contains a  timestamp 
-	*/
-	typedef struct {
-		[subcontext(4)] NTTIME time;
-	} frsrpc_FrsSendCommPktChunkDataTS;
-
-
-	typedef struct {
-		uint32 unknown1;
-	} frsrpc_FrsSendCommPktChunkDataA;
-
-	typedef struct {
-		uint32 unknown1;
-		GUID unknown2;
-		[subcontext(4)] nstring unknown3;
-	} frsrpc_FrsSendCommPktChunkDataB;
-
-	typedef struct {
-		uint32 unknown1;
-		GUID unknown2;
-	} frsrpc_FrsSendCommPktChunkDataC;
-
-	typedef [nodiscriminant] union {
-		[default,flag(NDR_REMAINING)] DATA_BLOB blob;
-		[case(1)] frsrpc_FrsSendCommPktChunkDataA A;
-		[case(2)] frsrpc_FrsSendCommPktChunkDataA A;
-		[case(3)] frsrpc_FrsSendCommPktChunkDataSSRV SSRV;
-		[case(4)] frsrpc_FrsSendCommPktChunkDataDSRV DSRV;
-		[case(5)] frsrpc_FrsSendCommPktChunkDataB B;
-		[case(8)] frsrpc_FrsSendCommPktChunkDataB B;
-		[case(6)] frsrpc_FrsSendCommPktChunkDataC C;
-		[case(18)] frsrpc_FrsSendCommPktChunkDataTS TS;
-		[case(19)] frsrpc_FrsSendCommPktChunkDataA A;
-	} frsrpc_FrsSendCommPktChunkData;
-
-	typedef struct {
-		uint16 type;
-		[subcontext(4),switch_is(type)] frsrpc_FrsSendCommPktChunkData data;
-	} frsrpc_FrsSendCommPktChunk;
-
-	typedef [flag(NDR_NOALIGN)] struct {
-		frsrpc_FrsSendCommPktChunk chunk1;
-		frsrpc_FrsSendCommPktChunk chunk2;
-		frsrpc_FrsSendCommPktChunk chunk3;
-		frsrpc_FrsSendCommPktChunk chunk4;
-		frsrpc_FrsSendCommPktChunk chunk5;
-		frsrpc_FrsSendCommPktChunk chunk6;
-		frsrpc_FrsSendCommPktChunk chunk7;
-		frsrpc_FrsSendCommPktChunk chunk8;
-		frsrpc_FrsSendCommPktChunk chunk9;
-	} frsrpc_FrsSendCommPktChunkCtr;
-
-	typedef struct {
-		uint32 unknown1;
-		uint32 unknown2;
-		uint32 unknown3;
-		uint32 unknown4;
-    		uint32 tlv_size;
-		uint32 unknown6;
-		uint32 unknown7; /* This may be a UNIQUE pointer? */
-		uint32 unknown8;
-		uint32 unknown9;
-		/*
-		 * The format of this blob is this a concatenation
-		 * of TLVs which are not really NDR encoded.
-		 *
-		 * The individual TLVs are encoded as :
-		 * struct {
-		 * 	uint16 type;
-		 *	[subcontext(4),switch_is(type)] chunk_data data;
-		 * } chunk;
-		 * 
-		 * some of the chunk are like this:
-		 *
-		 * struct {
-		 *	uint32 unknown; // 0x00000010
-		 *	struct GUID guid;
-		 *	lstring string;
-		 * } ...;
-		 *
-		 *
-		 * The tags are (might be) :
-		 *  3: Source server sending the PDU
-		 *  4: Destination server the PDU is sent to
-		 * 18: Timestamp
-		 *
-		 */
-		[subcontext(4)/*,size_is(tlv_size)*/] frsrpc_FrsSendCommPktChunkCtr *chunks;
-		uint32 unknown10;
-		uint32 unknown11;
-	} frsrpc_FrsSendCommPktReq;
-
-	WERROR frsrpc_FrsSendCommPkt(
-		[in]	frsrpc_FrsSendCommPktReq req
-	);
-
-	/*****************/
-	/* Function 0x01 */
-	[todo] void FRSRPC_VERIFY_PROMOTION_PARENT();
-
-	/*****************/
-	/* Function 0x02 */
-	[todo] void FRSRPC_START_PROMOTION_PARENT();
-
-	/*****************/
-	/* Function 0x03 */
-	[todo] void FRSRPC_NOP();
-
-	/*****************/
-	/* Function 0x04 */
-	[todo] void FRSRPC_BACKUP_COMPLETE();
-
-	/*****************/
-	/* Function 0x05 */
-	[todo] void FRSRPC_BACKUP_COMPLETE_5();
-
-	/*****************/
-	/* Function 0x06 */
-	[todo] void FRSRPC_BACKUP_COMPLETE_6();
-
-	/*****************/
-	/* Function 0x07 */
-	[todo] void FRSRPC_BACKUP_COMPLETE_7();
-
-	/*****************/
-	/* Function 0x08 */
-	[todo] void FRSRPC_BACKUP_COMPLETE_8();
-
-	/*****************/
-	/* Function 0x09 */
-	[todo] void FRSRPC_BACKUP_COMPLETE_9();
-
-	/*****************/
-	/* Function 0x0a */
-	[todo] void FRSRPC_VERIFY_PROMOTION_PARENT_EX();
-}
diff --git a/source4/librpc/idl/keysvc.idl b/source4/librpc/idl/keysvc.idl
deleted file mode 100644
index 9d05f7d8dc..0000000000
--- a/source4/librpc/idl/keysvc.idl
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-  cryptographic key services interface
-*/
-
-
-/* Also seen as: 0d72a7d4-6148-11d1-b4aa-00c04fb66ea0 */
-[
-  uuid("8d0ffe72-d252-11d0-bf8f-00c04fd9126b"),
-  pointer_default(unique),
-  version(1.0),
-  helpstring("Cryptographic Key Services")
-]
-interface keysvc
-{
-	WERROR keysvc_Unknown0();
-}
diff --git a/source4/librpc/idl/mgmt.idl b/source4/librpc/idl/mgmt.idl
deleted file mode 100644
index 35857f26cd..0000000000
--- a/source4/librpc/idl/mgmt.idl
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-  dcerpc remote management interface
-*/
-
-import "misc.idl";
-
-[
-  uuid("afa8bd80-7d8a-11c9-bef4-08002b102989"), 
-  version(1.0),
-  pointer_default(unique),
-  helpstring("DCE/RPC Remote Management")
-] 
-interface mgmt
-{
-	typedef struct {
-		ndr_syntax_id *id;
-	} ndr_syntax_id_p;
-
-	typedef struct {
-		uint32              count;
-		[size_is(count)] ndr_syntax_id_p if_id[*];
-	} rpc_if_id_vector_t;
-
-
-	/***********************/
-	/* Function 0x00       */
-	WERROR mgmt_inq_if_ids (
-		[out]       rpc_if_id_vector_t      **if_id_vector
-		);
-
-
-
-	/***********************/
-	/* Function 0x01       */
-
-
-	/* these are the array indexes in the statistics array */
-	const int MGMT_STATS_CALLS_IN       = 0;
-	const int MGMT_STATS_CALLS_OUT      = 1;
-	const int MGMT_STATS_PKTS_IN        = 2;
-	const int MGMT_STATS_PKTS_OUT       = 3;
-	const int MGMT_STATS_ARRAY_MAX_SIZE = 4;
-
-	typedef struct {
-		uint32 count;
-		[size_is(count)] uint32 statistics[*];
-	} mgmt_statistics;
-
-	WERROR mgmt_inq_stats (
-		[in]        uint32             max_count,
-		[in]        uint32             unknown,
-		[out,ref]   mgmt_statistics    *statistics
-		);
-
-
-	/***********************/
-	/* Function 0x02       */
-	boolean32 mgmt_is_server_listening (
-		[out,ref]       error_status_t          *status
-		);
-
-
-	/***********************/
-	/* Function 0x03       */
-	WERROR mgmt_stop_server_listening ();
-
-
-	/***********************/
-	/* Function 0x04       */
-	WERROR mgmt_inq_princ_name (
-		[in]        uint32                  authn_proto,
-		[in]        uint32                  princ_name_size,
-		[out]       [string,charset(DOS)] uint8 princ_name[]
-		);
-}
diff --git a/source4/librpc/idl/msgsvc.idl b/source4/librpc/idl/msgsvc.idl
deleted file mode 100644
index d196daf06b..0000000000
--- a/source4/librpc/idl/msgsvc.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Works over UDP */
-
-[
-	uuid("17fdd703-1827-4e34-79d4-24a55c53bb37"),
-	version(1.0),
-	pointer_default(unique),
-	helpstring("Messaging Service")
-] interface msgsvc
-{
-	[todo] void NetrMessageNameAdd();
-	[todo] void NetrMessageNameEnum();
-	[todo] void NetrMessageNameGetInfo();
-	[todo] void NetrMessageNameDel();
-}
-
-[
-	uuid("5a7b91f8-ff00-11d0-a9b2-00c04fb6e6fc"),
-	version(1.0)
-] interface msgsvcsend
-{
-	[todo] void NetrSendMessage();
-}
diff --git a/source4/librpc/idl/notify.idl b/source4/librpc/idl/notify.idl
deleted file mode 100644
index 6f9ad25f09..0000000000
--- a/source4/librpc/idl/notify.idl
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "idl_types.h"
-
-/*
-   IDL structures for notify change code
-
-   this defines the structures used in the notify database code, and
-   the change notify buffers
-*/
-
-import "misc.idl";
-
-[
-  pointer_default(unique)
-]
-interface notify
-{
-
-	/* structure used in the notify database */
-	typedef [public] struct {
-		server_id server;
-		uint32 filter; /* filter to apply in this directory */
-		uint32 subdir_filter; /* filter to apply in child directories */
-		utf8string path;
-		uint32 path_len; /* saves some computation on search */
-		pointer private_data;
-	} notify_entry;
-
-	/*
-	  to allow for efficient search for matching entries, we
-	  divide them by the directory depth, with a separate array
-	  per depth. The entries within each depth are sorted by path,
-	  allowing for a bisection search.
-
-	  The max_mask and max_mask_subdir at each depth is the
-	  bitwise or of the filters and subdir filters for all entries
-	  at that depth. This allows a depth to be quickly skipped if
-	  no entries will match the target filter	  
-	*/
-	typedef struct {
-		uint32 max_mask;
-		uint32 max_mask_subdir;
-		uint32 num_entries;
-		notify_entry entries[num_entries];
-	} notify_depth;
-
-	typedef [public] struct {
-		uint32 num_depths;
-		notify_depth depth[num_depths];
-	} notify_array;
-
-	/* structure sent between servers in notify messages */
-	typedef [public] struct {
-		uint32 action;
-		utf8string path;
-		pointer private_data;
-	} notify_event;
-
-}
diff --git a/source4/librpc/idl/orpc.idl b/source4/librpc/idl/orpc.idl
deleted file mode 100644
index d023865035..0000000000
--- a/source4/librpc/idl/orpc.idl
+++ /dev/null
@@ -1,230 +0,0 @@
-#include "idl_types.h"
-
-/**
-  DCOM interfaces
-  http://www.ietf.org/internet-drafts/draft-brown-dcom-v1-spec-04.txt
- */
-
-import "misc.idl";
-
-[
-	pointer_default(unique)
-]
-interface ObjectRpcBaseTypes
-{
-	/* COM_MINOR_VERSION = 1 (NT4.0, SP1, SP2, DCOM95). */
-	/* - Initial Release */
-	/* - Must be used when talking to downlevel machines, including */
-	/* on Remote Activation calls. */
-	/* COM_MINOR_VERSION = 2 (NT4.0 SP3 and beyond). */
-	/* - Added ResolveOxid2 to IObjectExporter to retrieve the */
-	/* COM version number of the server. Passed to the NDR engine */
-	/* to fix fatal endian-ness flaw in the way OLEAUTOMATION marshals */
-	/* BSTRS. Previous way used trailing padding, which is not NDR */
-	/* compatible. See Bug# 69189. */
-	/* COM_MINOR_VERSION = 3 (NT4.0 SP4 and DCOM95 builds 1018 and beyond) */
-	/* - OLEAUT32 added two new types to the SAFEARRAY, but SAFEARRAY */
-	/* previously included the "default" keyword, which prevented */
-	/* downlevel NDR engines from correctly handling any extensions. */
-	/* Machines with version >=5.3 don't use "default" and will */
-	/* gracefully handle future extensions to SAFEARRAY. */
-	/* old constants (for convenience) */
-
-	/* current version */
-	const uint16 COM_MAJOR_VERSION = 5;
-	const uint16 COM_MINOR_VERSION = 1;
-
-	/* Body Extensions */
-	const string dcom_ext_debugging = "f1f19680-4d2a-11ce-a66a-0020af6e72f4";
-	const string dcom_ext_extended_error = "f1f19681-4d2a-11ce-a66a-0020af6e72f4";
-
-	/* Component Object Model version number */
-
-
-	typedef [public] struct 
-	{
-		uint16 MajorVersion; /* Major version number */
-		uint16 MinorVersion; /* Minor version number */
-	} COMVERSION;
-
-	/* enumeration of additional information present in the call packet. */
-	typedef bitmap {
-		ORPCF_NULL = 			0x00, /* no additional info in packet */
-		ORPCF_LOCAL = 			0x01, /* call is local to this machine */
-		ORPCF_RESERVED1 = 		0x02, /* reserved for local use */
-		ORPCF_RESERVED2 = 		0x04, /* reserved for local use */
-		ORPCF_RESERVED3 = 		0x08, /* reserved for local use */
-		ORPCF_RESERVED4 = 	    0x10  /* reserved for local use */
-	} ORPC_FLAGS;
-
-	/* Extension to implicit parameters. */
-	typedef [public] struct 
-	{ 	
-		GUID id; /* Extension identifier. */
-		uint32 size; /* Extension size. */
-		[size_is(((size+7)&~7))] uint8 data[]; /* Extension data. */
-	} 	ORPC_EXTENT;
-
-
-	/* Array of extensions. */
-	typedef struct 
-	{
-		uint32 size; /* Num extents. */
-		uint32 reserved; /* Must be zero. */
-		[size_is(((size+1)&~1))] ORPC_EXTENT **extent; /* extents */
-	} ORPC_EXTENT_ARRAY;
-
-
-	/* implicit 'this' pointer which is the first [in] parameter on */
-	/* every ORPC call. */
-	typedef [public] struct 
-	{
-		COMVERSION version; /* COM version number */
-		uint32 flags; /* ORPCF flags for presence of other data */
-		uint32 reserved1; /* set to zero */
-		GUID cid; /* causality id of caller */
-		/* Extensions. */
-		[unique] ORPC_EXTENT_ARRAY *extensions;
-	} 	ORPCTHIS;
-
-
-	/* implicit 'that' pointer which is the first [out] parameter on */
-	/* every ORPC call. */
-	typedef [public] struct 
-	{
-		uint32 flags; /* ORPCF flags for presence of other data */
-		/* Extensions. */
-		[unique] ORPC_EXTENT_ARRAY *extensions;
-	} 	ORPCTHAT;
-
-
-	/* DUALSTRINGARRAYS are the return type for arrays of network addresses, */
-	/* arrays of endpoints and arrays of both used in many ORPC interfaces */
-	typedef [public,flag(NDR_NOALIGN)] struct 
-	{
-		uint16 wTowerId; /* Cannot be zero. */
-		nstring NetworkAddr; 
-	} 	STRINGBINDING;
-
-	typedef [public,nopush,nopull,noprint] struct 
-	{
-		STRINGBINDING **stringbindings;
-	} STRINGARRAY;
-
-	typedef [public,nopush,nopull,noprint] struct 
-	{
-		STRINGBINDING **stringbindings;
-		SECURITYBINDING **securitybindings;
-	} DUALSTRINGARRAY;
-
-	const uint16 COM_C_AUTHZ_NONE = 0xffff;
-	typedef [public,flag(NDR_NOALIGN)] struct 
-	{
-		uint16 wAuthnSvc; /* Cannot be zero. */
-		uint16 wAuthzSvc;
-		nstring PrincName; 
-	} 	SECURITYBINDING;
-
-	/* signature value for OBJREF (object reference, actually the */
-	/* marshaled form of a COM interface). 
-	 * MEOW apparently stands for "Microsoft Extended Object Wireformat"
-	 */
-	const uint32 OBJREF_SIGNATURE = 0x574f454d; /* 'MEOW' */
-
-	/* flag values for OBJREF */
-	typedef enum {
-		OBJREF_NULL = 0x0, /* NULL pointer */
-		OBJREF_STANDARD = 0x1, /* standard marshaled objref */
-		OBJREF_HANDLER = 0x2, /* handler marshaled objref */
-		OBJREF_CUSTOM = 0x4 /* custom marshaled objref */
-	} OBJREF_FLAGS;
-
-	/* Flag values for a STDOBJREF (standard part of an OBJREF). */
-	/* SORF_OXRES1 - SORF_OXRES8 are reserved for the object exporters */
-	/* use only, object importers must ignore them and must not enforce MBZ. */
-	typedef bitmap {
-		SORF_NULL   = 0x0000, /* convenient for initializing SORF */
-		SORF_OXRES1 = 0x0001, /* reserved for exporter */
-		SORF_OXRES2 = 0x0020, /* reserved for exporter */
-		SORF_OXRES3 = 0x0040, /* reserved for exporter */
-		SORF_OXRES4 = 0x0080, /* reserved for exporter */
-		SORF_OXRES5 = 0x0100, /* reserved for exporter */
-		SORF_OXRES6 = 0x0200, /* reserved for exporter */
-		SORF_OXRES7 = 0x0400, /* reserved for exporter */
-		SORF_OXRES8 = 0x0800, /* reserved for exporter */
-		SORF_NOPING = 0x1000  /* Pinging is not required  */
-	} STDOBJREF_FLAGS;
-
-	/* standard object reference */
-	typedef [public] struct 
-	{
-		uint32 flags; /* STDOBJREF flags (see above) */
-		uint32 cPublicRefs; /* count of references passed */
-		hyper oxid; /* oxid of server with this oid */
-		hyper oid; /* oid of object with this ipid */
-		GUID ipid; /* ipid of interface pointer to this object */
-	} 	STDOBJREF;
-
-	typedef struct
-	{
-		STDOBJREF std; /* standard objref */
-		STRINGARRAY saResAddr; /* resolver address */
-	} u_standard;
-
-	typedef struct
-	{
-		STDOBJREF std; /* standard objref */
-		GUID clsid; /* Clsid of handler code */
-		STRINGARRAY saResAddr; /* resolver address */
-	} u_handler;
-
-	typedef struct
-	{
-		GUID clsid; /* Clsid of unmarshaling code */
-		uint32 cbExtension; /* size of extension data */
-		uint32 size; /* size of data that follows */
-		uint8 pData[size]; /* extension + class specific data */
-	} u_custom;
-
-	typedef struct
-	{
-	} u_null;
-
-	typedef [nodiscriminant] union 
-	{
-		[case(OBJREF_NULL)] u_null u_null;
-		[case(OBJREF_STANDARD)] u_standard u_standard;
-		[case(OBJREF_HANDLER)] u_handler u_handler;
-		[case(OBJREF_CUSTOM)] u_custom u_custom;
-	} OBJREF_Types;
-
-	/* OBJREF is the format of a marshaled interface pointer. */
-	typedef [public,flag(NDR_LITTLE_ENDIAN)] struct 
-	{
-		uint32 signature;
-		uint32 flags; /* OBJREF flags (see above) */
-		GUID iid; /* interface identifier */
-		[switch_is(flags), switch_type(uint32)] OBJREF_Types u_objref;
-	} OBJREF;
-
-	/* wire representation of a marshalled interface pointer */
-	typedef [public] struct 
-	{
-		uint32 size;
-		[subcontext(4)] OBJREF obj;
-	} MInterfacePointer;
-
-	typedef [v1_enum,public] enum 
-	{
-		COM_OK 				= 0x00000000,
-		COM_OUTOFMEMORY 	= 0x80000002,
-		COM_INVALIDARG		= 0x80000003,
-		COM_NOINTERFACE		= 0x80000004,
-		COM_ACCESSDENIED	= 0x80070005,
-		COM_INVALID_OXID	= 0x80070776,
-		COM_INVALID_OID		= 0x80070777,
-		COM_INVALID_SET		= 0x80070778,
-		COM_UNEXPECTED		= 0x8000FFFF,
-		COM_CLSNOTFOUND		= 0x80040154
-	} COMRESULT;
-}
diff --git a/source4/librpc/idl/oxidresolver.idl b/source4/librpc/idl/oxidresolver.idl
deleted file mode 100644
index 95c8a1c5f0..0000000000
--- a/source4/librpc/idl/oxidresolver.idl
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
-  DCOM interfaces
-  http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm
- */
-
-/* 
- The OXID Resolver can turn a OXID (Object Exporter ID) into a 
- RPC binding string that can be used to contact an object
-
- (used by DCOM)
- */
-
-import "misc.idl", "orpc.idl";
-
-[ 
-	uuid("99fcfec4-5260-101b-bbcb-00aa0021347a"),
-	helpstring("Object Exporter ID Resolver"),
-	endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", "ncalrpc:"),
-	pointer_default(unique)
-]
-interface IOXIDResolver
-{
-#define OXID hyper
-#define SETID hyper
-#define IPID GUID
-#define OID GUID
-
-	/* Method to get the protocol sequences, string bindings */
-	/* and machine id for an object server given its OXID. */
-
-	[idempotent] WERROR ResolveOxid (
-		 [in] OXID pOxid,
-		 [in] uint16 cRequestedProtseqs,
-		 [in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
-		 [out] DUALSTRINGARRAY **ppdsaOxidBindings,
-		 [out,ref] IPID *pipidRemUnknown,
-		 [out,ref] uint32 *pAuthnHint
-			 );
-
-	/* Simple ping is used to ping a Set. Client machines use this */
-	/* to inform the object exporter that it is still using the */
-	/* members of the set. */
-	/* Returns S_TRUE if the SetId is known by the object exporter, */
-	/* S_FALSE if not. */
-	[idempotent] WERROR SimplePing (
-		[in] SETID *SetId /* Must not be zero */
-		);
-	
-	/* Complex ping is used to create sets of OIDs to ping. The */
-	/* whole set can subsequently be pinged using SimplePing, */
-	/* thus reducing network traffic. */
-	[idempotent] WERROR ComplexPing (
-		[in,out,ref] SETID *SetId, /* In of 0 on first call for new set. */
-		[in] uint16 SequenceNum,
-		[in] uint16 cAddToSet,
-		[in] uint16 cDelFromSet,
-		/* add these OIDs to the set */
-		[in, size_is(cAddToSet)] OID AddToSet[],
-		/*remove these OIDs from the set */
-		[in, size_is(cDelFromSet)] OID DelFromSet[],
-		[out,ref] uint16 *PingBackoffFactor/* 2^factor = multipler */
-			 );
-
-	/* In some cases the client maybe unsure that a particular */
-	/* binding will reach the server. (For example, when the oxid */
-	/* bindings have more than one TCP/IP binding) This call */
-	/* can be used to validate the binding */
-	/* from the client. */
-	[idempotent] WERROR ServerAlive ();
-
-	/* Method to get the protocol sequences, string bindings, */
-	/* RemoteUnknown IPID and COM version for an object server */
-	/* given its OXID. Supported by DCOM */
-	/* version 5.2 and above. Looks like that means 
-	 * Windows 2003/XP and above */
-	[idempotent] WERROR ResolveOxid2 (
-											  [in] OXID pOxid,
-											  [in] uint16 cRequestedProtseqs,
-											  [in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
-											  [out] DUALSTRINGARRAY **pdsaOxidBindings,
-											  [out,ref] IPID *ipidRemUnknown,
-											  [out,ref] uint32 *AuthnHint,
-											  [out,ref] COMVERSION *ComVersion
-											 );
-	typedef struct {
-		COMVERSION version;
-	  	uint32 unknown1;
-	} COMINFO;
-
-	[idempotent] WERROR ServerAlive2 (
-	  [out,ref] COMINFO *info,
-	  [out,ref] DUALSTRINGARRAY *dualstring,
-	  [out] uint8 unknown2[3]);
-}
diff --git a/source4/librpc/idl/policyagent.idl b/source4/librpc/idl/policyagent.idl
deleted file mode 100644
index ab137faf27..0000000000
--- a/source4/librpc/idl/policyagent.idl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/* IPSec policy agent (Win2k) */
-[
-	uuid("d335b8f6-cb31-11d0-b0f9-006097ba4e54"),
-	version(1.5),
-    	pointer_default(unique),
-	helpstring("IPSec Policy Agent")
-] interface policyagent
-{
-	/*****************/
-	/* Function 0x00 */
-	[todo] WERROR policyagent_Dummy();
-}
diff --git a/source4/librpc/idl/protected_storage.idl b/source4/librpc/idl/protected_storage.idl
deleted file mode 100644
index 7841f91ca9..0000000000
--- a/source4/librpc/idl/protected_storage.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-  protected_storage interface definitions
-  Also seen with UUID: 
-*/
-
-[ uuid("c9378ff1-16f7-11d0-a0b2-00aa0061426a"),
-  version(1.0),
-  pointer_default(unique)
-] interface protected_storage
-{
-	/*****************************/
-	/* Function        0x00      */
-	WERROR ps_XXX ();
-}
diff --git a/source4/librpc/idl/remact.idl b/source4/librpc/idl/remact.idl
deleted file mode 100644
index 2165ecfc81..0000000000
--- a/source4/librpc/idl/remact.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
-  DCOM interfaces
-  http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm
- */
-
-import "misc.idl", "orpc.idl";
-
-[
-	uuid("4d9f4ab8-7d1c-11cf-861e-0020af6e7c57"),
-	pointer_default(unique),
-	endpoint("ncalrpc:", "ncacn_ip_tcp:[135]", "ncacn_np:[\\pipe\\epmapper]")
-]
-interface IRemoteActivation
-{
-	typedef enum 
-	{
-		RPC_C_IMP_LEVEL_DEFAULT = 0,
-		RPC_C_IMP_LEVEL_ANONYMOUS = 1,
-		RPC_C_IMP_LEVEL_IDENTIFY = 2,
-		RPC_C_IMP_LEVEL_IMPERSONATE = 3,
-		RPC_C_IMP_LEVEL_DELEGATE = 4
-	} imp_levels;
-
-	const uint32 MODE_GET_CLASS_OBJECT = 0xffffffff;
-	WERROR RemoteActivation (
-			[in] ORPCTHIS this,
-			[out,ref] ORPCTHAT *that,
-			[in] GUID Clsid,
-			[in] [string,charset(UTF16)] uint16 *pwszObjectName,
-			[in] MInterfacePointer *pObjectStorage,
-			[in] uint32 ClientImpLevel,
-			[in] uint32 Mode,
-			[in,range(1,32768)] uint32 Interfaces,
-			[in,size_is(Interfaces)] GUID *pIIDs,
-			[in] uint16 num_protseqs,
-			[in, size_is(num_protseqs)] uint16 protseq[*],
-			[out,ref] hyper *pOxid,
-			[out,ref] DUALSTRINGARRAY *pdsaOxidBindings,
-			[out,ref] GUID *ipidRemUnknown,
-			[out,ref] uint32 *AuthnHint,
-			[out,ref] COMVERSION *ServerVersion,
-			[out,ref] WERROR *hr,
-			[out,size_is(Interfaces)] MInterfacePointer *ifaces[],
-			[out,size_is(Interfaces)] WERROR results[]
-			);
-}
diff --git a/source4/librpc/idl/rot.idl b/source4/librpc/idl/rot.idl
deleted file mode 100644
index 78eee48807..0000000000
--- a/source4/librpc/idl/rot.idl
+++ /dev/null
@@ -1,44 +0,0 @@
-import "orpc.idl";
-
-[
-	uuid("b9e79e60-3d52-11ce-aaa1-00006901293f"),
-	version(0.2),
-    	pointer_default(unique),
- 	endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", 
-		  "ncalrpc:[EPMAPPER]")
-] interface rot
-{
-	WERROR rot_add (
-					[in] uint32 flags, 
-					[in] MInterfacePointer *unk, 
-					[in] MInterfacePointer *moniker, 
-					[out] uint32 *rotid
-					);
-	
-	WERROR rot_remove (
-				  [in] uint32 rotid
-				  );
-	
-	WERROR rot_is_listed (
-					 [in] MInterfacePointer *moniker
-					 );
-	
-	WERROR rot_get_interface_pointer (
-					 [in] MInterfacePointer *moniker, 
-					 [out] MInterfacePointer *ip
-					 );
-	
-	WERROR rot_set_modification_time (
-						  [in] uint32 rotid, 
-						  [in] NTTIME *t
-						  );
-	
-	WERROR rot_get_modification_time (
-							   [in] MInterfacePointer *moniker,
-							   [out] NTTIME *t
-							   );
-	
-	WERROR rot_enum (
-					   [out] MInterfacePointer *EnumMoniker
-					   );
-}
diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl
deleted file mode 100644
index 6b4b0b8a16..0000000000
--- a/source4/librpc/idl/spoolss.idl
+++ /dev/null
@@ -1,1571 +0,0 @@
-#include "idl_types.h"
-
-/*
-  spoolss interface definitions
-*/
-import "misc.idl", "security.idl", "winreg.idl";
-
-[ uuid("12345678-1234-abcd-ef00-0123456789ab"),
-  version(1.0),
-  endpoint("ncacn_np:[\\pipe\\spoolss]"),
-  pointer_default(unique),
-  helpstring("Spooler SubSystem"),
-  helper("librpc/ndr/ndr_spoolss_buf.h")
-] interface spoolss
-{
-	typedef [v1_enum] enum winreg_Type winreg_Type;
-	typedef struct {
-		uint16 year;
-		uint16 month;
-		uint16 day_of_week;
-		uint16 day;
-		uint16 hour;
-		uint16 minute;
-		uint16 second;
-		uint16 millisecond;
-	} spoolss_Time;
-
-	typedef struct {
-		[relative] nstring *printername;
-		[relative] nstring *servername;
-		uint32 cjobs;
-		uint32 total_jobs;
-		uint32 total_bytes;
-		spoolss_Time time;		
-		uint32 global_counter;
-		uint32 total_pages;
-		uint32 version;
-		uint32 unknown10;
-		uint32 unknown11;
-		uint32 unknown12;
-		uint32 session_counter;
-		uint32 unknown14;
-		uint32 printer_errors;
-		uint32 unknown16;
-		uint32 unknown17;
-		uint32 unknown18;
-		uint32 unknown19;
-		uint32 change_id;
-		uint32 unknown21;
-		uint32 status;
-		uint32 unknown23;
-		uint32 c_setprinter;
-		uint16 unknown25;
-		uint16 unknown26;
-		uint32 unknown27;
-		uint32 unknown28;
-		uint32 unknown29;
-	} spoolss_PrinterInfo0;
-
-	typedef [public,gensize] struct {
-		[charset(UTF16)] uint16 devicename[32];
-		uint16 specversion;
-		uint16 driverversion;
-		uint16 size;
-		[value(r->driverextra_data.length)] uint16 __driverextra_length;
-		uint32 fields;
-		uint16 orientation;
-		uint16 papersize;
-		uint16 paperlength;
-		uint16 paperwidth;
-		uint16 scale;
-		uint16 copies;
-		uint16 defaultsource;
-		uint16 printquality;
-		uint16 color;
-		uint16 duplex;
-		uint16 yresolution;
-		uint16 ttoption;
-		uint16 collate;
-		[charset(UTF16)] uint16 formname[32];
-		uint16 logpixels;
-		uint32 bitsperpel;
-		uint32 pelswidth;
-		uint32 pelsheight;
-		uint32 displayflags;
-		uint32 displayfrequency;
-		uint32 icmmethod;
-		uint32 icmintent;
-		uint32 mediatype;
-		uint32 dithertype;
-		uint32 reserved1;
-		uint32 reserved2;
-		uint32 panningwidth;
-		uint32 panningheight;
-		[subcontext_size(__driverextra_length),subcontext(0),flag(NDR_REMAINING)] DATA_BLOB driverextra_data;
-	} spoolss_DeviceMode;
-
-	typedef [public] bitmap {
-		PRINTER_ENUM_DEFAULT     = 0x00000001,
-		PRINTER_ENUM_LOCAL       = 0x00000002,
-		PRINTER_ENUM_CONNECTIONS = 0x00000004,
-		PRINTER_ENUM_FAVORITE    = 0x00000004,
-		PRINTER_ENUM_NAME        = 0x00000008,
-		PRINTER_ENUM_REMOTE      = 0x00000010,
-		PRINTER_ENUM_SHARED      = 0x00000020,
-		PRINTER_ENUM_NETWORK     = 0x00000040,
-		PRINTER_ENUM_EXPAND      = 0x00004000,
-		PRINTER_ENUM_CONTAINER   = 0x00008000,
-		PRINTER_ENUM_ICON1       = 0x00010000,
-		PRINTER_ENUM_ICON2       = 0x00020000,
-		PRINTER_ENUM_ICON3       = 0x00040000,
-		PRINTER_ENUM_ICON4       = 0x00080000,
-		PRINTER_ENUM_ICON5       = 0x00100000,
-		PRINTER_ENUM_ICON6       = 0x00200000,
-		PRINTER_ENUM_ICON7       = 0x00400000,
-		PRINTER_ENUM_ICON8       = 0x00800000,
-		PRINTER_ENUM_HIDE        = 0x01000000
-	} spoolss_EnumPrinterFlags;
-
-	typedef struct {
-		spoolss_EnumPrinterFlags flags;
-		[relative] nstring *name;
-		[relative] nstring *description;
-		[relative] nstring *comment;
-	} spoolss_PrinterInfo1;
-
-	typedef bitmap {
-		PRINTER_ATTRIBUTE_QUEUED		= 0x00000001,
-		PRINTER_ATTRIBUTE_DIRECT		= 0x00000002,
-		PRINTER_ATTRIBUTE_DEFAULT		= 0x00000004,
-		PRINTER_ATTRIBUTE_SHARED		= 0x00000008,
-		PRINTER_ATTRIBUTE_NETWORK		= 0x00000010,
-		PRINTER_ATTRIBUTE_HIDDEN		= 0x00000020,
-		PRINTER_ATTRIBUTE_LOCAL			= 0x00000040,
-		PRINTER_ATTRIBUTE_ENABLE_DEVQ		= 0x00000080,
-		PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS	= 0x00000100,
-		PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST	= 0x00000200,
-		PRINTER_ATTRIBUTE_WORK_OFFLINE		= 0x00000400,
-		PRINTER_ATTRIBUTE_ENABLE_BIDI		= 0x00000800,
-		PRINTER_ATTRIBUTE_RAW_ONLY		= 0x00001000,
-		PRINTER_ATTRIBUTE_PUBLISHED		= 0x00002000,
-		PRINTER_ATTRIBUTE_FAX			= 0x00004000,
-		PRINTER_ATTRIBUTE_TS			= 0x00008000
-	} spoolss_PrinterAttributes;
-
-	typedef bitmap {
-		PRINTER_STATUS_PAUSED		= 0x00000001,
-		PRINTER_STATUS_ERROR		= 0x00000002,
-		PRINTER_STATUS_PENDING_DELETION	= 0x00000004,
-		PRINTER_STATUS_PAPER_JAM	= 0x00000008,
-		PRINTER_STATUS_PAPER_OUT	= 0x00000010,
-		PRINTER_STATUS_MANUAL_FEED	= 0x00000020,
-		PRINTER_STATUS_PAPER_PROBLEM	= 0x00000040,
-		PRINTER_STATUS_OFFLINE		= 0x00000080,
-		PRINTER_STATUS_IO_ACTIVE	= 0x00000100,
-		PRINTER_STATUS_BUSY		= 0x00000200,
-		PRINTER_STATUS_PRINTING		= 0x00000400,
-		PRINTER_STATUS_OUTPUT_BIN_FULL	= 0x00000800,
-		PRINTER_STATUS_NOT_AVAILABLE	= 0x00001000,
-		PRINTER_STATUS_WAITING		= 0x00002000,
-		PRINTER_STATUS_PROCESSING	= 0x00004000,
-		PRINTER_STATUS_INITIALIZING	= 0x00008000,
-		PRINTER_STATUS_WARMING_UP	= 0x00010000,
-		PRINTER_STATUS_TONER_LOW	= 0x00020000,
-		PRINTER_STATUS_NO_TONER		= 0x00040000,
-		PRINTER_STATUS_PAGE_PUNT	= 0x00080000,
-		PRINTER_STATUS_USER_INTERVENTION= 0x00100000,
-		PRINTER_STATUS_OUT_OF_MEMORY	= 0x00200000,
-		PRINTER_STATUS_DOOR_OPEN	= 0x00400000,
-		PRINTER_STATUS_SERVER_UNKNOWN	= 0x00800000,
-		PRINTER_STATUS_POWER_SAVE	= 0x01000000
-	} spoolss_PrinterStatus;
-
-	typedef struct {
-		[relative] nstring *servername;
-		[relative] nstring *printername;
-		[relative] nstring *sharename;
-		[relative] nstring *portname;
-		[relative] nstring *drivername;
-		[relative] nstring *comment;
-		[relative] nstring *location;
-		[relative,subcontext(0)] spoolss_DeviceMode *devmode;
-		[relative] nstring *sepfile;
-		[relative] nstring *printprocessor;
-		[relative] nstring *datatype;
-		[relative] nstring *parameters;
-		[relative,subcontext(0)] security_descriptor *secdesc;
-		spoolss_PrinterAttributes attributes;
-		uint32 priority;
-		uint32 defaultpriority;
-		uint32 starttime;
-		uint32 untiltime;
-		spoolss_PrinterStatus status;
-		uint32 cjobs;
-		uint32 averageppm;
-	} spoolss_PrinterInfo2;
-
-	typedef struct {
-		[relative,subcontext(0)] security_descriptor *secdesc;
-	} spoolss_PrinterInfo3;
-
-	typedef struct {
-		[relative] nstring *printername;
-		[relative] nstring *servername;
-		spoolss_PrinterAttributes attributes;
-	} spoolss_PrinterInfo4;
-
-	typedef struct {
-		[relative] nstring *printername;
-		[relative] nstring *portname;
-		spoolss_PrinterAttributes attributes;
-		uint32 device_not_selected_timeout;
-		uint32 transmission_retry_timeout;
-	} spoolss_PrinterInfo5;
-
-	typedef struct {
-		spoolss_PrinterStatus status;
-	} spoolss_PrinterInfo6;
-
-	typedef bitmap {
-		DSPRINT_PUBLISH		= 0x00000001,
-		DSPRINT_UPDATE		= 0x00000002,
-		DSPRINT_UNPUBLISH	= 0x00000004,
-		DSPRINT_REPUBLISH	= 0x00000008,
-		DSPRINT_PENDING		= 0x80000000
-	} spoolss_DsPrintAction;
-
-	typedef struct {
-		[relative] nstring *guid; /* text form of printer guid */
-		spoolss_DsPrintAction action;
-	} spoolss_PrinterInfo7;
-
-	typedef struct {
-		[relative,subcontext(0)] spoolss_DeviceMode *devmode;
-	} spoolss_DeviceModeInfo;
-
-	typedef [nodiscriminant,relative_base,public] union {
-		[case(0)] spoolss_PrinterInfo0 info0;
-		[case(1)] spoolss_PrinterInfo1 info1;
-		[case(2)] spoolss_PrinterInfo2 info2;
-		[case(3)] spoolss_PrinterInfo3 info3;
-		[case(4)] spoolss_PrinterInfo4 info4;
-		[case(5)] spoolss_PrinterInfo5 info5;
-		[case(6)] spoolss_PrinterInfo6 info6;
-		[case(7)] spoolss_PrinterInfo7 info7;
-		[case(8)] spoolss_DeviceModeInfo info8;
-		[case(9)] spoolss_DeviceModeInfo info9;
-		[default];
-	} spoolss_PrinterInfo;
-
-	/******************/
-	/* Function: 0x00 */
-	/* we are using this as internal parsing code */
-	[public,noopnum,noprint] WERROR _spoolss_EnumPrinters(
-		[in] spoolss_EnumPrinterFlags flags,
-		[in,unique] [string,charset(UTF16)] uint16 *server,
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		[out,unique] DATA_BLOB *info,
-		[out] uint32 needed,
-		[out] uint32 count
-	);
-	[public,noopnum,noprint] void __spoolss_EnumPrinters(
-		[in] uint32 level,
-		[in] uint32 count,
-		[out,switch_is(level)] spoolss_PrinterInfo info[count]
-	);
-	[nopull,nopush] WERROR spoolss_EnumPrinters(
-		[in] spoolss_EnumPrinterFlags flags,
-		[in,unique] [string,charset(UTF16)] uint16 *server,
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		/* what we have here is a subcontext containing an array of no discriminant unions
-		 * and the array has no size in front
-		 */
-		[out,unique,switch_is(level),size_is(count)] spoolss_PrinterInfo *info,
-		[out] uint32 needed,
-		[out] uint32 count
-	);
-
-	/******************/
-	/* Function: 0x01 */
-	typedef struct {
-		[value(_ndr_size_spoolss_DeviceMode(devmode, ndr->flags))] uint32 _ndr_size;
-		[subcontext(4),subcontext_size(_ndr_size)] spoolss_DeviceMode *devmode;
-	} spoolss_DevmodeContainer;
-
-	[public] WERROR spoolss_OpenPrinter(
-		[in,unique] [string,charset(UTF16)] uint16 *printername,
-		[in,unique] [string,charset(UTF16)] uint16 *datatype,
-		[in] spoolss_DevmodeContainer devmode_ctr,
-		[in] uint32 access_mask,
-		[out,ref] policy_handle *handle
-	);
-
-	/******************/
-	/* Function: 0x02 */
-	typedef struct {
-		uint32 job_id;
-		[relative] nstring *printer_name;
-		[relative] nstring *server_name;
-		[relative] nstring *user_name;
-		[relative] nstring *document_name;
-		[relative] nstring *data_type;
-		[relative] nstring *text_status;
-		uint32 status;
-		uint32 priority;
-		uint32 position;
-		uint32 total_pages;
-		uint32 pages_printed;
-		spoolss_Time time;
-	} spoolss_JobInfo1;
-
-	typedef [nodiscriminant,relative_base,public] union {
-		[case(1)] spoolss_JobInfo1 info1;
-		[case(2)]; /* TODO */
-		[case(3)]; /* TODO */
-		[default];
-	} spoolss_JobInfo;
-
-	typedef struct {
-		uint32 level;
-		[switch_is(level)] spoolss_JobInfo info;
-	} spoolss_JobInfoContainer;
-
-	typedef [v1_enum] enum {
-		SPOOLSS_JOB_CONTROL_PAUSE		= 1,
-		SPOOLSS_JOB_CONTROL_RESUME		= 2,
-		SPOOLSS_JOB_CONTROL_CANCEL		= 3,
-		SPOOLSS_JOB_CONTROL_RESTART		= 4,
-		SPOOLSS_JOB_CONTROL_DELETE		= 5,
-		SPOOLSS_JOB_CONTROL_SEND_TO_PRINTER	= 6,
-		SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED	= 7
-	} spoolss_JobControl;
-
-	WERROR spoolss_SetJob(
-		[in,ref] policy_handle *handle,
-		[in] uint32 job_id,
-		[in,unique] spoolss_JobInfoContainer *ctr,
-		[in] spoolss_JobControl command
-	);
-
-	/******************/
-	/* Function: 0x03 */
-	WERROR spoolss_GetJob(
-		[in,ref] policy_handle *handle,
-		[in] 	 uint32 job_id,
-		[in] 	 uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] 	 uint32 offered,
-		[out,unique,subcontext(4),subcontext_size(offered),switch_is(level)] spoolss_JobInfo *info,
-		[out] 	 uint32 needed
-	);
-
-	/******************/
-	/* Function: 0x04 */
-	[public,noopnum,noprint] WERROR _spoolss_EnumJobs(
-		[in,ref] policy_handle *handle,
-		[in] 	 uint32 firstjob,
-		[in] 	 uint32 numjobs,
-		[in] 	 uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] 	 uint32 offered,
-		[out,unique] DATA_BLOB *info,
-		[out] 	 uint32 needed,
-		[out] 	 uint32 count
-	);
-	[public,noopnum,noprint] void __spoolss_EnumJobs(
-		[in] uint32 level,
-		[in] uint32 count,
-		[out,switch_is(level)] spoolss_JobInfo info[count]
-	);
-	[nopull,nopush] WERROR spoolss_EnumJobs(
-		[in,ref] policy_handle *handle,
-		[in]	 uint32 firstjob,
-		[in]	 uint32 numjobs,
-		[in]	 uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] 	 uint32 offered,
-		[out,unique,switch_is(level),size_is(count)] spoolss_JobInfo *info,
-		[out] 	 uint32 needed,
-		[out]	 uint32 count
-	);
-
-	/******************/
-	/* Function: 0x05 */
-	[todo] WERROR spoolss_AddPrinter(
- 		/* This function is not implemented in Samba 3 as no
- 		   clients have been observed using it. */
-	);
-
-	/******************/
-	/* Function: 0x06 */
-	[todo] WERROR spoolss_DeletePrinter(
-	);
-
-	/******************/
-	/* Function: 0x07 */
-	typedef [v1_enum] enum {
-		SPOOLSS_PRINTER_CONTROL_UNPAUSE    = 0,
-		SPOOLSS_PRINTER_CONTROL_PAUSE      = 1,
-		SPOOLSS_PRINTER_CONTROL_RESUME     = 2,
-		SPOOLSS_PRINTER_CONTROL_PURGE      = 3,
-		SPOOLSS_PRINTER_CONTROL_SET_STATUS = 4
-	} spoolss_PrinterControl;
-
-	typedef [switch_type(uint32)] union {
-		[case(0)] spoolss_PrinterInfo0 *info0;
-		[case(1)] spoolss_PrinterInfo1 *info1;
-		[case(2)] spoolss_PrinterInfo2 *info2;
-		[case(3)] spoolss_PrinterInfo3 *info3;
-		[case(4)] spoolss_PrinterInfo4 *info4;
-		[case(5)] spoolss_PrinterInfo5 *info5;
-		[case(6)] spoolss_PrinterInfo6 *info6;
-		[case(7)] spoolss_PrinterInfo7 *info7;
-		[case(8)] spoolss_DeviceModeInfo *info8;
-		[case(9)] spoolss_DeviceModeInfo *info9;
-		[default];
-	} spoolss_SetPrinterInfo;
-
-	WERROR spoolss_SetPrinter(
-		[in,ref] policy_handle *handle,
-		[in] uint32 level,
-		[in,switch_is(level)] spoolss_SetPrinterInfo info,
-		[in] spoolss_DevmodeContainer devmode_ctr,
-		[in] sec_desc_buf secdesc_ctr,
-		[in] spoolss_PrinterControl command
-	);
-
-	/******************/
-	/* Function: 0x08 */
-	[public] WERROR spoolss_GetPrinter(
-		[in,ref] policy_handle *handle,
-		[in] 	 uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] 	 uint32 offered,
-		[out,unique,subcontext(4),subcontext_size(offered),switch_is(level)] spoolss_PrinterInfo *info,
-		[out] 	 uint32 needed
-	);
-
-	/******************/
-	/* Function: 0x09 */
-	[todo] WERROR spoolss_AddPrinterDriver(
-	);
-
-	typedef struct {
-		[relative] nstring *driver_name;
-	} spoolss_DriverInfo1;
-
-	typedef [v1_enum] enum {
-		SPOOLSS_DRIVER_VERSION_9X	= 0,
-		SPOOLSS_DRIVER_VERSION_NT35	= 1,
-		SPOOLSS_DRIVER_VERSION_NT4	= 2,
-		SPOOLSS_DRIVER_VERSION_200X	= 3
-	} spoolss_DriverOSVersion;
-
-	typedef struct {
-		spoolss_DriverOSVersion version;
-		[relative] nstring *driver_name;
-		[relative] nstring *architecture;
-		[relative] nstring *driver_path;
-		[relative] nstring *data_file;
-		[relative] nstring *config_file;
-	} spoolss_DriverInfo2;
-
-	typedef struct {
-		spoolss_DriverOSVersion version;
-		[relative] nstring *driver_name;
-		[relative] nstring *architecture;
-		[relative] nstring *driver_path;
-		[relative] nstring *data_file;
-		[relative] nstring *config_file;
-		[relative] nstring *help_file;
-		[relative] nstring_array *dependent_files;
-		[relative] nstring *monitor_name;
-		[relative] nstring *default_datatype;
-	} spoolss_DriverInfo3;
-
-	typedef struct {
-		spoolss_DriverOSVersion version;
-		[relative] nstring *driver_name;
-		[relative] nstring *architecture;
-		[relative] nstring *driver_path;
-		[relative] nstring *data_file;
-		[relative] nstring *config_file;
-		[relative] nstring *help_file;
-		[relative] nstring_array *dependent_files;
-		[relative] nstring *monitor_name;
-		[relative] nstring *default_datatype;
-		[relative] nstring_array *previous_names;
-	} spoolss_DriverInfo4;
-
-	typedef struct {
-		spoolss_DriverOSVersion version;
-		[relative] nstring *driver_name;
-		[relative] nstring *architecture;
-		[relative] nstring *driver_path;
-		[relative] nstring *data_file;
-		[relative] nstring *config_file;
-		uint32 driver_attributes;
-		uint32 config_version;
-		uint32 driver_version;
-	} spoolss_DriverInfo5;
-
-	typedef struct {
-		spoolss_DriverOSVersion version;
-		[relative] nstring *driver_name;
-		[relative] nstring *architecture;
-		[relative] nstring *driver_path;
-		[relative] nstring *data_file;
-		[relative] nstring *config_file;
-		[relative] nstring *help_file;
-		[relative] nstring_array *dependent_files;
-		[relative] nstring *monitor_name;
-		[relative] nstring *default_datatype;
-		[relative] nstring_array *previous_names;
-		NTTIME driver_data;
-		hyper driver_version;
-		[relative] nstring *manufacturer_name;
-		[relative] nstring *manufacturer_url;
-		[relative] nstring *hardware_id;
-		[relative] nstring *provider;
-	} spoolss_DriverInfo6;
-
-	typedef [nodiscriminant,relative_base,public] union {
-		[case(1)] spoolss_DriverInfo1 info1;
-		[case(2)] spoolss_DriverInfo2 info2;
-		[case(3)] spoolss_DriverInfo3 info3;
-		[case(4)] spoolss_DriverInfo4 info4;
-		[case(5)] spoolss_DriverInfo5 info5;
-		[case(6)] spoolss_DriverInfo6 info6;
-		[default];
-	} spoolss_DriverInfo;
-
-	/******************/
-	/* Function: 0x0a */
-	[public,noopnum,noprint] WERROR _spoolss_EnumPrinterDrivers(
-		[in,unique] [string,charset(UTF16)] uint16 *server,
-		[in,unique] [string,charset(UTF16)] uint16 *environment,
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		[out,unique] DATA_BLOB *info,
-		[out] uint32 needed,
-		[out] uint32 count
-	);
-	[public,noopnum,noprint] void __spoolss_EnumPrinterDrivers(
-		[in] uint32 level,
-		[in] uint32 count,
-		[out,switch_is(level)] spoolss_DriverInfo info[count]
-	);
-	[nopull,nopush] WERROR spoolss_EnumPrinterDrivers(
-		[in,unique] [string,charset(UTF16)] uint16 *server,
-		[in,unique] [string,charset(UTF16)] uint16 *environment,
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		[out,unique,switch_is(level),size_is(count)] spoolss_DriverInfo *info,
-		[out] uint32 needed,
-		[out] uint32 count
-	);
-
-	/******************/
-	/* Function: 0x0b */
-	[todo] WERROR spoolss_GetPrinterDriver(
-	);
-
-	/******************/
-	/* Function: 0x0c */
-	typedef struct {
-		nstring directory_name;
-	} spoolss_DriverDirectoryInfo1;
-
-	/* NOTE: it's seems that w2k3 completly ignores the level
-	         in its server code
-	 */
-	typedef [nodiscriminant,relative_base,gensize,public] union {
-		[case(1)] spoolss_DriverDirectoryInfo1 info1;
-		[default] spoolss_DriverDirectoryInfo1 info1;
-	} spoolss_DriverDirectoryInfo;
-
-	[public] WERROR spoolss_GetPrinterDriverDirectory(
-		[in,unique] [string,charset(UTF16)] uint16 *server,
-		[in,unique] [string,charset(UTF16)] uint16 *environment,
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		[out,unique,subcontext(4),subcontext_size(offered),switch_is(level)] spoolss_DriverDirectoryInfo *info,
-		[out] uint32 needed
-	);
-
-	/******************/
-	/* Function: 0x0d */
-	WERROR spoolss_DeletePrinterDriver(
-		[in,ref] policy_handle *handle,
-		[in,unique] [string,charset(UTF16)] uint16 *server,
-		[in] [string,charset(UTF16)] uint16 architecture[],
-		[in] [string,charset(UTF16)] uint16 driver[]
-	);
-
-	/******************/
-	/* Function: 0x0e */
-	[todo] WERROR spoolss_AddPrintProcessor(
-	);
-
-	/******************/
-	/* Function: 0x0f */
-	typedef struct {
-		[relative] nstring *print_processor_name;
-	} spoolss_PrintProcessorInfo1;
-
-	typedef [nodiscriminant,relative_base,public] union {
-		[case(1)] spoolss_PrintProcessorInfo1 info1;
-		[default];
-	} spoolss_PrintProcessorInfo;
-
-	[public,noopnum,noprint] WERROR _spoolss_EnumPrintProcessors(
-		[in,unique] [string,charset(UTF16)] uint16 *servername,
-		[in,unique] [string,charset(UTF16)] uint16 *environment,
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		[out,unique] DATA_BLOB *info,
-		[out] uint32 needed,
-		[out] uint32 count
-	);
-	[public,noopnum,noprint] void __spoolss_EnumPrintProcessors(
-		[in] uint32 level,
-		[in] uint32 count,
-		[out,switch_is(level)] spoolss_PrintProcessorInfo info[count]
-	);
-	[nopull,nopush] WERROR spoolss_EnumPrintProcessors(
-		[in,unique] [string,charset(UTF16)] uint16 *servername,
-		[in,unique] [string,charset(UTF16)] uint16 *environment,
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		[out,unique,switch_is(level),size_is(count)] spoolss_PrintProcessorInfo *info,
-		[out] uint32 needed,
-		[out] uint32 count
-	);
-
-	/******************/
-	/* Function: 0x10 */
-	[todo] WERROR spoolss_GetPrintProcessorDirectory(
-	);
-
-	/******************/
-	/* Function: 0x11 */
-	typedef struct {
-		[string,charset(UTF16)] uint16 *document_name;
-		[string,charset(UTF16)] uint16 *output_file;
-		[string,charset(UTF16)] uint16 *datatype;
-	} spoolss_DocumentInfo1;
-
-	typedef [switch_type(uint32)] union {
-		[case(1)] spoolss_DocumentInfo1 *info1;
-		[case(2)]; /* TODO */
-		[case(3)]; /* TODO */
-		[default];
-	} spoolss_DocumentInfo;
-
-	WERROR spoolss_StartDocPrinter(
-		[in,ref] policy_handle *handle,
-		[in] uint32 level,
-		[in,switch_is(level)] spoolss_DocumentInfo info,
-		[out] uint32 job_id
-	);
-
-	/******************/
-	/* Function: 0x12 */
-	WERROR spoolss_StartPagePrinter(
-		[in,ref] policy_handle *handle
-	);
-
-	/******************/
-	/* Function: 0x13 */
-	WERROR spoolss_WritePrinter(
-		[in,ref] policy_handle *handle,
-		[in] DATA_BLOB data,
-		[in,value(r->in.data.length)] uint32 _data_size,
-		[out] uint32 num_written
-	);
-
-	/******************/
-	/* Function: 0x14 */
-	WERROR spoolss_EndPagePrinter(
-		[in,ref] policy_handle *handle
-	);
-
-	/******************/
-	/* Function: 0x15 */
-	WERROR spoolss_AbortPrinter(
-		[in,ref] policy_handle *handle
-	);
-
-	/******************/
-	/* Function: 0x16 */
-	WERROR spoolss_ReadPrinter(
-		[in,ref] policy_handle *handle,
-		[in] uint32 data_size,
-		[out] DATA_BLOB data,
-		[out,value(r->out.data.length)] uint32 _data_size
-	);
-
-	/******************/
-	/* Function: 0x17 */
-	WERROR spoolss_EndDocPrinter(
-		[in,ref] policy_handle *handle
-	);
-
-	/******************/
-	/* Function: 0x18 */
-	[todo] WERROR spoolss_AddJob(
-	);
-
-	/******************/
-	/* Function: 0x19 */
-	[todo] WERROR spoolss_ScheduleJob(
-	);
-
-	/******************/
-	/* Function: 0x1a */
-	const string SPOOLSS_ARCHITECTURE_NT_X86		= "Windows NT x86";
-
-	typedef [public,gensize] struct {
-		[value(ndr_size_spoolss_OSVersion(r,ndr->flags))] uint32 _ndr_size;
-		uint32 major;
-		uint32 minor;
-		uint32 build;
-		[value(2)] uint32 unknown;
-		[subcontext(0),subcontext_size(256)] nstring extra_string;
-	} spoolss_OSVersion;
-
-	typedef [public,gensize] struct {
-		[value(ndr_size_spoolss_OSVersionEx(r,ndr->flags))] uint32 _ndr_size;
-		uint32 major;
-		uint32 minor;
-		uint32 build;
-		[value(2)] uint32 unknown1;
-		[subcontext(0),subcontext_size(256)] nstring extra_string;
-		uint32 unknown2;/* service pack number? I saw 0 from w2k3 and 1 from winxp sp1*/
-		uint32 unknown3;/* hmm? w2k3: 131346(0x20112) winxp sp1: 503382272 0x1E010100 */
-	} spoolss_OSVersionEx;
-
-	typedef [v1_enum] enum {
-		SPOOLSS_PRINTER_DATA_TYPE_NULL = 0,
-		SPOOLSS_PRINTER_DATA_TYPE_STRING = 1,
-		SPOOLSS_PRINTER_DATA_TYPE_BINARY = 3,
-		SPOOLSS_PRINTER_DATA_TYPE_UINT32 = 4,
-		SPOOLSS_PRINTER_DATA_TYPE_STRING_ARRAY = 7
-	} spoolss_PrinterDataType;
-
-	typedef [nodiscriminant,public,gensize] union {
-		[case(SPOOLSS_PRINTER_DATA_TYPE_NULL)];
-		[case(SPOOLSS_PRINTER_DATA_TYPE_STRING)] nstring string;
-		[case(SPOOLSS_PRINTER_DATA_TYPE_BINARY),flag(NDR_REMAINING)] DATA_BLOB binary;
-		[case(SPOOLSS_PRINTER_DATA_TYPE_UINT32)] uint32 value;
-		[case(SPOOLSS_PRINTER_DATA_TYPE_STRING_ARRAY)] nstring_array string_array;
-		[default,flag(NDR_REMAINING)] DATA_BLOB data;
-	} spoolss_PrinterData;
-
-	[noopnum,noprint,public] WERROR _spoolss_GetPrinterData(
-		[in,ref] policy_handle *handle,
-		[in] 	 [string,charset(UTF16)] uint16 value_name[],
-		[in] 	 uint32 offered,
-		[out] 	 spoolss_PrinterDataType type,
-		[out] 	 DATA_BLOB data,
-		[out] 	 uint32 needed
-	);
-	[noopnum,noprint,public] void __spoolss_GetPrinterData(
-		[in] spoolss_PrinterDataType type,
-		[out,switch_is(type)] spoolss_PrinterData data
-	);
-	[nopull,nopush,public] WERROR spoolss_GetPrinterData(
-		[in,ref] policy_handle *handle,
-		[in] 	 [string,charset(UTF16)] uint16 value_name[],
-		[in] 	 uint32 offered,
-		[out] 	 spoolss_PrinterDataType type,
-		[out,subcontext(4),subcontext_size(offered),switch_is(type)] spoolss_PrinterData data,
-		[out] 	 uint32 needed
-	);
-
-	/******************/
-	/* Function: 0x1b */
-	[noopnum,nopull,noprint,public] WERROR _spoolss_SetPrinterData(
-		[in,ref] policy_handle *handle,
-		[in] [string,charset(UTF16)] uint16 value_name[],
-		[in] spoolss_PrinterDataType type,
-		[in] DATA_BLOB data,
-		[in] uint32 _offered
-	);
-	[noopnum,nopull,noprint,public] void __spoolss_SetPrinterData(
-		[in] spoolss_PrinterDataType type,
-		[out,switch_is(type)] spoolss_PrinterData data
-	);
-	[nopush] WERROR spoolss_SetPrinterData(
-		[in,ref] policy_handle *handle,
-		[in] [string,charset(UTF16)] uint16 value_name[],
-		[in] spoolss_PrinterDataType type,
-		[in,subcontext(4),switch_is(type)] spoolss_PrinterData data,
-		[in,value(ndr_size_spoolss_PrinterData(&data,type,flags))] uint32 _offered
-	);
-
-	/******************/
-	/* Function: 0x1c */
-	[todo] WERROR spoolss_WaitForPrinterChange(
-	);
-
-	/******************/
-	/* Function: 0x1d */
-	[public] WERROR spoolss_ClosePrinter(
-		[in,out,ref]     policy_handle *handle
-	);
-
-	/******************/
-	/* Function: 0x1e */
-	typedef [v1_enum] enum {
-		SPOOLSS_FORM_USER	= 0,
-		SPOOLSS_FORM_BUILTIN	= 1,
-		SPOOLSS_FORM_PRINTER	= 2
-	} spoolss_FormFlags;
-
-	typedef struct {
-		uint32 width;
-		uint32 height;
-	} spoolss_FormSize;
-
-	typedef struct {
-		uint32 left;
-		uint32 top;
-		uint32 right;
-		uint32 bottom;
-	} spoolss_FormArea;
-
-	typedef struct {
-		spoolss_FormFlags flags;
-		[relative] nstring *form_name;
-		spoolss_FormSize size;
-		spoolss_FormArea area;
-	} spoolss_FormInfo1;
-
-	typedef [nodiscriminant,relative_base,public,gensize] union {
-		[case(1)] spoolss_FormInfo1 info1;
-		[default];
-	} spoolss_FormInfo;
-
-	typedef struct {
-		spoolss_FormFlags flags;
-		[string,charset(UTF16)] uint16 *form_name;
-		spoolss_FormSize size;
-		spoolss_FormArea area;
-	} spoolss_AddFormInfo1;
-
-	typedef [switch_type(uint32)] union {
-		[case(1)] spoolss_AddFormInfo1 *info1;
-	} spoolss_AddFormInfo;
-
-	WERROR spoolss_AddForm(
-		[in,ref] policy_handle *handle,
-		[in] uint32 level,
-		[in,switch_is(level)] spoolss_AddFormInfo info
-	);
-
-	/******************/
-	/* Function: 0x1f */
-	WERROR spoolss_DeleteForm(
-		[in,ref] policy_handle *handle,
-		[in] [string,charset(UTF16)] uint16 form_name[]
-	);
-
-	/******************/
-	/* Function: 0x20 */
-	WERROR spoolss_GetForm(
-		[in,ref] policy_handle *handle,
-		[in] [string,charset(UTF16)] uint16 form_name[],
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		[out,unique,subcontext(4),subcontext_size(offered),switch_is(level)] spoolss_FormInfo *info,
-		[out] uint32 needed
-	);
-
-	/******************/
-	/* Function: 0x21 */
-	WERROR spoolss_SetForm(
-		[in,ref] policy_handle *handle,
-		[in] [string,charset(UTF16)] uint16 form_name[],
-		[in] uint32 level,
-		[in,switch_is(level)] spoolss_AddFormInfo info
-	);
-
-	/******************/
-	/* Function: 0x22 */
-	[public,noopnum,noprint] WERROR _spoolss_EnumForms(
-		[in,ref] policy_handle *handle,
-		[in] 	 uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] 	 uint32 offered,
-		[out,unique] DATA_BLOB *info,
-		[out]	 uint32 needed,
-		[out]	 uint32 count
-	);
-	[public,noopnum,noprint] void __spoolss_EnumForms(
-		[in] uint32 level,
-		[in] uint32 count,
-		[out,switch_is(level)] spoolss_FormInfo info[count]
-	);
-	[nopull,nopush] WERROR spoolss_EnumForms(
-		[in,ref] policy_handle *handle,
-		[in] 	 uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] 	 uint32 offered,
-		[out,unique,switch_is(level),size_is(count)] spoolss_FormInfo *info,
-		[out] uint32 needed,
-		[out] uint32 count
-	);
-
-	typedef struct {
-		[relative] nstring *port_name;
-	} spoolss_PortInfo1;
-
-	typedef bitmap {
-		SPOOLSS_PORT_TYPE_WRITE		= 0x00000001,
-		SPOOLSS_PORT_TYPE_READ		= 0x00000002,
-		SPOOLSS_PORT_TYPE_REDIRECTED	= 0x00000004,
-		SPOOLSS_PORT_TYPE_NET_ATTACHED  = 0x00000008
-	} spoolss_PortType;
-
-	typedef struct {
-		[relative] nstring *port_name;
-		[relative] nstring *monitor_name;
-		[relative] nstring *description;
-		spoolss_PortType port_type;
-		uint32 reserved;
-	} spoolss_PortInfo2;
-
-	typedef [nodiscriminant,relative_base,public] union {
-		[case(1)] spoolss_PortInfo1 info1;
-		[case(2)] spoolss_PortInfo2 info2;
-		[case(3)]; /* TODO */
-		[default];
-	} spoolss_PortInfo;
-
-	/******************/
-	/* Function: 0x23 */
-	[public,noopnum,noprint] WERROR _spoolss_EnumPorts(
-		[in,unique] [string,charset(UTF16)] uint16 *servername,
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		[out,unique] DATA_BLOB *info,
-		[out] uint32 needed,
-		[out] uint32 count
-	);
-	[public,noopnum,noprint] void __spoolss_EnumPorts(
-		[in] uint32 level,
-		[in] uint32 count,
-		[out,switch_is(level)] spoolss_PortInfo info[count]
-	);
-	[nopull,nopush] WERROR spoolss_EnumPorts(
-		[in,unique] [string,charset(UTF16)] uint16 *servername,
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		[out,unique,switch_is(level),size_is(count)] spoolss_PortInfo *info,
-		[out] uint32 needed,
-		[out] uint32 count
-	);
-
-	/******************/
-	/* Function: 0x24 */
-	typedef struct {
-		[relative] nstring *monitor_name;
-	} spoolss_MonitorInfo1;
-
-	typedef struct {
-		[relative] nstring *monitor_name;
-		[relative] nstring *environment;
-		[relative] nstring *dll_name;
-	} spoolss_MonitorInfo2;
-
-	typedef [nodiscriminant,relative_base,public] union {
-		[case(1)] spoolss_MonitorInfo1 info1;
-		[case(2)] spoolss_MonitorInfo2 info2;
-		[default];
-	} spoolss_MonitorInfo;
-
-	[public,noopnum,noprint] WERROR _spoolss_EnumMonitors(
-		[in,unique] [string,charset(UTF16)] uint16 *servername,
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		[out,unique] DATA_BLOB *info,
-		[out] uint32 needed,
-		[out] uint32 count
-	);
-	[public,noopnum,noprint] void __spoolss_EnumMonitors(
-		[in] uint32 level,
-		[in] uint32 count,
-		[out,switch_is(level)] spoolss_MonitorInfo info[count]
-	);
-	[nopull,nopush] WERROR spoolss_EnumMonitors(
-		[in,unique] [string,charset(UTF16)] uint16 *servername,
-		[in] uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] uint32 offered,
-		[out,unique,switch_is(level),size_is(count)] spoolss_MonitorInfo *info,
-		[out] uint32 needed,
-		[out] uint32 count
-	);
-
-	/******************/
-	/* Function: 0x25 */
-	WERROR spoolss_AddPort(
-	       [in,unique] [string,charset(UTF16)] uint16 *server_name,
-	       [in] uint32 unknown,
-	       [in] [string,charset(UTF16)] uint16 monitor_name[]
-	);
-
-	/******************/
-	/* Function: 0x26 */
-	[todo] WERROR spoolss_ConfigurePort(
-	);
-
-	/******************/
-	/* Function: 0x27 */
-	[todo] WERROR spoolss_DeletePort(
-	);
-
-	/******************/
-	/* Function: 0x28 */
-	[todo] WERROR spoolss_CreatePrinterIC(
-	);
-
-	/******************/
-	/* Function: 0x29 */
-	[todo] WERROR spoolss_PlayGDIScriptOnPrinterIC(
-	);
-
-	/******************/
-	/* Function: 0x2a */
-	[todo] WERROR spoolss_DeletePrinterIC(
-	);
-
-	/******************/
-	/* Function: 0x2b */
-	[todo] WERROR spoolss_AddPrinterConnection(
-	);
-
-	/******************/
-	/* Function: 0x2c */
-	[todo] WERROR spoolss_DeletePrinterConnection(
-	);
-
-	/******************/
-	/* Function: 0x2d */
-	[todo] WERROR spoolss_PrinterMessageBox(
-		/* Marked as obsolete in MSDN.  "Not necessary and has
-		   no effect". */
-	);
-
-	/******************/
-	/* Function: 0x2e */
-	[todo] WERROR spoolss_AddMonitor(
-	);
-
-	/******************/
-	/* Function: 0x2f */
-	[todo] WERROR spoolss_DeleteMonitor(
-	);
-
-	/******************/
-	/* Function: 0x30 */
-	[todo] WERROR spoolss_DeletePrintProcessor(
-	);
-
-	/******************/
-	/* Function: 0x31 */
-	[todo] WERROR spoolss_AddPrintProvidor(
-	);
-
-	/******************/
-	/* Function: 0x32 */
-	[todo] WERROR spoolss_DeletePrintProvidor(
-	);
-
-	/******************/
-	/* Function: 0x33 */
-	[todo] WERROR spoolss_EnumPrintProcDataTypes(
-	);
-
-	/******************/
-	/* Function: 0x34 */
-	[todo] WERROR spoolss_ResetPrinter(
-	);
-
-	/******************/
-	/* Function: 0x35 */
-	WERROR spoolss_GetPrinterDriver2(
-		[in,ref] policy_handle *handle,
-		[in,unique] [string,charset(UTF16)] uint16 *architecture,
-		[in] 	 uint32 level,
-		[in,unique] DATA_BLOB *buffer,
-		[in] 	 uint32 offered,
-		[in] 	 uint32 client_major_version,
-		[in] 	 uint32 client_minor_version,
-		[out,unique] DATA_BLOB *info,
-		[out] 	 uint32 needed,
-		[out] 	 uint32 server_major_version,
-		[out] 	 uint32 server_minor_version
-	);
-
-	/******************/
-	/* Function: 0x36 */
-	[todo] WERROR spoolss_FindFirstPrinterChangeNotification(
-	);
-
-	/******************/
-	/* Function: 0x37 */
-	[todo] WERROR spoolss_FindNextPrinterChangeNotification(
-	);
-
-	/******************/
-	/* Function: 0x38 */
-	[public] WERROR spoolss_FindClosePrinterNotify(
-		[in,ref] policy_handle *handle
-	);
-
-	/******************/
-	/* Function: 0x39 */
-	[todo] WERROR spoolss_RouterFindFirstPrinterChangeNotificationOld(
-	);
-
-	/******************/
-	/* Function: 0x3a */
-	[public] WERROR spoolss_ReplyOpenPrinter(
-		[in,string,charset(UTF16)] uint16 server_name[],
-		[in] uint32 printer_local,
-		[in] winreg_Type type,
-		[in] uint32 unknown1,
-		[in] uint32 unknown2,
-		[out,ref] policy_handle *handle
-	);
-
-	/******************/
-	/* Function: 0x3b */
-	[todo] WERROR spoolss_RouterReplyPrinter(
-	);
-
-	/******************/
-	/* Function: 0x3c */
-	[public] WERROR spoolss_ReplyClosePrinter(
-		[in,out,ref] policy_handle *handle
-	);
-
-	/******************/
-	/* Function: 0x3d */
-	[todo] WERROR spoolss_AddPortEx(
-	);
-
-	/******************/
-	/* Function: 0x3e */
-	[todo] WERROR spoolss_RouterFindFirstPrinterChangeNotification(
-	);
-
-	/******************/
-	/* Function: 0x3f */
-	[todo] WERROR spoolss_SpoolerInit(
-	);
-
-	/******************/
-	/* Function: 0x40 */
-	[todo] WERROR spoolss_ResetPrinterEx(
-	);
-
-	typedef [enum16bit] enum {
-		SPOOLSS_FIELD_SERVER_NAME		=  0,
-		SPOOLSS_FIELD_PRINTER_NAME		=  1,
-		SPOOLSS_FIELD_SHARE_NAME    	=  2,
-		SPOOLSS_FIELD_PORT_NAME			=  3,
-		SPOOLSS_FIELD_DRIVER_NAME		=  4,
-		SPOOLSS_FIELD_COMMENT			=  5,
-		SPOOLSS_FIELD_LOCATION			=  6,
-		SPOOLSS_FIELD_DEVMODE			=  7,
-		SPOOLSS_FIELD_SEPFILE			=  8,
-		SPOOLSS_FIELD_PRINT_PROCESSOR	=  9,
-		SPOOLSS_FIELD_PARAMETERS		= 10,
-		SPOOLSS_FIELD_DATATYPE			= 11,
-		SPOOLSS_FIELD_SECURITY_DESCRIPTOR=12,
-		SPOOLSS_FIELD_ATTRIBUTES		= 13,
-		SPOOLSS_FIELD_PRIORITY			= 14,
-		SPOOLSS_FIELD_DEFAULT_PRIORITY	= 15,
-		SPOOLSS_FIELD_START_TIME		= 16,
-		SPOOLSS_FIELD_UNTIL_TIME		= 17,
-		SPOOLSS_FIELD_STATUS			= 18,
-		SPOOLSS_FIELD_STATUS_STRING		= 19,
-		SPOOLSS_FIELD_CJOBS				= 20,
-		SPOOLSS_FIELD_AVERAGE_PPM		= 21,
-		SPOOLSS_FIELD_TOTAL_PAGES		= 22,
-		SPOOLSS_FIELD_PAGES_PRINTED 	= 23,
-		SPOOLSS_FIELD_TOTAL_BYTES		= 24,
-		SPOOLSS_FIELD_BYTES_PRINTED		= 25
-	} spoolss_Field;
-
-	typedef [enum16bit] enum {
-		SPOOLSS_NOTIFY_PRINTER 			= 0,
-		SPOOLSS_NOTIFY_JOB				= 1
-	} spoolss_NotifyType;
-
-	/******************/
-	/* Function: 0x41 */
-	typedef struct {
-		spoolss_NotifyType type;
-		uint16 u1;
-		uint32 u2;
-		uint32 u3;
-		uint32 count;
-		[size_is(count)] spoolss_Field *fields;
-	} spoolss_NotifyOptionsArray;
-
-	typedef struct {
-		uint32 version;
-		uint32 flags;
-		uint32 count;
-		[size_is(count)] spoolss_NotifyOptionsArray *options;
-	} spoolss_NotifyOptionsContainer;
-
-	[public] WERROR spoolss_RemoteFindFirstPrinterChangeNotifyEx(
-		[in,ref] policy_handle *handle,
-		[in] uint32 flags,
-		[in] uint32 options,
-		[in,unique] [string,charset(UTF16)] uint16 *str,
-		[in] uint32 printer_local,
-		[in,unique] spoolss_NotifyOptionsContainer *t1
-	);
-
-	/******************/
-	/* Function: 0x42 */
-	[todo] WERROR spoolss_RouterRefreshPrinterChangeNotification(
-	);
-
-	typedef struct {
-		uint32 size;
-		[size_is(size/2),unique,charset(UTF16)] uint16 *string;
-	} spoolss_NotifyUTF16String;
-
-	typedef struct {
-		uint32 size;
-		[size_is(size),charset(DOS)] uint8 *string;
-	} spoolss_NotifyDOSString;
-
-	typedef struct {
-		uint16 data[8];
-	} spoolss_NotifyBlobData;
-
-	typedef struct {
-		uint32 len;
-		[unique] spoolss_NotifyBlobData *data;
-	} spoolss_NotifyBlob;
-
-	typedef [switch_type(uint32)] union {
-		[case(1)] dlong integer;
-		[case(2)] spoolss_NotifyUTF16String utf16_string;
-		[case(3)] spoolss_NotifyDOSString ascii_string;
-		[case(4)] spoolss_NotifyBlob blob;
-		[case(5)] spoolss_NotifyDOSString ascii_string;
-	} spoolss_NotifyData;
-
-	typedef struct {
-		spoolss_NotifyType type;
-		spoolss_Field field;
-		uint32 variable_type;
-		uint32 job_id;
-		[switch_is(variable_type)] spoolss_NotifyData data;
-	} spoolss_Notify;
-
-	typedef struct {
-		uint32 version;
-		uint32 flags;
-		uint32 count;
-		[size_is(count)] spoolss_Notify notifies[];
-	} spoolss_NotifyInfo;
-
-	/******************/
-	/* Function: 0x43 */
-	[public] WERROR spoolss_RemoteFindNextPrinterChangeNotifyEx(
-		[in,ref] policy_handle *handle,
-		[in] uint32 change_low,
-		[in,unique] spoolss_NotifyOptionsContainer *container,
-		[out, unique] spoolss_NotifyInfo *info
-	);
-
-	/******************/
-	/* Function: 0x44 */
-	[todo] WERROR spoolss_44(
-	);
-
-	typedef struct {
-		uint32 size;
-		[string,charset(UTF16)] uint16 *client;
-		[string,charset(UTF16)] uint16 *user;
-		uint32 build;
-		uint32 major;
-		uint32 minor;
-		uint32 processor;
-	} spoolss_UserLevel1;
-
-	typedef union {
-		[case(1)]  spoolss_UserLevel1 *level1;
-	} spoolss_UserLevel;
-
-	typedef bitmap {
-		SERVER_ACCESS_ADMINISTER	= 0x00000001,
-		SERVER_ACCESS_ENUMERATE		= 0x00000002,
-		PRINTER_ACCESS_ADMINISTER	= 0x00000004,
-		PRINTER_ACCESS_USE		= 0x00000008,
-		JOB_ACCESS_ADMINISTER		= 0x00000010
-	} spoolss_AccessRights;
-
-	/* Access rights for print servers */
-	const int SERVER_ALL_ACCESS	= SEC_STD_REQUIRED |
-					  SERVER_ACCESS_ADMINISTER |
-					  SERVER_ACCESS_ENUMERATE;
-
-	const int SERVER_READ		= SEC_STD_READ_CONTROL |
-					  SERVER_ACCESS_ENUMERATE;
-
-	const int SERVER_WRITE		= STANDARD_RIGHTS_WRITE_ACCESS |
-					  SERVER_ACCESS_ADMINISTER |
-					  SERVER_ACCESS_ENUMERATE;
-
-	const int SERVER_EXECUTE	= SEC_STD_READ_CONTROL |
-					  SERVER_ACCESS_ENUMERATE;
-
-	/* Access rights for printers */
-	const int PRINTER_ALL_ACCESS	= SEC_STD_REQUIRED |
-					  PRINTER_ACCESS_ADMINISTER |
-					  PRINTER_ACCESS_USE;
-
-	const int PRINTER_READ		= SEC_STD_READ_CONTROL |
-					  PRINTER_ACCESS_USE;
-
-	const int PRINTER_WRITE		= STANDARD_RIGHTS_WRITE_ACCESS |
-					  PRINTER_ACCESS_USE;
-
-	const int PRINTER_EXECUTE	= SEC_STD_READ_CONTROL |
-					  PRINTER_ACCESS_USE;
-
-	/* Access rights for jobs */
-	const int JOB_ALL_ACCESS	= SEC_STD_REQUIRED |
-					  JOB_ACCESS_ADMINISTER;
-
-	const int JOB_READ		= SEC_STD_READ_CONTROL |
-					  JOB_ACCESS_ADMINISTER;
-
-	const int JOB_WRITE		= STANDARD_RIGHTS_WRITE_ACCESS |
-					  JOB_ACCESS_ADMINISTER;
-
-	const int JOB_EXECUTE		= SEC_STD_READ_CONTROL |
-					  JOB_ACCESS_ADMINISTER;
-
-	/* ACE masks for various print permissions */
-	const int PRINTER_ACE_FULL_CONTROL = SEC_GENERIC_ALL |
-						PRINTER_ALL_ACCESS;
-
-	const int PRINTER_ACE_MANAGE_DOCUMENTS = SEC_GENERIC_ALL |
-						READ_CONTROL_ACCESS;
-
-	const int PRINTER_ACE_PRINT	= GENERIC_EXECUTE_ACCESS |
-					  READ_CONTROL_ACCESS |
-					  PRINTER_ACCESS_USE;
-
-	/******************/
-	/* Function: 0x45 */
-	[public] WERROR spoolss_OpenPrinterEx(
-		[in,unique]           [string,charset(UTF16)] uint16 *printername,
-		[in,unique]           [string,charset(UTF16)] uint16 *datatype,
-		[in]	              spoolss_DevmodeContainer devmode_ctr,
-		[in]	              uint32 access_mask,
-		[in]	              uint32 level,
-		[in,switch_is(level)] spoolss_UserLevel userlevel,
-		[out,ref]	      policy_handle *handle
-	);
-
-	/******************/
-	/* Function: 0x46 */
-	WERROR spoolss_AddPrinterEx(
-		[in,unique] [string,charset(UTF16)] uint16 *server,
-		[in] uint32 level,
-		[in,unique,switch_is(level)] spoolss_PrinterInfo *info,
-		[in] spoolss_DevmodeContainer devmode_ctr,
-		[in,unique] security_descriptor *secdesc,
-		[in] uint32 ulevel,
-		[in,switch_is(ulevel)] spoolss_UserLevel userlevel
-	);
-
-	/******************/
-	/* Function: 0x47 */
-	[todo] WERROR spoolss_47(
-	);
-
-	/******************/
-	/* Function: 0x48 */
-	WERROR spoolss_EnumPrinterData(
-		[in,ref] policy_handle *handle,
-		[in]	 uint32 enum_index,
-		[out,ref,size_is(value_offered/2),charset(UTF16)] uint16 *value_name,
-		[in]     uint32 value_offered,
-		[out,ref] uint32 *value_needed,
-		[out,ref] uint32 *printerdata_type,
-		[out,ref] DATA_BLOB *buffer,
-		[in]	 uint32 data_offered,
-		[out,ref] uint32 *data_needed
-	);
-
-	/******************/
-	/* Function: 0x49 */
-	WERROR spoolss_DeletePrinterData(
-		[in,ref] policy_handle *handle,
-		[in] [string,charset(UTF16)] uint16 value_name[]
-	);
-
-	/******************/
-	/* Function: 0x4a */
-	[todo] WERROR spoolss_4a(
-	);
-
-	/******************/
-	/* Function: 0x4b */
-	[todo] WERROR spoolss_4b(
-	);
-
-	/******************/
-	/* Function: 0x4c */
-	[todo] WERROR spoolss_4c(
-	);
-
-	/******************/
-	/* Function: 0x4d */
-	WERROR spoolss_SetPrinterDataEx(
-		[in,ref] policy_handle *handle,
-		[in] 	 [string,charset(UTF16)] uint16 key_name[],
-		[in] 	 [string,charset(UTF16)] uint16 value_name[],
-		[in] 	 uint32 type,
-		[in] 	 DATA_BLOB buffer,
-		[in] 	 uint32 offered
-	);
-
-	/******************/
-	/* Function: 0x4e */
-	WERROR spoolss_GetPrinterDataEx(
-		[in,ref] policy_handle *handle,
-		[in] 	 [string,charset(UTF16)] uint16 key_name[],
-		[in] 	 [string,charset(UTF16)] uint16 value_name[],
-		[in] 	 uint32 offered,
-		[out] 	 uint32 type,
-		[out] 	 DATA_BLOB buffer,
-		[out] 	 uint32 needed
-	);
-
-	/******************/
-	/* Function: 0x4f */
-	[public] WERROR spoolss_EnumPrinterDataEx(
-		[in,ref] policy_handle *handle,
-		[in] 	 [string,charset(UTF16)] uint16 key_name[],
-		[in] 	 uint32 offered,
-		[out] 	 DATA_BLOB buffer,
-		[out] 	 uint32 needed,
-		[out] 	 uint32 count
-	);
-
-	/******************/
-	/* Function: 0x50 */
-	[public] WERROR spoolss_EnumPrinterKey(
-		[in, ref] policy_handle *handle,
-		[in] [string,charset(UTF16)] uint16 key_name[],
-		[out] uint32 key_buffer_size,
-		[out] uint16 key_buffer[key_buffer_size],
-		[in,out] uint32 needed
-	);
-
-	/******************/
-	/* Function: 0x51 */
-	WERROR spoolss_DeletePrinterDataEx(
-		[in,ref] policy_handle *handle,
-		[in] [string,charset(UTF16)] uint16 key_name[],
-		[in] [string,charset(UTF16)] uint16 value_name[]
-	);
-
-	/******************/
-	/* Function: 0x52 */
-	[todo] WERROR spoolss_DeletePrinterKey(
-	);
-
-	/******************/
-	/* Function: 0x53 */
-	[todo] WERROR spoolss_53(
-	);
-
-	/******************/
-	/* Function: 0x54 */
-	[todo] WERROR spoolss_DeletePrinterDriverEx(
-	);
-
-	/******************/
-	/* Function: 0x55 */
-	[todo] WERROR spoolss_55(
-	);
-
-	/******************/
-	/* Function: 0x56 */
-	[todo] WERROR spoolss_56(
-	);
-
-	/******************/
-	/* Function: 0x57 */
-	[todo] WERROR spoolss_57(
-	);
-
-	/******************/
-	/* Function: 0x58 */
-	WERROR spoolss_XcvData(
-		[in,ref] policy_handle *handle,
-		[in] [string,charset(UTF16)] uint16 function_name[],
-		[in] DATA_BLOB in_data,
-		[in,value(r->in.in_data.length)] uint32 _in_data_length,
-		[in] uint32 offered,
-		[in] uint32 unknown1,
-		[out] DATA_BLOB out_data,
-		[out] uint32 needed,
-		[out] uint32 unknown2
-	);
-
-	/******************/
-	/* Function: 0x59 */
-	[public,todo] WERROR spoolss_AddPrinterDriverEx(
-	);
-
-	/******************/
-	/* Function: 0x5a */
-	[todo] WERROR spoolss_5a(
-	);
-
-	/******************/
-	/* Function: 0x5b */
-	[todo] WERROR spoolss_5b(
-	);
-
-	/******************/
-	/* Function: 0x5c */
-	[todo] WERROR spoolss_5c(
-	);
-
-	/******************/
-	/* Function: 0x5d */
-	[todo] WERROR spoolss_5d(
-	);
-
-	/******************/
-	/* Function: 0x5e */
-	[todo] WERROR spoolss_5e(
-	);
-
-	/******************/
-	/* Function: 0x5f */
-	[todo] WERROR spoolss_5f(
-	);
-}
diff --git a/source4/librpc/idl/trkwks.idl b/source4/librpc/idl/trkwks.idl
deleted file mode 100644
index 7f11af189b..0000000000
--- a/source4/librpc/idl/trkwks.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-  distributed key tracking services
-*/
-
-[
-	uuid("300f3532-38cc-11d0-a3f0-0020af6b0add"),
-	version(1.2),
-	pointer_default(unique),
-	helpstring("Distributed Key Tracking Service")
-]
-interface trkwks
-{
-
-	/*****************/
-	/* Function 0x00 */
-	WERROR trkwks_Unknown0();
-}
diff --git a/source4/librpc/idl/unixinfo.idl b/source4/librpc/idl/unixinfo.idl
deleted file mode 100644
index 6929e86e61..0000000000
--- a/source4/librpc/idl/unixinfo.idl
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "idl_types.h"
-/*
-  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")
-] interface unixinfo
-{
-	/******************/
-	/* Function: 0x00 */
-	NTSTATUS unixinfo_SidToUid (
-	    [in]	dom_sid sid,
-	    [out]	hyper *uid
-	    );
-
-	/******************/
-	/* Function: 0x01 */
-	NTSTATUS unixinfo_UidToSid (
-	    [in]	hyper uid,
-	    [out]	dom_sid *sid
-	    );
-
-	/******************/
-	/* Function: 0x02 */
-	NTSTATUS unixinfo_SidToGid (
-	    [in]	dom_sid sid,
-	    [out]	hyper *gid
-	    );
-
-	/******************/
-	/* Function: 0x03 */
-	NTSTATUS unixinfo_GidToSid (
-	    [in]	hyper gid,
-	    [out]	dom_sid *sid
-	    );
-
-	typedef struct {
-		NTSTATUS status;
-		[charset(UTF8),string] uint8 homedir[];
-		[charset(UTF8),string] uint8 shell[];
-	} unixinfo_GetPWUidInfo;
-
-	/******************/
-	/* Function: 0x04 */
-        NTSTATUS unixinfo_GetPWUid (
-		[in,out,ref,range(0,1023)] uint32 *count,
-		[in,size_is(*count)] hyper uids[],
-		[out,size_is(*count)] unixinfo_GetPWUidInfo infos[*]
-        );
-}
diff --git a/source4/librpc/idl/w32time.idl b/source4/librpc/idl/w32time.idl
deleted file mode 100644
index 4839899629..0000000000
--- a/source4/librpc/idl/w32time.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-  w32time interface definitions
-*/
-
-[
-  uuid("8fb6d884-2388-11d0-8c35-00c04fda2795"),
-  endpoint("ncacn_np:[\\pipe\\srvsvc]","ncacn_np:[\\pipe\\atsvc]","ncacn_np:[\\pipe\\browser]","ncacn_np:[\\pipe\\keysvc]","ncacn_np:[\\pipe\\wkssvc]"),
-  version(4.1),
-  pointer_default(unique),
-  helpstring("Win32 Time Server")
-]
-interface w32time
-{
-
-	/*****************/
-	/* Function 0x00 */
-	[todo] WERROR w32time_SyncTime();
-
-	[todo] WERROR w32time_GetNetLogonServiceBits();
-	[todo] WERROR w32time_QueryProviderStatus();
-}
diff --git a/source4/librpc/idl/wmi.idl b/source4/librpc/idl/wmi.idl
deleted file mode 100644
index 1f7b5ca1cf..0000000000
--- a/source4/librpc/idl/wmi.idl
+++ /dev/null
@@ -1,716 +0,0 @@
-/* 
- * WMI IDL.  
- * See http://en.wikipedia.org/wiki/Windows_Management_Instrumentation for more information.
- */
-#include "idl_types.h"
-
-import "dcom.idl";
-import "misc.idl";
-
-[
-	helper("librpc/ndr/ndr_wmi.h"),
-	uuid("8BC3F05E-D86B-11d0-A075-00C04FB68820")
-] coclass WbemLevel1Login
-{
-    interface IWbemLevel1Login;
-
-};
-
-[
-	local, 
-	object, 
-	uuid("dc12a681-737f-11cf-884d-00aa004b2e24")
-]
-interface IWbemClassObject : IUnknown
-{
-
-	typedef [noprint] struct {
-		[value(0x72657355)] uint32 flags;
-		[string, charset(UTF16)] uint16 data[];
-	} BSTR;
-
-    WERROR Delete(
-        [in, string, charset(UTF16)] uint16 *wszName
-        );
-
-};
-
-[
-    uuid(9A653086-174F-11d2-B5F9-00104B703EFD)
-]
-coclass WbemClassObject
-{
-	    interface IWbemClassObject;
-};
-
-
-[
-	uuid("9556dc99-828c-11cf-a37e-00aa003240c7"),
-	object,
-        pointer_default(unique)
-] interface IWbemServices : IUnknown
-{
-    typedef [v1_enum] enum
-    {
-	RPC_S_CALL_FAILED		= 1726,
-
-        WBEM_NO_ERROR = 0,
-        WBEM_S_NO_ERROR = 0,
-        WBEM_S_SAME = 0,
-        WBEM_S_FALSE = 1,
-        WBEM_S_ALREADY_EXISTS           = 0x40001,
-        WBEM_S_RESET_TO_DEFAULT         = 0x40002,
-        WBEM_S_DIFFERENT                = 0x40003,
-        WBEM_S_TIMEDOUT                 = 0x40004,
-        WBEM_S_NO_MORE_DATA             = 0x40005,
-        WBEM_S_OPERATION_CANCELLED      = 0x40006,
-        WBEM_S_PENDING                  = 0x40007,
-        WBEM_S_DUPLICATE_OBJECTS        = 0x40008,
-        WBEM_S_ACCESS_DENIED            = 0x40009,
-        WBEM_S_PARTIAL_RESULTS          = 0x40010,
-        WBEM_S_NO_POSTHOOK              = 0x40011,
-        WBEM_S_POSTHOOK_WITH_BOTH       = 0x40012,
-        WBEM_S_POSTHOOK_WITH_NEW        = 0x40013,
-        WBEM_S_POSTHOOK_WITH_STATUS     = 0x40014,
-        WBEM_S_POSTHOOK_WITH_OLD        = 0x40015,
-        WBEM_S_REDO_PREHOOK_WITH_ORIGINAL_OBJECT = 0x40016,
-        WBEM_S_SOURCE_NOT_AVAILABLE     = 0x40017,
-        WBEM_E_FAILED                           = 0x80041001,
-        WBEM_E_NOT_FOUND                        = 0x80041002,
-        WBEM_E_ACCESS_DENIED                    = 0x80041003,
-        WBEM_E_PROVIDER_FAILURE                 = 0x80041004,
-        WBEM_E_TYPE_MISMATCH                    = 0x80041005,
-        WBEM_E_OUT_OF_MEMORY                    = 0x80041006,
-        WBEM_E_INVALID_CONTEXT                  = 0x80041007,
-        WBEM_E_INVALID_PARAMETER                = 0x80041008,
-        WBEM_E_NOT_AVAILABLE                    = 0x80041009,
-        WBEM_E_CRITICAL_ERROR                   = 0x8004100A,
-        WBEM_E_INVALID_STREAM                   = 0x8004100B,
-        WBEM_E_NOT_SUPPORTED                    = 0x8004100C,
-        WBEM_E_INVALID_SUPERCLASS               = 0x8004100D,
-        WBEM_E_INVALID_NAMESPACE                = 0x8004100E,
-        WBEM_E_INVALID_OBJECT                   = 0x8004100F,
-        WBEM_E_INVALID_CLASS                    = 0x80041010,
-        WBEM_E_PROVIDER_NOT_FOUND               = 0x80041011,
-        WBEM_E_INVALID_PROVIDER_REGISTRATION    = 0x80041012,
-        WBEM_E_PROVIDER_LOAD_FAILURE            = 0x80041013,
-        WBEM_E_INITIALIZATION_FAILURE           = 0x80041014,
-        WBEM_E_TRANSPORT_FAILURE                = 0x80041015,
-        WBEM_E_INVALID_OPERATION                = 0x80041016,
-        WBEM_E_INVALID_QUERY                    = 0x80041017,
-        WBEM_E_INVALID_QUERY_TYPE               = 0x80041018,
-        WBEM_E_ALREADY_EXISTS                   = 0x80041019,
-        WBEM_E_OVERRIDE_NOT_ALLOWED             = 0x8004101A,
-        WBEM_E_PROPAGATED_QUALIFIER             = 0x8004101B,
-        WBEM_E_PROPAGATED_PROPERTY              = 0x8004101C,
-        WBEM_E_UNEXPECTED                       = 0x8004101D,
-        WBEM_E_ILLEGAL_OPERATION                = 0x8004101E,
-        WBEM_E_CANNOT_BE_KEY                    = 0x8004101F,
-        WBEM_E_INCOMPLETE_CLASS                 = 0x80041020,
-        WBEM_E_INVALID_SYNTAX                   = 0x80041021,
-        WBEM_E_NONDECORATED_OBJECT              = 0x80041022,
-        WBEM_E_READ_ONLY                        = 0x80041023,
-        WBEM_E_PROVIDER_NOT_CAPABLE             = 0x80041024,
-        WBEM_E_CLASS_HAS_CHILDREN               = 0x80041025,
-        WBEM_E_CLASS_HAS_INSTANCES              = 0x80041026,
-        WBEM_E_QUERY_NOT_IMPLEMENTED            = 0x80041027,
-        WBEM_E_ILLEGAL_NULL                     = 0x80041028,
-        WBEM_E_INVALID_QUALIFIER_TYPE           = 0x80041029,
-        WBEM_E_INVALID_PROPERTY_TYPE            = 0x8004102A,
-        WBEM_E_VALUE_OUT_OF_RANGE               = 0x8004102B,
-        WBEM_E_CANNOT_BE_SINGLETON              = 0x8004102C,
-        WBEM_E_INVALID_CIM_TYPE                 = 0x8004102D,
-        WBEM_E_INVALID_METHOD                   = 0x8004102E,
-        WBEM_E_INVALID_METHOD_PARAMETERS        = 0x8004102F,
-        WBEM_E_SYSTEM_PROPERTY                  = 0x80041030,
-        WBEM_E_INVALID_PROPERTY                 = 0x80041031,
-        WBEM_E_CALL_CANCELLED                   = 0x80041032,
-        WBEM_E_SHUTTING_DOWN                    = 0x80041033,
-        WBEM_E_PROPAGATED_METHOD                = 0x80041034,
-        WBEM_E_UNSUPPORTED_PARAMETER            = 0x80041035,
-        WBEM_E_MISSING_PARAMETER_ID             = 0x80041036,
-        WBEM_E_INVALID_PARAMETER_ID             = 0x80041037,
-        WBEM_E_NONCONSECUTIVE_PARAMETER_IDS     = 0x80041038,
-        WBEM_E_PARAMETER_ID_ON_RETVAL           = 0x80041039,
-        WBEM_E_INVALID_OBJECT_PATH              = 0x8004103A,
-        WBEM_E_OUT_OF_DISK_SPACE                = 0x8004103B,
-        WBEM_E_BUFFER_TOO_SMALL                 = 0x8004103C,
-        WBEM_E_UNSUPPORTED_PUT_EXTENSION        = 0x8004103D,
-        WBEM_E_UNKNOWN_OBJECT_TYPE              = 0x8004103E,
-        WBEM_E_UNKNOWN_PACKET_TYPE              = 0x8004103F,
-        WBEM_E_MARSHAL_VERSION_MISMATCH         = 0x80041040,
-        WBEM_E_MARSHAL_INVALID_SIGNATURE        = 0x80041041,
-        WBEM_E_INVALID_QUALIFIER                = 0x80041042,
-        WBEM_E_INVALID_DUPLICATE_PARAMETER      = 0x80041043,
-        WBEM_E_TOO_MUCH_DATA                    = 0x80041044,
-        WBEM_E_SERVER_TOO_BUSY                  = 0x80041045,
-        WBEM_E_INVALID_FLAVOR                   = 0x80041046,
-        WBEM_E_CIRCULAR_REFERENCE               = 0x80041047,
-        WBEM_E_UNSUPPORTED_CLASS_UPDATE         = 0x80041048,
-        WBEM_E_CANNOT_CHANGE_KEY_INHERITANCE    = 0x80041049,
-        WBEM_E_CANNOT_CHANGE_INDEX_INHERITANCE  = 0x80041050,
-        WBEM_E_TOO_MANY_PROPERTIES              = 0x80041051,
-        WBEM_E_UPDATE_TYPE_MISMATCH             = 0x80041052,
-        WBEM_E_UPDATE_OVERRIDE_NOT_ALLOWED      = 0x80041053,
-        WBEM_E_UPDATE_PROPAGATED_METHOD         = 0x80041054,
-        WBEM_E_METHOD_NOT_IMPLEMENTED           = 0x80041055,
-        WBEM_E_METHOD_DISABLED                  = 0x80041056,
-        WBEM_E_REFRESHER_BUSY                   = 0x80041057,
-        WBEM_E_UNPARSABLE_QUERY                 = 0x80041058,
-        WBEM_E_NOT_EVENT_CLASS                  = 0x80041059,
-        WBEM_E_MISSING_GROUP_WITHIN             = 0x8004105A,
-        WBEM_E_MISSING_AGGREGATION_LIST         = 0x8004105B,
-        WBEM_E_PROPERTY_NOT_AN_OBJECT           = 0x8004105C,
-        WBEM_E_AGGREGATING_BY_OBJECT            = 0x8004105D,
-        WBEM_E_UNINTERPRETABLE_PROVIDER_QUERY   = 0x8004105F,
-        WBEM_E_BACKUP_RESTORE_WINMGMT_RUNNING   = 0x80041060,
-        WBEM_E_QUEUE_OVERFLOW                   = 0x80041061,
-        WBEM_E_PRIVILEGE_NOT_HELD               = 0x80041062,
-        WBEM_E_INVALID_OPERATOR                 = 0x80041063,
-        WBEM_E_LOCAL_CREDENTIALS                = 0x80041064,
-        WBEM_E_CANNOT_BE_ABSTRACT               = 0x80041065,
-        WBEM_E_AMENDED_OBJECT                   = 0x80041066,
-        WBEM_E_CLIENT_TOO_SLOW                  = 0x80041067,
-        WBEM_E_NULL_SECURITY_DESCRIPTOR         = 0x80041068,
-        WBEM_E_TIMED_OUT                        = 0x80041069,
-        WBEM_E_INVALID_ASSOCIATION              = 0x8004106A,
-        WBEM_E_AMBIGUOUS_OPERATION              = 0x8004106B,
-        WBEM_E_QUOTA_VIOLATION                  = 0x8004106C,
-        WBEM_E_RESERVED_001                     = 0x8004106D,
-        WBEM_E_RESERVED_002                     = 0x8004106E,
-        WBEM_E_UNSUPPORTED_LOCALE               = 0x8004106F,
-        WBEM_E_HANDLE_OUT_OF_DATE               = 0x80041070,
-        WBEM_E_CONNECTION_FAILED                = 0x80041071,
-        WBEM_E_INVALID_HANDLE_REQUEST           = 0x80041072,
-        WBEM_E_PROPERTY_NAME_TOO_WIDE           = 0x80041073,
-        WBEM_E_CLASS_NAME_TOO_WIDE              = 0x80041074,
-        WBEM_E_METHOD_NAME_TOO_WIDE             = 0x80041075,
-        WBEM_E_QUALIFIER_NAME_TOO_WIDE          = 0x80041076,
-        WBEM_E_RERUN_COMMAND                    = 0x80041077,
-        WBEM_E_DATABASE_VER_MISMATCH            = 0x80041078,
-        WBEM_E_VETO_DELETE                      = 0x80041079,
-        WBEM_E_VETO_PUT                         = 0x8004107A,
-        WBEM_E_INVALID_LOCALE                   = 0x80041080,
-        WBEM_E_PROVIDER_SUSPENDED               = 0x80041081,
-        WBEM_E_SYNCHRONIZATION_REQUIRED         = 0x80041082,
-        WBEM_E_NO_SCHEMA                        = 0x80041083,
-        WBEM_E_PROVIDER_ALREADY_REGISTERED      = 0x80041084,
-        WBEM_E_PROVIDER_NOT_REGISTERED          = 0x80041085,
-        WBEM_E_FATAL_TRANSPORT_ERROR            = 0x80041086,
-        WBEM_E_ENCRYPTED_CONNECTION_REQUIRED    = 0x80041087,
-        WBEM_E_PROVIDER_TIMED_OUT               = 0x80041088,
-        WBEM_E_NO_KEY                           = 0x80041089,
-        WBEM_E_PROVIDER_DISABLED                = 0x8004108a
-    }   WBEMSTATUS;
-
-    typedef [public,noprint] enum
-    {
-        WBEM_FLAG_RETURN_WBEM_COMPLETE 		= 0,
-        WBEM_FLAG_BIDIRECTIONAL 			= 0,
-        WBEM_FLAG_RETURN_IMMEDIATELY 		= 0x000010,
-        WBEM_FLAG_FORWARD_ONLY 				= 0x000020,
-        WBEM_FLAG_NO_ERROR_OBJECT 			= 0x000040,
-        WBEM_FLAG_SEND_STATUS 				= 0x000080,
-        WBEM_FLAG_ENSURE_LOCATABLE 			= 0x000100,
-        WBEM_FLAG_DIRECT_READ 				= 0x000200,
-        WBEM_FLAG_USE_AMENDED_QUALIFIERS 	= 0x020000,
-        WBEM_FLAG_STRONG_VALIDATION 		= 0x100000,
-        WBEM_FLAG_RETURN_ERROR_OBJECT 		= 0,
-        WBEM_FLAG_DONT_SEND_STATUS 			= 0,
-        WBEM_FLAG_SEND_ONLY_SELECTED 		= 0,
-
-        WBEM_RETURN_WHEN_COMPLETE 			= 0,
-        WBEM_RETURN_IMMEDIATELY 			= WBEM_FLAG_RETURN_IMMEDIATELY,
-
-        WBEM_MASK_RESERVED_FLAGS 			= 0x001F000
-    } WBEM_GENERIC_FLAG_TYPE;
-
-    typedef [public,noprint,v1_enum] enum tag_WBEM_TIMEOUT_TYPE
-    {
-        WBEM_NO_WAIT = 0,
-        WBEM_INFINITE = 0xFFFFFFFF
-    } WBEM_TIMEOUT_TYPE;
-
-    typedef [public,v1_enum] enum
-    {
-        CIM_EMPTY  		= 0,
-        CIM_SINT16 		= 2,
-        CIM_SINT32 		= 3,
-        CIM_REAL32 		= 4,
-        CIM_REAL64 		= 5,
-        CIM_STRING 		= 8,
-
-        CIM_BOOLEAN 	= 11,
-        CIM_OBJECT  	= 13,
-        CIM_SINT8   	= 16,
-        CIM_UINT8   	= 17,
-        CIM_UINT16  	= 18,
-        CIM_UINT32  	= 19,
-        CIM_SINT64  	= 20,
-        CIM_UINT64  	= 21,
-        CIM_DATETIME 	= 101,
-        CIM_REFERENCE 	= 102,
-        CIM_CHAR16 		= 103,
-
-        CIM_FLAG_ARRAY 	= 0x2000,
-        CIM_ILLEGAL 	= 0x0fff,
-        CIM_TYPEMASK 	= 0x2fff,
-
-        CIM_ARR_SINT8 = CIM_FLAG_ARRAY | CIM_SINT8,
-        CIM_ARR_UINT8 = CIM_FLAG_ARRAY | CIM_UINT8,
-        CIM_ARR_SINT16 = CIM_FLAG_ARRAY | CIM_SINT16,
-        CIM_ARR_UINT16 = CIM_FLAG_ARRAY | CIM_UINT16,
-        CIM_ARR_SINT32 = CIM_FLAG_ARRAY | CIM_SINT32,
-        CIM_ARR_UINT32 = CIM_FLAG_ARRAY | CIM_UINT32,
-        CIM_ARR_SINT64 = CIM_FLAG_ARRAY | CIM_SINT64,
-        CIM_ARR_UINT64 = CIM_FLAG_ARRAY | CIM_UINT64,
-        CIM_ARR_REAL32 = CIM_FLAG_ARRAY | CIM_REAL32,
-        CIM_ARR_REAL64 = CIM_FLAG_ARRAY | CIM_REAL64,
-        CIM_ARR_BOOLEAN = CIM_FLAG_ARRAY | CIM_BOOLEAN,
-        CIM_ARR_STRING = CIM_FLAG_ARRAY | CIM_STRING,
-        CIM_ARR_DATETIME = CIM_FLAG_ARRAY | CIM_DATETIME,
-        CIM_ARR_REFERENCE = CIM_FLAG_ARRAY | CIM_REFERENCE,
-        CIM_ARR_CHAR16 = CIM_FLAG_ARRAY | CIM_CHAR16,
-        CIM_ARR_OBJECT = CIM_FLAG_ARRAY | CIM_OBJECT
-
-    } CIMTYPE_ENUMERATION;
-
-    typedef [public,bitmap8bit] bitmap
-    {
-        WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE = 0x1,
-        WBEM_FLAVOR_FLAG_PROPAGATE_TO_DERIVED_CLASS = 0x2,
-//        WBEM_FLAVOR_MASK_PROPAGATION = 0x0F,
-
-        WBEM_FLAVOR_NOT_OVERRIDABLE = 0x10,
-//        WBEM_FLAVOR_MASK_PERMISSIONS = 0x10,
-
-        WBEM_FLAVOR_ORIGIN_PROPAGATED = 0x20,
-        WBEM_FLAVOR_ORIGIN_SYSTEM = 0x40,
-//        WBEM_FLAVOR_MASK_ORIGIN = 0x60,
-
-        WBEM_FLAVOR_AMENDED = 0x80
-//        WBEM_FLAVOR_MASK_AMENDED = 0x80
-
-    } WBEM_FLAVOR_TYPE;
-
-    typedef [public,bitmap8bit] bitmap
-    {
-		WCF_DECORATIONS = 1,
-		WCF_INSTANCE = 2,
-		WCF_CLASS = 4,
-		WCF_CLASS_PART_INTERNAL = 8
-	//	WCF_CLASS_PART_SHARED = 0x104
-    } WCO_FLAGS;
-
-    typedef [public,nopull,nopush] struct
-    {
-		uint32 count;
-		[ref,charset(UTF16)] uint16 *item[count];
-    } CIMSTRINGS;
-
-    typedef [public,bitmap8bit] bitmap {
-        DEFAULT_FLAG_EMPTY = 1,
-        DEFAULT_FLAG_INHERITED = 2
-    } DEFAULT_FLAGS;
-
-	WERROR OpenNamespace(
-		[in] BSTR strNamespace,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[out, in, unique] IWbemServices** ppWorkingNamespace,
-		[out, in, unique] IWbemCallResult** ppResult
-		);
-
-	WERROR CancelAsyncCall(
-		[in] IWbemObjectSink* pSink
-		);
-
-	WERROR QueryObjectSink(
-		[in] long lFlags,
-		[out] IWbemObjectSink** ppResponseHandler
-		);
-
-	WERROR GetObject(
-		[in] BSTR strObjectPath,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[out, in, unique] IWbemClassObject** ppObject,
-		[out, in, unique] IWbemCallResult** ppCallResult
-		);
-
-
-	WERROR GetObjectAsync(
-		[in] BSTR strObjectPath,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[in] IWbemObjectSink* pResponseHandler
-		);
-
-	WERROR PutClass(
-		[in] IWbemClassObject* pObject,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[out, in, unique] IWbemCallResult** ppCallResult
-		);
-
-	WERROR PutClassAsync(
-		[in] IWbemClassObject* pObject,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[in] IWbemObjectSink* pResponseHandler
-		);
-
-	WERROR DeleteClass(
-		[in] BSTR strClass,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[out, in, unique] IWbemCallResult** ppCallResult
-		);
-
-	WERROR DeleteClassAsync(
-		[in] BSTR strClass,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[in] IWbemObjectSink* pResponseHandler
-		);
-
-	WERROR CreateClassEnum(
-		[in] BSTR strSuperclass,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[out] IEnumWbemClassObject** ppEnum
-		);
-
-	WERROR CreateClassEnumAsync(
-		[in] BSTR strSuperclass,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[in] IWbemObjectSink* pResponseHandler
-		);
-
-	WERROR PutInstance(
-		[in] IWbemClassObject* pInst,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[out, in, unique] IWbemCallResult** ppCallResult
-		);
-
-	WERROR PutInstanceAsync(
-		[in] IWbemClassObject* pInst,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[in] IWbemObjectSink* pResponseHandler
-		);
-
-
-	WERROR DeleteInstance(
-		[in] BSTR strObjectPath,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[out, in, unique] IWbemCallResult** ppCallResult
-		);
-
-
-	WERROR DeleteInstanceAsync(
-		[in] BSTR strObjectPath,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[in] IWbemObjectSink* pResponseHandler
-		);
-
-
-    WERROR CreateInstanceEnum(
-        [in] BSTR strFilter,          // allow more things than a class name
-        [in] long lFlags,
-        [in,unique]  IWbemContext* pCtx,
-        [out] IEnumWbemClassObject** ppEnum
-        );
-
-	WERROR CreateInstanceEnumAsync(
-		[in] BSTR strSuperClass,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[in] IWbemObjectSink* pResponseHandler
-		);
-
-    WERROR ExecQuery(
-        [in] BSTR strQueryLanguage,
-        [in] BSTR strQuery,
-        [in]  long lFlags,
-        [in,unique]  IWbemContext* pCtx,
-        [out] IEnumWbemClassObject** ppEnum
-        );
-
-	WERROR ExecQueryAsync(
-		[in] BSTR strQueryLanguage,
-		[in] BSTR strQuery,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[in] IWbemObjectSink* pResponseHandler
-		);
-
-    WERROR ExecNotificationQuery(
-        [in] BSTR strQueryLanguage,
-        [in] BSTR strQuery,
-        [in] long lFlags,
-        [in,unique]  IWbemContext* pCtx,
-        [out] IEnumWbemClassObject** ppEnum
-        );
-
-	WERROR ExecNotificationQueryAsync(
-		[in] BSTR strQueryLanguage,
-		[in] BSTR strQuery,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[in] IWbemObjectSink* pResponseHandler
-		);
-
-    WERROR ExecMethod(
-        [in] BSTR strObjectPath,
-        [in] BSTR strMethodName,
-        [in] long lFlags,
-        [in,unique] IWbemContext* pCtx,
-        [in,unique] IWbemClassObject* pInParams,
-        [in,out,unique] IWbemClassObject** ppOutParams,
-        [in,out,unique] IWbemCallResult** ppCallResult
-        );
-
-	WERROR ExecMethodAsync(
-		[in] BSTR strObjectPath,
-		[in] BSTR strMethodName,
-		[in] uint32 lFlags,
-		[in] IWbemContext* pCtx,
-		[in] IWbemClassObject* pInParams,
-		[in] IWbemObjectSink* pResponseHandler
-		);
-}
-
-[
-	object, 
-	uuid(027947e1-d731-11ce-a357-000000000001),
-	pointer_default(unique)
-] interface IEnumWbemClassObject : IUnknown
-{
-    WERROR Reset();
-
-    [call_as(Next)] WERROR IEnumWbemClassObject_Next(
-        [in]  int32 lTimeout,
-        [in]  uint32 uCount,
-		[out, size_is(uCount), length_is(*puReturned)] IWbemClassObject** apObjects,
-		[out] uint32* puReturned
-        );
-
-    WERROR NextAsync(
-        [in]  uint32 uCount,
-        [in]  IWbemObjectSink* pSink
-        );
-
-    WERROR IEnumWbemClassObject_Clone(
-        [out] IEnumWbemClassObject** ppEnum
-        );
-
-    WERROR Skip(
-        [in]  int32 lTimeout,
-        [in] uint32 nCount
-        );
-};
-
-[
-	object, 
-	local, 
-	uuid("44aca674-e8fc-11d0-a07c-00c04fb68820"),
-	pointer_default(unique)
-] interface IWbemContext : IUnknown
-{
-    WERROR Clone([out] IWbemContext** ppNewCopy);
-
-    WERROR GetNames(
-//        [in] long lFlags,
-//        [out] SAFEARRAY (BSTR)* pNames
-        );
-
-    WERROR BeginEnumeration([in] long lFlags);
-
-    WERROR Next(
-//        [in]  long lFlags,
-//        [out] BSTR* pstrName,
-//        [out] VARIANT* pValue
-        );
-
-    WERROR EndEnumeration();
-
-
-    WERROR SetValue(
-//        [in, string] LPCWSTR wszName,
-//        [in] long lFlags
-//        [in] VARIANT* pValue
-        );
-
-    WERROR GetValue(
-//        [in, string] LPCWSTR wszName,
-//        [in] long lFlags,
-//        [out] VARIANT* pValue
-        );
-
-    WERROR DeleteValue(
-//        [in, string] LPCWSTR wszName,
-//        [in] long lFlags
-        );
-
-    WERROR DeleteAll();
-}
-
-[
-	object,
-	uuid("F309AD18-D86A-11d0-A075-00C04FB68820"),
-	pointer_default(unique)
-] interface IWbemLevel1Login :  IUnknown
-{
-	WERROR EstablishPosition(
-		[in, unique, string, charset(UTF16)] uint16* wszLocaleList,
-		[in] DWORD dwNumLocales,
-		[out] DWORD* reserved
-		);
-	WERROR RequestChallenge(
-		[in, unique, string, charset(UTF16)] uint16* wszNetworkResource,
-		[in, unique, string, charset(UTF16)] uint16* wszUser,
-		[out, size_is(16), length_is(16)] uint8 * Nonce
-		);
-	WERROR WBEMLogin(
-		[in, unique, string, charset(UTF16)] uint16* wszPreferredLocale,
-		[in, size_is(16), length_is(16), unique] uint8 * AccessToken,
-		[in] long lFlags,
-		[in] IWbemContext* pCtx,
-		[out] IWbemServices** ppNamespace
-		);
-
-
-	WERROR NTLMLogin(
-		[in,unique,string,charset(UTF16)] uint16 *wszNetworkResource,
-		[in,unique,string,charset(UTF16)] uint16 *wszPreferredLocale,
-		[in]   long lFlags,
-		[in,unique]   IWbemContext* pCtx,
-		[out,ref]  IWbemServices** ppNamespace
-		);
-
-}
-
-[
-	object,
-	uuid("423ec01e-2e35-11d2-b604-00104b703efd"),
-	pointer_default(unique)
-] interface IWbemWCOSmartEnum : IUnknown
-{
-	typedef struct {
-		uint32 size;
-		char data[size];
-	} WBEMDATA;
-
-	typedef enum {
-		WTYPE_SCHEMA = 1,
-		WTYPE_CLASS = 2,
-		WTYPE_OBJECT = 3
-	} WTYPES;
-
-	typedef [relative_base] struct {
-		//	[relative] WBEMDATA4 *data; /* 0x9 */
-		uint32 data_size;
-		uint8 wtype;
-	} WBEMDATA4;
-
-	typedef [relative_base] struct {
-		[relative] WBEMDATA4 *data; /* 0x9 */
-		uint32 data_size;
-		uint8 wtype;
-	} WBEMDATA3;
-
-	typedef [relative_base] struct {
-		[relative,size_is(obj_num)] WBEMDATA3 *data; /* 0x8 */
-		uint32 data_size;
-		uint32 obj_num;
-	} WBEMDATA2;
-
-	typedef [relative_base] struct {
-		[relative] WBEMDATA2 *data; /* 0x8 */
-		uint32 data_size;
-	} WBEMDATA1;
-
-	typedef [relative_base] struct {
-		uint32 u1_0; /* 0 */
-		hyper signature; /* 'WBEMDATA' */
-		[relative] WBEMDATA1 *data; /* 0x1A */
-		uint32 data_size;
-		uint32 u2_0; /* 0 */
-		uint8 ver_major; /* 1 */
-		uint8 ver_minor; /* 0 - Win2000, 1 - WinXP/2003 */
-	} WBEMDATA0;
-
-	WERROR IWbemWCOSmartEnum_Next(
-		[in,ref] GUID *gEWCO,
-		[in] uint32 lTimeOut,
-		[in] uint32 uCount,
-		[in] uint32 unknown,
-		[in,ref] GUID *gWCO,
-		[out,ref] uint32 *puReturned,
-		[out,ref] uint32 *pSize,
-		[out,ref,noprint,size_is(,*pSize)] uint8 **pData
-		);
-}
-
-[
-	object,
-	uuid("1c1c45ee-4395-11d2-b60b-00104b703efd"),
-	pointer_default(unique)
-] interface IWbemFetchSmartEnum : IUnknown
-{
-	WERROR Fetch([out]	IWbemWCOSmartEnum** ppEnum);
-	WERROR Test([out]	IWbemClassObject** ppEnum);
-}
-
-[
-	object,
-	//	restricted,
-	uuid(44aca675-e8fc-11d0-a07c-00c04fb68820)
-] interface IWbemCallResult : IUnknown
-{
-	WERROR GetResultObject(
-						   [in]  long lTimeout,
-						   [out] IWbemClassObject** ppResultObject
-						  );
-
-	WERROR GetResultString(
-						   [in]  long lTimeout,
-						   [out] BSTR* pstrResultString
-						  );
-
-	WERROR GetResultServices(
-							 [in]  long lTimeout,
-							 [out] IWbemServices** ppServices
-							);
-
-	WERROR GetCallStatus(
-						 [in]  long lTimeout,
-						 [out] long* plStatus
-						);
-}
-
-
-[
-	object,
-	restricted,
-	uuid(7c857801-7381-11cf-884d-00aa004b2e24)
-]
-interface IWbemObjectSink : IUnknown
-{
-	WERROR SetStatus(
-					 [in] long lFlags,
-					 [in] WERROR hResult,
-					 [in] BSTR strParam,
-					 [in] IWbemClassObject* pObjParam
-					);
-	WERROR Indicate(
-					[in] long lObjectCount,
-					[in, size_is(lObjectCount)] IWbemClassObject** apObjArray
-				   );
-};
-
diff --git a/source4/librpc/idl/wzcsvc.idl b/source4/librpc/idl/wzcsvc.idl
deleted file mode 100644
index b403c0798c..0000000000
--- a/source4/librpc/idl/wzcsvc.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  wireless configuration service
-*/
-
-[
-  uuid("621dff68-3c39-4c6c-aae3-e68e2c6503ad"),
-  version(1.0),
-  helpstring("Wireless Configuration Service")
-]
-interface wzcsvc
-{
-
-	void wzcsvc_EnumInterfaces();
-	void wzcsvc_QueryInterface();
-	void wzcsvc_SetInterface();
-	void wzcsvc_RefreshInterface();
-	void wzcsvc_QueryContext();
-	void wzcsvc_SetContext();
-	void wzcsvc_EapolUIResponse();
-	void wzcsvc_EapolGetCustomAuthData();
-	void wzcsvc_EapolSetCustomAuthData();
-	void wzcsvc_EapolGetInterfaceParams();
-	void wzcsvc_EapolSetInterfaceParams();
-	void wzcsvc_EapolReAuthenticateInterface();
-	void wzcsvc_EapolQueryInterfaceState();
-	void wzcsvc_OpenWZCDbLogSession();
-	void wzcsvc_CloseWZCDbLogSession();
-	void wzcsvc_EnumWZCDbLogRecords();
-	void wzcsvc_FlushWZCdbLog();
-	void wzcsvc_GetWZCDbLogRecord();
-}