From ea967bce144cfeb4ac4e7245448eeabeeff80177 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 13 Jan 2014 12:47:43 +0000
Subject: [PATCH] [RPCSS] * Move some inclusions to the main header. * Remove
 inclusions and definitions that already exist in the main header. * Remove
 one time winsvc.h inclusion from the main header and put them back where it
 belongs. CORE-7716

svn path=/trunk/; revision=61605
---
 reactos/base/services/rpcss/epmp.c         |  3 +--
 reactos/base/services/rpcss/irotp.c        |  4 ++--
 reactos/base/services/rpcss/rpcss.h        | 13 ++++++++++++-
 reactos/base/services/rpcss/rpcss_main.c   |  4 ----
 reactos/base/services/rpcss/service_main.c |  2 ++
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/reactos/base/services/rpcss/epmp.c b/reactos/base/services/rpcss/epmp.c
index aef5fde0d30..5776cf6669e 100644
--- a/reactos/base/services/rpcss/epmp.c
+++ b/reactos/base/services/rpcss/epmp.c
@@ -18,10 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <epm_s.h>
+#include "rpcss.h"
 
 #include <wine/debug.h>
-#include <wine/list.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
diff --git a/reactos/base/services/rpcss/irotp.c b/reactos/base/services/rpcss/irotp.c
index 368dea64ebd..bf9c5690eea 100644
--- a/reactos/base/services/rpcss/irotp.c
+++ b/reactos/base/services/rpcss/irotp.c
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <irot_s.h>
-#include <wine/list.h>
+#include "rpcss.h"
+
 #include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpcss);
diff --git a/reactos/base/services/rpcss/rpcss.h b/reactos/base/services/rpcss/rpcss.h
index 67bbc52b38a..347a5cf9421 100644
--- a/reactos/base/services/rpcss/rpcss.h
+++ b/reactos/base/services/rpcss/rpcss.h
@@ -22,9 +22,20 @@
 #define __WINE_RPCSS_H
 
 #include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
 #include <windef.h>
 #include <winbase.h>
-#include <winsvc.h>
 
+#include <irot_s.h>
+#include <epm_s.h>
+
+#include <wine/list.h>
 
 #endif /* __WINE_RPCSS_H */
diff --git a/reactos/base/services/rpcss/rpcss_main.c b/reactos/base/services/rpcss/rpcss_main.c
index f2255020f9e..de2a9978543 100644
--- a/reactos/base/services/rpcss/rpcss_main.c
+++ b/reactos/base/services/rpcss/rpcss_main.c
@@ -43,11 +43,7 @@
  *     role of rpcss.exe in wine.
  */
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "rpcss.h"
-#include <irot_s.h>
-#include <epm_s.h>
 
 #include <wine/debug.h>
 
diff --git a/reactos/base/services/rpcss/service_main.c b/reactos/base/services/rpcss/service_main.c
index 501e2a43e3b..fbff5f66ecb 100644
--- a/reactos/base/services/rpcss/service_main.c
+++ b/reactos/base/services/rpcss/service_main.c
@@ -9,6 +9,8 @@
 
 #include "rpcss.h"
 
+#include <winsvc.h>
+
 #define NDEBUG
 #include <debug.h>