diff --git a/reactos/dll/ntdll/include/ntdll.h b/reactos/dll/ntdll/include/ntdll.h
index 1121c9f916d..a0e8f312e09 100644
--- a/reactos/dll/ntdll/include/ntdll.h
+++ b/reactos/dll/ntdll/include/ntdll.h
@@ -6,6 +6,9 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#ifndef _NTDLL_H
+#define _NTDLL_H
+
 /* INCLUDES ******************************************************************/
 
 /* We're a core NT DLL, we don't import syscalls */
@@ -46,4 +49,4 @@
 /* PSEH */
 #include <pseh/pseh2.h>
 
-/* EOF */
+#endif /* _NTDLL_H */
diff --git a/reactos/dll/opengl/opengl32/opengl32.h b/reactos/dll/opengl/opengl32/opengl32.h
index 72862f6a016..ea2ea2c31ec 100644
--- a/reactos/dll/opengl/opengl32/opengl32.h
+++ b/reactos/dll/opengl/opengl32/opengl32.h
@@ -5,7 +5,8 @@
  * PURPOSE:              OpenGL32 lib, general header
  */
 
-#pragma once
+#ifndef _OPENGL32_PCH_
+#define _OPENGL32_PCH_
 
 #define WIN32_NO_STATUS
 #include <stdarg.h>
@@ -168,3 +169,5 @@ PROC sw_GetProcAddress(LPCSTR name);
 BOOL sw_CopyContext(DHGLRC dhglrcSrc, DHGLRC dhglrcDst, UINT mask);
 BOOL sw_ShareLists(DHGLRC dhglrcSrc, DHGLRC dhglrcDst);
 BOOL sw_SwapBuffers(HDC hdc, struct wgl_dc_data* dc_data);
+
+#endif /* _OPENGL32_PCH_ */
diff --git a/reactos/dll/shellext/fontext/fontext.h b/reactos/dll/shellext/fontext/fontext.h
index 612b89e4f9d..aa9d56413c8 100644
--- a/reactos/dll/shellext/fontext/fontext.h
+++ b/reactos/dll/shellext/fontext/fontext.h
@@ -1,6 +1,11 @@
+#ifndef _FONTEXT_PCH_
+#define _FONTEXT_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
 #define COBJMACROS
 
 #include <windef.h>
+
+#endif /* _FONTEXT_PCH_ */
diff --git a/reactos/dll/win32/acledit/acledit.c b/reactos/dll/win32/acledit/acledit.c
index a7b98fc4d41..737cd353457 100644
--- a/reactos/dll/win32/acledit/acledit.c
+++ b/reactos/dll/win32/acledit/acledit.c
@@ -33,7 +33,6 @@
 
 HINSTANCE hDllInstance;
 
-
 BOOL WINAPI
 DllMain(
 	HINSTANCE hinstDLL,
diff --git a/reactos/dll/win32/acledit/stubs.c b/reactos/dll/win32/acledit/stubs.c
index 7fe47139d17..4c71e766dbe 100644
--- a/reactos/dll/win32/acledit/stubs.c
+++ b/reactos/dll/win32/acledit/stubs.c
@@ -20,7 +20,6 @@ ULONG DbgPrint(PCH Format,...);
 #define UNIMPLEMENTED \
   DbgPrint("ACLEDIT:  %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__)
 
-
 DWORD
 WINAPI
 EditAuditInfo(DWORD Unknown)
diff --git a/reactos/dll/win32/aclui/precomp.h b/reactos/dll/win32/aclui/precomp.h
index 60529aa0191..d97a718118a 100644
--- a/reactos/dll/win32/aclui/precomp.h
+++ b/reactos/dll/win32/aclui/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _ACLUI_PCH_
+#define _ACLUI_PCH_
+
 #define _ACLUI_
 
 #include <stdarg.h>
@@ -199,4 +202,4 @@ VOID
 DereferenceSidReqResult(IN HANDLE SidCacheMgr,
                         IN PSIDREQRESULT ReqResult);
 
-/* EOF */
+#endif /* _ACLUI_PCH_ */
diff --git a/reactos/dll/win32/advpack/advpack_private.h b/reactos/dll/win32/advpack/advpack_private.h
index ec0955eecfc..f14853eefd5 100644
--- a/reactos/dll/win32/advpack/advpack_private.h
+++ b/reactos/dll/win32/advpack/advpack_private.h
@@ -34,9 +34,9 @@
 #include <winternl.h>
 #include <advpub.h>
 
+#include <wine/debug.h>
 #include <wine/unicode.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(advpack);
 
 HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN;
diff --git a/reactos/dll/win32/advpack/reg.c b/reactos/dll/win32/advpack/reg.c
index 39f42e37ff1..2e467999e12 100644
--- a/reactos/dll/win32/advpack/reg.c
+++ b/reactos/dll/win32/advpack/reg.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 #include "advpack_private.h"
 
 static const WCHAR REGINST[] = {'R','E','G','I','N','S','T',0};
diff --git a/reactos/dll/win32/authz/authz.c b/reactos/dll/win32/authz/authz.c
index f7f38f1575d..c7e323eb8f5 100644
--- a/reactos/dll/win32/authz/authz.c
+++ b/reactos/dll/win32/authz/authz.c
@@ -33,7 +33,6 @@
 
 HINSTANCE hDllInstance;
 
-
 /*
  * @unimplemented
  */
diff --git a/reactos/dll/win32/authz/precomp.h b/reactos/dll/win32/authz/precomp.h
index 90efbeff94d..f3ec80b23b8 100644
--- a/reactos/dll/win32/authz/precomp.h
+++ b/reactos/dll/win32/authz/precomp.h
@@ -3,11 +3,12 @@
 
 #define _AUTHZ_
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
 
@@ -60,4 +61,3 @@ typedef struct _AUTHZ_CLIENT_CONTEXT
 } AUTHZ_CLIENT_CONTEXT, *PAUTHZ_CLIENT_CONTEXT;
 
 #endif /* __AUTHZ_PRECOMP_H */
-/* EOF */
diff --git a/reactos/dll/win32/browseui/precomp.h b/reactos/dll/win32/browseui/precomp.h
index 6a83cb4bb77..45880e36102 100644
--- a/reactos/dll/win32/browseui/precomp.h
+++ b/reactos/dll/win32/browseui/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _BROWSEUI_PCH_
+#define _BROWSEUI_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -37,3 +40,5 @@
 #include "regtreeoptions.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(browseui);
+
+#endif /* _BROWSEUI_PCH_ */
diff --git a/reactos/dll/win32/dbghelp/dbghelp_private.h b/reactos/dll/win32/dbghelp/dbghelp_private.h
index de9fc6336d3..a8712931651 100644
--- a/reactos/dll/win32/dbghelp/dbghelp_private.h
+++ b/reactos/dll/win32/dbghelp/dbghelp_private.h
@@ -21,6 +21,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _DBGHELP_PRIVATE_H_
+#define _DBGHELP_PRIVATE_H_
+
 #include <config.h>
 
 #include <assert.h>
@@ -842,3 +845,5 @@ extern struct symt_typedef*
                                      const char* name) DECLSPEC_HIDDEN;
 
 #include "image_private.h"
+
+#endif /* _DBGHELP_PRIVATE_H_ */
diff --git a/reactos/dll/win32/dnsapi/dnsapi/precomp.h b/reactos/dll/win32/dnsapi/dnsapi/precomp.h
index 1fb4f01c64a..ee426ccc4a5 100644
--- a/reactos/dll/win32/dnsapi/dnsapi/precomp.h
+++ b/reactos/dll/win32/dnsapi/dnsapi/precomp.h
@@ -6,6 +6,9 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#ifndef _DNSAPI_H
+#define _DNSAPI_H
+
 /* INCLUDES ******************************************************************/
 
 #include <stdarg.h>
@@ -127,3 +130,5 @@ static inline LPSTR dns_strdup_ua( const char *src )
     }
     return dst;
 }
+
+#endif /* _DNSAPI_H */
diff --git a/reactos/dll/win32/fmifs/precomp.h b/reactos/dll/win32/fmifs/precomp.h
index 9d203b7da28..e03812b2658 100644
--- a/reactos/dll/win32/fmifs/precomp.h
+++ b/reactos/dll/win32/fmifs/precomp.h
@@ -8,6 +8,9 @@
  *                  Hervé Poussineau (hpoussin@reactos.org)
  */
 
+#ifndef _FMIFS_PCH_
+#define _FMIFS_PCH_
+
 /* INCLUDES ******************************************************************/
 
 #define WIN32_NO_STATUS
@@ -43,4 +46,4 @@ PIFS_PROVIDER
 GetProvider(
 	IN PWCHAR FileSytem);
 
-/* EOF */
+#endif /* _FMIFS_PCH_ */
diff --git a/reactos/dll/win32/hid/precomp.h b/reactos/dll/win32/hid/precomp.h
index 0f39db1beb2..317b48b4ba0 100644
--- a/reactos/dll/win32/hid/precomp.h
+++ b/reactos/dll/win32/hid/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _HID_PCH_
+#define _HID_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -18,4 +21,4 @@ typedef VOID
 extern HINSTANCE hDllInstance;
 extern const GUID HidClassGuid;
 
-/* EOF */
+#endif /* _HID_PCH_ */
diff --git a/reactos/dll/win32/hlink/hlink_private.h b/reactos/dll/win32/hlink/hlink_private.h
index d940a8f67d0..b50744addd0 100644
--- a/reactos/dll/win32/hlink/hlink_private.h
+++ b/reactos/dll/win32/hlink/hlink_private.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _HLINK_PRIVATE_H
+#define _HLINK_PRIVATE_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -82,3 +85,5 @@ static inline LPWSTR hlink_co_strdupW(LPCWSTR str)
 
     return ret;
 }
+
+#endif /* _HLINK_PRIVATE_H */
diff --git a/reactos/dll/win32/hnetcfg/hnetcfg_private.h b/reactos/dll/win32/hnetcfg/hnetcfg_private.h
index 726a54937c7..d9f665cdfaf 100644
--- a/reactos/dll/win32/hnetcfg/hnetcfg_private.h
+++ b/reactos/dll/win32/hnetcfg/hnetcfg_private.h
@@ -16,7 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#ifndef _HNETCFG_PRIVATE_H_
+#define _HNETCFG_PRIVATE_H_
+
+#include <wine/config.h>
 
 #include <stdarg.h>
 
@@ -53,3 +56,5 @@ HRESULT NetFwAuthorizedApplication_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
 HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
 HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
 HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
+
+#endif /* _HNETCFG_PRIVATE_H_ */
diff --git a/reactos/dll/win32/ieframe/ieframe.h b/reactos/dll/win32/ieframe/ieframe.h
index e0afc62cbcb..bed94de0563 100644
--- a/reactos/dll/win32/ieframe/ieframe.h
+++ b/reactos/dll/win32/ieframe/ieframe.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _IEFRAME_H_
+#define _IEFRAME_H_
+
 #include <stdio.h>
 
 #define WIN32_NO_STATUS
@@ -400,3 +403,5 @@ static inline LPSTR co_strdupWtoA(LPCWSTR str)
         WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len, 0, 0);
     return ret;
 }
+
+#endif /* _IEFRAME_H_ */
diff --git a/reactos/dll/win32/iphlpapi/iphlpapi_private.h b/reactos/dll/win32/iphlpapi/iphlpapi_private.h
index ac83ff0ddf5..42fef454ee1 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi_private.h
+++ b/reactos/dll/win32/iphlpapi/iphlpapi_private.h
@@ -172,4 +172,4 @@ BOOL WINAPI
 GetComputerNameExA(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD);
 #endif
 
-#endif/*IPPRIVATE_H*/
+#endif /* IPPRIVATE_H */
diff --git a/reactos/dll/win32/jscript/jscript.h b/reactos/dll/win32/jscript/jscript.h
index 7d29493fee3..0b1d447fc91 100644
--- a/reactos/dll/win32/jscript/jscript.h
+++ b/reactos/dll/win32/jscript/jscript.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _WINE_JSCRIPT_H
+#define _WINE_JSCRIPT_H
+
 #include <wine/config.h>
 #include <wine/port.h>
 
@@ -555,3 +558,5 @@ static inline void unlock_module(void)
 
 #include "engine.h"
 #include "regexp.h"
+
+#endif /* _WINE_JSCRIPT_H */
diff --git a/reactos/dll/win32/lpk/ros_lpk.h b/reactos/dll/win32/lpk/ros_lpk.h
index 5535e8042fe..5c5a4c88a34 100644
--- a/reactos/dll/win32/lpk/ros_lpk.h
+++ b/reactos/dll/win32/lpk/ros_lpk.h
@@ -6,6 +6,9 @@
  *
  */
 
+#ifndef _LPK_H
+#define _LPK_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -64,3 +67,5 @@ DWORD WINAPI LpkGetTextExtentExPoint(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x
 DWORD WINAPI LpkPSMTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6);
 DWORD WINAPI LpkUseGDIWidthCache(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5);
 DWORD WINAPI ftsWordBreak(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5);
+
+#endif /* _LPK_H */
diff --git a/reactos/dll/win32/lsasrv/lsasrv.h b/reactos/dll/win32/lsasrv/lsasrv.h
index fdf08072574..46d7ab18ad0 100644
--- a/reactos/dll/win32/lsasrv/lsasrv.h
+++ b/reactos/dll/win32/lsasrv/lsasrv.h
@@ -7,6 +7,9 @@
  * PROGRAMMERS:     Eric Kohl
  */
 
+#ifndef _LSASRV_H
+#define _LSASRV_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -411,4 +414,4 @@ LsapAppendRidToSid(
     PSID SrcSid,
     ULONG Rid);
 
-/* EOF */
+#endif /* _LSASRV_H */
diff --git a/reactos/dll/win32/mmdevapi/mmdevapi.h b/reactos/dll/win32/mmdevapi/mmdevapi.h
index 07d930684e0..19b87ca7887 100644
--- a/reactos/dll/win32/mmdevapi/mmdevapi.h
+++ b/reactos/dll/win32/mmdevapi/mmdevapi.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _MMDEVAPI_H_
+#define _MMDEVAPI_H_
+
 #include <wine/config.h>
 #include <wine/port.h>
 
@@ -97,3 +100,5 @@ extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC
 extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN;
 
 extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN;
+
+#endif /* _MMDEVAPI_H_ */
diff --git a/reactos/dll/win32/mmdrv/auxil.c b/reactos/dll/win32/mmdrv/auxil.c
index b3a7f73f6d0..ecc872c956e 100644
--- a/reactos/dll/win32/mmdrv/auxil.c
+++ b/reactos/dll/win32/mmdrv/auxil.c
@@ -9,13 +9,14 @@
  * UPDATE HISTORY:
  *                       Mar 16, 2004: Created skeleton implementation
  */
-#include "mmdrv.h"
-#include "wave.h"
 
+#include "mmdrv.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "wave.h"
+
 APIENTRY DWORD auxMessage(UINT dwId,
                   UINT uMessage,
                   DWORD dwUser,
diff --git a/reactos/dll/win32/mmdrv/midi.c b/reactos/dll/win32/mmdrv/midi.c
index ac2299af615..5364fb66c29 100644
--- a/reactos/dll/win32/mmdrv/midi.c
+++ b/reactos/dll/win32/mmdrv/midi.c
@@ -10,11 +10,12 @@
  */
 
 #include "mmdrv.h"
-#include "wave.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "wave.h"
+
 // MIDI device instance information
 //
 #define LOCAL_DATA_SIZE 20
diff --git a/reactos/dll/win32/mmdrv/mmdrv.h b/reactos/dll/win32/mmdrv/mmdrv.h
index d88a8f54d94..a748e61ae03 100644
--- a/reactos/dll/win32/mmdrv/mmdrv.h
+++ b/reactos/dll/win32/mmdrv/mmdrv.h
@@ -17,7 +17,6 @@
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
-
 #include <windef.h>
 #include <winbase.h>
 #include <winioctl.h>
@@ -337,4 +336,4 @@ PerformWaveIO(SessionInfo* session_info);
 
 extern CRITICAL_SECTION critical_section;
 
-#endif
+#endif /* MMDRV_H */
diff --git a/reactos/dll/win32/mmdrv/mmioctl.h b/reactos/dll/win32/mmdrv/mmioctl.h
index 13378666046..b62b3b0d8f9 100644
--- a/reactos/dll/win32/mmdrv/mmioctl.h
+++ b/reactos/dll/win32/mmdrv/mmioctl.h
@@ -137,4 +137,4 @@
 #define IOCTL_SOUND_GET_CHANGED_VOLUME \
     CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS)
 
-#endif
+#endif /* MMDRV_IOCTLS */
diff --git a/reactos/dll/win32/mmdrv/wave.c b/reactos/dll/win32/mmdrv/wave.c
index ae5b0831e3a..31861332372 100644
--- a/reactos/dll/win32/mmdrv/wave.c
+++ b/reactos/dll/win32/mmdrv/wave.c
@@ -17,7 +17,6 @@
 
 #define MAX_WAVE_BUFFER_SIZE    65536
 
-
 MMRESULT
 QueueWaveBuffer(
     SessionInfo* session_info,
diff --git a/reactos/dll/win32/mshtml/mshtml_private.h b/reactos/dll/win32/mshtml/mshtml_private.h
index a1644ea6dfc..e07c1c11741 100644
--- a/reactos/dll/win32/mshtml/mshtml_private.h
+++ b/reactos/dll/win32/mshtml/mshtml_private.h
@@ -16,7 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#ifndef _MSHTML_PRIVATE_H_
+#define _MSHTML_PRIVATE_H_
+
+#include <wine/config.h>
 
 #include <assert.h>
 #include <stdarg.h>
@@ -52,10 +55,10 @@
 #include <wininet.h>
 #include <nsiface.h>
 
+#include <wine/debug.h>
 #include <wine/list.h>
 #include <wine/unicode.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define NS_ERROR_GENERATE_FAILURE(module,code) \
@@ -1204,3 +1207,5 @@ extern HINSTANCE hInst DECLSPEC_HIDDEN;
 #include "htmlstyle.h"
 #include "pluginhost.h"
 #include "resource.h"
+
+#endif /* _MSHTML_PRIVATE_H_ */
diff --git a/reactos/dll/win32/msi/msipriv.h b/reactos/dll/win32/msi/msipriv.h
index 855086af32a..37c06caa2cc 100644
--- a/reactos/dll/win32/msi/msipriv.h
+++ b/reactos/dll/win32/msi/msipriv.h
@@ -22,10 +22,10 @@
 #ifndef __WINE_MSI_PRIVATE__
 #define __WINE_MSI_PRIVATE__
 
-#include <config.h>
+#include <wine/config.h>
 
-#include <stdarg.h>
 #include <assert.h>
+#include <stdarg.h>
 
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
@@ -48,8 +48,8 @@
 #include <sddl.h>
 #include <msidefs.h>
 
-#include <wine/list.h>
 #include <wine/debug.h>
+#include <wine/list.h>
 #include <wine/unicode.h>
 
 static const BOOL is_64bit = sizeof(void *) > sizeof(int);
diff --git a/reactos/dll/win32/msports/precomp.h b/reactos/dll/win32/msports/precomp.h
index e9f5d9193e0..0b25e4d765f 100644
--- a/reactos/dll/win32/msports/precomp.h
+++ b/reactos/dll/win32/msports/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _MSPORTS_PCH_
+#define _MSPORTS_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -17,3 +20,5 @@
 #include "resource.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msports);
+
+#endif /* _MSPORTS_PCH_ */
diff --git a/reactos/dll/win32/mswsock/precomp.h b/reactos/dll/win32/mswsock/precomp.h
index e2fddb508f1..ddf6caf0c24 100644
--- a/reactos/dll/win32/mswsock/precomp.h
+++ b/reactos/dll/win32/mswsock/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _MSWSOCK_PCH_
+#define _MSWSOCK_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -6,3 +9,5 @@
 
 #include <windef.h>
 #include <winbase.h>
+
+#endif /* _MSWSOCK_PCH_ */
diff --git a/reactos/dll/win32/objsel/objsel.c b/reactos/dll/win32/objsel/objsel.c
index 15f2664b8ed..d2136e35063 100644
--- a/reactos/dll/win32/objsel/objsel.c
+++ b/reactos/dll/win32/objsel/objsel.c
@@ -19,6 +19,7 @@
  */
 
 #include "objsel_private.h"
+
 #include <rpcproxy.h>
 
 LONG dll_refs = 0;
diff --git a/reactos/dll/win32/objsel/objsel_private.h b/reactos/dll/win32/objsel/objsel_private.h
index 845cd64b8e1..48e99d7d1f7 100644
--- a/reactos/dll/win32/objsel/objsel_private.h
+++ b/reactos/dll/win32/objsel/objsel_private.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _OBJSEL_PRIVATE_H
+#define _OBJSEL_PRIVATE_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -58,3 +61,5 @@ typedef struct
 HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj) DECLSPEC_HIDDEN;
 
 extern ClassFactoryImpl OBJSEL_ClassFactory DECLSPEC_HIDDEN;
+
+#endif /* _OBJSEL_PRIVATE_H */
diff --git a/reactos/dll/win32/ole32/enumx.h b/reactos/dll/win32/ole32/enumx.h
index da76e13769b..d4347d9e335 100644
--- a/reactos/dll/win32/ole32/enumx.h
+++ b/reactos/dll/win32/ole32/enumx.h
@@ -31,4 +31,4 @@ extern HRESULT WINAPI enumx_Clone(enumx_impl *, enumx_impl **) DECLSPEC_HIDDEN;
 extern enumx_impl *enumx_allocate(REFIID, const void *, ULONG) DECLSPEC_HIDDEN;
 extern void *enumx_add_element(enumx_impl *, const void *) DECLSPEC_HIDDEN;
 
-#endif
+#endif /* __OLE_ENUM_H__ */
diff --git a/reactos/dll/win32/ole32/storage32.h b/reactos/dll/win32/ole32/storage32.h
index 0313e9794c2..e8f1fb63e15 100644
--- a/reactos/dll/win32/ole32/storage32.h
+++ b/reactos/dll/win32/ole32/storage32.h
@@ -27,6 +27,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #ifndef __STORAGE32_H__
 #define __STORAGE32_H__
 
diff --git a/reactos/dll/win32/propsys/propsys_private.h b/reactos/dll/win32/propsys/propsys_private.h
index 092c8bad289..8cb748b8a8b 100644
--- a/reactos/dll/win32/propsys/propsys_private.h
+++ b/reactos/dll/win32/propsys/propsys_private.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _PROPSYS_PRIVATE_H_
+#define _PROPSYS_PRIVATE_H_
+
 #include <config.h>
 
 #include <stdarg.h>
@@ -40,3 +43,5 @@
 WINE_DEFAULT_DEBUG_CHANNEL(propsys);
 
 HRESULT PropertyStore_CreateInstance(IUnknown *outer, REFIID riid, void **ppv) DECLSPEC_HIDDEN;
+
+#endif /* _PROPSYS_PRIVATE_H_ */
diff --git a/reactos/dll/win32/rasadhlp/precomp.h b/reactos/dll/win32/rasadhlp/precomp.h
index 0d61664607e..05d3ed076ea 100644
--- a/reactos/dll/win32/rasadhlp/precomp.h
+++ b/reactos/dll/win32/rasadhlp/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _RASADHLP_H
+#define _RASADHLP_H
+
 #define _WIN32_WINNT 0x502
 #define _CRT_SECURE_NO_DEPRECATE
 #define WIN32_NO_STATUS
@@ -91,3 +94,4 @@ AcsHlpAttemptConnection(
     IN PAUTODIAL_ADDR ConnectionAddress
 );
 
+#endif /* _RASADHLP_H */
diff --git a/reactos/dll/win32/riched20/editor.h b/reactos/dll/win32/riched20/editor.h
index d129a7978cf..0521522035e 100644
--- a/reactos/dll/win32/riched20/editor.h
+++ b/reactos/dll/win32/riched20/editor.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _RICHED20_EDITOR_H
+#define _RICHED20_EDITOR_H
+
 #include <config.h>
 
 #include <assert.h>
@@ -375,3 +378,5 @@ LRESULT ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream)
 
 /* clipboard.c */
 HRESULT ME_GetDataObject(ME_TextEditor *editor, const ME_Cursor *start, int nChars, LPDATAOBJECT *lplpdataobj) DECLSPEC_HIDDEN;
+
+#endif /* _RICHED20_EDITOR_H */
diff --git a/reactos/dll/win32/samlib/precomp.h b/reactos/dll/win32/samlib/precomp.h
index e2fddb508f1..7cab05c68e2 100644
--- a/reactos/dll/win32/samlib/precomp.h
+++ b/reactos/dll/win32/samlib/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _SAMLIB_PCH_
+#define _SAMLIB_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -6,3 +9,5 @@
 
 #include <windef.h>
 #include <winbase.h>
+
+#endif /* _SAMLIB_PCH_ */
diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h
index 36dd16587d2..750957f77d1 100644
--- a/reactos/dll/win32/samsrv/samsrv.h
+++ b/reactos/dll/win32/samsrv/samsrv.h
@@ -7,6 +7,9 @@
  * PROGRAMMERS:     Eric Kohl
  */
 
+#ifndef _SAMSRV_PCH_
+#define _SAMSRV_PCH_
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -430,3 +433,5 @@ NTSTATUS
 WINAPI
 SystemFunction007(PUNICODE_STRING string,
                   LPBYTE hash);
+
+#endif /* _SAMSRV_PCH_ */
diff --git a/reactos/dll/win32/schannel/precomp.h b/reactos/dll/win32/schannel/precomp.h
index 6aecb11896c..d9a7053494b 100644
--- a/reactos/dll/win32/schannel/precomp.h
+++ b/reactos/dll/win32/schannel/precomp.h
@@ -3,10 +3,11 @@
 
 #include <stdarg.h>
 
-#include <ntstatus.h>
-#define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
+
+#include <ntstatus.h>
+#define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
 #include <sspi.h>
diff --git a/reactos/dll/win32/secur32/precomp.h b/reactos/dll/win32/secur32/precomp.h
index 5752b760d73..427b1e0d5b3 100644
--- a/reactos/dll/win32/secur32/precomp.h
+++ b/reactos/dll/win32/secur32/precomp.h
@@ -6,6 +6,9 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#ifndef _SECUR32_PCH_
+#define _SECUR32_PCH_
+
 #include <stdarg.h>
 
 /* SDK/DDK/NDK Headers. */
@@ -19,3 +22,5 @@
 
 #include <secext.h>
 #include <security.h>
+
+#endif /* _SECUR32_PCH_ */
diff --git a/reactos/dll/win32/setupapi/setupapi_private.h b/reactos/dll/win32/setupapi/setupapi_private.h
index 1d15cac16c3..53db948def9 100644
--- a/reactos/dll/win32/setupapi/setupapi_private.h
+++ b/reactos/dll/win32/setupapi/setupapi_private.h
@@ -25,6 +25,7 @@
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 
 #include <windef.h>
diff --git a/reactos/dll/win32/shlwapi/precomp.h b/reactos/dll/win32/shlwapi/precomp.h
index d5fc1114e59..90d50f72a61 100644
--- a/reactos/dll/win32/shlwapi/precomp.h
+++ b/reactos/dll/win32/shlwapi/precomp.h
@@ -24,11 +24,11 @@
 #include <shlwapi.h>
 #include <shlobj.h>
 
-#include <wine/unicode.h>
-
 #include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+#include <wine/unicode.h>
 
 #include "resource.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
+
 #endif /* _SHLWAPI_PCH_ */
diff --git a/reactos/dll/win32/smdll/precomp.h b/reactos/dll/win32/smdll/precomp.h
index ef73922dae9..2caa290d549 100644
--- a/reactos/dll/win32/smdll/precomp.h
+++ b/reactos/dll/win32/smdll/precomp.h
@@ -1,5 +1,10 @@
+#ifndef _SMDLL_PCH_
+#define _SMDLL_PCH_
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
 #include <windef.h>
+
+#endif /* _SMDLL_PCH_ */
diff --git a/reactos/dll/win32/spoolss/spoolss.h b/reactos/dll/win32/spoolss/spoolss.h
index a56cba77c42..80fae4d11bd 100644
--- a/reactos/dll/win32/spoolss/spoolss.h
+++ b/reactos/dll/win32/spoolss/spoolss.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _SPOOLSS_H_
+#define _SPOOLSS_H_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -46,3 +49,5 @@ static inline BOOL heap_free( void *mem )
 {
     return HeapFree( GetProcessHeap(), 0, mem );
 }
+
+#endif /* _SPOOLSS_H_ */
diff --git a/reactos/dll/win32/sxs/sxs_private.h b/reactos/dll/win32/sxs/sxs_private.h
index dd2b2c34d24..7b332028f56 100644
--- a/reactos/dll/win32/sxs/sxs_private.h
+++ b/reactos/dll/win32/sxs/sxs_private.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _SXS_PRIVATE_H_
+#define _SXS_PRIVATE_H_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -54,3 +57,5 @@ static inline WCHAR *strdupW( const WCHAR *src )
     if (dst) strcpyW( dst, src );
     return dst;
 }
+
+#endif /* _SXS_PRIVATE_H_ */
diff --git a/reactos/dll/win32/syssetup/precomp.h b/reactos/dll/win32/syssetup/precomp.h
index 79b5f488bc6..18fdf66d807 100644
--- a/reactos/dll/win32/syssetup/precomp.h
+++ b/reactos/dll/win32/syssetup/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _SYSSETUP_PCH_
+#define _SYSSETUP_PCH_
+
 #include <stdio.h>
 
 #define WIN32_NO_STATUS
@@ -17,3 +20,5 @@
 
 #include "globals.h"
 #include "resource.h"
+
+#endif /* _SYSSETUP_PCH_ */
diff --git a/reactos/dll/win32/tapi32/precomp.h b/reactos/dll/win32/tapi32/precomp.h
index 297abf37073..031a8ca582f 100644
--- a/reactos/dll/win32/tapi32/precomp.h
+++ b/reactos/dll/win32/tapi32/precomp.h
@@ -1,7 +1,7 @@
 #ifndef _TAPI32_PCH_
 #define _TAPI32_PCH_
 
-#include <config.h>
+#include <wine/config.h>
 
 #include <stdarg.h>
 
diff --git a/reactos/dll/win32/twain_32/twain_i.h b/reactos/dll/win32/twain_32/twain_i.h
index b426aa323ee..a170454a4e0 100644
--- a/reactos/dll/win32/twain_32/twain_i.h
+++ b/reactos/dll/win32/twain_32/twain_i.h
@@ -20,7 +20,7 @@
 #ifndef _TWAIN32_H
 #define _TWAIN32_H
 
-#include <config.h>
+#include <wine/config.h>
 
 #include <stdarg.h>
 
@@ -67,4 +67,4 @@ extern TW_UINT16 TWAIN_OpenDSM
 extern TW_UINT16 TWAIN_GetDSMStatus
            (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
 
-#endif
+#endif /* _TWAIN32_H */
diff --git a/reactos/dll/win32/userenv/precomp.h b/reactos/dll/win32/userenv/precomp.h
index 62b7c70aa07..814688f7e22 100644
--- a/reactos/dll/win32/userenv/precomp.h
+++ b/reactos/dll/win32/userenv/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _USERENV_PCH_
+#define _USERENV_PCH_
+
 #include <stdio.h>
 
 #define WIN32_NO_STATUS
@@ -14,3 +17,5 @@
 #include <userenv.h>
 
 #include "internal.h"
+
+#endif /* _USERENV_PCH_ */
diff --git a/reactos/dll/win32/usp10/usp10_internal.h b/reactos/dll/win32/usp10/usp10_internal.h
index 0196a2d9c27..093acad7a1c 100644
--- a/reactos/dll/win32/usp10/usp10_internal.h
+++ b/reactos/dll/win32/usp10/usp10_internal.h
@@ -19,6 +19,9 @@
  *
  */
 
+#ifndef _USP10_INTERNAL_H_
+#define _USP10_INTERNAL_H_
+
 #include <config.h>
 
 #include <stdarg.h>
@@ -268,3 +271,5 @@ INT OpenType_apply_GPOS_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPL
 HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) DECLSPEC_HIDDEN;
 HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags) DECLSPEC_HIDDEN;
 HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, char tableType, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) DECLSPEC_HIDDEN;
+
+#endif /* _USP10_INTERNAL_H_ */
diff --git a/reactos/dll/win32/uxtheme/uxthemep.h b/reactos/dll/win32/uxtheme/uxthemep.h
index 320bb7f4195..e6eaa41ec9a 100644
--- a/reactos/dll/win32/uxtheme/uxthemep.h
+++ b/reactos/dll/win32/uxtheme/uxthemep.h
@@ -1,3 +1,6 @@
+#ifndef _UXTHEME_PCH_
+#define _UXTHEME_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -230,3 +233,5 @@ BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg);
 #define ALPHABLEND_BINARY           1
 /* Full alpha blending */
 #define ALPHABLEND_FULL             2
+
+#endif /* _UXTHEME_PCH_ */
diff --git a/reactos/dll/win32/vbscript/vbscript.h b/reactos/dll/win32/vbscript/vbscript.h
index 1f94db22635..9ffe55544e0 100644
--- a/reactos/dll/win32/vbscript/vbscript.h
+++ b/reactos/dll/win32/vbscript/vbscript.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _VBSCRIPT_H
+#define _VBSCRIPT_H
+
 #include <assert.h>
 #include <stdarg.h>
 
@@ -418,3 +421,5 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)
 #include "parse.h"
 #include "regexp.h"
 #include "vbscript_defs.h"
+
+#endif /* _VBSCRIPT_H */
diff --git a/reactos/dll/win32/wbemdisp/wbemdisp_private.h b/reactos/dll/win32/wbemdisp/wbemdisp_private.h
index 4d30189e9ad..b7fbb533a5f 100644
--- a/reactos/dll/win32/wbemdisp/wbemdisp_private.h
+++ b/reactos/dll/win32/wbemdisp/wbemdisp_private.h
@@ -16,7 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#ifndef _WBEMDISP_PRIVATE_H_
+#define _WBEMDISP_PRIVATE_H_
+
+#include <wine/config.h>
 
 #include <stdarg.h>
 
@@ -46,3 +49,5 @@ static inline BOOL heap_free( void *mem )
 {
     return HeapFree( GetProcessHeap(), 0, mem );
 }
+
+#endif /* _WBEMDISP_PRIVATE_H_ */
diff --git a/reactos/dll/win32/wbemprox/wbemprox_private.h b/reactos/dll/win32/wbemprox/wbemprox_private.h
index 36120c45b2b..6aee2da7356 100644
--- a/reactos/dll/win32/wbemprox/wbemprox_private.h
+++ b/reactos/dll/win32/wbemprox/wbemprox_private.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _WBEMPROX_PRIVATE_H_
+#define _WBEMPROX_PRIVATE_H_
+
 #include <config.h>
 
 #include <stdarg.h>
@@ -331,3 +334,5 @@ static const WCHAR param_typesW[] = {'T','y','p','e','s',0};
 static const WCHAR param_userW[] = {'U','s','e','r',0};
 static const WCHAR param_valueW[] = {'s','V','a','l','u','e',0};
 static const WCHAR param_valuenameW[] = {'s','V','a','l','u','e','N','a','m','e',0};
+
+#endif /* _WBEMPROX_PRIVATE_H_ */
diff --git a/reactos/dll/win32/winmm/winemm.h b/reactos/dll/win32/winmm/winemm.h
index 23351f8841f..fac668f56c6 100644
--- a/reactos/dll/win32/winmm/winemm.h
+++ b/reactos/dll/win32/winmm/winemm.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _WINEMM_H_
+#define _WINEMM_H_
+
 #include <wine/config.h>
 
 #include <assert.h>
@@ -199,3 +202,5 @@ extern HANDLE psStopEvent;
     "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Drivers"
 
 INT LoadRegistryMMEDrivers(char* key);
+
+#endif /* _WINEMM_H_ */
diff --git a/reactos/dll/win32/winsta/logon.c b/reactos/dll/win32/winsta/logon.c
index 421b77ba927..1ea47b78328 100644
--- a/reactos/dll/win32/winsta/logon.c
+++ b/reactos/dll/win32/winsta/logon.c
@@ -6,6 +6,7 @@
  * NOTES:           This file contains exported functions relevant to
  *                  userinit, winlogon, lsass and friends in vista.
  */
+
 #include "winsta.h"
 
 VOID
diff --git a/reactos/dll/win32/winsta/main.c b/reactos/dll/win32/winsta/main.c
index 400129c1d0f..7d5f3037c11 100644
--- a/reactos/dll/win32/winsta/main.c
+++ b/reactos/dll/win32/winsta/main.c
@@ -23,6 +23,7 @@
  * PROGRAMMER:      Emanuele Aliberti <ea@reactos.com>
  *                  Samuel Serapi?n
  */
+
 #include "winsta.h"
 
 HINSTANCE hDllInstance;
diff --git a/reactos/dll/win32/winsta/misc.c b/reactos/dll/win32/winsta/misc.c
index b3d21961faa..21bcfabe348 100644
--- a/reactos/dll/win32/winsta/misc.c
+++ b/reactos/dll/win32/winsta/misc.c
@@ -6,6 +6,7 @@
  * NOTES:           Misc functions.
  * 
  */
+
 #include "winsta.h"
 
 VOID
diff --git a/reactos/dll/win32/winsta/security.c b/reactos/dll/win32/winsta/security.c
index db304209a43..cbeab367f45 100644
--- a/reactos/dll/win32/winsta/security.c
+++ b/reactos/dll/win32/winsta/security.c
@@ -5,6 +5,7 @@
  * PROGRAMMER:      Samuel Serapi?n
  * NOTE:            Not needed, just here for the show.
  */
+
 #include "winsta.h"
 
 VOID
diff --git a/reactos/dll/win32/winsta/ws.c b/reactos/dll/win32/winsta/ws.c
index 32ed9557430..3b9fb158225 100644
--- a/reactos/dll/win32/winsta/ws.c
+++ b/reactos/dll/win32/winsta/ws.c
@@ -5,6 +5,7 @@
  * PROGRAMMER:      Samuel Serapi?n
  * 
  */
+
 #include "winsta.h"
 
 VOID
diff --git a/reactos/dll/win32/wldap32/winldap_private.h b/reactos/dll/win32/wldap32/winldap_private.h
index 2442014dd9b..2da56116534 100644
--- a/reactos/dll/win32/wldap32/winldap_private.h
+++ b/reactos/dll/win32/wldap32/winldap_private.h
@@ -22,7 +22,10 @@
  * native headers.
  */
 
-#include <config.h>
+#ifndef _WINLDAP_PRIVATE_H_
+#define _WINLDAP_PRIVATE_H_
+
+#include <wine/config.h>
 
 #include <stdarg.h>
 
@@ -477,3 +480,5 @@ ULONG CDECL LdapGetLastError(void);
 ULONG CDECL LdapMapErrorToWin32(ULONG);
 int CDECL LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int);
 int CDECL LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int);
+
+#endif /* _WINLDAP_PRIVATE_H_ */
diff --git a/reactos/dll/win32/wldap32/wldap32.h b/reactos/dll/win32/wldap32/wldap32.h
index 00a85a36539..09aa9f26318 100644
--- a/reactos/dll/win32/wldap32/wldap32.h
+++ b/reactos/dll/win32/wldap32/wldap32.h
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 extern HINSTANCE hwldap32 DECLSPEC_HIDDEN;
 
 ULONG map_error( int ) DECLSPEC_HIDDEN;
diff --git a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h
index 90e50c6b17e..0c11cf94318 100644
--- a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h
+++ b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h
@@ -5,6 +5,9 @@
  * PURPOSE:     WinSock 2.2 Main Header
  */
 
+#ifndef _WS2_32_NEW_PCH_
+#define _WS2_32_NEW_PCH_
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
@@ -37,3 +40,5 @@
 
 /* Internal headers */
 #include "ws2_32p.h"
+
+#endif /* _WS2_32_NEW_PCH_ */
diff --git a/reactos/dll/win32/wuapi/wuapi_private.h b/reactos/dll/win32/wuapi/wuapi_private.h
index 6e569a7acbb..5b18dad07c9 100644
--- a/reactos/dll/win32/wuapi/wuapi_private.h
+++ b/reactos/dll/win32/wuapi/wuapi_private.h
@@ -16,7 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#ifndef _WUAPI_PRIVATE_H_
+#define _WUAPI_PRIVATE_H_
+
+#include <wine/config.h>
 
 #include <stdarg.h>
 
@@ -39,3 +42,5 @@ extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLS
 extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
 extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;
 extern HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
+
+#endif /* _WUAPI_PRIVATE_H_ */