Index: base/services/rpcss/epm.idl
===================================================================
--- base/services/rpcss/epm.idl	(revision 63225)
+++ base/services/rpcss/epm.idl	(working copy)
@@ -16,4 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma makedep server
+
 #include "wine/epm.idl"
Index: base/services/rpcss/irot.idl
===================================================================
--- base/services/rpcss/irot.idl	(revision 63225)
+++ base/services/rpcss/irot.idl	(working copy)
@@ -16,4 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma makedep server
+
 #include "wine/irot.idl"
Index: base/services/rpcss/rpcss.h
===================================================================
--- base/services/rpcss/rpcss.h	(revision 63225)
+++ base/services/rpcss/rpcss.h	(working copy)
@@ -23,7 +23,6 @@
 
 #include <stdarg.h>
 
-#define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
Index: base/services/rpcss/rpcss_main.c
===================================================================
--- base/services/rpcss/rpcss_main.c	(revision 63225)
+++ base/services/rpcss/rpcss_main.c	(working copy)
@@ -51,7 +51,7 @@
 
 HANDLE exit_event;
 
-//extern HANDLE __wine_make_process_system(void);
+//extern HANDLE CDECL __wine_make_process_system(void);
 
 BOOL RPCSS_Initialize(void)
 {
Index: base/services/wlansvc/precomp.h
===================================================================
--- base/services/wlansvc/precomp.h	(revision 63225)
+++ base/services/wlansvc/precomp.h	(working copy)
@@ -3,7 +3,6 @@
 
 #include <stdarg.h>
 
-#define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
Index: cmake/widl-support.cmake
===================================================================
--- cmake/widl-support.cmake	(revision 63225)
+++ cmake/widl-support.cmake	(working copy)
@@ -61,10 +61,10 @@
     get_defines(DEFINES)
     # Is it a client or server module?
     if(__type STREQUAL "server")
-        set(__server_client -Oif -s -o)
+        set(__server_client -s -o)
         set(__suffix _s)
     elseif(__type STREQUAL "client")
-        set(__server_client -Oif -c -o)
+        set(__server_client -c -o)
         set(__suffix _c)
     else()
         message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files")