[PATCH v4 2/2] include: Move RTL functions that belong in ntifs.h from winternl.h to ntifs.h.

16 Dec 2023

diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 8d0c6977d72..b9cd8fac299 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -30,6 +30,7 @@
 #include "winreg.h"
 #include "winsafer.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
 #include "winioctl.h"
 #include "accctrl.h"
 #include "sddl.h"
diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c
index ae68c4b90c2..aa734c16ef8 100644
--- a/dlls/kerberos/krb5_ap.c
+++ b/dlls/kerberos/krb5_ap.c
@@ -33,6 +33,7 @@
 #include "ntsecapi.h"
 #include "ntsecpkg.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
#include "wine/debug.h"
 #include "unixlib.h"
diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index fab914898ec..fa8f10cfbcc 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -32,7 +32,7 @@
 #include "winternl.h"
 #include "winioctl.h"
 #include "wincon.h"
-#include "ddk/ntddk.h"
+#include "ddk/ntifs.h"
 #include "kernel_private.h"
 #include "fileapi.h"
 #include "shlwapi.h"
diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
index 1ec2f5cce0d..9256fcd08da 100644
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -28,11 +28,14 @@
 #include <string.h>
 #include <sys/types.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "winnt.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
#include "kernel_private.h"
diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index f4bdc08b87e..40458792dc3 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
#include "kernel_private.h"
 #include "wine/debug.h"
diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c
index db2e1ce3aab..1da96c5162d 100644
--- a/dlls/kernel32/resource.c
+++ b/dlls/kernel32/resource.c
@@ -27,7 +27,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winternl.h"
-#include "ddk/ntddk.h"
+#include "ddk/ntifs.h"
 #include "wine/debug.h"
 #include "wine/exception.h"
 #include "wine/list.h"
diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
index 42c47707582..8c77e202a8e 100644
--- a/dlls/kernelbase/file.c
+++ b/dlls/kernelbase/file.c
@@ -34,8 +34,8 @@
 #include "wincon.h"
 #include "fileapi.h"
 #include "shlwapi.h"
-#include "ddk/ntddk.h"
 #include "ddk/ntddser.h"
+#include "ddk/ntifs.h"
 #include "ioringapi.h"
#include "kernelbase.h"
diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c
index 59b91596f13..c892bc28b33 100644
--- a/dlls/kernelbase/loader.c
+++ b/dlls/kernelbase/loader.c
@@ -28,7 +28,7 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "winternl.h"
-#include "ddk/ntddk.h"
+#include "ddk/ntifs.h"
 #include "kernelbase.h"
 #include "wine/list.h"
 #include "wine/asm.h"
diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index 44af29f163d..fb8de84e355 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -35,6 +35,7 @@
 #include "winnls.h"
 #include "winuser.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
 #include "kernelbase.h"
 #include "wine/debug.h"
diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c
index 4f4bba9a13b..d06e447fe0a 100644
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -31,7 +31,7 @@
 #include "winnls.h"
 #include "winternl.h"
 #include "winerror.h"
-#include "ddk/wdm.h"
+#include "ddk/ntifs.h"
#include "kernelbase.h"
 #include "wine/exception.h"
diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c
index 40ddf840045..946902b8d91 100644
--- a/dlls/kernelbase/path.c
+++ b/dlls/kernelbase/path.c
@@ -20,6 +20,8 @@
 #include <stdarg.h>
 #include <string.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "pathcch.h"
@@ -28,6 +30,7 @@
 #include "wininet.h"
 #include "intshcut.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
#include "kernelbase.h"
 #include "wine/exception.h"
diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c
index a767d993254..dbecb677d7c 100644
--- a/dlls/kernelbase/registry.c
+++ b/dlls/kernelbase/registry.c
@@ -36,6 +36,7 @@
 #include "winternl.h"
 #include "winperf.h"
 #include "winuser.h"
+#include "ddk/ntifs.h"
 #include "shlwapi.h"
 #include "sddl.h"
diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c
index 1dd975a7aad..fee8984c186 100644
--- a/dlls/kernelbase/security.c
+++ b/dlls/kernelbase/security.c
@@ -29,7 +29,7 @@
 #include "winerror.h"
 #include "winternl.h"
 #include "winioctl.h"
-#include "ddk/ntddk.h"
+#include "ddk/ntifs.h"
#include "kernelbase.h"
 #include "wine/debug.h"
diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c
index f83ae35f19a..6ec5649ab62 100644
--- a/dlls/kernelbase/string.c
+++ b/dlls/kernelbase/string.c
@@ -18,11 +18,14 @@
#include <stdarg.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
 #include "shlwapi.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
#include "kernelbase.h"
 #include "wine/debug.h"
diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c
index d39613175f9..d9fb3942b0a 100644
--- a/dlls/kernelbase/volume.c
+++ b/dlls/kernelbase/volume.c
@@ -36,6 +36,7 @@
 #include "ntddcdrm.h"
 #define WINE_MOUNTMGR_EXTENSIONS
 #include "ddk/mountmgr.h"
+#include "ddk/ntifs.h"
 #include "ddk/wdm.h"
 #include "kernelbase.h"
 #include "wine/debug.h"
diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c
index 50cc3fa7f2e..0a2d62d32f0 100644
--- a/dlls/krnl386.exe16/int21.c
+++ b/dlls/krnl386.exe16/int21.c
@@ -27,11 +27,14 @@
 #include <stdio.h>
 #include <string.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
 #include "wincon.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
 #include "wine/winbase16.h"
 #include "kernel16_private.h"
 #include "dosexe.h"
diff --git a/dlls/krnl386.exe16/local.c b/dlls/krnl386.exe16/local.c
index 1f75d8ef00f..c21073e1dc1 100644
--- a/dlls/krnl386.exe16/local.c
+++ b/dlls/krnl386.exe16/local.c
@@ -29,9 +29,13 @@
#include <stdlib.h>
 #include <string.h>
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "wine/winbase16.h"
 #include "wownt32.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
 #include "kernel16_private.h"
 #include "wine/debug.h"
diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c
index 534b912e884..04413c0cfc6 100644
--- a/dlls/krnl386.exe16/task.c
+++ b/dlls/krnl386.exe16/task.c
@@ -23,6 +23,8 @@
 #include <string.h>
 #include <assert.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
@@ -32,6 +34,7 @@
#include "wine/winbase16.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
 #include "kernel16_private.h"
#include "wine/debug.h"
diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h
index b1de312dffb..50beae17d83 100644
--- a/dlls/mountmgr.sys/mountmgr.h
+++ b/dlls/mountmgr.sys/mountmgr.h
@@ -32,7 +32,7 @@
 #include "ntddstor.h"
 #include "ntddscsi.h"
 #include "ntddcdrm.h"
-#include "ddk/wdm.h"
+#include "ddk/ntifs.h"
 #define WINE_MOUNTMGR_EXTENSIONS
 #include "ddk/mountmgr.h"
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index fbffe691559..1fe075d23dd 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -29,8 +29,7 @@
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "winternl.h"
-#include "ddk/ntddk.h"
-#include "ddk/wdm.h"
+#include "ddk/ntifs.h"
 #include "ntdll_misc.h"
 #include "wine/exception.h"
 #include "wine/debug.h"
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 59624bc70f8..60e152f710e 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -29,6 +29,7 @@
 #include "winnt.h"
 #include "winioctl.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
 #include "delayloadhandler.h"
#include "wine/exception.h"
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index a7967a6c242..5ae0c8a2aa3 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -23,10 +23,13 @@
 #include <stdlib.h>
 #include <sys/types.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
 #include "unixlib.h"
 #include "wine/asm.h"
diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c
index 37419ea1e83..b7f684a795e 100644
--- a/dlls/ntdll/printf.c
+++ b/dlls/ntdll/printf.c
@@ -27,8 +27,6 @@
 #include <stdio.h>
 #include <string.h>
-#include "windef.h"
-#include "winternl.h"
 #include "ntdll_misc.h"
 #include "wine/debug.h"
diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c
index 9326c73070e..042adeca16d 100644
--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -30,7 +30,7 @@
 #include "windef.h"
 #include "winnt.h"
 #include "winternl.h"
-#include "ddk/ntddk.h"
+#include "ddk/ntifs.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c
index a48496b65c6..005d85ff725 100644
--- a/dlls/ntdll/string.c
+++ b/dlls/ntdll/string.c
@@ -28,10 +28,13 @@
 #include <string.h>
 #include <stdint.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
 #include "ntdll_misc.h"
diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index 62659fc8cb4..a4d38140c60 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -22,6 +22,7 @@
 #include "ntdll_test.h"
 #include "winternl.h"
 #include "winuser.h"
+#include "ddk/ntifs.h"
 #include "ddk/wdm.h"
 #include "stdio.h"
 #include "winnt.h"
diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c
index 697774dfa09..77441a58a6d 100644
--- a/dlls/ntdll/tests/pipe.c
+++ b/dlls/ntdll/tests/pipe.c
@@ -30,6 +30,7 @@
 #include "wine/test.h"
 #include "winternl.h"
 #include "winioctl.h"
+#include "ddk/ntifs.h"
#ifndef __WINE_WINTERNL_H
diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c
index 0d1ffbb4ff6..03e813a70f0 100644
--- a/dlls/ntdll/tests/reg.c
+++ b/dlls/ntdll/tests/reg.c
@@ -24,6 +24,7 @@
#include "ntdll_test.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
 #include "stdio.h"
 #include "winnt.h"
 #include "winnls.h"
diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c
index aa43c3de16b..0158a406aa7 100644
--- a/dlls/ntdll/wcstring.c
+++ b/dlls/ntdll/wcstring.c
@@ -28,11 +28,8 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "winternl.h"
 #include "ntdll_misc.h"
+#include "winnls.h"
static const unsigned short wctypes[256] =
 {
diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index 22dc23c54fd..f034a72bd46 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -24,6 +24,8 @@
 #include <string.h>
 #include <stdlib.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
@@ -32,6 +34,7 @@
 #include "winreg.h"
 #include "winternl.h"
 #include "winerror.h"
+#include "ddk/ntifs.h"
 #include "setupapi.h"
 #include "setupapi_private.h"
diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c
index 91f13413dce..06744125f10 100644
--- a/dlls/shell32/recyclebin.c
+++ b/dlls/shell32/recyclebin.c
@@ -24,12 +24,15 @@
#include <stdarg.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
 #include "winternl.h"
 #include "winreg.h"
 #include "winuser.h"
+#include "ddk/ntifs.h"
 #include "shlwapi.h"
 #include "ntquery.h"
 #include "shlobj.h"
diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index 0e925973e84..795cb5d2a12 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -23,10 +23,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "wingdi.h"
 #include "user_private.h"
 #include "controls.h"
 #include "wine/exception.h"
diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 4ba6fa71028..0786596ea7f 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -42,12 +42,8 @@
 #include <stdarg.h>
 #include <string.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winnls.h"
-#include "controls.h"
 #include "user_private.h"
+#include "controls.h"
 #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(menu);
diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c
index 497d40e9dc6..78897c3c5af 100644
--- a/dlls/user32/misc.c
+++ b/dlls/user32/misc.c
@@ -23,13 +23,10 @@
#include <stdarg.h>
-#include "windef.h"
+#include "user_private.h"
 #include "wine/windef16.h"
-#include "winbase.h"
-#include "wingdi.h"
 #include "controls.h"
 #include "imm.h"
-#include "user_private.h"
#include "wine/debug.h"
diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c
index 4d345777a10..cb8b4645c3d 100644
--- a/dlls/user32/msgbox.c
+++ b/dlls/user32/msgbox.c
@@ -22,12 +22,8 @@
 #include <stdarg.h>
 #include <string.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winternl.h"
-#include "dlgs.h"
 #include "user_private.h"
+#include "dlgs.h"
 #include "resources.h"
 #include "wine/debug.h"
diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c
index b050e1eba8c..3377eac85db 100644
--- a/dlls/user32/resource.c
+++ b/dlls/user32/resource.c
@@ -21,10 +21,7 @@
#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "ntuser.h"
+#include "user_private.h"
 #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(resource);
diff --git a/dlls/user32/static.c b/dlls/user32/static.c
index f3953f7610a..7b0118ff574 100644
--- a/dlls/user32/static.c
+++ b/dlls/user32/static.c
@@ -30,11 +30,8 @@
#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "controls.h"
 #include "user_private.h"
+#include "controls.h"
 #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(static);
diff --git a/dlls/user32/text.c b/dlls/user32/text.c
index 1896627c893..024e642c159 100644
--- a/dlls/user32/text.c
+++ b/dlls/user32/text.c
@@ -29,13 +29,9 @@
 #include <string.h>
 #include <assert.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winnls.h"
+#include "user_private.h"
 #include "controls.h"
 #include "usp10.h"
-#include "user_private.h"
 #include "wine/debug.h"
 #include "wine/heap.h"
diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c
index a8f3a0af84b..01c6931ca03 100644
--- a/dlls/user32/uitools.c
+++ b/dlls/user32/uitools.c
@@ -22,10 +22,6 @@
 #include <stdarg.h>
#define WINE_NO_INLINE_RECT
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
 #include "user_private.h"
 #include "controls.h"
 #include "wine/debug.h"
diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
index 50d4005d973..c74a37c471b 100644
--- a/dlls/user32/user_private.h
+++ b/dlls/user32/user_private.h
@@ -21,11 +21,14 @@
 #ifndef __WINE_USER_PRIVATE_H
 #define __WINE_USER_PRIVATE_H
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include <stdarg.h>
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "ntuser.h"
+#include "ddk/ntifs.h"
 #include "winreg.h"
 #include "winnls.h"
 #include "wine/heap.h"
diff --git a/dlls/win32u/bitblt.c b/dlls/win32u/bitblt.c
index 48c76bac676..46bb79d3867 100644
--- a/dlls/win32u/bitblt.c
+++ b/dlls/win32u/bitblt.c
@@ -27,9 +27,6 @@
 #include <math.h>
 #include <float.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
 #include "ntgdi_private.h"
 #include "wine/debug.h"
diff --git a/dlls/win32u/bitmap.c b/dlls/win32u/bitmap.c
index f255e4196e9..d88697f71bb 100644
--- a/dlls/win32u/bitmap.c
+++ b/dlls/win32u/bitmap.c
@@ -27,9 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
 #include "ntgdi_private.h"
 #include "wine/debug.h"
diff --git a/dlls/win32u/brush.c b/dlls/win32u/brush.c
index 29a96035599..6cf6419c7ad 100644
--- a/dlls/win32u/brush.c
+++ b/dlls/win32u/brush.c
@@ -25,9 +25,6 @@
 #include <stdarg.h>
 #include <string.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
 #include "ntgdi_private.h"
 #include "wine/debug.h"
diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c
index 6cf484a56ca..554065b5ac9 100644
--- a/dlls/win32u/clipboard.c
+++ b/dlls/win32u/clipboard.c
@@ -28,9 +28,7 @@
 #endif
#include <pthread.h>
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "win32u_private.h"
+
 #include "ntgdi_private.h"
 #include "ntuser_private.h"
 #include "wine/server.h"
diff --git a/dlls/win32u/clipping.c b/dlls/win32u/clipping.c
index 11027824362..ddb9450486e 100644
--- a/dlls/win32u/clipping.c
+++ b/dlls/win32u/clipping.c
@@ -24,9 +24,7 @@
#include <stdarg.h>
 #include <stdlib.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
+
 #include "ntgdi_private.h"
 #include "wine/debug.h"
diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c
index 2b8a56de5bd..91a1587739c 100644
--- a/dlls/win32u/dc.c
+++ b/dlls/win32u/dc.c
@@ -28,14 +28,8 @@
 #include <string.h>
 #include <pthread.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winreg.h"
-#include "winnls.h"
-#include "winternl.h"
-#include "winerror.h"
 #include "ntgdi_private.h"
+#include "winnls.h"
 #include "wine/wgl.h"
 #include "wine/wgl_driver.h"
diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c
index 5df30550cae..df71026cdbb 100644
--- a/dlls/win32u/dce.c
+++ b/dlls/win32u/dce.c
@@ -25,8 +25,7 @@
#include <assert.h>
 #include <pthread.h>
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
+
 #include "ntgdi_private.h"
 #include "ntuser_private.h"
 #include "wine/server.h"
diff --git a/dlls/win32u/dib.c b/dlls/win32u/dib.c
index 23dbfbcbfaf..92e12b98bdd 100644
--- a/dlls/win32u/dib.c
+++ b/dlls/win32u/dib.c
@@ -68,14 +68,6 @@
 #include <string.h>
 #include <assert.h>
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winternl.h"
-#include "ddk/d3dkmthk.h"
-
 #include "ntgdi_private.h"
 #include "wine/debug.h"
diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c
index af1a9b97f67..1d0116132b8 100644
--- a/dlls/win32u/font.c
+++ b/dlls/win32u/font.c
@@ -31,15 +31,9 @@
 #include <assert.h>
 #include <pthread.h>
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "winerror.h"
-#include "windef.h"
-#include "winbase.h"
+#include "ntgdi_private.h"
 #include "winnls.h"
-#include "winternl.h"
 #include "winreg.h"
-#include "ntgdi_private.h"
#include "wine/unixlib.h"
 #include "wine/rbtree.h"
diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c
index 701e15c110d..1ea691905fe 100644
--- a/dlls/win32u/freetype.c
+++ b/dlls/win32u/freetype.c
@@ -114,14 +114,6 @@
 #endif
 #endif /* HAVE_FT2BUILD_H */
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winternl.h"
-#include "winerror.h"
-#include "winreg.h"
-#include "wingdi.h"
 #include "ntgdi_private.h"
 #include "wine/debug.h"
 #include "wine/list.h"
diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c
index 057988e99e9..e230c7056a8 100644
--- a/dlls/win32u/gdiobj.c
+++ b/dlls/win32u/gdiobj.c
@@ -28,15 +28,8 @@
 #include <stdio.h>
 #include <pthread.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winreg.h"
-#include "winnls.h"
-#include "winerror.h"
-#include "winternl.h"
-
 #include "ntgdi_private.h"
+#include "winnls.h"
 #include "wine/debug.h"
 #include "wine/unixlib.h"
diff --git a/dlls/win32u/mapping.c b/dlls/win32u/mapping.c
index 65f276e853f..cd09b78d642 100644
--- a/dlls/win32u/mapping.c
+++ b/dlls/win32u/mapping.c
@@ -24,9 +24,6 @@
#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
 #include "ntgdi_private.h"
 #include "wine/debug.h"
diff --git a/dlls/win32u/opentype.c b/dlls/win32u/opentype.c
index 7a541ae4e4a..703bfb21820 100644
--- a/dlls/win32u/opentype.c
+++ b/dlls/win32u/opentype.c
@@ -24,13 +24,8 @@
 #include <stdarg.h>
 #include <stdlib.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-
-#include "wine/debug.h"
-
 #include "ntgdi_private.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(font);
diff --git a/dlls/win32u/painting.c b/dlls/win32u/painting.c
index a5a0f2e47a5..2841a4a45fb 100644
--- a/dlls/win32u/painting.c
+++ b/dlls/win32u/painting.c
@@ -28,10 +28,6 @@
 #include <string.h>
 #include <stdlib.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winerror.h"
 #include "ntgdi_private.h"
 #include "wine/debug.h"
diff --git a/dlls/win32u/path.c b/dlls/win32u/path.c
index e0c96f5ef6f..d0eb0381620 100644
--- a/dlls/win32u/path.c
+++ b/dlls/win32u/path.c
@@ -32,11 +32,6 @@
 #include <stdlib.h>
 #include <float.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winerror.h"
-
 #include "ntgdi_private.h"
 #include "wine/debug.h"
diff --git a/dlls/win32u/pen.c b/dlls/win32u/pen.c
index f45d7bb1c4e..7e0430ae1aa 100644
--- a/dlls/win32u/pen.c
+++ b/dlls/win32u/pen.c
@@ -27,9 +27,6 @@
 #include <string.h>
 #include <assert.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
 #include "ntgdi_private.h"
 #include "wine/debug.h"
diff --git a/dlls/win32u/printdrv.c b/dlls/win32u/printdrv.c
index bd8072a4027..5a078d293c7 100644
--- a/dlls/win32u/printdrv.c
+++ b/dlls/win32u/printdrv.c
@@ -27,14 +27,8 @@
#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winnls.h"
-#include "winspool.h"
-#include "winerror.h"
-#include "wine/debug.h"
 #include "ntgdi_private.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(print);
diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c
index c03118821d9..0441b241862 100644
--- a/dlls/win32u/syscall.c
+++ b/dlls/win32u/syscall.c
@@ -24,10 +24,6 @@
#include <stdarg.h>
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winnt.h"
 #include "ntgdi_private.h"
 #include "ntuser_private.h"
 #include "ntuser.h"
diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index ad6e7dce39b..215ee88b63e 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -27,8 +27,6 @@
 #include <pthread.h>
 #include <assert.h>
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
 #include "ntgdi_private.h"
 #include "ntuser_private.h"
 #include "devpropdef.h"
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index b08c0ceb716..8353268baf3 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -23,10 +23,7 @@
#include <stdarg.h>
 #include <stdlib.h>
-#include "windef.h"
-#include "winbase.h"
-#include "ntgdi.h"
-#include "ntuser.h"
+
 #include "wine/gdi_driver.h"
 #include "wine/unixlib.h"
 #include "wine/debug.h"
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 69dd8caba5d..6705d4e4a3c 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -25,8 +25,6 @@
#include <assert.h>
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
 #include "ntgdi_private.h"
 #include "ntuser_private.h"
 #include "wine/server.h"
diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c
index b187b246941..a0cb402d618 100644
--- a/dlls/win32u/winstation.c
+++ b/dlls/win32u/winstation.c
@@ -22,13 +22,6 @@
 #pragma makedep unix
 #endif
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "ntuser.h"
-#include "ddk/wdm.h"
 #include "ntgdi_private.h"
 #include "ntuser_private.h"
 #include "wine/server.h"
diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h
index e793d103788..6795e781375 100644
--- a/dlls/wineandroid.drv/android.h
+++ b/dlls/wineandroid.drv/android.h
@@ -30,9 +30,6 @@
 #include <android/input.h>
 #include <android/native_window_jni.h>
-#include "windef.h"
-#include "winbase.h"
-#include "ntgdi.h"
 #include "wine/gdi_driver.h"
 #include "unixlib.h"
 #include "android_native.h"
diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c
index e5adfed8611..2c5a8a6016c 100644
--- a/dlls/winebus.sys/main.c
+++ b/dlls/winebus.sys/main.c
@@ -33,6 +33,7 @@
 #include "ddk/hidport.h"
 #include "ddk/hidtypes.h"
 #include "ddk/hidpddi.h"
+#include "ddk/ntifs.h"
 #include "wine/asm.h"
 #include "wine/debug.h"
 #include "wine/list.h"
diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h
index b9cd9fde2ed..cdbbc32ae50 100644
--- a/dlls/winemac.drv/macdrv.h
+++ b/dlls/winemac.drv/macdrv.h
@@ -29,13 +29,8 @@
#include "macdrv_cocoa.h"
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "ntgdi.h"
-#include "wine/debug.h"
 #include "wine/gdi_driver.h"
+#include "wine/debug.h"
 #include "unixlib.h"
diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c
index e9b009b0e87..3c509f01e3a 100644
--- a/dlls/wineps.drv/unixlib.c
+++ b/dlls/wineps.drv/unixlib.c
@@ -28,14 +28,10 @@
 #include <stdlib.h>
 #include <math.h>
-#include "windef.h"
-#include "winbase.h"
-
+#include "wine/gdi_driver.h"
+#include "ddk/winddi.h"
 #include "ntf.h"
 #include "unixlib.h"
-#include "ntgdi.h"
-#include "ddk/winddi.h"
-#include "wine/gdi_driver.h"
 #include "wine/debug.h"
 #include "wine/wingdi16.h"
diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h
index 0883c43f1ff..041647f4a92 100644
--- a/dlls/winewayland.drv/waylanddrv.h
+++ b/dlls/winewayland.drv/waylanddrv.h
@@ -35,9 +35,6 @@
 #include "xdg-output-unstable-v1-client-protocol.h"
 #include "xdg-shell-client-protocol.h"
-#include "windef.h"
-#include "winbase.h"
-#include "ntgdi.h"
 #include "wine/gdi_driver.h"
 #include "wine/list.h"
 #include "wine/rbtree.h"
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
index 087e0aab79b..430ff27efb1 100644
--- a/dlls/winex11.drv/clipboard.c
+++ b/dlls/winex11.drv/clipboard.c
@@ -80,8 +80,6 @@
 #include <time.h>
 #include <assert.h>
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
 #include "x11drv.h"
#ifdef HAVE_X11_EXTENSIONS_XFIXES_H
diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c
index 4a0564392bd..58b5effa34e 100644
--- a/dlls/winex11.drv/graphics.c
+++ b/dlls/winex11.drv/graphics.c
@@ -42,11 +42,8 @@
 #include <string.h>
 #include <limits.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-
 #include "x11drv.h"
+#include "winreg.h"
 #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(graphics);
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 2cef05d2140..64cebc6b826 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -27,10 +27,8 @@
 #include <stdarg.h>
 #include <string.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
 #include "x11drv.h"
+#include "winreg.h"
 #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c
index 43974fe8896..25efa632fff 100644
--- a/dlls/winex11.drv/palette.c
+++ b/dlls/winex11.drv/palette.c
@@ -28,8 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "windef.h"
-#include "winbase.h"
 #include "x11drv.h"
 #include "wine/debug.h"
diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
index 8d1da4d0ddc..15f4f5ad875 100644
--- a/dlls/winex11.drv/vulkan.c
+++ b/dlls/winex11.drv/vulkan.c
@@ -30,11 +30,8 @@
 #include <stdio.h>
 #include <dlfcn.h>
-#include "windef.h"
-#include "winbase.h"
-
-#include "wine/debug.h"
 #include "x11drv.h"
+#include "wine/debug.h"
#define VK_NO_PROTOTYPES
 #define WINE_VK_HOST
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 51125065958..d1114a74877 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -44,9 +44,6 @@
 /* avoid conflict with field names in included win32 headers */
 #undef Status
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-
 #include "x11drv.h"
 #include "wingdi.h"
 #include "winuser.h"
diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index 6f1437f14c6..60ca79abfd9 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -29,8 +29,6 @@
 #include <math.h>
 #include <dlfcn.h>
-#include "windef.h"
-#include "winbase.h"
 #include "x11drv.h"
 #include "wine/debug.h"
 #include "wintab.h"
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index c80e4b3d3c9..32b28e42823 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -60,9 +60,6 @@ typedef int Status;
 /* avoid conflict with processthreadsapi.h */
 #undef ControlMask
-#include "windef.h"
-#include "winbase.h"
-#include "ntgdi.h"
 #include "wine/gdi_driver.h"
 #include "unixlib.h"
 #include "wine/list.h"
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index d1f31081b09..789c4f1fccf 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -41,9 +41,6 @@
 #include <X11/extensions/Xrender.h>
 #endif
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-
 #define VK_NO_PROTOTYPES
 #define WINE_VK_HOST
diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 74723915fc5..308b4db3911 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -35,10 +35,7 @@
 #include <stdlib.h>
 #include <dlfcn.h>
-#include "windef.h"
-#include "winbase.h"
 #include "x11drv.h"
-#include "winternl.h"
 #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(xrender);
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index c2345c1fa60..ffea5f28060 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -26,6 +26,7 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <winternl.h>
+#include <ddk/ntifs.h>
 #include <iphlpapi.h>
 #include <ws2tcpip.h>
 #include <wsipx.h>
diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h
index 9e116de814d..a24ebc05f97 100644
--- a/dlls/ws2_32/ws2_32_private.h
+++ b/dlls/ws2_32/ws2_32_private.h
@@ -44,6 +44,8 @@
 #include "mstcpip.h"
 #include "af_irda.h"
 #include "winnt.h"
+#include "winternl.h"
+#include "ddk/ntifs.h"
 #define USE_WC_PREFIX   /* For CMSG_DATA */
 #include "iphlpapi.h"
 #include "ip2string.h"
diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h
index 980235abdc9..20e1f0699f7 100644
--- a/include/ddk/ntifs.h
+++ b/include/ddk/ntifs.h
@@ -214,6 +214,68 @@ BOOLEAN WINAPI PsIsSystemThread(PETHREAD);
 NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*);
 NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*);
 void WINAPI PsRevertToSelf(void);
+NTSTATUS WINAPI RtlAbsoluteToSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,ULONG*);
+NTSTATUS WINAPI RtlAddAccessAllowedAce(ACL*,DWORD,DWORD,PSID);
+NTSTATUS WINAPI RtlAddAccessAllowedAceEx(ACL*,DWORD,DWORD,DWORD,PSID);
+NTSTATUS WINAPI RtlAddAce(ACL*,DWORD,DWORD,ACE_HEADER*,DWORD);
+NTSTATUS WINAPI RtlAllocateAndInitializeSid(SID_IDENTIFIER_AUTHORITY*,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID*);
+NTSTATUS WINAPI RtlAppendStringToString(STRING*,const STRING*);
+NTSTATUS WINAPI RtlCompressBuffer(USHORT,unsigned char*,ULONG,unsigned char*,ULONG,ULONG,ULONG*,void*);
+void WINAPI RtlCopyLuid(LUID*,const LUID*);
+BOOLEAN WINAPI RtlCopySid(DWORD,PSID,PSID);
+NTSTATUS WINAPI RtlCreateAcl(ACL*,DWORD,DWORD);
+HANDLE WINAPI RtlCreateHeap(ULONG,void*,SIZE_T,SIZE_T,void*,RTL_HEAP_DEFINITION*);
+BOOLEAN WINAPI RtlCreateUnicodeString(UNICODE_STRING*,const WCHAR*);
+NTSTATUS WINAPI RtlCustomCPToUnicodeN(CPTABLEINFO*,WCHAR*,DWORD,DWORD*,const char*,DWORD);
+NTSTATUS WINAPI RtlDecompressBuffer(USHORT,unsigned char*,ULONG,unsigned char*,ULONG,ULONG*);
+NTSTATUS WINAPI RtlDecompressFragment(USHORT,unsigned char*,ULONG,unsigned char*,ULONG,ULONG,ULONG*,void*);
+NTSTATUS WINAPI RtlDeleteAce(ACL*,DWORD);
+HANDLE WINAPI RtlDestroyHeap(HANDLE);
+NTSTATUS WINAPI RtlDowncaseUnicodeString(UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);
+NTSTATUS WINAPI RtlDuplicateUnicodeString(int,const UNICODE_STRING*,UNICODE_STRING*);
+BOOL WINAPI RtlEqualPrefixSid(PSID,PSID);
+BOOL WINAPI RtlEqualSid(PSID,PSID);
+DWORD WINAPI RtlFreeSid(PSID);
+NTSTATUS WINAPI RtlGetAce(ACL*,DWORD,void**);
+NTSTATUS WINAPI RtlGetCompressionWorkSpaceSize(USHORT,ULONG*,ULONG*);
+NTSTATUS WINAPI RtlGetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN*,ACL**,BOOLEAN*);
+NTSTATUS WINAPI RtlGetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID*,BOOLEAN*);
+NTSTATUS WINAPI RtlGetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID*,BOOLEAN*);
+NTSTATUS WINAPI RtlGetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN*,ACL**,BOOLEAN*);
+SID_IDENTIFIER_AUTHORITY* WINAPI RtlIdentifierAuthoritySid(PSID);
+NTSTATUS WINAPI RtlIdnToAscii(DWORD,const WCHAR*,INT,WCHAR*,INT*);
+NTSTATUS WINAPI RtlIdnToNameprepUnicode(DWORD,const WCHAR*,INT,WCHAR*,INT*);
+NTSTATUS WINAPI RtlIdnToUnicode(DWORD,const WCHAR*,INT,WCHAR*,INT*);
+void WINAPI RtlInitCodePageTable(USHORT*,CPTABLEINFO*);
+NTSTATUS WINAPI RtlInitializeSid(PSID,SID_IDENTIFIER_AUTHORITY*,BYTE);
+NTSTATUS WINAPI RtlIsNormalizedString(ULONG,const WCHAR*,INT,BOOLEAN*);
+DWORD WINAPI RtlLengthRequiredSid(DWORD);
+DWORD WINAPI RtlLengthSid(PSID);
+NTSTATUS WINAPI RtlMultiByteToUnicodeN(WCHAR*,DWORD,DWORD*,const char*,DWORD);
+NTSTATUS WINAPI RtlMultiByteToUnicodeSize(DWORD*,const char*,ULONG);
+NTSTATUS WINAPI RtlNormalizeString(ULONG,const WCHAR*,INT,WCHAR*,INT*);
+ULONG WINAPI RtlNtStatusToDosErrorNoTeb(NTSTATUS);
+ULONG WINAPI RtlOemStringToUnicodeSize(const STRING*);
+NTSTATUS WINAPI RtlOemStringToUnicodeString(UNICODE_STRING*,const STRING*,BOOLEAN);
+NTSTATUS WINAPI RtlOemToUnicodeN(WCHAR*,DWORD,DWORD*,const char*,DWORD);
 char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void);
+ULONG WINAPI RtlRandom(ULONG*);
+ULONG WINAPI RtlRandomEx(ULONG*);
+void WINAPI RtlSecondsSince1970ToTime(DWORD,LARGE_INTEGER*);
+void WINAPI RtlSecondsSince1980ToTime(DWORD,LARGE_INTEGER*);
+NTSTATUS WINAPI RtlSelfRelativeToAbsoluteSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,DWORD*,ACL*,DWORD*,ACL*,DWORD*,PSID,DWORD*,PSID,DWORD*);
+NTSTATUS WINAPI RtlSetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN);
+NTSTATUS WINAPI RtlSetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN);
+DWORD* WINAPI RtlSubAuthoritySid(PSID,DWORD);
+BYTE* WINAPI RtlSubAuthorityCountSid(PSID);
+BOOLEAN WINAPI RtlTimeToSecondsSince1980(const LARGE_INTEGER*,DWORD*);
+DWORD WINAPI RtlUnicodeStringToOemSize(const UNICODE_STRING*);
+NTSTATUS WINAPI RtlUnicodeToCustomCPN(CPTABLEINFO*,char*,DWORD,DWORD*,const WCHAR*,DWORD);
+NTSTATUS WINAPI RtlUnicodeToMultiByteN(char*,DWORD,DWORD*,const WCHAR*,DWORD);
+NTSTATUS WINAPI RtlUnicodeToOemN(char*,DWORD,DWORD*,const WCHAR*,DWORD);
+NTSTATUS WINAPI RtlUpcaseUnicodeToCustomCPN(CPTABLEINFO*,char*,DWORD,DWORD*,const WCHAR*,DWORD);
+NTSTATUS WINAPI RtlUpcaseUnicodeToMultiByteN(char*,DWORD,DWORD*,const WCHAR*,DWORD);
+NTSTATUS WINAPI RtlUpcaseUnicodeToOemN(char*,DWORD,DWORD*,const WCHAR*,DWORD);
+BOOLEAN WINAPI RtlValidSid(PSID);
#endif
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 26562bfef2b..5112447f9b4 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -25,7 +25,13 @@
 #error The GDI driver can only be used on the Unix side
 #endif
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "windef.h"
+#include "winbase.h"
 #include "winternl.h"
+#include "ddk/ntifs.h"
+#include "ntgdi.h"
 #include "ntuser.h"
 #include "immdev.h"
 #include "shellapi.h"
diff --git a/include/winternl.h b/include/winternl.h
index ff8756211a1..0c6a411c551 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -4601,7 +4601,6 @@ NTSYSAPI NTSTATUS  WINAPI NtWriteFileGather(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,
 NTSYSAPI NTSTATUS  WINAPI NtWriteRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG);
 NTSYSAPI NTSTATUS  WINAPI NtWriteVirtualMemory(HANDLE,void*,const void*,SIZE_T,SIZE_T*);
 NTSYSAPI NTSTATUS  WINAPI NtYieldExecution(void);
-NTSYSAPI NTSTATUS  WINAPI RtlAbsoluteToSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG);
 NTSYSAPI void      WINAPI RtlAcquirePebLock(void);
 NTSYSAPI BYTE      WINAPI RtlAcquireResourceExclusive(LPRTL_RWLOCK,BYTE);
 NTSYSAPI BYTE      WINAPI RtlAcquireResourceShared(LPRTL_RWLOCK,BYTE);
@@ -4609,13 +4608,10 @@ NTSYSAPI void      WINAPI RtlAcquireSRWLockExclusive(RTL_SRWLOCK*);
 NTSYSAPI void      WINAPI RtlAcquireSRWLockShared(RTL_SRWLOCK*);
 NTSYSAPI NTSTATUS  WINAPI RtlActivateActivationContext(DWORD,HANDLE,ULONG_PTR*);
 NTSYSAPI NTSTATUS  WINAPI RtlActivateActivationContextEx(ULONG,TEB*,HANDLE,ULONG_PTR*);
-NTSYSAPI NTSTATUS  WINAPI RtlAddAccessAllowedAce(PACL,DWORD,DWORD,PSID);
-NTSYSAPI NTSTATUS  WINAPI RtlAddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID);
 NTSYSAPI NTSTATUS  WINAPI RtlAddAccessAllowedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID);
 NTSYSAPI NTSTATUS  WINAPI RtlAddAccessDeniedAce(PACL,DWORD,DWORD,PSID);
 NTSYSAPI NTSTATUS  WINAPI RtlAddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID);
 NTSYSAPI NTSTATUS  WINAPI RtlAddAccessDeniedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID);
-NTSYSAPI NTSTATUS  WINAPI RtlAddAce(PACL,DWORD,DWORD,PACE_HEADER,DWORD);
 NTSYSAPI NTSTATUS  WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*);
 NTSYSAPI NTSTATUS  WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL);
 NTSYSAPI NTSTATUS  WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL);
@@ -4627,7 +4623,6 @@ NTSYSAPI PVOID     WINAPI RtlAddVectoredContinueHandler(ULONG,PVECTORED_EXCEPTIO
 NTSYSAPI PVOID     WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER);
 NTSYSAPI PVOID     WINAPI RtlAddressInSectionTable(const IMAGE_NT_HEADERS*,HMODULE,DWORD);
 NTSYSAPI NTSTATUS  WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN);
-NTSYSAPI NTSTATUS  WINAPI RtlAllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *);
 NTSYSAPI RTL_HANDLE * WINAPI RtlAllocateHandle(RTL_HANDLE_TABLE *,ULONG *);
 NTSYSAPI BOOLEAN   WINAPI RtlFreeHeap(HANDLE,ULONG,PVOID);
 NTSYSAPI PVOID     WINAPI RtlAllocateHeap(HANDLE,ULONG,SIZE_T) __WINE_ALLOC_SIZE(3) __WINE_DEALLOC(RtlFreeHeap,3) __WINE_MALLOC;
@@ -4635,7 +4630,6 @@ NTSYSAPI WCHAR     WINAPI RtlAnsiCharToUnicodeChar(LPSTR *);
 NTSYSAPI DWORD     WINAPI RtlAnsiStringToUnicodeSize(const STRING *);
 NTSYSAPI NTSTATUS  WINAPI RtlAnsiStringToUnicodeString(PUNICODE_STRING,PCANSI_STRING,BOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlAppendAsciizToString(STRING *,LPCSTR);
-NTSYSAPI NTSTATUS  WINAPI RtlAppendStringToString(STRING *,const STRING *);
 NTSYSAPI NTSTATUS  WINAPI RtlAppendUnicodeStringToString(UNICODE_STRING *,const UNICODE_STRING *);
 NTSYSAPI NTSTATUS  WINAPI RtlAppendUnicodeToString(UNICODE_STRING *,LPCWSTR);
 NTSYSAPI BOOLEAN   WINAPI RtlAreAllAccessesGranted(ACCESS_MASK,ACCESS_MASK);
@@ -4650,22 +4644,17 @@ NTSYSAPI void      WINAPI RtlClearBits(PRTL_BITMAP,ULONG,ULONG);
 NTSYSAPI ULONG     WINAPI RtlCompactHeap(HANDLE,ULONG);
 NTSYSAPI LONG      WINAPI RtlCompareUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);
 NTSYSAPI LONG      WINAPI RtlCompareUnicodeStrings(const WCHAR*,SIZE_T,const WCHAR*,SIZE_T,BOOLEAN);
-NTSYSAPI NTSTATUS  WINAPI RtlCompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,ULONG,PULONG,PVOID);
 NTSYSAPI DWORD     WINAPI RtlComputeCrc32(DWORD,const BYTE*,INT);
 NTSYSAPI NTSTATUS  WINAPI RtlConvertSidToUnicodeString(PUNICODE_STRING,PSID,BOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlConvertToAutoInheritSecurityObject(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID*,BOOL,PGENERIC_MAPPING);
 NTSYSAPI NTSTATUS  WINAPI RtlCopyContext(CONTEXT*,DWORD,CONTEXT*);
 NTSYSAPI NTSTATUS  WINAPI RtlCopyExtendedContext(CONTEXT_EX*,ULONG,CONTEXT_EX*);
-NTSYSAPI void      WINAPI RtlCopyLuid(PLUID,const LUID*);
 NTSYSAPI void      WINAPI RtlCopyLuidAndAttributesArray(ULONG,const LUID_AND_ATTRIBUTES*,PLUID_AND_ATTRIBUTES);
 NTSYSAPI NTSTATUS  WINAPI RtlCopySecurityDescriptor(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR);
-NTSYSAPI BOOLEAN   WINAPI RtlCopySid(DWORD,PSID,PSID);
 NTSYSAPI void      WINAPI RtlCopyUnicodeString(UNICODE_STRING*,const UNICODE_STRING*);
-NTSYSAPI NTSTATUS  WINAPI RtlCreateAcl(PACL,DWORD,DWORD);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateActivationContext(HANDLE*,const void*);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateAtomTable(ULONG,RTL_ATOM_TABLE*);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateEnvironment(BOOLEAN, PWSTR*);
-NTSYSAPI HANDLE    WINAPI RtlCreateHeap(ULONG,PVOID,SIZE_T,SIZE_T,PVOID,PRTL_HEAP_DEFINITION);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateProcessParameters(RTL_USER_PROCESS_PARAMETERS**,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,PWSTR,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateProcessParametersEx(RTL_USER_PROCESS_PARAMETERS**,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,PWSTR,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,ULONG);
 NTSYSAPI PDEBUG_BUFFER WINAPI RtlCreateQueryDebugBuffer(ULONG,BOOLEAN);
@@ -4673,19 +4662,14 @@ NTSYSAPI NTSTATUS  WINAPI RtlCreateRegistryKey(ULONG,PWSTR);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateTimer(HANDLE,HANDLE*,RTL_WAITORTIMERCALLBACKFUNC, PVOID, DWORD, DWORD, ULONG);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateTimerQueue(PHANDLE);
-NTSYSAPI BOOLEAN   WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR);
 NTSYSAPI BOOLEAN   WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateUserProcess(UNICODE_STRING*,ULONG,RTL_USER_PROCESS_PARAMETERS*,SECURITY_DESCRIPTOR*,SECURITY_DESCRIPTOR*,HANDLE,BOOLEAN,HANDLE,HANDLE,RTL_USER_PROCESS_INFORMATION*);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateUserStack(SIZE_T,SIZE_T,ULONG,SIZE_T,SIZE_T,INITIAL_TEB*);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateUserThread(HANDLE,SECURITY_DESCRIPTOR*,BOOLEAN,ULONG,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*);
-NTSYSAPI NTSTATUS  WINAPI RtlCustomCPToUnicodeN(CPTABLEINFO*,WCHAR*,DWORD,DWORD*,const char*,DWORD);
 NTSYSAPI PRTL_USER_PROCESS_PARAMETERS WINAPI RtlDeNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*);
 NTSYSAPI void      WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR);
 NTSYSAPI PVOID     WINAPI RtlDecodePointer(PVOID);
-NTSYSAPI NTSTATUS  WINAPI RtlDecompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,PULONG);
-NTSYSAPI NTSTATUS  WINAPI RtlDecompressFragment(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,ULONG,PULONG,PVOID);
 NTSYSAPI NTSTATUS  WINAPI RtlDefaultNpAcl(PACL*);
-NTSYSAPI NTSTATUS  WINAPI RtlDeleteAce(PACL,DWORD);
 NTSYSAPI NTSTATUS  WINAPI RtlDeleteAtomFromAtomTable(RTL_ATOM_TABLE,RTL_ATOM);
 NTSYSAPI NTSTATUS  WINAPI RtlDeleteCriticalSection(RTL_CRITICAL_SECTION *);
 NTSYSAPI NTSTATUS  WINAPI RtlDeleteRegistryValue(ULONG, PCWSTR, PCWSTR);
@@ -4699,7 +4683,6 @@ NTSYSAPI NTSTATUS  WINAPI RtlDeregisterWaitEx(HANDLE,HANDLE);
 NTSYSAPI NTSTATUS  WINAPI RtlDestroyAtomTable(RTL_ATOM_TABLE);
 NTSYSAPI NTSTATUS  WINAPI RtlDestroyEnvironment(PWSTR);
 NTSYSAPI NTSTATUS  WINAPI RtlDestroyHandleTable(RTL_HANDLE_TABLE *);
-NTSYSAPI HANDLE    WINAPI RtlDestroyHeap(HANDLE);
 NTSYSAPI void      WINAPI RtlDestroyProcessParameters(RTL_USER_PROCESS_PARAMETERS*);
 NTSYSAPI NTSTATUS  WINAPI RtlDestroyQueryDebugBuffer(PDEBUG_BUFFER);
 NTSYSAPI DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR);
@@ -4711,9 +4694,7 @@ NTSYSAPI BOOLEAN   WINAPI RtlDosPathNameToRelativeNtPathName_U(PCWSTR,PUNICODE_S
 NTSYSAPI NTSTATUS  WINAPI RtlDosPathNameToRelativeNtPathName_U_WithStatus(PCWSTR,PUNICODE_STRING,PWSTR*,RTL_RELATIVE_NAME*);
 NTSYSAPI ULONG     WINAPI RtlDosSearchPath_U(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, LPWSTR, LPWSTR*);
 NTSYSAPI WCHAR     WINAPI RtlDowncaseUnicodeChar(WCHAR);
-NTSYSAPI NTSTATUS  WINAPI RtlDowncaseUnicodeString(UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);
 NTSYSAPI void      WINAPI RtlDumpResource(LPRTL_RWLOCK);
-NTSYSAPI NTSTATUS  WINAPI RtlDuplicateUnicodeString(int,const UNICODE_STRING*,UNICODE_STRING*);
 NTSYSAPI NTSTATUS  WINAPI RtlEmptyAtomTable(RTL_ATOM_TABLE,BOOLEAN);
 NTSYSAPI PVOID     WINAPI RtlEncodePointer(PVOID);
 NTSYSAPI NTSTATUS  WINAPI RtlEnterCriticalSection(RTL_CRITICAL_SECTION *);
@@ -4721,8 +4702,6 @@ NTSYSAPI void      WINAPI RtlEraseUnicodeString(UNICODE_STRING*);
 NTSYSAPI NTSTATUS  WINAPI RtlEqualComputerName(const UNICODE_STRING*,const UNICODE_STRING*);
 NTSYSAPI NTSTATUS  WINAPI RtlEqualDomainName(const UNICODE_STRING*,const UNICODE_STRING*);
 NTSYSAPI BOOLEAN   WINAPI RtlEqualLuid(const LUID*,const LUID*);
-NTSYSAPI BOOL      WINAPI RtlEqualPrefixSid(PSID,PSID);
-NTSYSAPI BOOL      WINAPI RtlEqualSid(PSID,PSID);
 NTSYSAPI BOOLEAN   WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);
 NTSYSAPI void      WINAPI RtlEraseUnicodeString(UNICODE_STRING*);
 NTSYSAPI void      DECLSPEC_NORETURN WINAPI RtlExitUserProcess(ULONG);
@@ -4762,20 +4741,16 @@ NTSYSAPI void      WINAPI RtlFreeActivationContextStack(ACTIVATION_CONTEXT_STACK
 NTSYSAPI void      WINAPI RtlFreeAnsiString(PANSI_STRING);
 NTSYSAPI BOOLEAN   WINAPI RtlFreeHandle(RTL_HANDLE_TABLE *,RTL_HANDLE *);
 NTSYSAPI void      WINAPI RtlFreeOemString(POEM_STRING);
-NTSYSAPI DWORD     WINAPI RtlFreeSid(PSID);
 NTSYSAPI void      WINAPI RtlFreeThreadActivationContextStack(void);
 NTSYSAPI void      WINAPI RtlFreeUnicodeString(PUNICODE_STRING);
 NTSYSAPI void      WINAPI RtlFreeUserStack(void*);
 NTSYSAPI NTSTATUS  WINAPI RtlGUIDFromString(PUNICODE_STRING,GUID*);
-NTSYSAPI NTSTATUS  WINAPI RtlGetAce(PACL,DWORD,LPVOID *);
 NTSYSAPI NTSTATUS  WINAPI RtlGetActiveActivationContext(HANDLE*);
-NTSYSAPI NTSTATUS  WINAPI RtlGetCompressionWorkSpaceSize(USHORT,PULONG,PULONG);
 NTSYSAPI NTSTATUS  WINAPI RtlGetControlSecurityDescriptor(PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR_CONTROL,LPDWORD);
 NTSYSAPI ULONG     WINAPI RtlGetCurrentDirectory_U(ULONG, LPWSTR);
 NTSYSAPI PEB *     WINAPI RtlGetCurrentPeb(void);
 NTSYSAPI void      WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER*);
 NTSYSAPI HANDLE    WINAPI RtlGetCurrentTransaction(void);
-NTSYSAPI NTSTATUS  WINAPI RtlGetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,PBOOLEAN,PACL *,PBOOLEAN);
 NTSYSAPI ULONG64   WINAPI RtlGetEnabledExtendedFeatures(ULONG64);
 NTSYSAPI NTSTATUS  WINAPI RtlGetExePath(PCWSTR,PWSTR*);
 NTSYSAPI NTSTATUS  WINAPI RtlGetExtendedContextLength(ULONG,ULONG*);
@@ -4783,7 +4758,6 @@ NTSYSAPI NTSTATUS  WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64);
 NTSYSAPI ULONG64   WINAPI RtlGetExtendedFeaturesMask(CONTEXT_EX*);
 NTSYSAPI TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void);
 NTSYSAPI ULONG     WINAPI RtlGetFullPathName_U(PCWSTR,ULONG,PWSTR,PWSTR*);
-NTSYSAPI NTSTATUS  WINAPI RtlGetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID *,PBOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlGetLastNtStatus(void);
 NTSYSAPI DWORD     WINAPI RtlGetLastWin32Error(void);
 NTSYSAPI NTSTATUS  WINAPI RtlGetLocaleFileMappingAddress(void**,LCID*,LARGE_INTEGER*);
@@ -4792,11 +4766,9 @@ NTSYSAPI NTSTATUS  WINAPI RtlGetNativeSystemInformation(SYSTEM_INFORMATION_CLASS
 NTSYSAPI ULONG     WINAPI RtlGetNtGlobalFlags(void);
 NTSYSAPI BOOLEAN   WINAPI RtlGetNtProductType(LPDWORD);
 NTSYSAPI void      WINAPI RtlGetNtVersionNumbers(LPDWORD,LPDWORD,LPDWORD);
-NTSYSAPI NTSTATUS  WINAPI RtlGetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID *,PBOOLEAN);
 NTSYSAPI ULONG     WINAPI RtlGetProcessHeaps(ULONG,HANDLE*);
 NTSYSAPI NTSTATUS  WINAPI RtlGetProcessPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*);
 NTSYSAPI BOOLEAN   WINAPI RtlGetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD);
-NTSYSAPI NTSTATUS  WINAPI RtlGetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,PBOOLEAN,PACL *,PBOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlGetSearchPath(PWSTR*);
 NTSYSAPI NTSTATUS  WINAPI RtlGetSystemPreferredUILanguages(DWORD,ULONG,ULONG*,WCHAR*,ULONG*);
 NTSYSAPI LONGLONG  WINAPI RtlGetSystemTimePrecise(void);
@@ -4806,10 +4778,6 @@ NTSYSAPI BOOLEAN   WINAPI RtlGetUserInfoHeap(HANDLE,ULONG,void*,void**,ULONG*);
 NTSYSAPI NTSTATUS  WINAPI RtlGetUserPreferredUILanguages(DWORD,ULONG,ULONG*,WCHAR*,ULONG*);
 NTSYSAPI NTSTATUS  WINAPI RtlGetVersion(RTL_OSVERSIONINFOEXW*);
 NTSYSAPI NTSTATUS  WINAPI RtlHashUnicodeString(const UNICODE_STRING*,BOOLEAN,ULONG,ULONG*);
-NTSYSAPI PSID_IDENTIFIER_AUTHORITY WINAPI RtlIdentifierAuthoritySid(PSID);
-NTSYSAPI NTSTATUS  WINAPI RtlIdnToAscii(DWORD,const WCHAR*,INT,WCHAR*,INT*);
-NTSYSAPI NTSTATUS  WINAPI RtlIdnToNameprepUnicode(DWORD,const WCHAR*,INT,WCHAR*,INT*);
-NTSYSAPI NTSTATUS  WINAPI RtlIdnToUnicode(DWORD,const WCHAR*,INT,WCHAR*,INT*);
 NTSYSAPI PVOID     WINAPI RtlImageDirectoryEntryToData(HMODULE,BOOL,WORD,ULONG *);
 NTSYSAPI PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE);
 NTSYSAPI PIMAGE_SECTION_HEADER WINAPI RtlImageRvaToSection(const IMAGE_NT_HEADERS *,HMODULE,DWORD);
@@ -4817,7 +4785,6 @@ NTSYSAPI PVOID     WINAPI RtlImageRvaToVa(const IMAGE_NT_HEADERS *,HMODULE,DWORD
 NTSYSAPI NTSTATUS  WINAPI RtlImpersonateSelf(SECURITY_IMPERSONATION_LEVEL);
 NTSYSAPI void      WINAPI RtlInitAnsiString(PANSI_STRING,PCSZ);
 NTSYSAPI NTSTATUS  WINAPI RtlInitAnsiStringEx(PANSI_STRING,PCSZ);
-NTSYSAPI void      WINAPI RtlInitCodePageTable(USHORT*,CPTABLEINFO*);
 NTSYSAPI void      WINAPI RtlInitNlsTables(USHORT*,USHORT*,USHORT*,NLSTABLEINFO*);
 NTSYSAPI void      WINAPI RtlInitString(PSTRING,PCSZ);
 NTSYSAPI void      WINAPI RtlInitUnicodeString(PUNICODE_STRING,PCWSTR);
@@ -4832,7 +4799,6 @@ NTSYSAPI NTSTATUS  WINAPI RtlInitializeExtendedContext2(void*,ULONG,CONTEXT_EX**
 NTSYSAPI void      WINAPI RtlInitializeHandleTable(ULONG,ULONG,RTL_HANDLE_TABLE *);
 NTSYSAPI void      WINAPI RtlInitializeResource(LPRTL_RWLOCK);
 NTSYSAPI void      WINAPI RtlInitializeSRWLock(RTL_SRWLOCK*);
-NTSYSAPI NTSTATUS  WINAPI RtlInitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE);
 NTSYSAPI NTSTATUS  WINAPI RtlInt64ToUnicodeString(ULONGLONG,ULONG,UNICODE_STRING *);
 NTSYSAPI NTSTATUS  WINAPI RtlIntegerToChar(ULONG,ULONG,ULONG,PCHAR);
 NTSYSAPI NTSTATUS  WINAPI RtlIntegerToUnicodeString(ULONG,ULONG,UNICODE_STRING *);
@@ -4843,7 +4809,6 @@ NTSYSAPI BOOLEAN   WINAPI RtlIsCurrentProcess(HANDLE);
 NTSYSAPI BOOLEAN   WINAPI RtlIsCurrentThread(HANDLE);
 NTSYSAPI ULONG     WINAPI RtlIsDosDeviceName_U(PCWSTR);
 NTSYSAPI BOOLEAN   WINAPI RtlIsNameLegalDOS8Dot3(const UNICODE_STRING*,POEM_STRING,PBOOLEAN);
-NTSYSAPI NTSTATUS  WINAPI RtlIsNormalizedString(ULONG,const WCHAR*,INT,BOOLEAN*);
 NTSYSAPI BOOLEAN   WINAPI RtlIsProcessorFeaturePresent(UINT);
 NTSYSAPI BOOLEAN   WINAPI RtlIsTextUnicode(LPCVOID,INT,INT *);
 NTSYSAPI BOOLEAN   WINAPI RtlIsValidHandle(const RTL_HANDLE_TABLE *, const RTL_HANDLE *);
@@ -4851,9 +4816,7 @@ NTSYSAPI BOOLEAN   WINAPI RtlIsValidIndexHandle(const RTL_HANDLE_TABLE *, ULONG
 NTSYSAPI BOOLEAN   WINAPI RtlIsValidLocaleName(const WCHAR*,ULONG);
 NTSYSAPI NTSTATUS  WINAPI RtlLcidToLocaleName(LCID,UNICODE_STRING*,ULONG,BOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlLeaveCriticalSection(RTL_CRITICAL_SECTION *);
-NTSYSAPI DWORD     WINAPI RtlLengthRequiredSid(DWORD);
 NTSYSAPI ULONG     WINAPI RtlLengthSecurityDescriptor(PSECURITY_DESCRIPTOR);
-NTSYSAPI DWORD     WINAPI RtlLengthSid(PSID);
 NTSYSAPI NTSTATUS  WINAPI RtlLocalTimeToSystemTime(const LARGE_INTEGER*,PLARGE_INTEGER);
 NTSYSAPI NTSTATUS  WINAPI RtlLocaleNameToLcid(const WCHAR*,LCID*,ULONG);
 NTSYSAPI void *    WINAPI RtlLocateExtendedFeature(CONTEXT_EX*,ULONG,ULONG*);
@@ -4862,21 +4825,14 @@ NTSYSAPI void *    WINAPI RtlLocateLegacyContext(CONTEXT_EX*,ULONG*);
 NTSYSAPI BOOLEAN   WINAPI RtlLockHeap(HANDLE);
 NTSYSAPI NTSTATUS  WINAPI RtlLookupAtomInAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*);
 NTSYSAPI NTSTATUS  WINAPI RtlMakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD);
-NTSYSAPI NTSTATUS  WINAPI RtlMultiByteToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD);
-NTSYSAPI NTSTATUS  WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,ULONG);
 NTSYSAPI NTSTATUS  WINAPI RtlNewSecurityObject(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOLEAN,HANDLE,PGENERIC_MAPPING);
 NTSYSAPI NTSTATUS  WINAPI RtlNewSecurityObjectEx(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID*,BOOLEAN,ULONG,HANDLE,PGENERIC_MAPPING);
 NTSYSAPI NTSTATUS  WINAPI RtlNewSecurityObjectWithMultipleInheritance(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,
     GUID **,ULONG,BOOLEAN,ULONG,HANDLE,PGENERIC_MAPPING);
 NTSYSAPI PRTL_USER_PROCESS_PARAMETERS WINAPI RtlNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*);
-NTSYSAPI NTSTATUS  WINAPI RtlNormalizeString(ULONG,const WCHAR*,INT,WCHAR*,INT*);
 NTSYSAPI ULONG     WINAPI RtlNtStatusToDosError(NTSTATUS);
-NTSYSAPI ULONG     WINAPI RtlNtStatusToDosErrorNoTeb(NTSTATUS);
 NTSYSAPI ULONG     WINAPI RtlNumberOfSetBits(PCRTL_BITMAP);
 NTSYSAPI ULONG     WINAPI RtlNumberOfClearBits(PCRTL_BITMAP);
-NTSYSAPI ULONG     WINAPI RtlOemStringToUnicodeSize(const STRING*);
-NTSYSAPI NTSTATUS  WINAPI RtlOemStringToUnicodeString(UNICODE_STRING*,const STRING*,BOOLEAN);
-NTSYSAPI NTSTATUS  WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD);
 NTSYSAPI NTSTATUS  WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE);
 NTSYSAPI NTSTATUS  WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM);
 NTSYSAPI void      WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*);
@@ -4900,8 +4856,6 @@ NTSYSAPI NTSTATUS  WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION*
 NTSYSAPI BOOL      WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG*);
 NTSYSAPI NTSTATUS  WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE,PVOID,ULONG);
 NTSYSAPI void      DECLSPEC_NORETURN WINAPI RtlRaiseStatus(NTSTATUS);
-NTSYSAPI ULONG     WINAPI RtlRandom(PULONG);
-NTSYSAPI ULONG     WINAPI RtlRandomEx(PULONG);
 NTSYSAPI PVOID     WINAPI RtlReAllocateHeap(HANDLE,ULONG,PVOID,SIZE_T) __WINE_ALLOC_SIZE(4) __WINE_DEALLOC(RtlFreeHeap,3);
 NTSYSAPI NTSTATUS  WINAPI RtlRegisterWait(PHANDLE,HANDLE,RTL_WAITORTIMERCALLBACKFUNC,PVOID,ULONG,ULONG);
 NTSYSAPI void      WINAPI RtlReleaseActivationContext(HANDLE);
@@ -4915,9 +4869,6 @@ NTSYSAPI ULONG     WINAPI RtlRemoveVectoredContinueHandler(PVOID);
 NTSYSAPI ULONG     WINAPI RtlRemoveVectoredExceptionHandler(PVOID);
 NTSYSAPI void      WINAPI RtlResetRtlTranslations(const NLSTABLEINFO*);
 NTSYSAPI void      WINAPI RtlRestoreLastWin32Error(DWORD);
-NTSYSAPI void      WINAPI RtlSecondsSince1970ToTime(DWORD,LARGE_INTEGER *);
-NTSYSAPI void      WINAPI RtlSecondsSince1980ToTime(DWORD,LARGE_INTEGER *);
-NTSYSAPI NTSTATUS  WINAPI RtlSelfRelativeToAbsoluteSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PDWORD,PACL,PDWORD,PACL,PDWORD,PSID,PDWORD,PSID,PDWORD);
 NTSYSAPI void      WINAPI RtlSetAllBits(PRTL_BITMAP);
 NTSYSAPI void      WINAPI RtlSetBits(PRTL_BITMAP,ULONG,ULONG);
 NTSYSAPI NTSTATUS  WINAPI RtlSetControlSecurityDescriptor(PSECURITY_DESCRIPTOR,SECURITY_DESCRIPTOR_CONTROL,SECURITY_DESCRIPTOR_CONTROL);
@@ -4928,12 +4879,10 @@ NTSYSAPI BOOL      WINAPI RtlSetCurrentTransaction(HANDLE);
 NTSYSAPI NTSTATUS  WINAPI RtlSetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlSetEnvironmentVariable(PWSTR*,PUNICODE_STRING,PUNICODE_STRING);
 NTSYSAPI void      WINAPI RtlSetExtendedFeaturesMask(CONTEXT_EX*,ULONG64);
-NTSYSAPI NTSTATUS  WINAPI RtlSetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlSetHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T);
 NTSYSAPI NTSTATUS  WINAPI RtlSetIoCompletionCallback(HANDLE,PRTL_OVERLAPPED_COMPLETION_ROUTINE,ULONG);
 NTSYSAPI void      WINAPI RtlSetLastWin32Error(DWORD);
 NTSYSAPI void      WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus(NTSTATUS);
-NTSYSAPI NTSTATUS  WINAPI RtlSetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlSetProcessPreferredUILanguages(DWORD,PCZZWSTR,ULONG*);
 NTSYSAPI NTSTATUS  WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlSetSearchPathMode(ULONG);
@@ -4947,13 +4896,10 @@ NTSYSAPI SIZE_T    WINAPI RtlSizeHeap(HANDLE,ULONG,const void*);
 NTSYSAPI NTSTATUS  WINAPI RtlSleepConditionVariableCS(RTL_CONDITION_VARIABLE*,RTL_CRITICAL_SECTION*,const LARGE_INTEGER*);
 NTSYSAPI NTSTATUS  WINAPI RtlSleepConditionVariableSRW(RTL_CONDITION_VARIABLE*,RTL_SRWLOCK*,const LARGE_INTEGER*,ULONG);
 NTSYSAPI NTSTATUS  WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING);
-NTSYSAPI LPDWORD   WINAPI RtlSubAuthoritySid(PSID,DWORD);
-NTSYSAPI LPBYTE    WINAPI RtlSubAuthorityCountSid(PSID);
 NTSYSAPI NTSTATUS  WINAPI RtlSystemTimeToLocalTime(const LARGE_INTEGER*,PLARGE_INTEGER);
 NTSYSAPI BOOLEAN   WINAPI RtlTimeFieldsToTime(PTIME_FIELDS,PLARGE_INTEGER);
 NTSYSAPI void      WINAPI RtlTimeToElapsedTimeFields(const LARGE_INTEGER *,PTIME_FIELDS);
 NTSYSAPI BOOLEAN   WINAPI RtlTimeToSecondsSince1970(const LARGE_INTEGER *,LPDWORD);
-NTSYSAPI BOOLEAN   WINAPI RtlTimeToSecondsSince1980(const LARGE_INTEGER *,LPDWORD);
 NTSYSAPI void      WINAPI RtlTimeToTimeFields(const LARGE_INTEGER*,PTIME_FIELDS);
 NTSYSAPI BOOLEAN   WINAPI RtlTryAcquireSRWLockExclusive(RTL_SRWLOCK *);
 NTSYSAPI BOOLEAN   WINAPI RtlTryAcquireSRWLockShared(RTL_SRWLOCK *);
@@ -4962,12 +4908,8 @@ NTSYSAPI NTSTATUS  WINAPI RtlUTF8ToUnicodeN(WCHAR*,DWORD,DWORD*,const char*,DWOR
 NTSYSAPI DWORD     WINAPI RtlUnicodeStringToAnsiSize(const UNICODE_STRING*);
 NTSYSAPI NTSTATUS  WINAPI RtlUnicodeStringToAnsiString(PANSI_STRING,PCUNICODE_STRING,BOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlUnicodeStringToInteger(const UNICODE_STRING *,ULONG,ULONG *);
-NTSYSAPI DWORD     WINAPI RtlUnicodeStringToOemSize(const UNICODE_STRING*);
 NTSYSAPI NTSTATUS  WINAPI RtlUnicodeStringToOemString(POEM_STRING,PCUNICODE_STRING,BOOLEAN);
-NTSYSAPI NTSTATUS  WINAPI RtlUnicodeToCustomCPN(CPTABLEINFO*,char*,DWORD,DWORD*,const WCHAR*,DWORD);
-NTSYSAPI NTSTATUS  WINAPI RtlUnicodeToMultiByteN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD);
 NTSYSAPI NTSTATUS  WINAPI RtlUnicodeToMultiByteSize(PULONG,PCWSTR,ULONG);
-NTSYSAPI NTSTATUS  WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD);
 NTSYSAPI NTSTATUS  WINAPI RtlUnicodeToUTF8N(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD);
 NTSYSAPI ULONG     WINAPI RtlUniform(PULONG);
 NTSYSAPI BOOLEAN   WINAPI RtlUnlockHeap(HANDLE);
@@ -4975,15 +4917,11 @@ NTSYSAPI WCHAR     WINAPI RtlUpcaseUnicodeChar(WCHAR);
 NTSYSAPI NTSTATUS  WINAPI RtlUpcaseUnicodeStringToAnsiString(STRING*,const UNICODE_STRING*,BOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlUpcaseUnicodeStringToCountedOemString(STRING*,const UNICODE_STRING*,BOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlUpcaseUnicodeStringToOemString(STRING*,const UNICODE_STRING*,BOOLEAN);
-NTSYSAPI NTSTATUS  WINAPI RtlUpcaseUnicodeToCustomCPN(CPTABLEINFO*,char*,DWORD,DWORD*,const WCHAR*,DWORD);
-NTSYSAPI NTSTATUS  WINAPI RtlUpcaseUnicodeToMultiByteN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD);
-NTSYSAPI NTSTATUS  WINAPI RtlUpcaseUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD);
 NTSYSAPI NTSTATUS  WINAPI RtlUpdateTimer(HANDLE, HANDLE, DWORD, DWORD);
 NTSYSAPI void      WINAPI RtlUserThreadStart(PRTL_THREAD_START_ROUTINE,void*);
 NTSYSAPI BOOLEAN   WINAPI RtlValidAcl(PACL);
 NTSYSAPI BOOLEAN   WINAPI RtlValidRelativeSecurityDescriptor(PSECURITY_DESCRIPTOR,ULONG,SECURITY_INFORMATION);
 NTSYSAPI BOOLEAN   WINAPI RtlValidSecurityDescriptor(PSECURITY_DESCRIPTOR);
-NTSYSAPI BOOLEAN   WINAPI RtlValidSid(PSID);
 NTSYSAPI BOOLEAN   WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID);
 NTSYSAPI NTSTATUS  WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG);
 NTSYSAPI NTSTATUS  WINAPI RtlWaitOnAddress(const void *,const void *,SIZE_T,const LARGE_INTEGER *);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3982

    

2025

2024

2023

2022

[PATCH v4 2/2] include: Move RTL functions that belong in ntifs.h from winternl.h to ntifs.h.