diff --git a/reactos/include/ddk/ntddk.h b/reactos/include/ddk/ntddk.h
index 275b8023f8e..1087bcb3cd9 100644
--- a/reactos/include/ddk/ntddk.h
+++ b/reactos/include/ddk/ntddk.h
@@ -4706,15 +4706,16 @@ NtOpenProcess(
   _In_ POBJECT_ATTRIBUTES ObjectAttributes,
   _In_opt_ PCLIENT_ID ClientId);
 
+__kernel_entry
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtQueryInformationProcess(
-  IN HANDLE ProcessHandle,
-  IN PROCESSINFOCLASS ProcessInformationClass,
-  OUT PVOID ProcessInformation OPTIONAL,
-  IN ULONG ProcessInformationLength,
-  OUT PULONG ReturnLength OPTIONAL);
+  _In_ HANDLE ProcessHandle,
+  _In_ PROCESSINFOCLASS ProcessInformationClass,
+  _Out_ PVOID ProcessInformation,
+  _In_ ULONG ProcessInformationLength,
+  _Out_opt_ PULONG ReturnLength);
 
 #if (NTDDI_VERSION >= NTDDI_WIN2K)
 
diff --git a/reactos/include/ndk/cmfuncs.h b/reactos/include/ndk/cmfuncs.h
index 37d83ec16b4..609b98b3008 100644
--- a/reactos/include/ndk/cmfuncs.h
+++ b/reactos/include/ndk/cmfuncs.h
@@ -176,20 +176,22 @@ NtNotifyChangeKey(
     _In_ BOOLEAN WatchSubtree
 );
 
+__kernel_entry
+NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtNotifyChangeMultipleKeys(
     _In_ HANDLE MasterKeyHandle,
-    _In_ ULONG Count,
-    _In_ POBJECT_ATTRIBUTES SlaveObjects,
-    _In_ HANDLE Event,
+    _In_opt_ ULONG Count,
+    _In_reads_opt_(Count) OBJECT_ATTRIBUTES SubordinateObjects[],
+    _In_opt_ HANDLE Event,
     _In_opt_ PIO_APC_ROUTINE ApcRoutine,
     _In_opt_ PVOID ApcContext,
     _Out_ PIO_STATUS_BLOCK IoStatusBlock,
     _In_ ULONG CompletionFilter,
     _In_ BOOLEAN WatchTree,
-    _Out_bytecap_(Length) PVOID Buffer,
-    _In_ ULONG Length,
+    _Out_writes_bytes_opt_(BufferSize) PVOID Buffer,
+    _In_ ULONG BufferSize,
     _In_ BOOLEAN Asynchronous
 );
 
@@ -222,16 +224,17 @@ NtQueryKey(
     _Out_ PULONG ResultLength
 );
 
+__kernel_entry
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtQueryMultipleValueKey(
     _In_ HANDLE KeyHandle,
-    _Inout_ PKEY_VALUE_ENTRY ValueList,
-    _In_ ULONG NumberOfValues,
-    _Out_bytecap_(*Length) PVOID Buffer,
-    _Inout_ PULONG Length,
-    _Out_ PULONG ReturnLength
+    _Inout_updates_(EntryCount) PKEY_VALUE_ENTRY ValueEntries,
+    _In_ ULONG EntryCount,
+    _Out_writes_bytes_(*BufferLength) PVOID ValueBuffer,
+    _Inout_ PULONG BufferLength,
+    _Out_opt_ PULONG RequiredBufferLength
 );
 
 NTSTATUS
@@ -270,7 +273,7 @@ NTSTATUS
 NTAPI
 NtRenameKey(
     _In_ HANDLE KeyHandle,
-    _In_ PUNICODE_STRING ReplacementName
+    _In_ PUNICODE_STRING NewName
 );
 
 NTSYSCALLAPI
@@ -317,14 +320,16 @@ NtSaveMergedKeys(
     _In_ HANDLE FileHandle
 );
 
+__kernel_entry
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtSetInformationKey(
     _In_ HANDLE KeyHandle,
-    _In_ KEY_SET_INFORMATION_CLASS KeyInformationClass,
-    _In_ PVOID KeyInformation,
-    _In_ ULONG KeyInformationLength
+    _In_ _Strict_type_match_
+        KEY_SET_INFORMATION_CLASS KeySetInformationClass,
+    _In_reads_bytes_(KeySetInformationLength) PVOID KeySetInformation,
+    _In_ ULONG KeySetInformationLength
 );
 
 NTSYSCALLAPI
diff --git a/reactos/include/ndk/exfuncs.h b/reactos/include/ndk/exfuncs.h
index 3fa9fa17f00..4570137c890 100644
--- a/reactos/include/ndk/exfuncs.h
+++ b/reactos/include/ndk/exfuncs.h
@@ -401,13 +401,14 @@ NtQuerySystemEnvironmentValueEx(
     _Inout_ PULONG Attributes
 );
 
+__kernel_entry
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtQuerySystemInformation(
     _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass,
     _Out_ PVOID SystemInformation,
-    _In_ ULONG Length,
+    _In_ ULONG InformationLength,
     _Out_opt_ PULONG ResultLength
 );
 
diff --git a/reactos/include/ndk/obfuncs.h b/reactos/include/ndk/obfuncs.h
index 8339ca9780c..1bca142d08b 100644
--- a/reactos/include/ndk/obfuncs.h
+++ b/reactos/include/ndk/obfuncs.h
@@ -373,7 +373,7 @@ NTAPI
 NtWaitForSingleObject(
     _In_ HANDLE Object,
     _In_ BOOLEAN Alertable,
-    _In_opt_ PLARGE_INTEGER Time
+    _In_opt_ PLARGE_INTEGER Timeout
 );
 
 NTSYSAPI
diff --git a/reactos/include/ndk/psfuncs.h b/reactos/include/ndk/psfuncs.h
index 195f62a9eae..ec49aacb922 100644
--- a/reactos/include/ndk/psfuncs.h
+++ b/reactos/include/ndk/psfuncs.h
@@ -507,6 +507,7 @@ NtQueryInformationJobObject(
 );
 
 #ifndef _NTDDK_
+__kernel_entry
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
@@ -515,7 +516,7 @@ NtQueryInformationProcess(
     _In_ PROCESSINFOCLASS ProcessInformationClass,
     _Out_ PVOID ProcessInformation,
     _In_ ULONG ProcessInformationLength,
-    _Out_opt_ PULONG ReturnLength OPTIONAL
+    _Out_opt_ PULONG ReturnLength
 );
 #endif
 
diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h
index 0e7497bc860..32cee88b378 100644
--- a/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@@ -4323,6 +4323,9 @@ NTAPI
 RtlQueryDepthSList(
   _In_ PSLIST_HEADER ListHead);
 
+#ifndef _RTL_RUN_ONCE_DEF
+#define _RTL_RUN_ONCE_DEF
+
 #define RTL_RUN_ONCE_CHECK_ONLY 0x00000001UL
 #define RTL_RUN_ONCE_ASYNC 0x00000002UL
 #define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL
@@ -4344,6 +4347,8 @@ RtlRunOnceComplete(
     DWORD,
     PVOID);
 
+#endif
+
 #define RTL_CONDITION_VARIABLE_INIT {0}
 #define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 0x1
 
diff --git a/reactos/include/xdk/psfuncs.h b/reactos/include/xdk/psfuncs.h
index b6d4f803133..2a256ae9c47 100644
--- a/reactos/include/xdk/psfuncs.h
+++ b/reactos/include/xdk/psfuncs.h
@@ -41,15 +41,16 @@ NtOpenProcess(
   _In_ POBJECT_ATTRIBUTES ObjectAttributes,
   _In_opt_ PCLIENT_ID ClientId);
 
+__kernel_entry
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtQueryInformationProcess(
-  IN HANDLE ProcessHandle,
-  IN PROCESSINFOCLASS ProcessInformationClass,
-  OUT PVOID ProcessInformation OPTIONAL,
-  IN ULONG ProcessInformationLength,
-  OUT PULONG ReturnLength OPTIONAL);
+  _In_ HANDLE ProcessHandle,
+  _In_ PROCESSINFOCLASS ProcessInformationClass,
+  _Out_ PVOID ProcessInformation,
+  _In_ ULONG ProcessInformationLength,
+  _Out_opt_ PULONG ReturnLength);
 $endif (_NTDDK_)
 $if (_NTIFS_)
 
diff --git a/reactos/include/xdk/winnt_old.h b/reactos/include/xdk/winnt_old.h
index e3402213a85..6dfd2d95720 100644
--- a/reactos/include/xdk/winnt_old.h
+++ b/reactos/include/xdk/winnt_old.h
@@ -672,6 +672,8 @@ typedef enum {
 #define PF_RDTSC_INSTRUCTION_AVAILABLE 8
 #define PF_PAE_ENABLED 9
 #define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10
+#define PF_NX_ENABLED 12
+
 /* also in ddk/ntifs.h */
 #define FILE_ACTION_ADDED                   0x00000001
 #define FILE_ACTION_REMOVED                 0x00000002
@@ -4351,6 +4353,7 @@ typedef struct _ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION {
   PCWSTR lpAssemblyManifestPath;
   PCWSTR lpAssemblyPolicyPath;
   PCWSTR lpAssemblyDirectoryName;
+  DWORD ulFileCount;
 } ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION, *PACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION;
 typedef const ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *PCACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION;