diff --git a/source4/lib/wmi/config.mk b/source4/lib/wmi/config.mk
index 84beb7161d2..086a2cbba9c 100644
--- a/source4/lib/wmi/config.mk
+++ b/source4/lib/wmi/config.mk
@@ -1,4 +1,5 @@
 [SUBSYSTEM::WMI]
+PRIVATE_PROTO_HEADER = proto.h
 PUBLIC_DEPENDENCIES = RPC_NDR_OXIDRESOLVER \
 		NDR_DCOM \
 		RPC_NDR_REMACT \
@@ -6,12 +7,11 @@ PUBLIC_DEPENDENCIES = RPC_NDR_OXIDRESOLVER \
 		DCOM_PROXY_DCOM \
 		DCOM
 
-WMI_OBJ_FILES = $(addprefix lib/wmi/, wmicore.o wbemdata.o ../librpc/gen_ndr/dcom_p.o)
+WMI_OBJ_FILES = $(addprefix lib/wmi/, wmicore.o wbemdata.o ../../librpc/gen_ndr/dcom_p.o)
 
 #################################
 # Start BINARY wmic
 [BINARY::wmic]
-PRIVATE_PROTO_HEADER = proto.h
 INSTALLDIR = BINDIR
 PRIVATE_DEPENDENCIES = \
                 POPT_SAMBA \
@@ -34,10 +34,7 @@ PRIVATE_DEPENDENCIES = \
 				WMI
 
 wmis_OBJ_FILES = \
-                wmis.o \
-		wmicore.o \
-		wbemdata.o \
-		../librpc/gen_ndr/dcom_p.o
+                lib/wmi/tools/wmis.o
 
 # End BINARY wmis
 #################################
diff --git a/source4/lib/wmi/tools/wmis.c b/source4/lib/wmi/tools/wmis.c
index 85063ecdb9f..cd22b13bf11 100644
--- a/source4/lib/wmi/tools/wmis.c
+++ b/source4/lib/wmi/tools/wmis.c
@@ -29,16 +29,14 @@
 #include "librpc/gen_ndr/ndr_remact_c.h"
 #include "librpc/gen_ndr/ndr_epmapper_c.h"
 #include "librpc/gen_ndr/com_dcom.h"
-#include "librpc/rpc/dcerpc_table.h"
 
 #include "lib/com/dcom/dcom.h"
-#include "lib/com/proto.h"
-#include "lib/com/dcom/proto.h"
+#include "librpc/gen_ndr/com_wmi.h"
+#include "librpc/ndr/ndr_table.h"
 
 struct WBEMCLASS;
 struct WBEMOBJECT;
 enum CIMTYPE_ENUMERATION;
-NTSTATUS dcom_proxy_IWbemClassObject_init();
 
 #include "wmi/proto.h"
 
@@ -188,7 +186,7 @@ int main(int argc, char **argv)
         parse_args(argc, argv, &args);
 
 	dcerpc_init();
-	dcerpc_table_init();
+	ndr_table_init();
 
 	dcom_proxy_IUnknown_init();
 	dcom_proxy_IWbemLevel1Login_init();
diff --git a/source4/lib/wmi/wbemdata.c b/source4/lib/wmi/wbemdata.c
index 02eed3dbc53..ffe1bf66483 100644
--- a/source4/lib/wmi/wbemdata.c
+++ b/source4/lib/wmi/wbemdata.c
@@ -673,7 +673,7 @@ struct composite_context *dcom_proxy_IEnumWbemClassObject_Release_send(struct IU
         return c;
 }
 
-NTSTATUS dcom_proxy_IWbemClassObject_init()
+NTSTATUS dcom_proxy_IWbemClassObject_init(void)
 {
 	struct GUID clsid;
 	GUID_from_string("4590f812-1d3a-11d0-891f-00aa004b2e24", &clsid);