From 79b21071d299527978eb89f651debd7eda7718c8 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 11 Aug 2011 15:16:48 +0000
Subject: [PATCH] [WIN32DLLS] * PCHify some modules when possible.

svn path=/trunk/; revision=53185
---
 reactos/dll/win32/acledit/CMakeLists.txt      |  1 +
 reactos/dll/win32/acledit/acledit.c           |  3 +-
 reactos/dll/win32/acledit/acledit.rbuild      |  1 +
 reactos/dll/win32/acledit/acleditint.h        |  3 +-
 reactos/dll/win32/acledit/stubs.c             |  2 +-
 reactos/dll/win32/cabinet/CMakeLists.txt      |  4 +--
 reactos/dll/win32/cabinet/cabinet.rbuild      |  1 +
 reactos/dll/win32/comctl32/CMakeLists.txt     |  1 +
 reactos/dll/win32/comctl32/comctl32.rbuild    |  1 +
 reactos/dll/win32/dbghelp/CMakeLists.txt      |  2 +-
 reactos/dll/win32/fmifs/CMakeLists.txt        |  5 +--
 reactos/dll/win32/hlink/CMakeLists.txt        |  1 +
 reactos/dll/win32/hlink/hlink.rbuild          |  1 +
 reactos/dll/win32/iphlpapi/CMakeLists.txt     |  2 +-
 reactos/dll/win32/iphlpapi/dhcp_reactos.c     |  4 ---
 reactos/dll/win32/iphlpapi/ifenum_reactos.c   |  2 --
 reactos/dll/win32/iphlpapi/iphlpapi.rbuild    |  1 +
 reactos/dll/win32/iphlpapi/iphlpapi_main.c    | 32 ++-----------------
 reactos/dll/win32/iphlpapi/iphlpapi_private.h | 10 ++++++
 reactos/dll/win32/iphlpapi/ipstats_reactos.c  |  4 ---
 reactos/dll/win32/iphlpapi/resinfo_reactos.c  | 23 -------------
 reactos/dll/win32/iphlpapi/route_reactos.c    | 23 -------------
 reactos/dll/win32/lpk/CMakeLists.txt          |  1 +
 reactos/dll/win32/lpk/lpk.rbuild              |  2 +-
 reactos/dll/win32/lsasrv/CMakeLists.txt       |  9 ++----
 reactos/dll/win32/lsasrv/lsasrv.rbuild        |  1 +
 reactos/dll/win32/mciavi32/CMakeLists.txt     |  2 +-
 reactos/dll/win32/mciavi32/mciavi32.rbuild    |  1 +
 reactos/dll/win32/mscms/CMakeLists.txt        |  2 +-
 reactos/dll/win32/mscms/mscms.rbuild          |  1 +
 reactos/dll/win32/msgina/CMakeLists.txt       |  2 +-
 reactos/dll/win32/msgina/gui.c                |  2 --
 reactos/dll/win32/msgina/msgina.c             |  2 --
 reactos/dll/win32/msgina/msgina.h             |  5 +--
 reactos/dll/win32/msgina/msgina.rbuild        |  1 +
 reactos/dll/win32/msgina/stubs.c              |  4 +--
 reactos/dll/win32/msgina/tui.c                |  2 --
 reactos/dll/win32/msi/CMakeLists.txt          |  2 +-
 reactos/dll/win32/mstask/CMakeLists.txt       |  5 +--
 reactos/dll/win32/mstask/mstask.rbuild        |  1 +
 reactos/dll/win32/newdev/CMakeLists.txt       |  5 +--
 reactos/dll/win32/newdev/newdev.rbuild        |  1 +
 reactos/dll/win32/objsel/CMakeLists.txt       |  1 +
 reactos/dll/win32/objsel/objsel.rbuild        |  1 +
 reactos/dll/win32/qmgr/CMakeLists.txt         |  1 +
 reactos/dll/win32/qmgr/qmgr.rbuild            |  1 +
 reactos/dll/win32/rasadhlp/CMakeLists.txt     |  4 +--
 reactos/dll/win32/rasadhlp/rasadhlp.rbuild    |  1 +
 reactos/dll/win32/riched20/CMakeLists.txt     |  1 +
 reactos/dll/win32/riched20/riched20.rbuild    |  1 +
 reactos/dll/win32/rsaenh/CMakeLists.txt       |  1 +
 reactos/dll/win32/rsaenh/rsaenh.rbuild        |  1 +
 reactos/dll/win32/shdocvw/CMakeLists.txt      |  1 +
 reactos/dll/win32/shdocvw/shdocvw.rbuild      |  1 +
 54 files changed, 61 insertions(+), 132 deletions(-)

diff --git a/reactos/dll/win32/acledit/CMakeLists.txt b/reactos/dll/win32/acledit/CMakeLists.txt
index 5a923400e28..bf9a297d4a5 100644
--- a/reactos/dll/win32/acledit/CMakeLists.txt
+++ b/reactos/dll/win32/acledit/CMakeLists.txt
@@ -13,5 +13,6 @@ add_library(acledit SHARED ${SOURCE})
 
 set_module_type(acledit win32dll)
 add_importlibs(acledit msvcrt kernel32 ntdll)
+add_pch(acledit acleditint.h)
 add_cd_file(TARGET acledit DESTINATION reactos/system32 FOR all)
 add_importlib_target(acledit.spec)
diff --git a/reactos/dll/win32/acledit/acledit.c b/reactos/dll/win32/acledit/acledit.c
index 4b16cddb403..a7b98fc4d41 100644
--- a/reactos/dll/win32/acledit/acledit.c
+++ b/reactos/dll/win32/acledit/acledit.c
@@ -28,9 +28,8 @@
  * UPDATE HISTORY:
  *      07/09/2004  Created
  */
-#include <windows.h>
+
 #include "acleditint.h"
-#include "resource.h"
 
 HINSTANCE hDllInstance;
 
diff --git a/reactos/dll/win32/acledit/acledit.rbuild b/reactos/dll/win32/acledit/acledit.rbuild
index e851138f276..741acb91b88 100644
--- a/reactos/dll/win32/acledit/acledit.rbuild
+++ b/reactos/dll/win32/acledit/acledit.rbuild
@@ -10,4 +10,5 @@
 	<file>acledit.c</file>
 	<file>stubs.c</file>
 	<file>acledit.rc</file>
+	<pch>acleditint.h</pch>
 </module>
diff --git a/reactos/dll/win32/acledit/acleditint.h b/reactos/dll/win32/acledit/acleditint.h
index 1ebad0b6531..9cb292f55b3 100644
--- a/reactos/dll/win32/acledit/acleditint.h
+++ b/reactos/dll/win32/acledit/acleditint.h
@@ -1,4 +1,5 @@
-#pragma once
+#include <windows.h>
+#include "resource.h"
 
 extern HINSTANCE hDllInstance;
 
diff --git a/reactos/dll/win32/acledit/stubs.c b/reactos/dll/win32/acledit/stubs.c
index 45d23c78652..7fe47139d17 100644
--- a/reactos/dll/win32/acledit/stubs.c
+++ b/reactos/dll/win32/acledit/stubs.c
@@ -12,7 +12,7 @@
  * UPDATE HISTORY:
  *      07/09/2004  Created
  */
-#include <windows.h>
+
 #include "acleditint.h"
 
 ULONG DbgPrint(PCH Format,...);
diff --git a/reactos/dll/win32/cabinet/CMakeLists.txt b/reactos/dll/win32/cabinet/CMakeLists.txt
index f85c5e0a4d5..f576efd211b 100644
--- a/reactos/dll/win32/cabinet/CMakeLists.txt
+++ b/reactos/dll/win32/cabinet/CMakeLists.txt
@@ -16,11 +16,9 @@ list(APPEND SOURCE
 add_library(cabinet SHARED ${SOURCE})
 
 set_entrypoint(cabinet 0)
-
 target_link_libraries(cabinet wine)
-
 add_importlibs(cabinet kernel32 ntdll)
 add_importlib_target(cabinet.spec)
-
+add_pch(cabinet cabinet.h)
 add_dependencies(cabinet psdk)
 add_cd_file(TARGET cabinet DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/cabinet/cabinet.rbuild b/reactos/dll/win32/cabinet/cabinet.rbuild
index 75c64fe1014..22b32681fab 100644
--- a/reactos/dll/win32/cabinet/cabinet.rbuild
+++ b/reactos/dll/win32/cabinet/cabinet.rbuild
@@ -11,6 +11,7 @@
 	<file>fdi.c</file>
 	<file>stubs.c</file>
 	<file>cabinet.rc</file>
+	<pch>cabinet.h</pch>
 	<library>wine</library>
 	<library>ntdll</library>
 </module>
diff --git a/reactos/dll/win32/comctl32/CMakeLists.txt b/reactos/dll/win32/comctl32/CMakeLists.txt
index 2bf968616b8..29b93d7fc53 100644
--- a/reactos/dll/win32/comctl32/CMakeLists.txt
+++ b/reactos/dll/win32/comctl32/CMakeLists.txt
@@ -71,5 +71,6 @@ add_importlibs(comctl32
     kernel32
     ntdll)
 
+add_pch(comctl32 comctl32.h)
 add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all)
 add_importlib_target(comctl32.spec)
diff --git a/reactos/dll/win32/comctl32/comctl32.rbuild b/reactos/dll/win32/comctl32/comctl32.rbuild
index 15ed84c0602..62f5c14f13b 100644
--- a/reactos/dll/win32/comctl32/comctl32.rbuild
+++ b/reactos/dll/win32/comctl32/comctl32.rbuild
@@ -48,6 +48,7 @@
 	<file>updown.c</file>
 	<file>stubs.c</file>
 	<file>rsrc.rc</file>
+	<pch>comctl32.h</pch>
 	<library>uuid</library>
 	<library>wine</library>
 	<library>user32</library>
diff --git a/reactos/dll/win32/dbghelp/CMakeLists.txt b/reactos/dll/win32/dbghelp/CMakeLists.txt
index 6107df2401a..f7f682a5891 100644
--- a/reactos/dll/win32/dbghelp/CMakeLists.txt
+++ b/reactos/dll/win32/dbghelp/CMakeLists.txt
@@ -52,7 +52,7 @@ target_link_libraries(dbghelp
     ${PSEH_LIB}
     oldnames)
 
-add_pch(dbghelp dbghelp_private.h)
 add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll)
+add_pch(dbghelp dbghelp_private.h)
 add_importlib_target(dbghelp.spec)
 add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/fmifs/CMakeLists.txt b/reactos/dll/win32/fmifs/CMakeLists.txt
index 8773f74176b..af7b7bfb87a 100644
--- a/reactos/dll/win32/fmifs/CMakeLists.txt
+++ b/reactos/dll/win32/fmifs/CMakeLists.txt
@@ -15,12 +15,9 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def)
 
 add_library(fmifs SHARED ${SOURCE})
-
-add_pch(fmifs precomp.h)
-
 set_entrypoint(fmifs InitializeFmIfs@12)
-
 add_importlibs(fmifs kernel32 ntdll)
+add_pch(fmifs precomp.h)
 add_dependencies(fmifs psdk)
 add_cd_file(TARGET fmifs DESTINATION reactos/system32 FOR all)
 add_importlib_target(fmifs.spec)
diff --git a/reactos/dll/win32/hlink/CMakeLists.txt b/reactos/dll/win32/hlink/CMakeLists.txt
index 4229f6dccb6..f054ab8c877 100644
--- a/reactos/dll/win32/hlink/CMakeLists.txt
+++ b/reactos/dll/win32/hlink/CMakeLists.txt
@@ -27,5 +27,6 @@ add_importlibs(hlink
     kernel32
     ntdll)
 
+add_pch(hlink hlink_private.h)
 add_importlib_target(hlink.spec)
 add_cd_file(TARGET hlink DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/hlink/hlink.rbuild b/reactos/dll/win32/hlink/hlink.rbuild
index f5753ca15a0..1a64f365fb3 100644
--- a/reactos/dll/win32/hlink/hlink.rbuild
+++ b/reactos/dll/win32/hlink/hlink.rbuild
@@ -11,6 +11,7 @@
 	<file>extserv.c</file>
 	<file>hlink_main.c</file>
 	<file>link.c</file>
+	<pch>hlink_private.h</pch>
 	<library>wine</library>
 	<library>shell32</library>
 	<library>ole32</library>
diff --git a/reactos/dll/win32/iphlpapi/CMakeLists.txt b/reactos/dll/win32/iphlpapi/CMakeLists.txt
index c8ae984d34a..308e6b778c5 100644
--- a/reactos/dll/win32/iphlpapi/CMakeLists.txt
+++ b/reactos/dll/win32/iphlpapi/CMakeLists.txt
@@ -24,8 +24,8 @@ list(APPEND SOURCE
 add_library(iphlpapi SHARED ${SOURCE})
 
 set_module_type(iphlpapi win32dll)
-
 target_link_libraries(iphlpapi wine tdilib)
 add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll)
+add_pch(iphlpapi iphlpapi_private.h)
 add_cd_file(TARGET iphlpapi DESTINATION reactos/system32 FOR all)
 add_importlib_target(iphlpapi.spec)
diff --git a/reactos/dll/win32/iphlpapi/dhcp_reactos.c b/reactos/dll/win32/iphlpapi/dhcp_reactos.c
index b72c945f2d5..ecfedda9e97 100644
--- a/reactos/dll/win32/iphlpapi/dhcp_reactos.c
+++ b/reactos/dll/win32/iphlpapi/dhcp_reactos.c
@@ -7,10 +7,6 @@
  */
 
 #include "iphlpapi_private.h"
-#include "dhcp.h"
-#include "dhcpcsdk.h"
-#include "dhcpcapi.h"
-#include <assert.h>
 
 DWORD APIENTRY DhcpRosGetAdapterInfo(DWORD AdapterIndex,
                                      PBOOL DhcpEnabled,
diff --git a/reactos/dll/win32/iphlpapi/ifenum_reactos.c b/reactos/dll/win32/iphlpapi/ifenum_reactos.c
index 0ffe129ebd0..e637a4a78a3 100644
--- a/reactos/dll/win32/iphlpapi/ifenum_reactos.c
+++ b/reactos/dll/win32/iphlpapi/ifenum_reactos.c
@@ -37,8 +37,6 @@
  *   functions into iphlpv6.c (arty)
  */
 #include "iphlpapi_private.h"
-#include "ifenum.h"
-#include <assert.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi);
 
diff --git a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
index ed1fe25218e..ac85f54437c 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
+++ b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
@@ -19,4 +19,5 @@
 	<file>resinfo_reactos.c</file>
 	<file>route_reactos.c</file>
 	<file>iphlpapi.rc</file>
+	<pch>iphlpapi_private.h</pch>
 </module>
diff --git a/reactos/dll/win32/iphlpapi/iphlpapi_main.c b/reactos/dll/win32/iphlpapi/iphlpapi_main.c
index 50f8d614e40..6b4791efd8f 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi_main.c
+++ b/reactos/dll/win32/iphlpapi/iphlpapi_main.c
@@ -18,39 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define DEBUG
+
 #include "config.h"
 #include "iphlpapi_private.h"
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-# include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-# include <resolv.h>
-#endif
-
-#define DEBUG
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "iphlpapi.h"
-#include "dhcp.h"
-#include "ifenum.h"
-#include "ipstats.h"
-#include "resinfo.h"
-#include "route.h"
-#include "wine/debug.h"
-#include "dhcpcsdk.h"
-#include "dhcpcapi.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi);
 
 typedef struct _NAME_SERVER_LIST_CONTEXT {
diff --git a/reactos/dll/win32/iphlpapi/iphlpapi_private.h b/reactos/dll/win32/iphlpapi/iphlpapi_private.h
index 767b97c9ed8..4fc8b551014 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi_private.h
+++ b/reactos/dll/win32/iphlpapi/iphlpapi_private.h
@@ -31,12 +31,22 @@
 #include "resinfo.h"
 #include "wine/debug.h"
 
+#include "dhcp.h"
+#include "dhcpcsdk.h"
+#include "dhcpcapi.h"
+#include <assert.h>
+
 //#include "ntddndis.h"
 #include "tdiinfo.h"
 #include "tcpioctl.h"
 
 #include "tdilib.h"
 
+#include "ifenum.h"
+
+#include "ipstats.h"
+#include "route.h"
+
 #ifndef ETH_ALEN
 #define ETH_ALEN 6
 #endif
diff --git a/reactos/dll/win32/iphlpapi/ipstats_reactos.c b/reactos/dll/win32/iphlpapi/ipstats_reactos.c
index e05b9e67767..4f732f5cfc4 100644
--- a/reactos/dll/win32/iphlpapi/ipstats_reactos.c
+++ b/reactos/dll/win32/iphlpapi/ipstats_reactos.c
@@ -19,11 +19,7 @@
  * tcpip.sys
  */
 
-#include <stdio.h>
-
 #include "iphlpapi_private.h"
-#include "ipstats.h"
-#include "ifenum.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi);
 
diff --git a/reactos/dll/win32/iphlpapi/resinfo_reactos.c b/reactos/dll/win32/iphlpapi/resinfo_reactos.c
index 6ee496a4b75..d2f6fe3b385 100644
--- a/reactos/dll/win32/iphlpapi/resinfo_reactos.c
+++ b/reactos/dll/win32/iphlpapi/resinfo_reactos.c
@@ -24,29 +24,6 @@
 #include "config.h"
 #include "iphlpapi_private.h"
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-# include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-# include <resolv.h>
-#endif
-
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "resinfo.h"
-#include "iphlpapi.h"
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi);
 
 typedef struct _NAME_SERVER_LIST_PRIVATE {
diff --git a/reactos/dll/win32/iphlpapi/route_reactos.c b/reactos/dll/win32/iphlpapi/route_reactos.c
index 5af1c8ff21d..453ddab43f7 100644
--- a/reactos/dll/win32/iphlpapi/route_reactos.c
+++ b/reactos/dll/win32/iphlpapi/route_reactos.c
@@ -24,29 +24,6 @@
 #include "config.h"
 #include "iphlpapi_private.h"
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-# include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-# include <resolv.h>
-#endif
-
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "resinfo.h"
-#include "iphlpapi.h"
-#include "wine/debug.h"
-
 #define IP_FORWARD_ADD 3
 #define IP_FORWARD_DEL 2
 
diff --git a/reactos/dll/win32/lpk/CMakeLists.txt b/reactos/dll/win32/lpk/CMakeLists.txt
index 3e5d6275d11..293d5544883 100644
--- a/reactos/dll/win32/lpk/CMakeLists.txt
+++ b/reactos/dll/win32/lpk/CMakeLists.txt
@@ -18,4 +18,5 @@ set_module_type(lpk win32dll)
 
 add_importlib_target(lpk.spec)
 add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll)
+add_pch(lpk ros_lpk.h)
 add_cd_file(TARGET lpk DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/lpk/lpk.rbuild b/reactos/dll/win32/lpk/lpk.rbuild
index 5656efc4efe..700e9c71e40 100644
--- a/reactos/dll/win32/lpk/lpk.rbuild
+++ b/reactos/dll/win32/lpk/lpk.rbuild
@@ -8,6 +8,6 @@
 
 	<file>dllmain.c</file>
 	<file>stub.c</file>
-
 	<file>lpk.rc</file>
+	<pch>ros_lpk.h</pch>
 </module>
diff --git a/reactos/dll/win32/lsasrv/CMakeLists.txt b/reactos/dll/win32/lsasrv/CMakeLists.txt
index ba27056e530..f0411f05013 100644
--- a/reactos/dll/win32/lsasrv/CMakeLists.txt
+++ b/reactos/dll/win32/lsasrv/CMakeLists.txt
@@ -1,12 +1,12 @@
 
 include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${REACTOS_SOURCE_DIR}/include/reactos/idl
     ${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass)
 
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl)
 
 set_unicode()
-
 set_rc_compiler()
 
 spec2def(lsasrv.dll lsasrv.spec)
@@ -25,12 +25,9 @@ list(APPEND SOURCE
 add_library(lsasrv SHARED ${SOURCE})
 
 set_entrypoint(lsasrv 0)
-
-target_link_libraries(lsasrv
-    wine
-    ${PSEH_LIB})
-
+target_link_libraries(lsasrv wine ${PSEH_LIB})
 add_importlibs(lsasrv rpcrt4 msvcrt kernel32 ntdll)
+add_pch(lsasrv lsasrv.h)
 add_dependencies(lsasrv psdk)
 add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all)
 add_importlib_target(lsasrv.spec)
diff --git a/reactos/dll/win32/lsasrv/lsasrv.rbuild b/reactos/dll/win32/lsasrv/lsasrv.rbuild
index 1102aa4e1be..f2d9494cdcb 100644
--- a/reactos/dll/win32/lsasrv/lsasrv.rbuild
+++ b/reactos/dll/win32/lsasrv/lsasrv.rbuild
@@ -14,4 +14,5 @@
 	<file>privileges.c</file>
 	<file>sids.c</file>
 	<file>lsasrv.rc</file>
+	<pch>lsasrv.h</pch>
 </module>
diff --git a/reactos/dll/win32/mciavi32/CMakeLists.txt b/reactos/dll/win32/mciavi32/CMakeLists.txt
index 1bb93315c1d..adc7a9b14ea 100644
--- a/reactos/dll/win32/mciavi32/CMakeLists.txt
+++ b/reactos/dll/win32/mciavi32/CMakeLists.txt
@@ -13,8 +13,8 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def)
 
 add_library(mciavi32 SHARED ${SOURCE})
-
 set_module_type(mciavi32 win32dll)
 target_link_libraries(mciavi32 wine)
 add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll)
+add_pch(mciavi32 private_mciavi.h)
 add_cd_file(TARGET mciavi32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mciavi32/mciavi32.rbuild b/reactos/dll/win32/mciavi32/mciavi32.rbuild
index dad219a3227..92c508eba84 100644
--- a/reactos/dll/win32/mciavi32/mciavi32.rbuild
+++ b/reactos/dll/win32/mciavi32/mciavi32.rbuild
@@ -8,6 +8,7 @@
 	<file>mmoutput.c</file>
 	<file>wnd.c</file>
 	<file>mciavi_res.rc</file>
+	<pch>private_mciavi.h</pch>
 	<library>wine</library>
 	<library>msvfw32</library>
 	<library>winmm</library>
diff --git a/reactos/dll/win32/mscms/CMakeLists.txt b/reactos/dll/win32/mscms/CMakeLists.txt
index 8b3f6d9e74c..0be83686493 100644
--- a/reactos/dll/win32/mscms/CMakeLists.txt
+++ b/reactos/dll/win32/mscms/CMakeLists.txt
@@ -18,8 +18,8 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mscms.def)
 
 add_library(mscms SHARED ${SOURCE})
-
 set_module_type(mscms win32dll)
 target_link_libraries(mscms wine)
 add_importlibs(mscms msvcrt advapi32 kernel32 ntdll)
+add_pch(mscms mscms_priv.h)
 add_cd_file(TARGET mscms DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mscms/mscms.rbuild b/reactos/dll/win32/mscms/mscms.rbuild
index 5afe2342938..838302033ac 100644
--- a/reactos/dll/win32/mscms/mscms.rbuild
+++ b/reactos/dll/win32/mscms/mscms.rbuild
@@ -10,6 +10,7 @@
 	<file>stub.c</file>
 	<file>transform.c</file>
 	<file>version.rc</file>
+	<pch>mscms_priv.h</pch>
 	<library>wine</library>
 	<library>advapi32</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/msgina/CMakeLists.txt b/reactos/dll/win32/msgina/CMakeLists.txt
index 61071b9a646..17a98b30540 100644
--- a/reactos/dll/win32/msgina/CMakeLists.txt
+++ b/reactos/dll/win32/msgina/CMakeLists.txt
@@ -17,8 +17,8 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/msgina.def)
 
 add_library(msgina SHARED ${SOURCE})
-
 set_module_type(msgina win32dll)
 target_link_libraries(msgina wine)
 add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll)
+add_pch(msgina msgina.h)
 add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c
index 6677a29bf68..06e40aa0f26 100644
--- a/reactos/dll/win32/msgina/gui.c
+++ b/reactos/dll/win32/msgina/gui.c
@@ -7,8 +7,6 @@
 
 #include "msgina.h"
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(msgina);
 
 typedef struct _DISPLAYSTATUSMSG
diff --git a/reactos/dll/win32/msgina/msgina.c b/reactos/dll/win32/msgina/msgina.c
index 02c619d3e32..d2620475112 100644
--- a/reactos/dll/win32/msgina/msgina.c
+++ b/reactos/dll/win32/msgina/msgina.c
@@ -26,8 +26,6 @@
 
 #include "msgina.h"
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(msgina);
 
 HINSTANCE hDllInstance;
diff --git a/reactos/dll/win32/msgina/msgina.h b/reactos/dll/win32/msgina/msgina.h
index 906681542dc..e221b3b8e3d 100644
--- a/reactos/dll/win32/msgina/msgina.h
+++ b/reactos/dll/win32/msgina/msgina.h
@@ -1,8 +1,9 @@
-#pragma once
-
 #include <windows.h>
 #include <userenv.h>
 #include <winwlx.h>
+
+#include <wine/debug.h>
+
 #include "resource.h"
 
 /* Values for GINA_CONTEXT.AutoLogonState */
diff --git a/reactos/dll/win32/msgina/msgina.rbuild b/reactos/dll/win32/msgina/msgina.rbuild
index 1f21595c6e5..ea5077ab3a1 100644
--- a/reactos/dll/win32/msgina/msgina.rbuild
+++ b/reactos/dll/win32/msgina/msgina.rbuild
@@ -14,4 +14,5 @@
 	<file>stubs.c</file>
 	<file>tui.c</file>
 	<file>msgina.rc</file>
+	<pch>msgina.h</pch>
 </module>
diff --git a/reactos/dll/win32/msgina/stubs.c b/reactos/dll/win32/msgina/stubs.c
index 436c6d7b670..951380c6764 100644
--- a/reactos/dll/win32/msgina/stubs.c
+++ b/reactos/dll/win32/msgina/stubs.c
@@ -9,10 +9,8 @@
  * UPDATE HISTORY:
  *      24-11-2003  Created
  */
-#include <windows.h>
-#include <winwlx.h>
 
-#include <wine/debug.h>
+#include "msgina.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msgina);
 
diff --git a/reactos/dll/win32/msgina/tui.c b/reactos/dll/win32/msgina/tui.c
index 2a88388cf52..a94393a97a9 100644
--- a/reactos/dll/win32/msgina/tui.c
+++ b/reactos/dll/win32/msgina/tui.c
@@ -7,8 +7,6 @@
 
 #include "msgina.h"
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(msgina);
 
 static BOOL
diff --git a/reactos/dll/win32/msi/CMakeLists.txt b/reactos/dll/win32/msi/CMakeLists.txt
index b52c905dcb5..a639493311e 100644
--- a/reactos/dll/win32/msi/CMakeLists.txt
+++ b/reactos/dll/win32/msi/CMakeLists.txt
@@ -68,7 +68,6 @@ if(MSVC)
 endif()
 
 add_library(msi SHARED ${SOURCE})
-add_pch(msi msipriv.h)
 
 add_idl_Headers(msi_idlheader msiserver.idl)
 add_typelib(msi_tlb msiserver.idl)
@@ -94,6 +93,7 @@ add_importlibs(msi
     kernel32
     ntdll)
 
+add_pch(msi msipriv.h)
 add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all)
 
 endif(NOT MSVC)
diff --git a/reactos/dll/win32/mstask/CMakeLists.txt b/reactos/dll/win32/mstask/CMakeLists.txt
index cf5b7571024..b0880679f4e 100644
--- a/reactos/dll/win32/mstask/CMakeLists.txt
+++ b/reactos/dll/win32/mstask/CMakeLists.txt
@@ -27,11 +27,8 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/mstask.def)
 
 add_library(mstask SHARED ${SOURCE})
-
 set_module_type(mstask win32dll)
-
 target_link_libraries(mstask uuid wine)
-
 add_importlibs(mstask ole32 msvcrt kernel32 ntdll)
-
+add_pch(mstask mstask_private.h)
 add_cd_file(TARGET mstask DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mstask/mstask.rbuild b/reactos/dll/win32/mstask/mstask.rbuild
index f766f72f640..095642eaaba 100644
--- a/reactos/dll/win32/mstask/mstask.rbuild
+++ b/reactos/dll/win32/mstask/mstask.rbuild
@@ -15,6 +15,7 @@
 	<file>task_scheduler.c</file>
 	<file>task_trigger.c</file>
 	<file>rsrc.rc</file>
+	<pch>mstask_private.h</pch>
 	<library>mstask_local_interface</library>
 	<library>wine</library>
 	<library>uuid</library>
diff --git a/reactos/dll/win32/newdev/CMakeLists.txt b/reactos/dll/win32/newdev/CMakeLists.txt
index d8c112f149d..921daa462fb 100644
--- a/reactos/dll/win32/newdev/CMakeLists.txt
+++ b/reactos/dll/win32/newdev/CMakeLists.txt
@@ -12,12 +12,9 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/newdev.def)
 
 add_library(newdev SHARED ${SOURCE})
-
 set_module_type(newdev win32dll)
-
 target_link_libraries(newdev wine)
-
 add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 msvcrt kernel32 ntdll)
-
+add_pch(newdev newdev_private.h)
 add_cd_file(TARGET newdev DESTINATION reactos/system32 FOR all)
 add_importlib_target(newdev.spec)
diff --git a/reactos/dll/win32/newdev/newdev.rbuild b/reactos/dll/win32/newdev/newdev.rbuild
index 9d8cb9e4616..86636e12d21 100644
--- a/reactos/dll/win32/newdev/newdev.rbuild
+++ b/reactos/dll/win32/newdev/newdev.rbuild
@@ -5,6 +5,7 @@
 	<file>stubs.c</file>
 	<file>wizard.c</file>
 	<file>newdev.rc</file>
+	<pch>newdev_private.h</pch>
 	<library>wine</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
diff --git a/reactos/dll/win32/objsel/CMakeLists.txt b/reactos/dll/win32/objsel/CMakeLists.txt
index d71651b29b9..413a0dc47e3 100644
--- a/reactos/dll/win32/objsel/CMakeLists.txt
+++ b/reactos/dll/win32/objsel/CMakeLists.txt
@@ -29,4 +29,5 @@ add_importlibs(objsel
     kernel32
     ntdll)
 
+add_pch(objsel objsel_private.h)
 add_cd_file(TARGET objsel DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/objsel/objsel.rbuild b/reactos/dll/win32/objsel/objsel.rbuild
index f3409b38ea3..bec0a5b3260 100644
--- a/reactos/dll/win32/objsel/objsel.rbuild
+++ b/reactos/dll/win32/objsel/objsel.rbuild
@@ -18,5 +18,6 @@
 	<file>objsel.c</file>
 	<file>regsvr.c</file>
 	<file>objsel.rc</file>
+	<pch>objsel_private.h</pch>
 </module>
 </group>
diff --git a/reactos/dll/win32/qmgr/CMakeLists.txt b/reactos/dll/win32/qmgr/CMakeLists.txt
index 0cc4ba961e7..b8d2d508d53 100644
--- a/reactos/dll/win32/qmgr/CMakeLists.txt
+++ b/reactos/dll/win32/qmgr/CMakeLists.txt
@@ -28,5 +28,6 @@ add_idl_headers(qmgr_idlheader qmgr_local.idl)
 set_module_type(qmgr win32dll)
 target_link_libraries(qmgr uuid wine)
 add_importlibs(qmgr ole32 wininet urlmon advapi32 msvcrt kernel32 ntdll)
+add_pch(qmgr qmgr.h)
 add_cd_file(TARGET qmgr DESTINATION reactos/system32 FOR all)
 add_dependencies(qmgr qmgr_idlheader)
diff --git a/reactos/dll/win32/qmgr/qmgr.rbuild b/reactos/dll/win32/qmgr/qmgr.rbuild
index 38ac841058b..790313ee9d5 100644
--- a/reactos/dll/win32/qmgr/qmgr.rbuild
+++ b/reactos/dll/win32/qmgr/qmgr.rbuild
@@ -24,6 +24,7 @@
 	<file>qmgr_main.c</file>
 	<file>service.c</file>
 	<file>rsrc.rc</file>
+	<pch>qmgr.h</pch>
 </module>
 <module name="qmgr_local_header" type="idlheader">
 	<file>qmgr_local.idl</file>
diff --git a/reactos/dll/win32/rasadhlp/CMakeLists.txt b/reactos/dll/win32/rasadhlp/CMakeLists.txt
index 05b95a07f0a..33786a1a408 100644
--- a/reactos/dll/win32/rasadhlp/CMakeLists.txt
+++ b/reactos/dll/win32/rasadhlp/CMakeLists.txt
@@ -11,9 +11,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def)
 
 add_library(rasadhlp SHARED ${SOURCE})
-
 set_module_type(rasadhlp win32dll)
-
 add_importlibs(rasadhlp ws2_32 msvcrt kernel32 ntdll)
-
+add_pch(rasadhlp precomp.h)
 add_cd_file(TARGET rasadhlp DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/rasadhlp/rasadhlp.rbuild b/reactos/dll/win32/rasadhlp/rasadhlp.rbuild
index e12c60d7c02..b98b8fe9327 100644
--- a/reactos/dll/win32/rasadhlp/rasadhlp.rbuild
+++ b/reactos/dll/win32/rasadhlp/rasadhlp.rbuild
@@ -9,4 +9,5 @@
 	<file>autodial.c</file>
 	<file>init.c</file>
 	<file>winsock.c</file>
+	<pch>precomp.h</pch>
 </module>
diff --git a/reactos/dll/win32/riched20/CMakeLists.txt b/reactos/dll/win32/riched20/CMakeLists.txt
index cf636b6f0c7..b73767d15c7 100644
--- a/reactos/dll/win32/riched20/CMakeLists.txt
+++ b/reactos/dll/win32/riched20/CMakeLists.txt
@@ -48,5 +48,6 @@ add_importlibs(riched20
     kernel32
     ntdll)
 
+add_pch(riched20 editor.h)
 add_importlib_target(riched20.spec)
 add_cd_file(TARGET riched20 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/riched20/riched20.rbuild b/reactos/dll/win32/riched20/riched20.rbuild
index b176049bb8a..f5869ae868e 100644
--- a/reactos/dll/win32/riched20/riched20.rbuild
+++ b/reactos/dll/win32/riched20/riched20.rbuild
@@ -28,6 +28,7 @@
 	<file>wrap.c</file>
 	<file>writer.c</file>
 	<file>version.rc</file>
+	<pch>editor.h</pch>
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ole32</library>
diff --git a/reactos/dll/win32/rsaenh/CMakeLists.txt b/reactos/dll/win32/rsaenh/CMakeLists.txt
index 49434499d74..1fea4c9d719 100644
--- a/reactos/dll/win32/rsaenh/CMakeLists.txt
+++ b/reactos/dll/win32/rsaenh/CMakeLists.txt
@@ -24,5 +24,6 @@ add_library(rsaenh SHARED ${SOURCE})
 set_module_type(rsaenh win32dll)
 target_link_libraries(rsaenh wine)
 add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll)
+add_pch(rsaenh tomcrypt.h)
 add_importlib_target(rsaenh.spec)
 add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/rsaenh/rsaenh.rbuild b/reactos/dll/win32/rsaenh/rsaenh.rbuild
index 49973032b7e..4c909f3254d 100644
--- a/reactos/dll/win32/rsaenh/rsaenh.rbuild
+++ b/reactos/dll/win32/rsaenh/rsaenh.rbuild
@@ -19,6 +19,7 @@
 	<file>rsaenh.c</file>
 	<file>sha2.c</file>
 	<file>version.rc</file>
+	<pch>tomcrypt.h</pch>
 	<library>wine</library>
 	<library>crypt32</library>
 	<library>advapi32</library>
diff --git a/reactos/dll/win32/shdocvw/CMakeLists.txt b/reactos/dll/win32/shdocvw/CMakeLists.txt
index db2f0c48a1f..c4f7e01d50e 100644
--- a/reactos/dll/win32/shdocvw/CMakeLists.txt
+++ b/reactos/dll/win32/shdocvw/CMakeLists.txt
@@ -54,5 +54,6 @@ add_importlibs(shdocvw
     ntdll)
 
 add_dependencies(shdocvw shdocvw_v1)
+add_pch(shdocvw shdocvw.h)
 add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all)
 add_importlib_target(shdocvw.spec)
diff --git a/reactos/dll/win32/shdocvw/shdocvw.rbuild b/reactos/dll/win32/shdocvw/shdocvw.rbuild
index c7b565269d2..e7a721bfe7d 100644
--- a/reactos/dll/win32/shdocvw/shdocvw.rbuild
+++ b/reactos/dll/win32/shdocvw/shdocvw.rbuild
@@ -41,6 +41,7 @@
 	<file>view.c</file>
 	<file>webbrowser.c</file>
 	<file>shdocvw.rc</file>
+	<pch>shdocvw.h</pch>
 </module>
 <module name="shdocvw_v1" type="embeddedtypelib" allowwarnings="true">
 	<dependency>stdole2</dependency>