diff --git a/reactos/dll/win32/advapi32/advapi32.h b/reactos/dll/win32/advapi32/advapi32.h
index a304ec5504d..39492bdae2d 100644
--- a/reactos/dll/win32/advapi32/advapi32.h
+++ b/reactos/dll/win32/advapi32/advapi32.h
@@ -15,25 +15,19 @@
 #include <stdio.h>
 
 /* PSDK/NDK Headers */
+#define WINE_STRICT_PROTOTYPES
 #define WIN32_NO_STATUS
 #define WIN32_LEAN_AND_MEAN
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
 #define _WMI_SOURCE_
-#include <windows.h>
-#include <winefs.h>
 #include <aclapi.h>
-#include <wmistr.h>
-#include <evntrace.h>
 #include <winsafer.h>
-#include <sddl.h>
 #define NTOS_MODE_USER
-#include <ndk/cmfuncs.h>
-#include <ndk/exfuncs.h>
 #include <ndk/iofuncs.h>
-#include <ndk/kefuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/psfuncs.h>
 #include <ndk/rtlfuncs.h>
-#include <ndk/setypes.h>
 #include <ndk/sefuncs.h>
 
 /* this has to go after the NDK when being used with the NDK */
@@ -41,13 +35,11 @@
 
 #include <services/services.h>
 #include <svcctl_c.h>
-#include <lsa_c.h>
-#include <eventlogrpc_c.h>
 
-#include "crypt/crypt.h"
 #include <wine/debug.h>
 #include <wine/unicode.h>
-#include <wincred.h>
+
+#include "crypt/crypt.h"
 
 #ifndef HAS_FN_PROGRESSW
 #define FN_PROGRESSW FN_PROGRESS
diff --git a/reactos/dll/win32/advapi32/crypt/crypt.c b/reactos/dll/win32/advapi32/crypt/crypt.c
index ff734d5e139..81b37c891e5 100644
--- a/reactos/dll/win32/advapi32/crypt/crypt.c
+++ b/reactos/dll/win32/advapi32/crypt/crypt.c
@@ -24,7 +24,6 @@
  *  - Thread-safing
   */
 
-#define WINE_STRICT_PROTOTYPES
 #include <advapi32.h>
 WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 
diff --git a/reactos/dll/win32/advapi32/misc/efs.c b/reactos/dll/win32/advapi32/misc/efs.c
index 49bd4e33bc3..47bf3ece631 100644
--- a/reactos/dll/win32/advapi32/misc/efs.c
+++ b/reactos/dll/win32/advapi32/misc/efs.c
@@ -7,8 +7,10 @@
  */
 
 #include <advapi32.h>
-WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
+#include <winefs.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /*
  * @unimplemented
diff --git a/reactos/dll/win32/advapi32/misc/shutdown.c b/reactos/dll/win32/advapi32/misc/shutdown.c
index 933a774e3e9..4cd0039ce15 100644
--- a/reactos/dll/win32/advapi32/misc/shutdown.c
+++ b/reactos/dll/win32/advapi32/misc/shutdown.c
@@ -8,6 +8,9 @@
  */
 
 #include <advapi32.h>
+
+#include <ndk/exfuncs.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /**********************************************************************
diff --git a/reactos/dll/win32/advapi32/misc/trace.c b/reactos/dll/win32/advapi32/misc/trace.c
index f09d9a72718..08f34020c0e 100644
--- a/reactos/dll/win32/advapi32/misc/trace.c
+++ b/reactos/dll/win32/advapi32/misc/trace.c
@@ -3,6 +3,10 @@
  */
 
 #include <advapi32.h>
+
+#include <wmistr.h>
+#include <evntrace.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 /*
  * @unimplemented
diff --git a/reactos/dll/win32/advapi32/reg/reg.c b/reactos/dll/win32/advapi32/reg/reg.c
index de15bf5f7d7..c4518ba376e 100644
--- a/reactos/dll/win32/advapi32/reg/reg.c
+++ b/reactos/dll/win32/advapi32/reg/reg.c
@@ -14,7 +14,10 @@
 /* INCLUDES *****************************************************************/
 
 #include <advapi32.h>
+
+#include <ndk/cmfuncs.h>
 #include <pseh/pseh2.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(reg);
 
 /* DEFINES ******************************************************************/
diff --git a/reactos/dll/win32/advapi32/sec/cred.c b/reactos/dll/win32/advapi32/sec/cred.c
index d0a0cb658e7..4c6dd287c54 100644
--- a/reactos/dll/win32/advapi32/sec/cred.c
+++ b/reactos/dll/win32/advapi32/sec/cred.c
@@ -19,6 +19,9 @@
  */
 
 #include <advapi32.h>
+
+#include <wincred.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(cred);
 
 /* the size of the ARC4 key used to encrypt the password data */
diff --git a/reactos/dll/win32/advapi32/sec/lsa.c b/reactos/dll/win32/advapi32/sec/lsa.c
index e899859350b..898497cda09 100644
--- a/reactos/dll/win32/advapi32/sec/lsa.c
+++ b/reactos/dll/win32/advapi32/sec/lsa.c
@@ -13,8 +13,9 @@
 
 #include <advapi32.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(advapi);
+#include <lsa_c.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 static
 BOOL
diff --git a/reactos/dll/win32/advapi32/sec/misc.c b/reactos/dll/win32/advapi32/sec/misc.c
index 4a309268455..33019693207 100644
--- a/reactos/dll/win32/advapi32/sec/misc.c
+++ b/reactos/dll/win32/advapi32/sec/misc.c
@@ -11,8 +11,8 @@
  */
 
 #include <advapi32.h>
-WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
+WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /* Interface to ntmarta.dll ***************************************************/
 
diff --git a/reactos/dll/win32/advapi32/sec/sid.c b/reactos/dll/win32/advapi32/sec/sid.c
index d645a53583d..fe1bb856df6 100644
--- a/reactos/dll/win32/advapi32/sec/sid.c
+++ b/reactos/dll/win32/advapi32/sec/sid.c
@@ -12,6 +12,9 @@
  */
 
 #include <advapi32.h>
+
+#include <sddl.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 #define MAX_GUID_STRING_LEN 39
diff --git a/reactos/dll/win32/advapi32/service/eventlog.c b/reactos/dll/win32/advapi32/service/eventlog.c
index 2788854c923..2b535b7c800 100644
--- a/reactos/dll/win32/advapi32/service/eventlog.c
+++ b/reactos/dll/win32/advapi32/service/eventlog.c
@@ -22,6 +22,10 @@
  */
 
 #include <advapi32.h>
+
+#include <ndk/kefuncs.h>
+#include <eventlogrpc_c.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 static RPC_UNICODE_STRING EmptyStringU = { 0, 0, L"" };
diff --git a/reactos/dll/win32/advapi32/token/token.c b/reactos/dll/win32/advapi32/token/token.c
index 2c2687b2834..5da745d2a59 100644
--- a/reactos/dll/win32/advapi32/token/token.c
+++ b/reactos/dll/win32/advapi32/token/token.c
@@ -9,6 +9,9 @@
  */
 
 #include <advapi32.h>
+
+#include <ndk/setypes.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /*