- don't include winreg.h

- include kernel_private.h to get declaration for convert_old_config()

dlls/kernel/change.c

@@ -28,7 +28,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "ntstatus.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "wine/windef16.h"

dlls/kernel/computername.c

@@ -39,7 +39,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/exception.h"

dlls/kernel/cpu.c

@@ -50,7 +50,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winerror.h"
 #include "wine/unicode.h"

dlls/kernel/dosmem.c

@@ -33,7 +33,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "excpt.h"
 #include "winternl.h"
 #include "wine/winbase16.h"

dlls/kernel/except.c

@@ -44,7 +44,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wingdi.h"
 #include "winuser.h"

dlls/kernel/fiber.c

@@ -31,7 +31,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/exception.h"
 #include "wine/library.h"

dlls/kernel/file.c

@@ -32,7 +32,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winioctl.h"
 #include "wincon.h"

dlls/kernel/file16.c

@@ -35,7 +35,6 @@
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
 #include "wine/server.h"

dlls/kernel/format_msg.c

@@ -28,7 +28,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winuser.h"
 #include "winnls.h"

dlls/kernel/global16.c

@@ -40,7 +40,6 @@
 #include "wine/winbase16.h"
 #include "ntstatus.h"
 #include "toolhelp.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"

dlls/kernel/heap.c

@@ -44,7 +44,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winnt.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "excpt.h"
 #include "wine/exception.h"

dlls/kernel/kernel_main.c

@@ -33,7 +33,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wincon.h"
-#include "winreg.h"
 #include "winternl.h"
 
 #include "wine/winbase16.h"

dlls/kernel/lcformat.c

@@ -33,7 +33,6 @@
 #include "winbase.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
-#include "winreg.h"
 #include "winternl.h"
 
 #include "kernel_private.h"

dlls/kernel/local16.c

@@ -36,7 +36,6 @@
 #include "wine/winbase16.h"
 #include "wownt32.h"
 #include "toolhelp.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"

dlls/kernel/locale.c

@@ -35,7 +35,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"  /* for RT_STRINGW */
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "winnls.h"

dlls/kernel/module.c

@@ -34,7 +34,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "thread.h"
 #include "module.h"

dlls/kernel/ne_module.c

@@ -35,7 +35,6 @@
 #include "windef.h"
 #include "wine/winbase16.h"
 #include "wownt32.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "toolhelp.h"
 #include "excpt.h"

dlls/kernel/ne_segment.c

@@ -35,7 +35,6 @@
 
 #include "wine/winbase16.h"
 #include "wownt32.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/library.h"
 #include "kernel_private.h"

dlls/kernel/oldconfig.c

@@ -42,7 +42,6 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winnls.h"
 #include "winternl.h"
 #include "ntstatus.h"
@@ -52,6 +51,7 @@
 #include "wine/server.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
+#include "kernel_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(reg);
 

dlls/kernel/path.c

@@ -34,7 +34,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 
 #include "kernel_private.h"

dlls/kernel/process.c

@@ -37,7 +37,6 @@
 #include "wine/winuser16.h"
 #include "ntstatus.h"
 #include "winioctl.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "module.h"
 #include "kernel_private.h"

dlls/kernel/profile.c

@@ -29,7 +29,6 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
 #include "wine/unicode.h"

dlls/kernel/pthread.c

@@ -45,7 +45,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "wine/pthread.h"

dlls/kernel/relay16.c

@@ -29,7 +29,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wine/winbase16.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"

dlls/kernel/resource.c

@@ -29,7 +29,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wownt32.h"
 #include "wine/winbase16.h"

dlls/kernel/snoop16.c

@@ -29,7 +29,6 @@
 #include "winbase.h"
 #include "winnt.h"
 #include "wine/winbase16.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/library.h"
 #include "kernel_private.h"

dlls/kernel/sync.c

@@ -49,7 +49,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"
-#include "winreg.h"
 #include "winternl.h"
 
 #include "wine/server.h"

dlls/kernel/syslevel.c

@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
 #include "kernel_private.h"

dlls/kernel/system.c

@@ -28,7 +28,6 @@
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "wownt32.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"

dlls/kernel/thunk.c

@@ -34,7 +34,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wownt32.h"
 #include "wine/winbase16.h"

dlls/kernel/time.c

@@ -41,7 +41,6 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "wine/unicode.h"

dlls/kernel/utthunk.c

@@ -23,7 +23,6 @@
 #include "wine/winbase16.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wownt32.h"
 #include "wine/debug.h"

dlls/kernel/virtual.c

@@ -36,7 +36,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winerror.h"
 #include "wine/exception.h"

dlls/kernel/volume.c

@@ -31,7 +31,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winnls.h"
 #include "winternl.h"
 #include "ntstatus.h"

dlls/kernel/vxd.c

@@ -36,7 +36,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winerror.h"
 #include "winternl.h"
 #include "kernel_private.h"

dlls/kernel/wowthunk.c

@@ -31,7 +31,6 @@
 #include "wownt32.h"
 #include "excpt.h"
 #include "thread.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"