diff --git a/generation/WinSDK/libMappings.rsp b/generation/WinSDK/libMappings.rsp
index bd06233bd..4bac586fa 100644
--- a/generation/WinSDK/libMappings.rsp
+++ b/generation/WinSDK/libMappings.rsp
@@ -12306,14 +12306,14 @@ BthpNextRecord=BluetoothApis
 BthpRegisterForAuthentication=BluetoothApis
 BthpShouldForceAuthentication=BluetoothApis
 BthpTransposeAndExtendBytes=BluetoothApis
-BluetoothAuthenticateDevice=bthprops
-BluetoothAuthenticateDeviceEx=bthprops
-BluetoothAuthenticateMultipleDevices=bthprops
-BluetoothAuthenticationAgent=bthprops
-BluetoothDisplayDeviceProperties=bthprops
-BluetoothSelectDevices=bthprops
-BluetoothSelectDevicesFree=bthprops
-CPlApplet=bthprops
+BluetoothAuthenticateDevice=bthprops.cpl
+BluetoothAuthenticateDeviceEx=bthprops.cpl
+BluetoothAuthenticateMultipleDevices=bthprops.cpl
+BluetoothAuthenticationAgent=bthprops.cpl
+BluetoothDisplayDeviceProperties=bthprops.cpl
+BluetoothSelectDevices=bthprops.cpl
+BluetoothSelectDevicesFree=bthprops.cpl
+CPlApplet=bthprops.cpl
 CertSrvBackupClose=certadm
 CertSrvBackupEnd=certadm
 CertSrvBackupFree=certadm
@@ -15706,12 +15706,12 @@ KeyCredentialManagerFreeInformation=KeyCredMgr
 KeyCredentialManagerGetInformation=KeyCredMgr
 KeyCredentialManagerGetOperationErrorStates=KeyCredMgr
 KeyCredentialManagerShowUIOperation=KeyCredMgr
-KsGetMediaType=ksproxy
-KsGetMediaTypeCount=ksproxy
-KsGetMultiplePinFactoryItems=ksproxy
-KsOpenDefaultDevice=ksproxy
-KsResolveRequiredAttributes=ksproxy
-KsSynchronousDeviceControl=ksproxy
+KsGetMediaType=ksproxy.ax
+KsGetMediaTypeCount=ksproxy.ax
+KsGetMultiplePinFactoryItems=ksproxy.ax
+KsOpenDefaultDevice=ksproxy.ax
+KsResolveRequiredAttributes=ksproxy.ax
+KsSynchronousDeviceControl=ksproxy.ax
 KsCreateAllocator=ksuser
 KsCreateAllocator2=ksuser
 KsCreateClock=ksuser
@@ -20858,48 +20858,48 @@ OnDemandRemoveMatchingRoute=OnDemandConnRouteHelper
 OnDemandRemoveRouteRequest=OnDemandConnRouteHelper
 OnDemandUnRegisterNotification=OnDemandConnRouteHelper
 IsApiSetImplemented=api-ms-win-core-apiquery-l2-1-0
-XcvDataW=WINSPOOL
-WritePrinter=WINSPOOL
-StartDocPrinterW=WINSPOOL
-SetPrinterW=WINSPOOL
-SetPrinterDataW=WINSPOOL
-SetPrinterDataExW=WINSPOOL
-SetPrinterA=WINSPOOL
-SetJobW=WINSPOOL
-SetDefaultPrinterW=WINSPOOL
-ReportJobProcessingProgress=WINSPOOL
-OpenPrinterW=WINSPOOL
-OpenPrinterA=WINSPOOL
-InstallPrinterDriverFromPackageW=WINSPOOL
-GetPrintOutputInfo=WINSPOOL
-GetPrinterW=WINSPOOL
-GetPrinterDriverW=WINSPOOL
-GetPrinterDriverDirectoryW=WINSPOOL
-GetPrinterDataW=WINSPOOL
-GetPrinterDataExW=WINSPOOL
-GetPrinterA=WINSPOOL
-GetJobW=WINSPOOL
-GetDefaultPrinterW=WINSPOOL
-FreePrinterNotifyInfo=WINSPOOL
-EnumPrintersW=WINSPOOL
-EnumPrintersA=WINSPOOL
-EnumPrinterDriversW=WINSPOOL
-EnumPortsW=WINSPOOL
-EnumJobsW=WINSPOOL
-EndDocPrinter=WINSPOOL
-DocumentPropertiesW=WINSPOOL
-DocumentPropertiesA=WINSPOOL
-DeviceCapabilitiesW=WINSPOOL
-DeletePrinterDataW=WINSPOOL
-DeletePrinterDataExW=WINSPOOL
-DeletePrinterConnectionW=WINSPOOL
-DeletePrinter=WINSPOOL
-ClosePrinter=WINSPOOL
-AddPrinterW=WINSPOOL
-AddPrinterConnectionW=WINSPOOL
-AddPrinterConnection2W=WINSPOOL
-AddPrinterA=WINSPOOL
-AbortPrinter=WINSPOOL
+XcvDataW=winspool.drv
+WritePrinter=winspool.drv
+StartDocPrinterW=winspool.drv
+SetPrinterW=winspool.drv
+SetPrinterDataW=winspool.drv
+SetPrinterDataExW=winspool.drv
+SetPrinterA=winspool.drv
+SetJobW=winspool.drv
+SetDefaultPrinterW=winspool.drv
+ReportJobProcessingProgress=winspool.drv
+OpenPrinterW=winspool.drv
+OpenPrinterA=winspool.drv
+InstallPrinterDriverFromPackageW=winspool.drv
+GetPrintOutputInfo=winspool.drv
+GetPrinterW=winspool.drv
+GetPrinterDriverW=winspool.drv
+GetPrinterDriverDirectoryW=winspool.drv
+GetPrinterDataW=winspool.drv
+GetPrinterDataExW=winspool.drv
+GetPrinterA=winspool.drv
+GetJobW=winspool.drv
+GetDefaultPrinterW=winspool.drv
+FreePrinterNotifyInfo=winspool.drv
+EnumPrintersW=winspool.drv
+EnumPrintersA=winspool.drv
+EnumPrinterDriversW=winspool.drv
+EnumPortsW=winspool.drv
+EnumJobsW=winspool.drv
+EndDocPrinter=winspool.drv
+DocumentPropertiesW=winspool.drv
+DocumentPropertiesA=winspool.drv
+DeviceCapabilitiesW=winspool.drv
+DeletePrinterDataW=winspool.drv
+DeletePrinterDataExW=winspool.drv
+DeletePrinterConnectionW=winspool.drv
+DeletePrinter=winspool.drv
+ClosePrinter=winspool.drv
+AddPrinterW=winspool.drv
+AddPrinterConnectionW=winspool.drv
+AddPrinterConnection2W=winspool.drv
+AddPrinterA=winspool.drv
+AbortPrinter=winspool.drv
 SetWindowThemeAttribute=UXTHEME
 SetWindowTheme=UXTHEME
 RefreshImmersiveColorPolicyState=UXTHEME
@@ -23390,17 +23390,17 @@ SLGetServerStatus=slcext
 SLInstallPackage=slcext
 SLUninstallPackage=slcext
 SLIsGenuineLocal=SLWGA
-AddFormW=WINSPOOL
-AddJobW=WINSPOOL
-AddMonitorW=WINSPOOL
-AddPerMachineConnectionW=WINSPOOL
-AddPortExW=WINSPOOL
-AddPortW=WINSPOOL
+AddFormW=winspool.drv
+AddJobW=winspool.drv
+AddMonitorW=winspool.drv
+AddPerMachineConnectionW=winspool.drv
+AddPortExW=winspool.drv
+AddPortW=winspool.drv
 AddPrintDeviceObject=SPOOLSS
-AddPrintProcessorW=WINSPOOL
-AddPrintProvidorW=WINSPOOL
-AddPrinterDriverExW=WINSPOOL
-AddPrinterDriverW=WINSPOOL
+AddPrintProcessorW=winspool.drv
+AddPrintProvidorW=winspool.drv
+AddPrinterDriverExW=winspool.drv
+AddPrinterDriverW=winspool.drv
 AddPrinterExW=SPOOLSS
 AdjustPointers=SPOOLSS
 AdjustPointersInStructuresArray=SPOOLSS
@@ -23419,46 +23419,46 @@ CacheIsNameInNodeList=SPOOLSS
 CallDrvDevModeConversion=SPOOLSS
 CallRouterFindFirstPrinterChangeNotification=SPOOLSS
 CheckLocalCall=SPOOLSS
-ConfigurePortW=WINSPOOL
-CreatePrinterIC=WINSPOOL
-DeleteFormW=WINSPOOL
-DeleteJobNamedProperty=WINSPOOL
-DeleteMonitorW=WINSPOOL
-DeletePerMachineConnectionW=WINSPOOL
-DeletePortW=WINSPOOL
-DeletePrintProcessorW=WINSPOOL
-DeletePrintProvidorW=WINSPOOL
-DeletePrinterDriverExW=WINSPOOL
-DeletePrinterDriverW=WINSPOOL
-DeletePrinterIC=WINSPOOL
-DeletePrinterKeyW=WINSPOOL
+ConfigurePortW=winspool.drv
+CreatePrinterIC=winspool.drv
+DeleteFormW=winspool.drv
+DeleteJobNamedProperty=winspool.drv
+DeleteMonitorW=winspool.drv
+DeletePerMachineConnectionW=winspool.drv
+DeletePortW=winspool.drv
+DeletePrintProcessorW=winspool.drv
+DeletePrintProvidorW=winspool.drv
+DeletePrinterDriverExW=winspool.drv
+DeletePrinterDriverW=winspool.drv
+DeletePrinterIC=winspool.drv
+DeletePrinterKeyW=winspool.drv
 DllAllocSplMem=SPOOLSS
 DllAllocSplStr=SPOOLSS
 DllFreeSplMem=SPOOLSS
 DllFreeSplStr=SPOOLSS
 DllReallocSplMem=SPOOLSS
 DllReallocSplStr=SPOOLSS
-EndPagePrinter=WINSPOOL
-EnumFormsW=WINSPOOL
-EnumMonitorsW=WINSPOOL
-EnumPerMachineConnectionsW=WINSPOOL
-EnumPrintProcessorDatatypesW=WINSPOOL
-EnumPrintProcessorsW=WINSPOOL
-EnumPrinterDataExW=WINSPOOL
-EnumPrinterDataW=WINSPOOL
-EnumPrinterKeyW=WINSPOOL
-FindClosePrinterChangeNotification=WINSPOOL
-FlushPrinter=WINSPOOL
+EndPagePrinter=winspool.drv
+EnumFormsW=winspool.drv
+EnumMonitorsW=winspool.drv
+EnumPerMachineConnectionsW=winspool.drv
+EnumPrintProcessorDatatypesW=winspool.drv
+EnumPrintProcessorsW=winspool.drv
+EnumPrinterDataExW=winspool.drv
+EnumPrinterDataW=winspool.drv
+EnumPrinterKeyW=winspool.drv
+FindClosePrinterChangeNotification=winspool.drv
+FlushPrinter=winspool.drv
 FormatPrinterForRegistryKey=SPOOLSS
 FormatRegistryKeyForPrinter=SPOOLSS
 FreeOtherNames=SPOOLSS
-FreePrintPropertyValue=WINSPOOL
-GetFormW=WINSPOOL
+FreePrintPropertyValue=winspool.drv
+GetFormW=winspool.drv
 GetJobAttributes=SPOOLSS
 GetJobAttributesEx=SPOOLSS
-GetJobNamedPropertyValue=WINSPOOL
+GetJobNamedPropertyValue=winspool.drv
 GetNetworkId=SPOOLSS
-GetPrintProcessorDirectoryW=WINSPOOL
+GetPrintProcessorDirectoryW=winspool.drv
 GetPrinterDriverExW=SPOOLSS
 GetServerPolicy=SPOOLSS
 GetShrinkedSize=SPOOLSS
@@ -23476,17 +23476,17 @@ MarshallDownStructuresArray=SPOOLSS
 MarshallUpStructure=SPOOLSS
 MarshallUpStructuresArray=SPOOLSS
 OldGetPrinterDriverW=SPOOLSS
-OpenPrinter2W=WINSPOOL
+OpenPrinter2W=winspool.drv
 OpenPrinterPort2W=SPOOLSS
 PackStringToEOB=SPOOLSS
 PackStrings=SPOOLSS
 PartialReplyPrinterChangeNotification=SPOOLSS
-PlayGdiScriptOnPrinterIC=WINSPOOL
+PlayGdiScriptOnPrinterIC=winspool.drv
 PrinterHandleRundown=SPOOLSS
-PrinterMessageBoxW=WINSPOOL
+PrinterMessageBoxW=winspool.drv
 ProvidorFindClosePrinterChangeNotification=SPOOLSS
 ProvidorFindFirstPrinterChangeNotification=SPOOLSS
-ReadPrinter=WINSPOOL
+ReadPrinter=winspool.drv
 ReallocSplMem=SPOOLSS
 ReallocSplStr=SPOOLSS
 RemoteFindFirstPrinterChangeNotification=SPOOLSS
@@ -23495,7 +23495,7 @@ ReplyClosePrinter=SPOOLSS
 ReplyOpenPrinter=SPOOLSS
 ReplyPrinterChangeNotification=SPOOLSS
 ReplyPrinterChangeNotificationEx=SPOOLSS
-ResetPrinterW=WINSPOOL
+ResetPrinterW=winspool.drv
 RevertToPrinterSelf=SPOOLSS
 RouterAddPrinterConnection2=SPOOLSS
 RouterAllocBidiMem=SPOOLSS
@@ -23506,21 +23506,21 @@ RouterFindCompatibleDriver=SPOOLSS
 RouterFindFirstPrinterChangeNotification=SPOOLSS
 RouterFindNextPrinterChangeNotification=SPOOLSS
 RouterFreeBidiMem=SPOOLSS
-RouterFreeBidiResponseContainer=WINSPOOL
+RouterFreeBidiResponseContainer=winspool.drv
 RouterFreePrinterNotifyInfo=SPOOLSS
 RouterInternalGetPrinterDriver=SPOOLSS
 RouterRefreshPrinterChangeNotification=SPOOLSS
 RouterReplyPrinter=SPOOLSS
 RouterSpoolerSetPolicy=SPOOLSS
-ScheduleJob=WINSPOOL
-SeekPrinter=WINSPOOL
-SendRecvBidiData=WINSPOOL
-SetFormW=WINSPOOL
-SetJobNamedProperty=WINSPOOL
-SetPortW=WINSPOOL
+ScheduleJob=winspool.drv
+SeekPrinter=winspool.drv
+SendRecvBidiData=winspool.drv
+SetFormW=winspool.drv
+SetJobNamedProperty=winspool.drv
+SetPortW=winspool.drv
 SplCloseSpoolFileHandle=SPOOLSS
 SplCommitSpoolData=SPOOLSS
-SplDriverUnloadComplete=WINSPOOL
+SplDriverUnloadComplete=winspool.drv
 SplGetClientUserHandle=SPOOLSS
 SplGetSpoolFileInfo=SPOOLSS
 SplGetUserSidStringFromToken=SPOOLSS
@@ -23531,7 +23531,7 @@ SplProcessPnPEvent=SPOOLSS
 SplProcessSessionEvent=SPOOLSS
 SplPromptUIInUsersSession=SPOOLSS
 SplQueryUserInfo=SPOOLSS
-SplReadPrinter=WINSPOOL
+SplReadPrinter=winspool.drv
 SplRegisterForDeviceEvents=SPOOLSS
 SplRegisterForSessionEvents=SPOOLSS
 SplShutDownRouter=SPOOLSS
@@ -23545,7 +23545,7 @@ SpoolerFreePrinterNotifyInfo=SPOOLSS
 SpoolerHasInitialized=SPOOLSS
 SpoolerInit=SPOOLSS
 SpoolerRefreshPrinterChangeNotification=SPOOLSS
-StartPagePrinter=WINSPOOL
+StartPagePrinter=winspool.drv
 UndoAlignKMPtr=SPOOLSS
 UndoAlignRpcPtr=SPOOLSS
 UpdateBufferSize=SPOOLSS
@@ -23553,7 +23553,7 @@ UpdatePrintDeviceObject=SPOOLSS
 UpdatePrinterRegAll=SPOOLSS
 UpdatePrinterRegAllEx=SPOOLSS
 UpdatePrinterRegUser=SPOOLSS
-WaitForPrinterChange=WINSPOOL
+WaitForPrinterChange=winspool.drv
 WaitForSpoolerInitialization=SPOOLSS
 bGetDevModePerUser=SPOOLSS
 bSetDevModePerUser=SPOOLSS
@@ -25269,117 +25269,117 @@ SCardStatusW=WinSCard
 SCardTransmit=WinSCard
 SCardWriteCacheA=WinSCard
 SCardWriteCacheW=WinSCard
-AddFormA=WINSPOOL
-AddJobA=WINSPOOL
-AddMonitorA=WINSPOOL
-AddPerMachineConnectionA=WINSPOOL
-AddPortA=WINSPOOL
-AddPortExA=WINSPOOL
-AddPrintProcessorA=WINSPOOL
-AddPrintProvidorA=WINSPOOL
-AddPrinterConnection2A=WINSPOOL
-AddPrinterConnectionA=WINSPOOL
-AddPrinterDriverA=WINSPOOL
-AddPrinterDriverExA=WINSPOOL
-AdvancedDocumentPropertiesA=WINSPOOL
-AdvancedDocumentPropertiesW=WINSPOOL
-CloseSpoolFileHandle=WINSPOOL
-CommitSpoolData=WINSPOOL
-ConfigurePortA=WINSPOOL
-ConnectToPrinterDlg=WINSPOOL
-CorePrinterDriverInstalledA=WINSPOOL
-CorePrinterDriverInstalledW=WINSPOOL
-CreatePrintAsyncNotifyChannel=WINSPOOL
-DEVICECAPABILITIES=WINSPOOL
-DeleteFormA=WINSPOOL
-DeleteMonitorA=WINSPOOL
-DeletePerMachineConnectionA=WINSPOOL
-DeletePortA=WINSPOOL
-DeletePrintProcessorA=WINSPOOL
-DeletePrintProvidorA=WINSPOOL
-DeletePrinterConnectionA=WINSPOOL
-DeletePrinterDataA=WINSPOOL
-DeletePrinterDataExA=WINSPOOL
-DeletePrinterDriverA=WINSPOOL
-DeletePrinterDriverExA=WINSPOOL
-DeletePrinterDriverPackageA=WINSPOOL
-DeletePrinterDriverPackageW=WINSPOOL
-DeletePrinterKeyA=WINSPOOL
-DevQueryPrint=WINSPOOL
-DevQueryPrintEx=WINSPOOL
-DeviceCapabilities=WINSPOOL
-DeviceCapabilitiesA=WINSPOOL
-DevicePropertySheets=WINSPOOL
-DocumentPropertySheets=WINSPOOL
-EXTDEVICEMODE=WINSPOOL
-EnumFormsA=WINSPOOL
-EnumJobNamedProperties=WINSPOOL
-EnumJobsA=WINSPOOL
-EnumMonitorsA=WINSPOOL
-EnumPerMachineConnectionsA=WINSPOOL
-EnumPortsA=WINSPOOL
-EnumPrintProcessorDatatypesA=WINSPOOL
-EnumPrintProcessorsA=WINSPOOL
-EnumPrinterDataA=WINSPOOL
-EnumPrinterDataExA=WINSPOOL
-EnumPrinterDriversA=WINSPOOL
-EnumPrinterKeyA=WINSPOOL
-EnumPrinterPropertySheets=WINSPOOL
-ExtDeviceMode=WINSPOOL
-ExternalConnectToLd64In32Server=WINSPOOL
-FindFirstPrinterChangeNotification=WINSPOOL
-FindNextPrinterChangeNotification=WINSPOOL
-ForceUnloadDriver=WINSPOOL
-FreePrintNamedPropertyArray=WINSPOOL
-GetCorePrinterDriversA=WINSPOOL
-GetCorePrinterDriversW=WINSPOOL
-GetDefaultPrinterA=WINSPOOL
-GetFormA=WINSPOOL
-GetJobA=WINSPOOL
-GetPrintClassObject=WINSPOOL
-GetPrintExecutionData=WINSPOOL
-GetPrintProcessorDirectoryA=WINSPOOL
-GetPrinterDataA=WINSPOOL
-GetPrinterDataExA=WINSPOOL
-GetPrinterDriver2A=WINSPOOL
-GetPrinterDriver2W=WINSPOOL
-GetPrinterDriverA=WINSPOOL
-GetPrinterDriverDirectoryA=WINSPOOL
-GetPrinterDriverPackagePathA=WINSPOOL
-GetPrinterDriverPackagePathW=WINSPOOL
-GetSpoolFileHandle=WINSPOOL
-InstallPrinterDriverFromPackageA=WINSPOOL
-IsValidDevmodeA=WINSPOOL
-IsValidDevmodeW=WINSPOOL
-IsWorkflowAssociated=WINSPOOL
-LoadPrinterDriver=WINSPOOL
-OpenPrinter2A=WINSPOOL
-PrintUICreateInstance=WINSPOOL
-PrintUIWebPnpEntry=WINSPOOL
-PrintUIWebPnpPostEntry=WINSPOOL
-PrinterMessageBoxA=WINSPOOL
-PrinterProperties=WINSPOOL
-PublishPrinterA=WINSPOOL
-PublishPrinterW=WINSPOOL
-RefCntLoadDriver=WINSPOOL
-RefCntUnloadDriver=WINSPOOL
-RegisterForPrintAsyncNotifications=WINSPOOL
-ResetPrinterA=WINSPOOL
-SetDefaultPrinterA=WINSPOOL
-SetFormA=WINSPOOL
-SetJobA=WINSPOOL
-SetPortA=WINSPOOL
-SetPrintExecutionData=WINSPOOL
-SetPrinterDataA=WINSPOOL
-SetPrinterDataExA=WINSPOOL
-SetWinspoolOptions=WINSPOOL
-SpoolerPrinterEvent=WINSPOOL
-SpoolerSetPolicy=WINSPOOL
-StartDocDlgA=WINSPOOL
-StartDocPrinterA=WINSPOOL
-UnRegisterForPrintAsyncNotifications=WINSPOOL
-UploadPrinterDriverPackageA=WINSPOOL
-UploadPrinterDriverPackageW=WINSPOOL
+AddFormA=winspool.drv
+AddJobA=winspool.drv
+AddMonitorA=winspool.drv
+AddPerMachineConnectionA=winspool.drv
+AddPortA=winspool.drv
+AddPortExA=winspool.drv
+AddPrintProcessorA=winspool.drv
+AddPrintProvidorA=winspool.drv
+AddPrinterConnection2A=winspool.drv
+AddPrinterConnectionA=winspool.drv
+AddPrinterDriverA=winspool.drv
+AddPrinterDriverExA=winspool.drv
+AdvancedDocumentPropertiesA=winspool.drv
+AdvancedDocumentPropertiesW=winspool.drv
+CloseSpoolFileHandle=winspool.drv
+CommitSpoolData=winspool.drv
+ConfigurePortA=winspool.drv
+ConnectToPrinterDlg=winspool.drv
+CorePrinterDriverInstalledA=winspool.drv
+CorePrinterDriverInstalledW=winspool.drv
+CreatePrintAsyncNotifyChannel=winspool.drv
+DEVICECAPABILITIES=winspool.drv
+DeleteFormA=winspool.drv
+DeleteMonitorA=winspool.drv
+DeletePerMachineConnectionA=winspool.drv
+DeletePortA=winspool.drv
+DeletePrintProcessorA=winspool.drv
+DeletePrintProvidorA=winspool.drv
+DeletePrinterConnectionA=winspool.drv
+DeletePrinterDataA=winspool.drv
+DeletePrinterDataExA=winspool.drv
+DeletePrinterDriverA=winspool.drv
+DeletePrinterDriverExA=winspool.drv
+DeletePrinterDriverPackageA=winspool.drv
+DeletePrinterDriverPackageW=winspool.drv
+DeletePrinterKeyA=winspool.drv
+DevQueryPrint=winspool.drv
+DevQueryPrintEx=winspool.drv
+DeviceCapabilities=winspool.drv
+DeviceCapabilitiesA=winspool.drv
+DevicePropertySheets=winspool.drv
+DocumentPropertySheets=winspool.drv
+EXTDEVICEMODE=winspool.drv
+EnumFormsA=winspool.drv
+EnumJobNamedProperties=winspool.drv
+EnumJobsA=winspool.drv
+EnumMonitorsA=winspool.drv
+EnumPerMachineConnectionsA=winspool.drv
+EnumPortsA=winspool.drv
+EnumPrintProcessorDatatypesA=winspool.drv
+EnumPrintProcessorsA=winspool.drv
+EnumPrinterDataA=winspool.drv
+EnumPrinterDataExA=winspool.drv
+EnumPrinterDriversA=winspool.drv
+EnumPrinterKeyA=winspool.drv
+EnumPrinterPropertySheets=winspool.drv
+ExtDeviceMode=winspool.drv
+ExternalConnectToLd64In32Server=winspool.drv
+FindFirstPrinterChangeNotification=winspool.drv
+FindNextPrinterChangeNotification=winspool.drv
+ForceUnloadDriver=winspool.drv
+FreePrintNamedPropertyArray=winspool.drv
+GetCorePrinterDriversA=winspool.drv
+GetCorePrinterDriversW=winspool.drv
+GetDefaultPrinterA=winspool.drv
+GetFormA=winspool.drv
+GetJobA=winspool.drv
+GetPrintClassObject=winspool.drv
+GetPrintExecutionData=winspool.drv
+GetPrintProcessorDirectoryA=winspool.drv
+GetPrinterDataA=winspool.drv
+GetPrinterDataExA=winspool.drv
+GetPrinterDriver2A=winspool.drv
+GetPrinterDriver2W=winspool.drv
+GetPrinterDriverA=winspool.drv
+GetPrinterDriverDirectoryA=winspool.drv
+GetPrinterDriverPackagePathA=winspool.drv
+GetPrinterDriverPackagePathW=winspool.drv
+GetSpoolFileHandle=winspool.drv
+InstallPrinterDriverFromPackageA=winspool.drv
+IsValidDevmodeA=winspool.drv
+IsValidDevmodeW=winspool.drv
+IsWorkflowAssociated=winspool.drv
+LoadPrinterDriver=winspool.drv
+OpenPrinter2A=winspool.drv
+PrintUICreateInstance=winspool.drv
+PrintUIWebPnpEntry=winspool.drv
+PrintUIWebPnpPostEntry=winspool.drv
+PrinterMessageBoxA=winspool.drv
+PrinterProperties=winspool.drv
+PublishPrinterA=winspool.drv
+PublishPrinterW=winspool.drv
+RefCntLoadDriver=winspool.drv
+RefCntUnloadDriver=winspool.drv
+RegisterForPrintAsyncNotifications=winspool.drv
+ResetPrinterA=winspool.drv
+SetDefaultPrinterA=winspool.drv
+SetFormA=winspool.drv
+SetJobA=winspool.drv
+SetPortA=winspool.drv
+SetPrintExecutionData=winspool.drv
+SetPrinterDataA=winspool.drv
+SetPrinterDataExA=winspool.drv
+SetWinspoolOptions=winspool.drv
+SpoolerPrinterEvent=winspool.drv
+SpoolerSetPolicy=winspool.drv
+StartDocDlgA=winspool.drv
+StartDocPrinterA=winspool.drv
+UnRegisterForPrintAsyncNotifications=winspool.drv
+UploadPrinterDriverPackageA=winspool.drv
+UploadPrinterDriverPackageW=winspool.drv
 sqlite3_aggregate_context=winsqlite3
 sqlite3_aggregate_count=winsqlite3
 sqlite3_auto_extension=winsqlite3
diff --git a/generation/WinSDK/requiredNamespacesForNames.rsp b/generation/WinSDK/requiredNamespacesForNames.rsp
index 50ea7ebcd..0aa11e9c5 100644
--- a/generation/WinSDK/requiredNamespacesForNames.rsp
+++ b/generation/WinSDK/requiredNamespacesForNames.rsp
@@ -1531,6 +1531,7 @@ ACCESS_DENIED_ACE=Windows.Win32.Security
 ACCESS_DENIED_CALLBACK_ACE=Windows.Win32.Security
 ACCESS_DENIED_CALLBACK_OBJECT_ACE=Windows.Win32.Security
 ACCESS_DENIED_OBJECT_ACE=Windows.Win32.Security
+ACCESS_REASONS=Windows.Win32.Security
 ACE_HEADER=Windows.Win32.Security
 ACL_INFORMATION_CLASS=Windows.Win32.Security
 ACL_REVISION_INFORMATION=Windows.Win32.Security
@@ -1544,115 +1545,127 @@ ACTIVATION_CONTEXT_DETAILED_INFORMATION=Windows.Win32.System.ApplicationInstalla
 ACTIVATION_CONTEXT_QUERY_INDEX=Windows.Win32.System.ApplicationInstallationAndServicing
 ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION=Windows.Win32.System.ApplicationInstallationAndServicing
 ADMINISTRATOR_POWER_POLICY=Windows.Win32.System.Power
+ARM64_NT_CONTEXT=Windows.Win32.System.Diagnostics.Debug
+ARM64_NT_NEON128=Windows.Win32.System.Diagnostics.Debug
 ASSEMBLY_FILE_DETAILED_INFORMATION=Windows.Win32.System.ApplicationInstallationAndServicing
 AUDIT_EVENT_TYPE=Windows.Win32.Security
 BATTERY_REPORTING_SCALE=Windows.Win32.System.Power
 BindIoCompletionCallback=Windows.Win32.System.IO
+CACHE_DESCRIPTOR=Windows.Win32.System.SystemInformation
+CACHE_RELATIONSHIP=Windows.Win32.System.SystemInformation
+CFG_CALL_TARGET_INFO=Windows.Win32.System.Memory
 CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE=Windows.Win32.Security
 CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE=Windows.Win32.Security
 CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1=Windows.Win32.Security
 CLAIM_SECURITY_ATTRIBUTE_V1=Windows.Win32.Security
 CLAIM_SECURITY_ATTRIBUTES_INFORMATION=Windows.Win32.Security
+CM_POWER_DATA=Windows.Win32.System.Power
 COMPARTMENT_ID=Windows.Win32.System.Kernel
 COMPATIBILITY_CONTEXT_ELEMENT=Windows.Win32.System.ApplicationInstallationAndServicing
 CONTEXT=Windows.Win32.System.Diagnostics.Debug
 CORRELATION_VECTOR=Windows.Win32.System.CorrelationVector
-RTL_CORRELATION_*=Windows.Win32.System.CorrelationVector
-RtlInitializeCorrelationVector=Windows.Win32.System.CorrelationVector
-RtlIncrementCorrelationVector=Windows.Win32.System.CorrelationVector
-RtlExtendCorrelationVector=Windows.Win32.System.CorrelationVector
-RtlValidateCorrelationVector=Windows.Win32.System.CorrelationVector
+CPU_SET_INFORMATION_TYPE=Windows.Win32.System.SystemInformation
 CUSTOM_SYSTEM_EVENT_TRIGGER_CONFIG=Windows.Win32.System.WindowsProgramming
-DISPATCHER_CONTEXT=Windows.Win32.System.Diagnostics.Debug
-DISPATCHER_CONTEXT_ARM64=Windows.Win32.System.Diagnostics.Debug
+CY=Windows.Win32.System.Com
+DECIMAL=Windows.Win32.Foundation
 DEVICE_POWER_STATE=Windows.Win32.System.Power
+DISPATCHER_CONTEXT_ARM64=Windows.Win32.System.Diagnostics.Debug
+DISPATCHER_CONTEXT=Windows.Win32.System.Diagnostics.Debug
 EVENTLOGRECORD=Windows.Win32.System.EventLog
 EVENTSFORLOGFILE=Windows.Win32.System.EventLog
-XSAVE_FORMAT=Windows.Win32.System.Diagnostics.Debug
-XSAVE_AREA=Windows.Win32.System.Diagnostics.Debug
-XSTATE_CONTEXT=Windows.Win32.System.Diagnostics.Debug
 EXCEPTION_POINTERS=Windows.Win32.System.Diagnostics.Debug
 EXCEPTION_RECORD=Windows.Win32.System.Diagnostics.Debug
+EXCEPTION_RECORD32=Windows.Win32.System.Diagnostics.Debug
 EXCEPTION_RECORD64=Windows.Win32.System.Diagnostics.Debug
 EXCEPTION_REGISTRATION_RECORD=Windows.Win32.System.Kernel
-NT_TIB=Windows.Win32.System.Kernel
-ARM64_NT_CONTEXT=Windows.Win32.System.Diagnostics.Debug
-XSTATE_CONFIGURATION=Windows.Win32.System.Diagnostics.Debug
-IMAGE_ROM_HEADERS=Windows.Win32.System.Diagnostics.Debug
-IMAGE_COR20_HEADER=Windows.Win32.System.Diagnostics.Debug
 FILE_ID_128=Windows.Win32.Storage.FileSystem
 FILE_NOTIFY_EXTENDED_INFORMATION=Windows.Win32.Storage.FileSystem
 FILE_NOTIFY_INFORMATION=Windows.Win32.Storage.FileSystem
 FILE_SEGMENT_ELEMENT=Windows.Win32.Storage.FileSystem
 FIRMWARE_TYPE=Windows.Win32.System.SystemInformation
+FLOAT128=Windows.Win32.Foundation
 FLOATING_SAVE_AREA=Windows.Win32.System.Kernel
 FPO_DATA=Windows.Win32.System.Diagnostics.Debug
 GENERIC_MAPPING=Windows.Win32.Security
+GROUP_AFFINITY=Windows.Win32.System.SystemInformation
+GROUP_RELATIONSHIP=Windows.Win32.System.SystemInformation
 HARDWARE_COUNTER_DATA=Windows.Win32.System.Performance.HardwareCounterProfiling
 HARDWARE_COUNTER_TYPE=Windows.Win32.System.Performance.HardwareCounterProfiling
+HEAP_INFORMATION_CLASS=Windows.Win32.System.Memory
+IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY=Windows.Win32.System.Diagnostics.Debug
 IMAGE_COFF_SYMBOLS_HEADER=Windows.Win32.System.Diagnostics.Debug
+IMAGE_COR20_HEADER=Windows.Win32.System.Diagnostics.Debug
 IMAGE_DATA_DIRECTORY=Windows.Win32.System.Diagnostics.Debug
 IMAGE_DEBUG_DIRECTORY=Windows.Win32.System.Diagnostics.Debug
+IMAGE_DELAYLOAD_DESCRIPTOR=Windows.Win32.System.WindowsProgramming
 IMAGE_FILE_HEADER=Windows.Win32.System.Diagnostics.Debug
 IMAGE_FUNCTION_ENTRY=Windows.Win32.System.Diagnostics.Debug
 IMAGE_FUNCTION_ENTRY64=Windows.Win32.System.Diagnostics.Debug
+IMAGE_LOAD_CONFIG_CODE_INTEGRITY=Windows.Win32.System.Diagnostics.Debug
 IMAGE_LOAD_CONFIG_DIRECTORY32=Windows.Win32.System.Diagnostics.Debug
 IMAGE_LOAD_CONFIG_DIRECTORY64=Windows.Win32.System.Diagnostics.Debug
 IMAGE_NT_HEADERS32=Windows.Win32.System.Diagnostics.Debug
 IMAGE_NT_HEADERS64=Windows.Win32.System.Diagnostics.Debug
 IMAGE_OPTIONAL_HEADER32=Windows.Win32.System.Diagnostics.Debug
 IMAGE_OPTIONAL_HEADER64=Windows.Win32.System.Diagnostics.Debug
+IMAGE_ROM_HEADERS=Windows.Win32.System.Diagnostics.Debug
+IMAGE_ROM_OPTIONAL_HEADER=Windows.Win32.System.Diagnostics.Debug
+IMAGE_RUNTIME_FUNCTION_ENTRY=Windows.Win32.System.Diagnostics.Debug
 IMAGE_SECTION_HEADER=Windows.Win32.System.Diagnostics.Debug
-IMAGE_DELAYLOAD_DESCRIPTOR=Windows.Win32.System.WindowsProgramming
 IMAGE_THUNK_DATA32=Windows.Win32.System.WindowsProgramming
 IMAGE_THUNK_DATA64=Windows.Win32.System.WindowsProgramming
+IO_COUNTERS=Windows.Win32.System.Threading
 JOB_OBJECT_IO_RATE_CONTROL_FLAGS=Windows.Win32.System.JobObjects
-JOBOBJECTINFOCLASS=Windows.Win32.System.JobObjects
-JOB_SET_ARRAY=Windows.Win32.System.JobObjects
-JOBOBJECT_BASIC_LIMIT_INFORMATION=Windows.Win32.System.JobObjects
-JOBOBJECT_NOTIFICATION_LIMIT_INFORMATION=Windows.Win32.System.JobObjects
-JOBOBJECT_NOTIFICATION_LIMIT_INFORMATION_2=Windows.Win32.System.JobObjects
-JOBOBJECT_LIMIT_VIOLATION_INFORMATION=Windows.Win32.System.JobObjects
-JOBOBJECT_LIMIT_VIOLATION_INFORMATION_2=Windows.Win32.System.JobObjects
-JOBOBJECT_EXTENDED_LIMIT_INFORMATION=Windows.Win32.System.JobObjects
-JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION=Windows.Win32.System.JobObjects
-JOBOBJECT_BASIC_UI_RESTRICTIONS=Windows.Win32.System.JobObjects
-JOBOBJECT_IO_RATE_CONTROL_INFORMATION_NATIVE=Windows.Win32.System.JobObjects
-JOBOBJECT_IO_RATE_CONTROL_INFORMATION_NATIVE_V2=Windows.Win32.System.JobObjects
-JOBOBJECT_IO_RATE_CONTROL_INFORMATION_NATIVE_V3=Windows.Win32.System.JobObjects
-JOBOBJECT_BASIC_ACCOUNTING_INFORMATION=Windows.Win32.System.JobObjects
-JOBOBJECT_RATE_CONTROL_TOLERANCE=Windows.Win32.System.JobObjects
-JOBOBJECT_RATE_CONTROL_TOLERANCE_INTERVAL=Windows.Win32.System.JobObjects
 JOB_OBJECT_NET_RATE_CONTROL_FLAGS=Windows.Win32.System.JobObjects
+JOB_SET_ARRAY=Windows.Win32.System.JobObjects
 JOBOBJECT_ASSOCIATE_COMPLETION_PORT=Windows.Win32.System.JobObjects
+JOBOBJECT_BASIC_ACCOUNTING_INFORMATION=Windows.Win32.System.JobObjects
+JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION=Windows.Win32.System.JobObjects
+JOBOBJECT_BASIC_LIMIT_INFORMATION=Windows.Win32.System.JobObjects
 JOBOBJECT_BASIC_PROCESS_ID_LIST=Windows.Win32.System.JobObjects
+JOBOBJECT_BASIC_UI_RESTRICTIONS=Windows.Win32.System.JobObjects
 JOBOBJECT_CPU_RATE_CONTROL_INFORMATION=Windows.Win32.System.JobObjects
 JOBOBJECT_END_OF_JOB_TIME_INFORMATION=Windows.Win32.System.JobObjects
+JOBOBJECT_EXTENDED_LIMIT_INFORMATION=Windows.Win32.System.JobObjects
 JOBOBJECT_IO_ATTRIBUTION_CONTROL_FLAGS=Windows.Win32.System.JobObjects
 JOBOBJECT_IO_ATTRIBUTION_INFORMATION=Windows.Win32.System.JobObjects
 JOBOBJECT_IO_ATTRIBUTION_STATS=Windows.Win32.System.JobObjects
+JOBOBJECT_IO_RATE_CONTROL_INFORMATION_NATIVE_V2=Windows.Win32.System.JobObjects
+JOBOBJECT_IO_RATE_CONTROL_INFORMATION_NATIVE_V3=Windows.Win32.System.JobObjects
+JOBOBJECT_IO_RATE_CONTROL_INFORMATION_NATIVE=Windows.Win32.System.JobObjects
 JOBOBJECT_JOBSET_INFORMATION=Windows.Win32.System.JobObjects
+JOBOBJECT_LIMIT_VIOLATION_INFORMATION_2=Windows.Win32.System.JobObjects
+JOBOBJECT_LIMIT_VIOLATION_INFORMATION=Windows.Win32.System.JobObjects
 JOBOBJECT_NET_RATE_CONTROL_INFORMATION=Windows.Win32.System.JobObjects
+JOBOBJECT_NOTIFICATION_LIMIT_INFORMATION_2=Windows.Win32.System.JobObjects
+JOBOBJECT_NOTIFICATION_LIMIT_INFORMATION=Windows.Win32.System.JobObjects
+JOBOBJECT_RATE_CONTROL_TOLERANCE_INTERVAL=Windows.Win32.System.JobObjects
+JOBOBJECT_RATE_CONTROL_TOLERANCE=Windows.Win32.System.JobObjects
+JOBOBJECT_SECURITY_LIMIT_INFORMATION=Windows.Win32.System.JobObjects
+JOBOBJECTINFOCLASS=Windows.Win32.System.JobObjects
+KNONVOLATILE_CONTEXT_POINTERS_ARM64=Windows.Win32.System.Diagnostics.Debug
+KNONVOLATILE_CONTEXT_POINTERS=Windows.Win32.System.Diagnostics.Debug
+LARGE_INTEGER=Windows.Win32.Foundation
 LATENCY_TIME=Windows.Win32.System.Power
 LDT_ENTRY=Windows.Win32.System.Diagnostics.Debug
 LOGICAL_PROCESSOR_RELATIONSHIP=Windows.Win32.System.SystemInformation
-LARGE_INTEGER=Windows.Win32.Foundation
-ULARGE_INTEGER=Windows.Win32.Foundation
-LUID=Windows.Win32.Foundation
-VARIANT=Windows.Win32.System.Com
-CY=Windows.Win32.System.Com
-FLOAT128=Windows.Win32.Foundation
-DECIMAL=Windows.Win32.Foundation
-UNICODE_STRING=Windows.Win32.Foundation
 LUID_AND_ATTRIBUTES=Windows.Win32.Security
+LUID=Windows.Win32.Foundation
+M128A=Windows.Win32.System.Diagnostics.Debug
 MANDATORY_LEVEL=Windows.Win32.Security
+MEM_ADDRESS_REQUIREMENTS=Windows.Win32.System.Memory
+MEM_EXTENDED_PARAMETER_TYPE=Windows.Win32.System.Memory
+MEM_EXTENDED_PARAMETER=Windows.Win32.System.Memory
 MEMORY_BASIC_INFORMATION=Windows.Win32.System.Memory
 MEMORY_BASIC_INFORMATION32=Windows.Win32.System.Memory
 MEMORY_BASIC_INFORMATION64=Windows.Win32.System.Memory
 MESSAGE_RESOURCE_BLOCK=Windows.Win32.UI.WindowsAndMessaging
 MESSAGE_RESOURCE_DATA=Windows.Win32.UI.WindowsAndMessaging
 MESSAGE_RESOURCE_ENTRY=Windows.Win32.UI.WindowsAndMessaging
+NT_TIB=Windows.Win32.System.Kernel
+NUMA_NODE_RELATIONSHIP=Windows.Win32.System.SystemInformation
 OBJECT_TYPE_LIST=Windows.Win32.Security
+OS_DEPLOYEMENT_STATE_VALUES=Windows.Win32.System.SystemInformation
 OSVERSIONINFOA=Windows.Win32.System.SystemInformation
 OSVERSIONINFOA=Windows.Win32.System.SystemInformation
 OSVERSIONINFOEXA=Windows.Win32.System.SystemInformation
@@ -1661,74 +1674,47 @@ OSVERSIONINFOEXW=Windows.Win32.System.SystemInformation
 OSVERSIONINFOEXW=Windows.Win32.System.SystemInformation
 OSVERSIONINFOW=Windows.Win32.System.SystemInformation
 OSVERSIONINFOW=Windows.Win32.System.SystemInformation
+PAPCFUNC=Windows.Win32.Foundation
+PAPFUNC=Windows.Win32.System.Threading
+PERFORMANCE_DATA=Windows.Win32.System.Performance.HardwareCounterProfiling
 PFLS_CALLBACK_FUNCTION=Windows.Win32.System.Threading
+PGET_RUNTIME_FUNCTION_CALLBACK=Windows.Win32.System.Diagnostics.Debug
+POWER_ACTION_POLICY=Windows.Win32.System.Power
+POWER_ACTION=Windows.Win32.System.Power
 POWER_INFORMATION_LEVEL=Windows.Win32.System.Power
+POWER_PLATFORM_ROLE=Windows.Win32.System.Power
 POWER_REQUEST_TYPE=Windows.Win32.System.Power
-CM_POWER_DATA=Windows.Win32.System.Power
-SET_POWER_SETTING_VALUE=Windows.Win32.System.Power
-RTL_SRWLOCK=Windows.Win32.System.Threading
-RTL_CRITICAL_SECTION=Windows.Win32.System.Threading
-RTL_RUN_ONCE=Windows.Win32.System.Threading
-RTL_CONDITION_VARIABLE=Windows.Win32.System.Threading
-REASON_CONTEXT=Windows.Win32.System.Threading
-RTL_BARRIER=Windows.Win32.System.Threading
-SE_SECURITY_DESCRIPTOR=Windows.Win32.Security
-SE_ACCESS_REPLY=Windows.Win32.Security
-ACCESS_REASONS=Windows.Win32.Security
-SE_SID=Windows.Win32.Security
+PRIVILEGE_SET=Windows.Win32.Security
 PROCESS_DYNAMIC_EH_CONTINUATION_TARGET=Windows.Win32.System.Threading
+PROCESS_DYNAMIC_EH_CONTINUATION_TARGETS_INFORMATION=Windows.Win32.System.Threading
 PROCESS_DYNAMIC_ENFORCED_ADDRESS_RANGE=Windows.Win32.System.Threading
-WAITORTIMERCALLBACK=Windows.Win32.System.Threading
-TP_POOL_STACK_INFORMATION=Windows.Win32.System.Threading
-TP_CALLBACK_INSTANCE=Windows.Win32.System.Threading
-PTP_SIMPLE_CALLBACK=Windows.Win32.System.Threading
-TP_CALLBACK_ENVIRON_V3=Windows.Win32.System.Threading
-TP_WORK=Windows.Win32.System.Threading
-PTP_WORK_CALLBACK=Windows.Win32.System.Threading
-TP_TIMER=Windows.Win32.System.Threading
-PTP_TIMER_CALLBACK=Windows.Win32.System.Threading
-TP_WAIT=Windows.Win32.System.Threading
-PTP_WAIT_CALLBACK=Windows.Win32.System.Threading
-TP_IO=Windows.Win32.System.Threading
-IO_COUNTERS=Windows.Win32.System.Threading
-RTL_UMS_THREAD_INFO_CLASS=Windows.Win32.System.Threading
-PRTL_UMS_SCHEDULER_ENTRY_POINT=Windows.Win32.System.Threading
-SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX=Windows.Win32.System.SystemInformation
-PAPFUNC=Windows.Win32.System.Threading
+PROCESS_DYNAMIC_ENFORCED_ADDRESS_RANGES_INFORMATION=Windows.Win32.System.Threading
+PROCESS_HEAP_ENTRY=Windows.Win32.System.Memory
+PROCESS_MITIGATION_POLICY=Windows.Win32.System.Threading
 PROCESSOR_CACHE_TYPE=Windows.Win32.System.SystemInformation
-CACHE_DESCRIPTOR=Windows.Win32.System.SystemInformation
-PROCESSOR_RELATIONSHIP=Windows.Win32.System.SystemInformation
-NUMA_NODE_RELATIONSHIP=Windows.Win32.System.SystemInformation
-CACHE_RELATIONSHIP=Windows.Win32.System.SystemInformation
 PROCESSOR_GROUP_INFO=Windows.Win32.System.SystemInformation
-GROUP_RELATIONSHIP=Windows.Win32.System.SystemInformation
-STORAGE_BUS_TYPE=Windows.Win32.Storage.FileSystem
-SYSTEM_CPU_SET_INFORMATION=Windows.Win32.System.SystemInformation
-SYSTEM_POOL_ZEROING_INFORMATION=Windows.Win32.System.SystemInformation
-SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION=Windows.Win32.System.SystemInformation
-SYSTEM_PROCESS_TRUST_LABEL_ACE=Windows.Win32.Security
-SYSTEM_ACCESS_FILTER_ACE=Windows.Win32.Security
-SE_ACCESS_REQUEST=Windows.Win32.Security
-SE_ACCESS_REPLY=Windows.Win32.Security
-SE_IMPERSONATION_STATE=Windows.Win32.Security
-JOBOBJECT_SECURITY_LIMIT_INFORMATION=Windows.Win32.System.JobObjects
-SYSTEM_SUPPORTED_PROCESSOR_ARCHITECTURES_INFORMATION=Windows.Win32.System.SystemInformation
-CPU_SET_INFORMATION_TYPE=Windows.Win32.System.SystemInformation
-GROUP_AFFINITY=Windows.Win32.System.SystemInformation
-PAPCFUNC=Windows.Win32.Foundation
-PERFORMANCE_DATA=Windows.Win32.System.Performance.HardwareCounterProfiling
-POWER_ACTION_POLICY=Windows.Win32.System.Power
-POWER_ACTION=Windows.Win32.System.Power
-POWER_PLATFORM_ROLE=Windows.Win32.System.Power
-PRIVILEGE_SET=Windows.Win32.Security
 PROCESSOR_POWER_POLICY_INFO=Windows.Win32.System.Power
 PROCESSOR_POWER_POLICY=Windows.Win32.System.Power
-PROCESS_DYNAMIC_EH_CONTINUATION_TARGETS_INFORMATION=Windows.Win32.System.Threading
-PROCESS_DYNAMIC_ENFORCED_ADDRESS_RANGES_INFORMATION=Windows.Win32.System.Threading
+PROCESSOR_RELATIONSHIP=Windows.Win32.System.SystemInformation
+PRTL_UMS_SCHEDULER_ENTRY_POINT=Windows.Win32.System.Threading
 PSECURE_MEMORY_CACHE_CALLBACK=Windows.Win32.System.Memory
+PTP_CLEANUP_GROUP_CANCEL_CALLBACK=Windows.Win32.System.Threading
+PTP_SIMPLE_CALLBACK=Windows.Win32.System.Threading
+PTP_TIMER_CALLBACK=Windows.Win32.System.Threading
+PTP_WAIT_CALLBACK=Windows.Win32.System.Threading
+PTP_WORK_CALLBACK=Windows.Win32.System.Threading
 PVECTORED_EXCEPTION_HANDLER=Windows.Win32.System.Diagnostics.Debug
 QUOTA_LIMITS=Windows.Win32.Security
+REASON_CONTEXT=Windows.Win32.System.Threading
 REPARSE_GUID_DATA_BUFFER=Windows.Win32.Storage.FileSystem
+RTL_BARRIER=Windows.Win32.System.Threading
+RTL_CONDITION_VARIABLE=Windows.Win32.System.Threading
+RTL_CORRELATION_*=Windows.Win32.System.CorrelationVector
+RTL_CRITICAL_SECTION_DEBUG=Windows.Win32.System.Threading
+RTL_CRITICAL_SECTION=Windows.Win32.System.Threading
+RTL_RUN_ONCE=Windows.Win32.System.Threading
+RTL_SRWLOCK=Windows.Win32.System.Threading
+RTL_UMS_THREAD_INFO_CLASS=Windows.Win32.System.Threading
 RtlAddFunctionTable=Windows.Win32.System.Diagnostics.Debug
 RtlAddGrowableFunctionTable=Windows.Win32.System.Diagnostics.Debug
 RtlCaptureContext=Windows.Win32.System.Diagnostics.Debug
@@ -1738,8 +1724,12 @@ RtlCompareMemory=Windows.Win32.System.Memory
 RtlConvertDeviceFamilyInfoToString=Windows.Win32.System.SystemInformation
 RtlCrc32=Windows.Win32.System.Memory
 RtlCrc64=Windows.Win32.System.Memory
+RtlDeleteFunctionTable=Windows.Win32.System.Diagnostics.Debug
+RtlDeleteGrowableFunctionTable=Windows.Win32.System.Diagnostics.Debug
 RtlDrainNonVolatileFlush=Windows.Win32.System.Memory.NonVolatile
+RtlExtendCorrelationVector=Windows.Win32.System.CorrelationVector
 RtlFillNonVolatileMemory=Windows.Win32.System.Memory.NonVolatile
+RtlFirstEntrySList=Windows.Win32.System.Kernel
 RtlFlushNonVolatileMemory=Windows.Win32.System.Memory.NonVolatile
 RtlFlushNonVolatileMemoryRanges=Windows.Win32.System.Memory.NonVolatile
 RtlFreeNonVolatileToken=Windows.Win32.System.Memory.NonVolatile
@@ -1748,22 +1738,19 @@ RtlGetNonVolatileToken=Windows.Win32.System.Memory.NonVolatile
 RtlGetProductInfo=Windows.Win32.System.SystemInformation
 RtlGetReturnAddressHijackTarget=Windows.Win32.System.WindowsProgramming
 RtlGetSystemGlobalData=Windows.Win32.System.SystemInformation
-RtlIsZeroMemory=Windows.Win32.System.Memory
-RtlOsDeploymentState=Windows.Win32.System.SystemInformation
-OS_DEPLOYEMENT_STATE_VALUES=Windows.Win32.System.SystemInformation
-RtlWriteNonVolatileMemory=Windows.Win32.System.Memory.NonVolatile
-RtlDeleteFunctionTable=Windows.Win32.System.Diagnostics.Debug
-RtlDeleteGrowableFunctionTable=Windows.Win32.System.Diagnostics.Debug
 RtlGrowFunctionTable=Windows.Win32.System.Diagnostics.Debug
+RtlIncrementCorrelationVector=Windows.Win32.System.CorrelationVector
+RtlInitializeCorrelationVector=Windows.Win32.System.CorrelationVector
 RtlInitializeSListHead=Windows.Win32.System.Kernel
-RtlFirstEntrySList=Windows.Win32.System.Kernel
+RtlInstallFunctionTableCallback=Windows.Win32.System.Diagnostics.Debug
+RtlInterlockedFlushSList=Windows.Win32.System.Kernel
 RtlInterlockedPopEntrySList=Windows.Win32.System.Kernel
 RtlInterlockedPushEntrySList=Windows.Win32.System.Kernel
 RtlInterlockedPushListSListEx=Windows.Win32.System.Kernel
-RtlInterlockedFlushSList=Windows.Win32.System.Kernel
-RtlInstallFunctionTableCallback=Windows.Win32.System.Diagnostics.Debug
+RtlIsZeroMemory=Windows.Win32.System.Memory
 RtlLookupFunctionEntry=Windows.Win32.System.Diagnostics.Debug
 RtlNormalizeSecurityDescriptor=Windows.Win32.Security
+RtlOsDeploymentState=Windows.Win32.System.SystemInformation
 RtlPcToFileHeader=Windows.Win32.System.Diagnostics.Debug
 RtlQueryDepthSList=Windows.Win32.System.Kernel
 RtlRaiseCustomSystemEventTrigger=Windows.Win32.System.WindowsProgramming
@@ -1772,11 +1759,20 @@ RtlRestoreContext=Windows.Win32.System.Diagnostics.Debug
 RtlSwitchedVVI=Windows.Win32.System.SystemInformation
 RtlUnwind=Windows.Win32.System.Diagnostics.Debug
 RtlUnwindEx=Windows.Win32.System.Diagnostics.Debug
+RtlValidateCorrelationVector=Windows.Win32.System.CorrelationVector
 RtlVirtualUnwind=Windows.Win32.System.Diagnostics.Debug
+RtlWriteNonVolatileMemory=Windows.Win32.System.Memory.NonVolatile
+SE_ACCESS_REPLY=Windows.Win32.Security
+SE_ACCESS_REPLY=Windows.Win32.Security
+SE_ACCESS_REQUEST=Windows.Win32.Security
+SE_IMPERSONATION_STATE=Windows.Win32.Security
+SE_SECURITY_DESCRIPTOR=Windows.Win32.Security
+SE_SID=Windows.Win32.Security
 SECURITY_CAPABILITIES=Windows.Win32.Security
 SECURITY_DESCRIPTOR=Windows.Win32.Security
 SECURITY_IMPERSONATION_LEVEL=Windows.Win32.Security
 SECURITY_QUALITY_OF_SERVICE=Windows.Win32.Security
+SET_POWER_SETTING_VALUE=Windows.Win32.System.Power
 SID_AND_ATTRIBUTES_HASH=Windows.Win32.Security
 SID_AND_ATTRIBUTES=Windows.Win32.Security
 SID_IDENTIFIER_AUTHORITY=Windows.Win32.Security
@@ -1785,6 +1781,8 @@ SID=Windows.Win32.Security
 SINGLE_LIST_ENTRY=Windows.Win32.System.Kernel
 SLIST_ENTRY=Windows.Win32.System.Kernel
 SLIST_HEADER=Windows.Win32.System.Kernel
+STORAGE_BUS_TYPE=Windows.Win32.Storage.FileSystem
+SYSTEM_ACCESS_FILTER_ACE=Windows.Win32.Security
 SYSTEM_ALARM_ACE=Windows.Win32.Security
 SYSTEM_ALARM_CALLBACK_ACE=Windows.Win32.Security
 SYSTEM_ALARM_CALLBACK_OBJECT_ACE=Windows.Win32.Security
@@ -1794,21 +1792,31 @@ SYSTEM_AUDIT_CALLBACK_ACE=Windows.Win32.Security
 SYSTEM_AUDIT_CALLBACK_OBJECT_ACE=Windows.Win32.Security
 SYSTEM_AUDIT_OBJECT_ACE=Windows.Win32.Security
 SYSTEM_BATTERY_STATE=Windows.Win32.System.Power
+SYSTEM_CPU_SET_INFORMATION_ALLOCATED_TO_TARGET_PROCESS=Windows.Win32.System.SystemInformation
+SYSTEM_CPU_SET_INFORMATION_ALLOCATED=Windows.Win32.System.SystemInformation
+SYSTEM_CPU_SET_INFORMATION_PARKED=Windows.Win32.System.SystemInformation
+SYSTEM_CPU_SET_INFORMATION_REALTIME=Windows.Win32.System.SystemInformation
+SYSTEM_CPU_SET_INFORMATION=Windows.Win32.System.SystemInformation
+SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX=Windows.Win32.System.SystemInformation
 SYSTEM_LOGICAL_PROCESSOR_INFORMATION=Windows.Win32.System.SystemInformation
 SYSTEM_MANDATORY_LABEL_ACE=Windows.Win32.Security
+SYSTEM_POOL_ZEROING_INFORMATION=Windows.Win32.System.SystemInformation
 SYSTEM_POWER_CAPABILITIES=Windows.Win32.System.Power
 SYSTEM_POWER_CONDITION=Windows.Win32.System.Power
 SYSTEM_POWER_LEVEL=Windows.Win32.System.Power
 SYSTEM_POWER_POLICY=Windows.Win32.System.Power
 SYSTEM_POWER_STATE=Windows.Win32.System.Power
+SYSTEM_PROCESS_TRUST_LABEL_ACE=Windows.Win32.Security
+SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION=Windows.Win32.System.SystemInformation
 SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION=Windows.Win32.System.SystemInformation
 SYSTEM_RESOURCE_ATTRIBUTE_ACE=Windows.Win32.Security
 SYSTEM_SCOPED_POLICY_ID_ACE=Windows.Win32.Security
+SYSTEM_SUPPORTED_PROCESSOR_ARCHITECTURES_INFORMATION=Windows.Win32.System.SystemInformation
 TAPE_ERASE=Windows.Win32.Storage.FileSystem
-TAPE_PREPARE=Windows.Win32.Storage.FileSystem
-TAPE_WRITE_MARKS=Windows.Win32.Storage.FileSystem
 TAPE_GET_POSITION=Windows.Win32.Storage.FileSystem
+TAPE_PREPARE=Windows.Win32.Storage.FileSystem
 TAPE_SET_POSITION=Windows.Win32.Storage.FileSystem
+TAPE_WRITE_MARKS=Windows.Win32.Storage.FileSystem
 TOKEN_ACCESS_INFORMATION=Windows.Win32.Security
 TOKEN_APPCONTAINER_INFORMATION=Windows.Win32.Security
 TOKEN_AUDIT_POLICY=Windows.Win32.Security
@@ -1832,8 +1840,22 @@ TOKEN_STATISTICS=Windows.Win32.Security
 TOKEN_TYPE=Windows.Win32.Security
 TOKEN_USER_CLAIMS=Windows.Win32.Security
 TOKEN_USER=Windows.Win32.Security
+TP_CALLBACK_ENVIRON_V3=Windows.Win32.System.Threading
+TP_CALLBACK_INSTANCE=Windows.Win32.System.Threading
+TP_CALLBACK_PRIORITY=Windows.Win32.System.Threading
+TP_IO=Windows.Win32.System.Threading
+TP_POOL_STACK_INFORMATION=Windows.Win32.System.Threading
+TP_TIMER=Windows.Win32.System.Threading
+TP_WAIT=Windows.Win32.System.Threading
+TP_WORK=Windows.Win32.System.Threading
 TRANSACTION_OUTCOME=Windows.Win32.Storage.FileSystem
+ULARGE_INTEGER=Windows.Win32.Foundation
+UNICODE_STRING=Windows.Win32.Foundation
+UNWIND_HISTORY_TABLE_ENTRY=Windows.Win32.System.Diagnostics.Debug
+UNWIND_HISTORY_TABLE=Windows.Win32.System.Diagnostics.Debug
+VARIANT=Windows.Win32.System.Com
 VerSetConditionMask=Windows.Win32.System.SystemInformation
+WAITORTIMERCALLBACK=Windows.Win32.System.Threading
 WELL_KNOWN_SID_TYPE=Windows.Win32.Security
 WOW64_ARCHITECTURE_INFORMATION=Windows.Win32.System.SystemInformation
 WOW64_CONTEXT_*=Windows.Win32.System.Diagnostics.Debug
@@ -1843,33 +1865,12 @@ WOW64_FLOATING_SAVE_AREA=Windows.Win32.System.Diagnostics.Debug
 WOW64_LDT_ENTRY=Windows.Win32.System.Diagnostics.Debug
 WOW64_MAXIMUM_SUPPORTED_EXTENSION=Windows.Win32.System.Diagnostics.Debug
 WOW64_SIZE_OF_80387_REGISTERS=Windows.Win32.System.Diagnostics.Debug
-PROCESS_MITIGATION_POLICY=Windows.Win32.System.Threading
-RTL_CRITICAL_SECTION_DEBUG=Windows.Win32.System.Threading
-PTP_CLEANUP_GROUP_CANCEL_CALLBACK=Windows.Win32.System.Threading
-TP_CALLBACK_PRIORITY=Windows.Win32.System.Threading
-SYSTEM_CPU_SET_INFORMATION_PARKED=Windows.Win32.System.SystemInformation
-SYSTEM_CPU_SET_INFORMATION_ALLOCATED=Windows.Win32.System.SystemInformation
-SYSTEM_CPU_SET_INFORMATION_ALLOCATED_TO_TARGET_PROCESS=Windows.Win32.System.SystemInformation
-SYSTEM_CPU_SET_INFORMATION_REALTIME=Windows.Win32.System.SystemInformation
-IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY=Windows.Win32.System.Diagnostics.Debug
-UNWIND_HISTORY_TABLE=Windows.Win32.System.Diagnostics.Debug
-KNONVOLATILE_CONTEXT_POINTERS_ARM64=Windows.Win32.System.Diagnostics.Debug
-PGET_RUNTIME_FUNCTION_CALLBACK=Windows.Win32.System.Diagnostics.Debug
-KNONVOLATILE_CONTEXT_POINTERS=Windows.Win32.System.Diagnostics.Debug
-ARM64_NT_NEON128=Windows.Win32.System.Diagnostics.Debug
-M128A=Windows.Win32.System.Diagnostics.Debug
-IMAGE_LOAD_CONFIG_CODE_INTEGRITY=Windows.Win32.System.Diagnostics.Debug
-XSTATE_FEATURE=Windows.Win32.System.Diagnostics.Debug
 XSAVE_AREA_HEADER=Windows.Win32.System.Diagnostics.Debug
-IMAGE_ROM_OPTIONAL_HEADER=Windows.Win32.System.Diagnostics.Debug
-EXCEPTION_RECORD32=Windows.Win32.System.Diagnostics.Debug
-IMAGE_RUNTIME_FUNCTION_ENTRY=Windows.Win32.System.Diagnostics.Debug
-UNWIND_HISTORY_TABLE_ENTRY=Windows.Win32.System.Diagnostics.Debug
-HEAP_INFORMATION_CLASS=Windows.Win32.System.Memory
-PROCESS_HEAP_ENTRY=Windows.Win32.System.Memory
-CFG_CALL_TARGET_INFO=Windows.Win32.System.Memory
-MEM_EXTENDED_PARAMETER=Windows.Win32.System.Memory
-MEM_EXTENDED_PARAMETER_TYPE=Windows.Win32.System.Memory
+XSAVE_AREA=Windows.Win32.System.Diagnostics.Debug
+XSAVE_FORMAT=Windows.Win32.System.Diagnostics.Debug
+XSTATE_CONFIGURATION=Windows.Win32.System.Diagnostics.Debug
+XSTATE_CONTEXT=Windows.Win32.System.Diagnostics.Debug
+XSTATE_FEATURE=Windows.Win32.System.Diagnostics.Debug
 # endregion winnt.h (SLIST per-architecture design also defined in ntdef.h)
 # region winsock2.h
 QOS=Windows.Win32.NetworkManagement.QoS
diff --git a/scripts/BaselineWinmd/Windows.Win32.winmd b/scripts/BaselineWinmd/Windows.Win32.winmd
index edddd9f51..0e2ce1700 100644
--- a/scripts/BaselineWinmd/Windows.Win32.winmd
+++ b/scripts/BaselineWinmd/Windows.Win32.winmd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4092d6156a7f3d047ab50d176076063af20b0f7e6f47ab3436cc10f0e5c6eddf
+oid sha256:f4d531865f9701aac75a3ff82fe051d464db93b95ef99dec50a259c71286a48d
 size 16124416