diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c
index 8e80efa9835..55d5fcd3551 100644
--- a/dlls/kernelbase/debug.c
+++ b/dlls/kernelbase/debug.c
@@ -30,6 +30,7 @@
 #include "winnls.h"
 #include "wingdi.h"
 #include "winuser.h"
+#define PSAPI_VERSION 1  /* avoid K32 function remapping */
 #include "psapi.h"
 #include "werapi.h"
 
@@ -910,18 +911,20 @@ static BOOL get_ldr_module32( HANDLE process, HMODULE module, LDR_DATA_TABLE_ENT
 
 
 /***********************************************************************
+ *         EmptyWorkingSet   (kernelbase.@)
  *         K32EmptyWorkingSet   (kernelbase.@)
  */
-BOOL WINAPI DECLSPEC_HOTPATCH K32EmptyWorkingSet( HANDLE process )
+BOOL WINAPI DECLSPEC_HOTPATCH EmptyWorkingSet( HANDLE process )
 {
     return SetProcessWorkingSetSizeEx( process, (SIZE_T)-1, (SIZE_T)-1, 0 );
 }
 
 
 /***********************************************************************
+ *         EnumDeviceDrivers   (kernelbase.@)
  *         K32EnumDeviceDrivers   (kernelbase.@)
  */
-BOOL WINAPI K32EnumDeviceDrivers( void **image_base, DWORD count, DWORD *needed )
+BOOL WINAPI EnumDeviceDrivers( void **image_base, DWORD count, DWORD *needed )
 {
     FIXME( "(%p, %d, %p): stub\n", image_base, count, needed );
     if (needed) *needed = 0;
@@ -930,9 +933,10 @@ BOOL WINAPI K32EnumDeviceDrivers( void **image_base, DWORD count, DWORD *needed
 
 
 /***********************************************************************
+ *         EnumPageFilesA   (kernelbase.@)
  *         K32EnumPageFilesA   (kernelbase.@)
  */
-BOOL WINAPI /* DECLSPEC_HOTPATCH */ K32EnumPageFilesA( PENUM_PAGE_FILE_CALLBACKA callback, void *context )
+BOOL WINAPI /* DECLSPEC_HOTPATCH */ EnumPageFilesA( PENUM_PAGE_FILE_CALLBACKA callback, void *context )
 {
     FIXME( "(%p, %p) stub\n", callback, context );
     return FALSE;
@@ -940,9 +944,10 @@ BOOL WINAPI /* DECLSPEC_HOTPATCH */ K32EnumPageFilesA( PENUM_PAGE_FILE_CALLBACKA
 
 
 /***********************************************************************
+ *         EnumPageFilesW   (kernelbase.@)
  *         K32EnumPageFilesW   (kernelbase.@)
  */
-BOOL WINAPI /* DECLSPEC_HOTPATCH */ K32EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, void *context )
+BOOL WINAPI /* DECLSPEC_HOTPATCH */ EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, void *context )
 {
     FIXME( "(%p, %p) stub\n", callback, context );
     return FALSE;
@@ -950,10 +955,11 @@ BOOL WINAPI /* DECLSPEC_HOTPATCH */ K32EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW
 
 
 /***********************************************************************
+ *         EnumProcessModules   (kernelbase.@)
  *         K32EnumProcessModules   (kernelbase.@)
  */
-BOOL WINAPI DECLSPEC_HOTPATCH K32EnumProcessModules( HANDLE process, HMODULE *module,
-                                                     DWORD count, DWORD *needed )
+BOOL WINAPI DECLSPEC_HOTPATCH EnumProcessModules( HANDLE process, HMODULE *module,
+                                                  DWORD count, DWORD *needed )
 {
     struct module_iterator iter;
     DWORD size = 0;
@@ -1022,20 +1028,22 @@ BOOL WINAPI DECLSPEC_HOTPATCH K32EnumProcessModules( HANDLE process, HMODULE *mo
 
 
 /***********************************************************************
+ *         EnumProcessModulesEx   (kernelbase.@)
  *         K32EnumProcessModulesEx   (kernelbase.@)
  */
-BOOL WINAPI K32EnumProcessModulesEx( HANDLE process, HMODULE *module, DWORD count,
-                                     DWORD *needed, DWORD filter )
+BOOL WINAPI EnumProcessModulesEx( HANDLE process, HMODULE *module, DWORD count,
+                                  DWORD *needed, DWORD filter )
 {
     FIXME( "(%p, %p, %d, %p, %d) semi-stub\n", process, module, count, needed, filter );
-    return K32EnumProcessModules( process, module, count, needed );
+    return EnumProcessModules( process, module, count, needed );
 }
 
 
 /***********************************************************************
+ *         EnumProcesses   (kernelbase.@)
  *         K32EnumProcesses   (kernelbase.@)
  */
-BOOL WINAPI K32EnumProcesses( DWORD *ids, DWORD count, DWORD *used )
+BOOL WINAPI EnumProcesses( DWORD *ids, DWORD count, DWORD *used )
 {
     SYSTEM_PROCESS_INFORMATION *spi;
     ULONG size = 0x4000;
@@ -1069,9 +1077,10 @@ BOOL WINAPI K32EnumProcesses( DWORD *ids, DWORD count, DWORD *used )
 
 
 /***********************************************************************
+ *         GetDeviceDriverBaseNameA   (kernelbase.@)
  *         K32GetDeviceDriverBaseNameA   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetDeviceDriverBaseNameA( void *image_base, char *name, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverBaseNameA( void *image_base, char *name, DWORD size )
 {
     FIXME( "(%p, %p, %d): stub\n", image_base, name, size );
     if (name && size) name[0] = 0;
@@ -1080,9 +1089,10 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetDeviceDriverBaseNameA( void *image_base, ch
 
 
 /***********************************************************************
+ *         GetDeviceDriverBaseNameW   (kernelbase.@)
  *         K32GetDeviceDriverBaseNameW   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetDeviceDriverBaseNameW( void *image_base, WCHAR *name, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverBaseNameW( void *image_base, WCHAR *name, DWORD size )
 {
     FIXME( "(%p, %p, %d): stub\n", image_base, name, size );
     if (name && size) name[0] = 0;
@@ -1091,9 +1101,10 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetDeviceDriverBaseNameW( void *image_base, WC
 
 
 /***********************************************************************
+ *         GetDeviceDriverFileNameA   (kernelbase.@)
  *         K32GetDeviceDriverFileNameA   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetDeviceDriverFileNameA( void *image_base, char *name, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverFileNameA( void *image_base, char *name, DWORD size )
 {
     FIXME( "(%p, %p, %d): stub\n", image_base, name, size );
     if (name && size) name[0] = 0;
@@ -1102,9 +1113,10 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetDeviceDriverFileNameA( void *image_base, ch
 
 
 /***********************************************************************
+ *         GetDeviceDriverFileNameW   (kernelbase.@)
  *         K32GetDeviceDriverFileNameW   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetDeviceDriverFileNameW( void *image_base, WCHAR *name, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverFileNameW( void *image_base, WCHAR *name, DWORD size )
 {
     FIXME( "(%p, %p, %d): stub\n", image_base, name, size );
     if (name && size) name[0] = 0;
@@ -1113,9 +1125,10 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetDeviceDriverFileNameW( void *image_base, WC
 
 
 /***********************************************************************
+ *         GetMappedFileNameA   (kernelbase.@)
  *         K32GetMappedFileNameA   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetMappedFileNameA( HANDLE process, void *addr, char *name, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetMappedFileNameA( HANDLE process, void *addr, char *name, DWORD size )
 {
     FIXME( "(%p, %p, %p, %d): stub\n", process, addr, name, size );
     if (name && size) name[0] = 0;
@@ -1124,9 +1137,10 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetMappedFileNameA( HANDLE process, void *addr
 
 
 /***********************************************************************
+ *         GetMappedFileNameW   (kernelbase.@)
  *         K32GetMappedFileNameW   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetMappedFileNameW( HANDLE process, void *addr, WCHAR *name, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetMappedFileNameW( HANDLE process, void *addr, WCHAR *name, DWORD size )
 {
     FIXME( "(%p, %p, %p, %d): stub\n", process, addr, name, size );
     if (name && size) name[0] = 0;
@@ -1135,10 +1149,11 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetMappedFileNameW( HANDLE process, void *addr
 
 
 /***********************************************************************
+ *         GetModuleBaseNameA   (kernelbase.@)
  *         K32GetModuleBaseNameA   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetModuleBaseNameA( HANDLE process, HMODULE module,
-                                                      char *name, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetModuleBaseNameA( HANDLE process, HMODULE module,
+                                                   char *name, DWORD size )
 {
     WCHAR *name_w;
     DWORD len, ret = 0;
@@ -1150,7 +1165,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetModuleBaseNameA( HANDLE process, HMODULE mo
     }
     if (!(name_w = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * size ))) return 0;
 
-    len = K32GetModuleBaseNameW( process, module, name_w, size );
+    len = GetModuleBaseNameW( process, module, name_w, size );
     TRACE( "%d, %s\n", len, debugstr_w(name_w) );
     if (len)
     {
@@ -1163,10 +1178,11 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetModuleBaseNameA( HANDLE process, HMODULE mo
 
 
 /***********************************************************************
+ *         GetModuleBaseNameW   (kernelbase.@)
  *         K32GetModuleBaseNameW   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetModuleBaseNameW( HANDLE process, HMODULE module,
-                                                      WCHAR *name, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetModuleBaseNameW( HANDLE process, HMODULE module,
+                                                   WCHAR *name, DWORD size )
 {
     BOOL wow64;
 
@@ -1198,10 +1214,11 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetModuleBaseNameW( HANDLE process, HMODULE mo
 
 
 /***********************************************************************
+ *         GetModuleFileNameExA   (kernelbase.@)
  *         K32GetModuleFileNameExA   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetModuleFileNameExA( HANDLE process, HMODULE module,
-                                                        char *name, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExA( HANDLE process, HMODULE module,
+                                                     char *name, DWORD size )
 {
     WCHAR *ptr;
     DWORD len;
@@ -1221,7 +1238,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetModuleFileNameExA( HANDLE process, HMODULE
     }
 
     if (!(ptr = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return 0;
-    len = K32GetModuleFileNameExW( process, module, ptr, size );
+    len = GetModuleFileNameExW( process, module, ptr, size );
     if (!len)
     {
         name[0] = 0;
@@ -1241,10 +1258,11 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetModuleFileNameExA( HANDLE process, HMODULE
 
 
 /***********************************************************************
+ *         GetModuleFileNameExW   (kernelbase.@)
  *         K32GetModuleFileNameExW   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetModuleFileNameExW( HANDLE process, HMODULE module,
-                                                        WCHAR *name, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExW( HANDLE process, HMODULE module,
+                                                     WCHAR *name, DWORD size )
 {
     BOOL wow64;
     DWORD len;
@@ -1288,9 +1306,10 @@ DWORD WINAPI DECLSPEC_HOTPATCH K32GetModuleFileNameExW( HANDLE process, HMODULE
 
 
 /***********************************************************************
+ *         GetModuleInformation   (kernelbase.@)
  *         K32GetModuleInformation   (kernelbase.@)
  */
-BOOL WINAPI K32GetModuleInformation( HANDLE process, HMODULE module, MODULEINFO *modinfo, DWORD count )
+BOOL WINAPI GetModuleInformation( HANDLE process, HMODULE module, MODULEINFO *modinfo, DWORD count )
 {
     BOOL wow64;
 
@@ -1325,9 +1344,10 @@ BOOL WINAPI K32GetModuleInformation( HANDLE process, HMODULE module, MODULEINFO
 
 
 /***********************************************************************
+ *         GetPerformanceInfo   (kernelbase.@)
  *         K32GetPerformanceInfo   (kernelbase.@)
  */
-BOOL WINAPI DECLSPEC_HOTPATCH K32GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size )
+BOOL WINAPI DECLSPEC_HOTPATCH GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size )
 {
     SYSTEM_PERFORMANCE_INFORMATION perf;
     SYSTEM_BASIC_INFORMATION basic;
@@ -1395,28 +1415,31 @@ BOOL WINAPI DECLSPEC_HOTPATCH K32GetPerformanceInfo( PPERFORMANCE_INFORMATION in
 
 
 /***********************************************************************
+ *         GetProcessImageFileNameA   (kernelbase.@)
  *         K32GetProcessImageFileNameA   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetProcessImageFileNameA( HANDLE process, char *file, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetProcessImageFileNameA( HANDLE process, char *file, DWORD size )
 {
     return QueryFullProcessImageNameA( process, PROCESS_NAME_NATIVE, file, &size ) ? size : 0;
 }
 
 
 /***********************************************************************
+ *         GetProcessImageFileNameW   (kernelbase.@)
  *         K32GetProcessImageFileNameW   (kernelbase.@)
  */
-DWORD WINAPI DECLSPEC_HOTPATCH K32GetProcessImageFileNameW( HANDLE process, WCHAR *file, DWORD size )
+DWORD WINAPI DECLSPEC_HOTPATCH GetProcessImageFileNameW( HANDLE process, WCHAR *file, DWORD size )
 {
     return QueryFullProcessImageNameW( process, PROCESS_NAME_NATIVE, file, &size ) ? size : 0;
 }
 
 
 /***********************************************************************
+ *         GetProcessMemoryInfo   (kernelbase.@)
  *         K32GetProcessMemoryInfo   (kernelbase.@)
  */
-BOOL WINAPI DECLSPEC_HOTPATCH K32GetProcessMemoryInfo( HANDLE process, PROCESS_MEMORY_COUNTERS *pmc,
-                                                       DWORD count )
+BOOL WINAPI DECLSPEC_HOTPATCH GetProcessMemoryInfo( HANDLE process, PROCESS_MEMORY_COUNTERS *pmc,
+                                                    DWORD count )
 {
     VM_COUNTERS vmc;
 
@@ -1444,9 +1467,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH K32GetProcessMemoryInfo( HANDLE process, PROCESS_M
 
 
 /***********************************************************************
+ *         GetWsChanges   (kernelbase.@)
  *         K32GetWsChanges   (kernelbase.@)
  */
-BOOL WINAPI DECLSPEC_HOTPATCH K32GetWsChanges( HANDLE process, PSAPI_WS_WATCH_INFORMATION *info, DWORD size )
+BOOL WINAPI DECLSPEC_HOTPATCH GetWsChanges( HANDLE process, PSAPI_WS_WATCH_INFORMATION *info, DWORD size )
 {
     TRACE( "(%p, %p, %d)\n", process, info, size );
     return set_ntstatus( NtQueryInformationProcess( process, ProcessWorkingSetWatch, info, size, NULL ));
@@ -1454,10 +1478,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH K32GetWsChanges( HANDLE process, PSAPI_WS_WATCH_IN
 
 
 /***********************************************************************
+ *         GetWsChangesEx   (kernelbase.@)
  *         K32GetWsChangesEx   (kernelbase.@)
  */
-BOOL WINAPI DECLSPEC_HOTPATCH K32GetWsChangesEx( HANDLE process, PSAPI_WS_WATCH_INFORMATION_EX *info,
-                                                 DWORD *size )
+BOOL WINAPI DECLSPEC_HOTPATCH GetWsChangesEx( HANDLE process, PSAPI_WS_WATCH_INFORMATION_EX *info,
+                                              DWORD *size )
 {
     FIXME( "(%p, %p, %p)\n", process, info, size );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
@@ -1466,9 +1491,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH K32GetWsChangesEx( HANDLE process, PSAPI_WS_WATCH_
 
 
 /***********************************************************************
+ *         InitializeProcessForWsWatch   (kernelbase.@)
  *         K32InitializeProcessForWsWatch   (kernelbase.@)
  */
-BOOL WINAPI /* DECLSPEC_HOTPATCH */ K32InitializeProcessForWsWatch( HANDLE process )
+BOOL WINAPI /* DECLSPEC_HOTPATCH */ InitializeProcessForWsWatch( HANDLE process )
 {
     FIXME( "(process=%p): stub\n", process );
     return TRUE;
@@ -1476,9 +1502,10 @@ BOOL WINAPI /* DECLSPEC_HOTPATCH */ K32InitializeProcessForWsWatch( HANDLE proce
 
 
 /***********************************************************************
+ *         QueryWorkingSet   (kernelbase.@)
  *         K32QueryWorkingSet   (kernelbase.@)
  */
-BOOL WINAPI DECLSPEC_HOTPATCH K32QueryWorkingSet( HANDLE process, void *buffer, DWORD size )
+BOOL WINAPI DECLSPEC_HOTPATCH QueryWorkingSet( HANDLE process, void *buffer, DWORD size )
 {
     TRACE( "(%p, %p, %d)\n", process, buffer, size );
     return set_ntstatus( NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL ));
@@ -1486,9 +1513,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH K32QueryWorkingSet( HANDLE process, void *buffer,
 
 
 /***********************************************************************
+ *         QueryWorkingSetEx   (kernelbase.@)
  *         K32QueryWorkingSetEx   (kernelbase.@)
  */
-BOOL WINAPI K32QueryWorkingSetEx( HANDLE process, void *buffer, DWORD size )
+BOOL WINAPI QueryWorkingSetEx( HANDLE process, void *buffer, DWORD size )
 {
     TRACE( "(%p, %p, %d)\n", process, buffer, size );
     return set_ntstatus( NtQueryVirtualMemory( process, NULL, MemoryWorkingSetExInformation,
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index b02737f045b..543961d2ce6 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -285,7 +285,7 @@
 # @ stub DuplicateStateContainerHandle
 @ stdcall DuplicateToken(long long ptr)
 @ stdcall DuplicateTokenEx(long long ptr long long ptr)
-# @ stub EmptyWorkingSet
+@ stdcall EmptyWorkingSet(long)
 @ stdcall EncodePointer(ptr) ntdll.RtlEncodePointer
 # @ stub EncodeRemotePointer
 @ stdcall EncodeSystemPointer(ptr) ntdll.RtlEncodeSystemPointer
@@ -298,14 +298,14 @@
 @ stdcall EnumDateFormatsExEx(ptr wstr long long)
 @ stdcall EnumDateFormatsExW(ptr long long)
 @ stdcall EnumDateFormatsW(ptr long long)
-# @ stub EnumDeviceDrivers
+@ stdcall EnumDeviceDrivers(ptr long ptr)
 @ stdcall EnumDynamicTimeZoneInformation(long ptr)
 @ stdcall EnumLanguageGroupLocalesW(ptr long long ptr)
-# @ stub EnumPageFilesA
-# @ stub EnumPageFilesW
-# @ stub EnumProcessModules
-# @ stub EnumProcessModulesEx
-# @ stub EnumProcesses
+@ stdcall EnumPageFilesA(ptr ptr)
+@ stdcall EnumPageFilesW(ptr ptr)
+@ stdcall EnumProcessModules(long ptr long ptr)
+@ stdcall EnumProcessModulesEx(long ptr long ptr long)
+@ stdcall EnumProcesses(ptr long ptr)
 @ stdcall EnumResourceLanguagesExA(long str str ptr long long long)
 @ stdcall EnumResourceLanguagesExW(long wstr wstr ptr long long long)
 @ stdcall EnumResourceNamesExA(long str ptr long long long)
@@ -477,10 +477,10 @@
 @ stdcall GetDateFormatA(long long ptr str ptr long) kernel32.GetDateFormatA
 @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) kernel32.GetDateFormatEx
 @ stdcall GetDateFormatW(long long ptr wstr ptr long) kernel32.GetDateFormatW
-# @ stub GetDeviceDriverBaseNameA
-# @ stub GetDeviceDriverBaseNameW
-# @ stub GetDeviceDriverFileNameA
-# @ stub GetDeviceDriverFileNameW
+@ stdcall GetDeviceDriverBaseNameA(ptr ptr long)
+@ stdcall GetDeviceDriverBaseNameW(ptr ptr long)
+@ stdcall GetDeviceDriverFileNameA(ptr ptr long)
+@ stdcall GetDeviceDriverFileNameW(ptr ptr long)
 @ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr)
 @ stdcall GetDiskFreeSpaceExA(str ptr ptr ptr)
 @ stdcall GetDiskFreeSpaceExW(wstr ptr ptr ptr)
@@ -553,20 +553,20 @@
 @ stdcall GetLogicalProcessorInformationEx(long ptr ptr)
 @ stdcall GetLongPathNameA(str ptr long)
 @ stdcall GetLongPathNameW(wstr ptr long)
-# @ stub GetMappedFileNameA
-# @ stub GetMappedFileNameW
+@ stdcall GetMappedFileNameA(long ptr ptr long)
+@ stdcall GetMappedFileNameW(long ptr ptr long)
 # @ stub GetMemoryErrorHandlingCapabilities
-# @ stub GetModuleBaseNameA
-# @ stub GetModuleBaseNameW
+@ stdcall GetModuleBaseNameA(long long ptr long)
+@ stdcall GetModuleBaseNameW(long long ptr long)
 @ stdcall GetModuleFileNameA(long ptr long)
-# @ stub GetModuleFileNameExA
-# @ stub GetModuleFileNameExW
+@ stdcall GetModuleFileNameExA(long long ptr long)
+@ stdcall GetModuleFileNameExW(long long ptr long)
 @ stdcall GetModuleFileNameW(long ptr long)
 @ stdcall GetModuleHandleA(str)
 @ stdcall GetModuleHandleExA(long ptr ptr)
 @ stdcall GetModuleHandleExW(long ptr ptr)
 @ stdcall GetModuleHandleW(wstr)
-# @ stub GetModuleInformation
+@ stdcall GetModuleInformation(long long ptr long)
 @ stdcall GetNLSVersion(long long ptr)
 @ stdcall GetNLSVersionEx(long wstr ptr)
 @ stub GetNamedLocaleHashNode
@@ -615,7 +615,7 @@
 # @ stub GetPackageTargetPlatformProperty
 # @ stub GetPackageVolumeSisPath
 # @ stub GetPackagesByPackageFamily
-# @ stub GetPerformanceInfo
+@ stdcall GetPerformanceInfo(ptr long)
 @ stdcall GetPhysicallyInstalledSystemMemory(ptr)
 # @ stub GetPreviousFgPolicyRefreshInfoInternal
 @ stdcall GetPriorityClass(long)
@@ -629,10 +629,10 @@
 @ stdcall -import GetProcessHeaps(long ptr) RtlGetProcessHeaps
 @ stdcall GetProcessId(long)
 @ stdcall GetProcessIdOfThread(long)
-# @ stub GetProcessImageFileNameA
-# @ stub GetProcessImageFileNameW
+@ stdcall GetProcessImageFileNameA(long ptr long)
+@ stdcall GetProcessImageFileNameW(long ptr long)
 # @ stub GetProcessInformation
-# @ stub GetProcessMemoryInfo
+@ stdcall GetProcessMemoryInfo(long ptr long)
 @ stdcall GetProcessMitigationPolicy(long long ptr long)
 @ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr)
 @ stdcall GetProcessPriorityBoost(long ptr)
@@ -764,8 +764,8 @@
 @ stdcall GetWindowsDirectoryA(ptr long)
 @ stdcall GetWindowsDirectoryW(ptr long)
 @ stdcall GetWriteWatch(long ptr long ptr ptr ptr)
-# @ stub GetWsChanges
-# @ stub GetWsChangesEx
+@ stdcall GetWsChanges(long ptr long)
+@ stdcall GetWsChangesEx(long ptr ptr)
 @ stdcall -arch=i386,x86_64 GetXStateFeaturesMask(ptr ptr)
 @ stdcall GlobalAlloc(long long)
 @ stdcall GlobalFree(long)
@@ -808,7 +808,7 @@
 @ stdcall InitializeCriticalSectionEx(ptr long long)
 # @ stub InitializeEnclave
 @ stdcall InitializeProcThreadAttributeList(ptr long long ptr)
-# @ stub InitializeProcessForWsWatch
+@ stdcall InitializeProcessForWsWatch(long)
 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead
 @ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock
 @ stdcall InitializeSecurityDescriptor(ptr long)
@@ -888,33 +888,33 @@
 @ stdcall IsWellKnownSid(ptr long)
 @ stdcall IsWow64Process(ptr ptr)
 @ stdcall IsWow64Process2(ptr ptr ptr)
-@ stdcall K32EmptyWorkingSet(long)
-@ stdcall K32EnumDeviceDrivers(ptr long ptr)
-@ stdcall K32EnumPageFilesA(ptr ptr)
-@ stdcall K32EnumPageFilesW(ptr ptr)
-@ stdcall K32EnumProcessModules(long ptr long ptr)
-@ stdcall K32EnumProcessModulesEx(long ptr long ptr long)
-@ stdcall K32EnumProcesses(ptr long ptr)
-@ stdcall K32GetDeviceDriverBaseNameA(ptr ptr long)
-@ stdcall K32GetDeviceDriverBaseNameW(ptr ptr long)
-@ stdcall K32GetDeviceDriverFileNameA(ptr ptr long)
-@ stdcall K32GetDeviceDriverFileNameW(ptr ptr long)
-@ stdcall K32GetMappedFileNameA(long ptr ptr long)
-@ stdcall K32GetMappedFileNameW(long ptr ptr long)
-@ stdcall K32GetModuleBaseNameA(long long ptr long)
-@ stdcall K32GetModuleBaseNameW(long long ptr long)
-@ stdcall K32GetModuleFileNameExA(long long ptr long)
-@ stdcall K32GetModuleFileNameExW(long long ptr long)
-@ stdcall K32GetModuleInformation(long long ptr long)
-@ stdcall K32GetPerformanceInfo(ptr long)
-@ stdcall K32GetProcessImageFileNameA(long ptr long)
-@ stdcall K32GetProcessImageFileNameW(long ptr long)
-@ stdcall K32GetProcessMemoryInfo(long ptr long)
-@ stdcall K32GetWsChanges(long ptr long)
-@ stdcall K32GetWsChangesEx(long ptr ptr)
-@ stdcall K32InitializeProcessForWsWatch(long)
-@ stdcall K32QueryWorkingSet(long ptr long)
-@ stdcall K32QueryWorkingSetEx(long ptr long)
+@ stdcall K32EmptyWorkingSet(long) EmptyWorkingSet
+@ stdcall K32EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers
+@ stdcall K32EnumPageFilesA(ptr ptr) EnumPageFilesA
+@ stdcall K32EnumPageFilesW(ptr ptr) EnumPageFilesW
+@ stdcall K32EnumProcessModules(long ptr long ptr) EnumProcessModules
+@ stdcall K32EnumProcessModulesEx(long ptr long ptr long) EnumProcessModulesEx
+@ stdcall K32EnumProcesses(ptr long ptr) EnumProcesses
+@ stdcall K32GetDeviceDriverBaseNameA(ptr ptr long) GetDeviceDriverBaseNameA
+@ stdcall K32GetDeviceDriverBaseNameW(ptr ptr long) GetDeviceDriverBaseNameW
+@ stdcall K32GetDeviceDriverFileNameA(ptr ptr long) GetDeviceDriverFileNameA
+@ stdcall K32GetDeviceDriverFileNameW(ptr ptr long) GetDeviceDriverFileNameW
+@ stdcall K32GetMappedFileNameA(long ptr ptr long) GetMappedFileNameA
+@ stdcall K32GetMappedFileNameW(long ptr ptr long) GetMappedFileNameW
+@ stdcall K32GetModuleBaseNameA(long long ptr long) GetModuleBaseNameA
+@ stdcall K32GetModuleBaseNameW(long long ptr long) GetModuleBaseNameW
+@ stdcall K32GetModuleFileNameExA(long long ptr long) GetModuleFileNameExA
+@ stdcall K32GetModuleFileNameExW(long long ptr long) GetModuleFileNameExW
+@ stdcall K32GetModuleInformation(long long ptr long) GetModuleInformation
+@ stdcall K32GetPerformanceInfo(ptr long) GetPerformanceInfo
+@ stdcall K32GetProcessImageFileNameA(long ptr long) GetProcessImageFileNameA
+@ stdcall K32GetProcessImageFileNameW(long ptr long) GetProcessImageFileNameW
+@ stdcall K32GetProcessMemoryInfo(long ptr long) GetProcessMemoryInfo
+@ stdcall K32GetWsChanges(long ptr long) GetWsChanges
+@ stdcall K32GetWsChangesEx(long ptr ptr) GetWsChangesEx
+@ stdcall K32InitializeProcessForWsWatch(long) InitializeProcessForWsWatch
+@ stdcall K32QueryWorkingSet(long ptr long) QueryWorkingSet
+@ stdcall K32QueryWorkingSetEx(long ptr long) QueryWorkingSetEx
 @ stub KernelBaseGetGlobalData
 @ stdcall LCIDToLocaleName(long ptr long long)
 @ stdcall LCMapStringA(long long str long ptr long)
@@ -1220,8 +1220,8 @@
 @ stdcall QueryUnbiasedInterruptTime(ptr) ntdll.RtlQueryUnbiasedInterruptTime
 # @ stub QueryUnbiasedInterruptTimePrecise
 # @ stub QueryVirtualMemoryInformation
-# @ stub QueryWorkingSet
-# @ stub QueryWorkingSetEx
+@ stdcall QueryWorkingSet(long ptr long)
+@ stdcall QueryWorkingSetEx(long ptr long)
 @ stdcall QueueUserAPC(ptr long long)
 @ stdcall QueueUserWorkItem(ptr ptr long)
 # @ stub QuirkGetData