diff --git a/reactos/dll/win32/advapi32/advapi32.h b/reactos/dll/win32/advapi32/advapi32.h
index cf370072669..eb113866582 100644
--- a/reactos/dll/win32/advapi32/advapi32.h
+++ b/reactos/dll/win32/advapi32/advapi32.h
@@ -25,7 +25,14 @@
 #include <winsafer.h>
 #include <sddl.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/exfuncs.h>
+#include <ndk/iofuncs.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 */
 #include <ntsecapi.h>
@@ -35,6 +42,13 @@
 #include "lsa_c.h"
 #include "eventlogrpc_c.h"
 
+#include <rpc.h>
+
+#include "crypt/crypt.h"
+#include <wine/debug.h>
+#include <wine/unicode.h>
+#include <wincred.h>
+
 #ifndef HAS_FN_PROGRESSW
 #define FN_PROGRESSW FN_PROGRESS
 #endif
diff --git a/reactos/dll/win32/advapi32/crypt/crypt.c b/reactos/dll/win32/advapi32/crypt/crypt.c
index e7c04c5478c..59ff684d8bf 100644
--- a/reactos/dll/win32/advapi32/crypt/crypt.c
+++ b/reactos/dll/win32/advapi32/crypt/crypt.c
@@ -25,10 +25,6 @@
   */
 
 #include <advapi32.h>
-#include "crypt.h"
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 
 
diff --git a/reactos/dll/win32/advapi32/crypt/crypt_arc4.c b/reactos/dll/win32/advapi32/crypt/crypt_arc4.c
index 32a68fe68fd..7d2381b4583 100644
--- a/reactos/dll/win32/advapi32/crypt/crypt_arc4.c
+++ b/reactos/dll/win32/advapi32/crypt/crypt_arc4.c
@@ -21,9 +21,6 @@
 
 #include <advapi32.h>
 
-#include "crypt.h"
-
-
 void arc4_init(arc4_info *a4i, const BYTE *key, unsigned int keyLen)
 {
     unsigned int keyIndex = 0, stateIndex = 0;
diff --git a/reactos/dll/win32/advapi32/crypt/crypt_des.c b/reactos/dll/win32/advapi32/crypt/crypt_des.c
index cf59d400073..f568082c1d3 100644
--- a/reactos/dll/win32/advapi32/crypt/crypt_des.c
+++ b/reactos/dll/win32/advapi32/crypt/crypt_des.c
@@ -22,7 +22,6 @@
  */
 
 #include <advapi32.h>
-#include "crypt.h"
 
 static const unsigned char InitialPermuteMap[64] =
 {
diff --git a/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c b/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c
index 657505ef252..129c9842075 100644
--- a/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c
+++ b/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c
@@ -21,8 +21,6 @@
  */
 
 #include <advapi32.h>
-#include "crypt.h"
-
 
 static const unsigned char CRYPT_LMhash_Magic[8] =
     { 'K', 'G', 'S', '!', '@', '#', '$', '%' };
diff --git a/reactos/dll/win32/advapi32/crypt/crypt_md4.c b/reactos/dll/win32/advapi32/crypt/crypt_md4.c
index bbf23a73432..b32eebd6184 100644
--- a/reactos/dll/win32/advapi32/crypt/crypt_md4.c
+++ b/reactos/dll/win32/advapi32/crypt/crypt_md4.c
@@ -34,8 +34,6 @@
  */
 
 #include <advapi32.h>
-#include "crypt.h"
-
 
 /* The three core functions */
 
diff --git a/reactos/dll/win32/advapi32/crypt/crypt_md5.c b/reactos/dll/win32/advapi32/crypt/crypt_md5.c
index 1b6d4ef9100..1837eb023a8 100644
--- a/reactos/dll/win32/advapi32/crypt/crypt_md5.c
+++ b/reactos/dll/win32/advapi32/crypt/crypt_md5.c
@@ -34,8 +34,6 @@
  */
 
 #include <advapi32.h>
-#include "crypt.h"
-
 
 typedef struct
 {
diff --git a/reactos/dll/win32/advapi32/crypt/crypt_sha.c b/reactos/dll/win32/advapi32/crypt/crypt_sha.c
index 320c5c363df..b677c426ea8 100644
--- a/reactos/dll/win32/advapi32/crypt/crypt_sha.c
+++ b/reactos/dll/win32/advapi32/crypt/crypt_sha.c
@@ -18,7 +18,6 @@
  */
 
 #include <advapi32.h>
-#include "crypt.h"
 
 /* SHA Context Structure Declaration */
 
diff --git a/reactos/dll/win32/advapi32/misc/dllmain.c b/reactos/dll/win32/advapi32/misc/dllmain.c
index 39a2445e4aa..042e3bf9da1 100644
--- a/reactos/dll/win32/advapi32/misc/dllmain.c
+++ b/reactos/dll/win32/advapi32/misc/dllmain.c
@@ -10,8 +10,7 @@
  */
 
 #include <advapi32.h>
-#define NDEBUG
-#include <debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 extern BOOL RegInitialize(VOID);
 extern BOOL RegCleanup(VOID);
diff --git a/reactos/dll/win32/advapi32/misc/efs.c b/reactos/dll/win32/advapi32/misc/efs.c
index 51f4111368a..9f66a810e69 100644
--- a/reactos/dll/win32/advapi32/misc/efs.c
+++ b/reactos/dll/win32/advapi32/misc/efs.c
@@ -7,8 +7,6 @@
  */
 
 #include <advapi32.h>
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 
diff --git a/reactos/dll/win32/advapi32/misc/hwprofiles.c b/reactos/dll/win32/advapi32/misc/hwprofiles.c
index 6bfc08b0df0..980001d999b 100644
--- a/reactos/dll/win32/advapi32/misc/hwprofiles.c
+++ b/reactos/dll/win32/advapi32/misc/hwprofiles.c
@@ -8,8 +8,6 @@
  */
 
 #include <advapi32.h>
-#include <rpc.h>
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /******************************************************************************
diff --git a/reactos/dll/win32/advapi32/misc/logon.c b/reactos/dll/win32/advapi32/misc/logon.c
index 8cd1954a188..0498f3db141 100644
--- a/reactos/dll/win32/advapi32/misc/logon.c
+++ b/reactos/dll/win32/advapi32/misc/logon.c
@@ -7,8 +7,6 @@
  */
 
 #include <advapi32.h>
-
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 
diff --git a/reactos/dll/win32/advapi32/misc/msi.c b/reactos/dll/win32/advapi32/misc/msi.c
index dc1d1397f71..bae86b7db4c 100644
--- a/reactos/dll/win32/advapi32/misc/msi.c
+++ b/reactos/dll/win32/advapi32/misc/msi.c
@@ -9,7 +9,6 @@
 
 #include <advapi32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 #ifndef _UNICODE
 #define debugstr_aw debugstr_a
diff --git a/reactos/dll/win32/advapi32/misc/shutdown.c b/reactos/dll/win32/advapi32/misc/shutdown.c
index 26582aaa095..6e8af4d7267 100644
--- a/reactos/dll/win32/advapi32/misc/shutdown.c
+++ b/reactos/dll/win32/advapi32/misc/shutdown.c
@@ -11,7 +11,7 @@
  */
 
 #include <advapi32.h>
-#include <debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 #define USZ {0,0,0}
 
diff --git a/reactos/dll/win32/advapi32/misc/sysfunc.c b/reactos/dll/win32/advapi32/misc/sysfunc.c
index c6295d5509e..1512d38dc29 100644
--- a/reactos/dll/win32/advapi32/misc/sysfunc.c
+++ b/reactos/dll/win32/advapi32/misc/sysfunc.c
@@ -12,7 +12,6 @@
  */
 
 #include <advapi32.h>
-#include <crypt/crypt.h>
 
 static const unsigned char CRYPT_LMhash_Magic[8] =
     { 'K', 'G', 'S', '!', '@', '#', '$', '%' };
diff --git a/reactos/dll/win32/advapi32/misc/trace.c b/reactos/dll/win32/advapi32/misc/trace.c
index 9de75f93ce2..f09d9a72718 100644
--- a/reactos/dll/win32/advapi32/misc/trace.c
+++ b/reactos/dll/win32/advapi32/misc/trace.c
@@ -3,10 +3,6 @@
  */
 
 #include <advapi32.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.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 28dcbe4dabb..e15b879123a 100644
--- a/reactos/dll/win32/advapi32/reg/reg.c
+++ b/reactos/dll/win32/advapi32/reg/reg.c
@@ -14,8 +14,6 @@
 /* INCLUDES *****************************************************************/
 
 #include <advapi32.h>
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(reg);
 
 /* DEFINES ******************************************************************/
diff --git a/reactos/dll/win32/advapi32/sec/ac.c b/reactos/dll/win32/advapi32/sec/ac.c
index 111402a6715..76355366b8e 100644
--- a/reactos/dll/win32/advapi32/sec/ac.c
+++ b/reactos/dll/win32/advapi32/sec/ac.c
@@ -7,8 +7,6 @@
  */
 
 #include <advapi32.h>
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /* --- ACL --- */
diff --git a/reactos/dll/win32/advapi32/sec/audit.c b/reactos/dll/win32/advapi32/sec/audit.c
index 1fc0464a0d5..74ab74cc74b 100644
--- a/reactos/dll/win32/advapi32/sec/audit.c
+++ b/reactos/dll/win32/advapi32/sec/audit.c
@@ -12,8 +12,6 @@
 /* INCLUDES *****************************************************************/
 
 #include <advapi32.h>
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/dll/win32/advapi32/sec/cred.c b/reactos/dll/win32/advapi32/sec/cred.c
index cd74a6a17d0..3c5b7821d85 100644
--- a/reactos/dll/win32/advapi32/sec/cred.c
+++ b/reactos/dll/win32/advapi32/sec/cred.c
@@ -18,19 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <time.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "wincred.h"
-#include "winternl.h"
-#include "../crypt/crypt.h"
-
-#include "wine/unicode.h"
-#include "wine/debug.h"
-
+#include <advapi32.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 ec76774bbfd..b02bd3bca2d 100644
--- a/reactos/dll/win32/advapi32/sec/lsa.c
+++ b/reactos/dll/win32/advapi32/sec/lsa.c
@@ -11,9 +11,6 @@
  *
  */
 #include <advapi32.h>
-#include "wine/debug.h"
-#include "wine/unicode.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 
diff --git a/reactos/dll/win32/advapi32/sec/misc.c b/reactos/dll/win32/advapi32/sec/misc.c
index f03c1a0bb9c..7bd77d6f7cc 100644
--- a/reactos/dll/win32/advapi32/sec/misc.c
+++ b/reactos/dll/win32/advapi32/sec/misc.c
@@ -11,9 +11,6 @@
  */
 
 #include <advapi32.h>
-#include "wine/unicode.h"
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 
diff --git a/reactos/dll/win32/advapi32/sec/sec.c b/reactos/dll/win32/advapi32/sec/sec.c
index 99222f3f315..780942d560c 100644
--- a/reactos/dll/win32/advapi32/sec/sec.c
+++ b/reactos/dll/win32/advapi32/sec/sec.c
@@ -12,8 +12,6 @@
  */
 
 #include <advapi32.h>
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /*
diff --git a/reactos/dll/win32/advapi32/sec/sid.c b/reactos/dll/win32/advapi32/sec/sid.c
index a51dc45fca6..91b5db6fb21 100644
--- a/reactos/dll/win32/advapi32/sec/sid.c
+++ b/reactos/dll/win32/advapi32/sec/sid.c
@@ -12,10 +12,6 @@
  */
 
 #include <advapi32.h>
-#include <sddl.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 #define MAX_GUID_STRING_LEN 39
diff --git a/reactos/dll/win32/advapi32/sec/trustee.c b/reactos/dll/win32/advapi32/sec/trustee.c
index c8dad098768..9a2b533be26 100644
--- a/reactos/dll/win32/advapi32/sec/trustee.c
+++ b/reactos/dll/win32/advapi32/sec/trustee.c
@@ -7,9 +7,6 @@
  */
 
 #include <advapi32.h>
-
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 
diff --git a/reactos/dll/win32/advapi32/service/eventlog.c b/reactos/dll/win32/advapi32/service/eventlog.c
index 6401b063ef8..18d09e11789 100644
--- a/reactos/dll/win32/advapi32/service/eventlog.c
+++ b/reactos/dll/win32/advapi32/service/eventlog.c
@@ -22,8 +22,6 @@
  */
 
 #include <advapi32.h>
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 static RPC_UNICODE_STRING EmptyStringU = { 0, 0, L"" };
diff --git a/reactos/dll/win32/advapi32/service/scm.c b/reactos/dll/win32/advapi32/service/scm.c
index e935f091373..d3117e13b9e 100644
--- a/reactos/dll/win32/advapi32/service/scm.c
+++ b/reactos/dll/win32/advapi32/service/scm.c
@@ -13,9 +13,6 @@
 /* INCLUDES ******************************************************************/
 
 #include <advapi32.h>
-
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 
diff --git a/reactos/dll/win32/advapi32/service/sctrl.c b/reactos/dll/win32/advapi32/service/sctrl.c
index 90810bcca3c..1a1b31e6966 100644
--- a/reactos/dll/win32/advapi32/service/sctrl.c
+++ b/reactos/dll/win32/advapi32/service/sctrl.c
@@ -13,8 +13,6 @@
 /* INCLUDES ******************************************************************/
 
 #include <advapi32.h>
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 
diff --git a/reactos/dll/win32/advapi32/token/token.c b/reactos/dll/win32/advapi32/token/token.c
index 3e0cfcf8701..2c2687b2834 100644
--- a/reactos/dll/win32/advapi32/token/token.c
+++ b/reactos/dll/win32/advapi32/token/token.c
@@ -9,8 +9,6 @@
  */
 
 #include <advapi32.h>
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /*