diff --git a/reactos/base/services/eventlog/rpc.c b/reactos/base/services/eventlog/rpc.c
index 3ab54378c52..0ed2f0d1803 100644
--- a/reactos/base/services/eventlog/rpc.c
+++ b/reactos/base/services/eventlog/rpc.c
@@ -32,11 +32,7 @@ DWORD STDCALL RpcThreadRoutine(LPVOID lpParameter)
         return 0;
     }
 
-#ifdef _MSC_VER
     Status = RpcServerRegisterIf(eventlog_v0_0_s_ifspec, NULL, NULL);
-#else
-    Status = RpcServerRegisterIf(eventlog_ServerIfHandle, NULL, NULL);
-#endif
 
     if (Status != RPC_S_OK)
     {
diff --git a/reactos/base/system/services/rpcserver.c b/reactos/base/system/services/rpcserver.c
index 1b97689ae31..da692d6dba3 100644
--- a/reactos/base/system/services/rpcserver.c
+++ b/reactos/base/system/services/rpcserver.c
@@ -127,7 +127,7 @@ ScmStartRpcServer(VOID)
         return;
     }
 
-    Status = RpcServerRegisterIf(svcctl_ServerIfHandle,
+    Status = RpcServerRegisterIf(svcctl_v2_0_s_ifspec,
                                  NULL,
                                  NULL);
     if (Status != RPC_S_OK)
diff --git a/reactos/dll/win32/lsasrv/lsarpc.c b/reactos/dll/win32/lsasrv/lsarpc.c
index 8d553767e77..97b7535eab1 100644
--- a/reactos/dll/win32/lsasrv/lsarpc.c
+++ b/reactos/dll/win32/lsasrv/lsarpc.c
@@ -102,7 +102,7 @@ LsarStartRpcServer(VOID)
         return;
     }
 
-    Status = RpcServerRegisterIf(lsarpc_ServerIfHandle,
+    Status = RpcServerRegisterIf(lsarpc_v0_0_s_ifspec,
                                  NULL,
                                  NULL);
     if (Status != RPC_S_OK)
diff --git a/reactos/include/reactos/idl/idl.rbuild b/reactos/include/reactos/idl/idl.rbuild
index 093f1c35d3a..ceef4342e68 100644
--- a/reactos/include/reactos/idl/idl.rbuild
+++ b/reactos/include/reactos/idl/idl.rbuild
@@ -8,21 +8,21 @@
 	<file>pnp.idl</file>
 </module>
 <module name="scm_server" type="rpcserver">
-	<file switches="--oldnames">svcctl.idl</file>
+	<file>svcctl.idl</file>
 </module>
 <module name="scm_client" type="rpcclient">
-	<file switches="--oldnames">svcctl.idl</file>
+	<file>svcctl.idl</file>
 </module>
 <module name="eventlog_server" type="rpcserver" allowwarnings="true">
-	<file switches="--oldnames">eventlogrpc.idl</file>
+	<file>eventlogrpc.idl</file>
 </module>
 <module name="eventlog_client" type="rpcclient" >
-	<file switches="--oldnames">eventlogrpc.idl</file>
+	<file>eventlogrpc.idl</file>
 </module>
 <module name="lsa_server" type="rpcserver">
-	<file switches="--oldnames">lsa.idl</file>
+	<file>lsa.idl</file>
 </module>
 <module name="lsa_client" type="rpcclient">
-	<file switches="--oldnames">lsa.idl</file>
+	<file>lsa.idl</file>
 </module>
 </group>