diff --git a/generation/WinSDK/autoTypes.json b/generation/WinSDK/autoTypes.json
index 0f41cb92..4bd05fe3 100644
--- a/generation/WinSDK/autoTypes.json
+++ b/generation/WinSDK/autoTypes.json
@@ -678,6 +678,22 @@
     "InvalidHandleValues": [ -1, 0 ],
     "NativeTypedef": true
   },
+  {
+    "Namespace": "Windows.Win32.System.Threading",
+    "Name": "AVRT_TASK_HANDLE",
+    "ValueType": "void*",
+    "CloseApi": "AvRevertMmThreadCharacteristics",
+    "InvalidHandleValues": [ 0 ],
+    "NativeTypedef": false
+  },
+  {
+    "Namespace": "Windows.Win32.System.Threading",
+    "Name": "AVRT_THREAD_ORDERING_GROUP_HANDLE",
+    "ValueType": "void*",
+    "CloseApi": "AvRtDeleteThreadOrderingGroup",
+    "InvalidHandleValues": [ 0 ],
+    "NativeTypedef": false
+  },
   {
     "Namespace": "Windows.Win32.Devices.DeviceAndDriverInstallation",
     "Name": "HCMNOTIFICATION",
@@ -999,6 +1015,14 @@
     "InvalidHandleValues": [ -1, 0 ],
     "NativeTypedef": true
   },
+  {
+    "Namespace": "Windows.Win32.Networking.HttpServer",
+    "Name": "HTTP_REQUEST_QUEUE_HANDLE",
+    "ValueType": "void*",
+    "CloseApi": "HttpCloseRequestQueue",
+    "InvalidHandleValues": [ 0 ],
+    "NativeTypedef": false
+  },
   {
     "Namespace": "Windows.Win32.Globalization",
     "Name": "HSAVEDUILANGUAGES",
diff --git a/generation/WinSDK/emitter.settings.rsp b/generation/WinSDK/emitter.settings.rsp
index 6600f366..26a9526d 100644
--- a/generation/WinSDK/emitter.settings.rsp
+++ b/generation/WinSDK/emitter.settings.rsp
@@ -624,6 +624,20 @@ IAgileReference::Resolve::ppvObjectReference=[ComOutPtr]
 OpenVirtualDisk::return=WIN32_ERROR
 CreateVirtualDisk::return=WIN32_ERROR
 AttachVirtualDisk::return=WIN32_ERROR
+AvQuerySystemResponsiveness::AvrtHandle=AVRT_TASK_HANDLE
+AvRevertMmThreadCharacteristics::AvrtHandle=AVRT_TASK_HANDLE
+AvRtCreateThreadOrderingGroup::Context=AVRT_THREAD_ORDERING_GROUP_HANDLE*
+AvRtCreateThreadOrderingGroupExA::Context=AVRT_THREAD_ORDERING_GROUP_HANDLE*
+AvRtCreateThreadOrderingGroupExW::Context=AVRT_THREAD_ORDERING_GROUP_HANDLE*
+AvRtDeleteThreadOrderingGroup::Context=AVRT_THREAD_ORDERING_GROUP_HANDLE
+AvRtJoinThreadOrderingGroup::Context=AVRT_THREAD_ORDERING_GROUP_HANDLE*
+AvRtLeaveThreadOrderingGroup::Context=AVRT_THREAD_ORDERING_GROUP_HANDLE
+AvRtWaitOnThreadOrderingGroup::Context=AVRT_THREAD_ORDERING_GROUP_HANDLE
+AvSetMmMaxThreadCharacteristicsA::return=AVRT_TASK_HANDLE
+AvSetMmMaxThreadCharacteristicsW::return=AVRT_TASK_HANDLE
+AvSetMmThreadCharacteristicsA::return=AVRT_TASK_HANDLE
+AvSetMmThreadCharacteristicsW::return=AVRT_TASK_HANDLE
+AvSetMmThreadPriority::AvrtHandle=AVRT_TASK_HANDLE
 DetachVirtualDisk::return=WIN32_ERROR
 GetVirtualDiskPhysicalPath::return=WIN32_ERROR
 GetAllAttachedVirtualDiskPhysicalPaths::return=WIN32_ERROR
@@ -997,8 +1011,10 @@ IDCompositionDevice::GetFrameStatistics::statistics=[RetVal]
 IDCompositionDevice2::GetFrameStatistics::statistics=[RetVal]
 HttpAddFragmentToCache::Overlapped=[In][Out][Optional][Retained]
 HttpCancelHttpRequest::Overlapped=[In][Out][Optional][Retained]
+HttpCloseRequestQueue::RequestQueueHandle=HTTP_REQUEST_QUEUE_HANDLE
 HttpCreateRequestQueue::Flags=[Optional]
 HttpCreateRequestQueue::Name=[Optional]
+HttpCreateRequestQueue::RequestQueueHandle=HTTP_REQUEST_QUEUE_HANDLE*
 HttpCreateRequestQueue::SecurityAttributes=[Optional]
 HttpFlushResponseCache::Overlapped=[In][Out][Optional][Retained]
 HttpReadFragmentFromCache::ByteRange=[Optional]
diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
index 7c9e4292..9d7a74d4 100644
--- a/scripts/ChangesSinceLastRelease.txt
+++ b/scripts/ChangesSinceLastRelease.txt
@@ -65,6 +65,26 @@ Windows.Win32.NetworkManagement.WindowsFilteringPlatform.IPSEC_SA_CONTEXT_ENUM_H
 Windows.Win32.NetworkManagement.WindowsFilteringPlatform.IPSEC_SA_ENUM_HANDLE added
 # Make ITfCandidateListUIElement::GetPageIndex pIndex parameter optional
 Windows.Win32.UI.TextServices.ITfCandidateListUIElement.GetPageIndex : pIndex : [NativeArrayInfo(CountParamIndex=1),Out] => [NativeArrayInfo(CountParamIndex=1),Optional,Out]
+# Add synthetic handles for Av* and Http APIs
+Windows.Win32.Networking.HttpServer.Apis.HttpCloseRequestQueue : RequestQueueHandle...HANDLE => HTTP_REQUEST_QUEUE_HANDLE
+Windows.Win32.Networking.HttpServer.Apis.HttpCreateRequestQueue : RequestQueueHandle...HANDLE* => HTTP_REQUEST_QUEUE_HANDLE*
+Windows.Win32.Networking.HttpServer.HTTP_REQUEST_QUEUE_HANDLE added
+Windows.Win32.System.Threading.Apis.AvQuerySystemResponsiveness : AvrtHandle...HANDLE => AVRT_TASK_HANDLE
+Windows.Win32.System.Threading.Apis.AvRevertMmThreadCharacteristics : AvrtHandle...HANDLE => AVRT_TASK_HANDLE
+Windows.Win32.System.Threading.Apis.AvRtCreateThreadOrderingGroup : Context...HANDLE* => AVRT_THREAD_ORDERING_GROUP_HANDLE*
+Windows.Win32.System.Threading.Apis.AvRtCreateThreadOrderingGroupExA : Context...HANDLE* => AVRT_THREAD_ORDERING_GROUP_HANDLE*
+Windows.Win32.System.Threading.Apis.AvRtCreateThreadOrderingGroupExW : Context...HANDLE* => AVRT_THREAD_ORDERING_GROUP_HANDLE*
+Windows.Win32.System.Threading.Apis.AvRtDeleteThreadOrderingGroup : Context...HANDLE => AVRT_THREAD_ORDERING_GROUP_HANDLE
+Windows.Win32.System.Threading.Apis.AvRtJoinThreadOrderingGroup : Context...HANDLE* => AVRT_THREAD_ORDERING_GROUP_HANDLE*
+Windows.Win32.System.Threading.Apis.AvRtLeaveThreadOrderingGroup : Context...HANDLE => AVRT_THREAD_ORDERING_GROUP_HANDLE
+Windows.Win32.System.Threading.Apis.AvRtWaitOnThreadOrderingGroup : Context...HANDLE => AVRT_THREAD_ORDERING_GROUP_HANDLE
+Windows.Win32.System.Threading.Apis.AvSetMmMaxThreadCharacteristicsA : return...HANDLE => AVRT_TASK_HANDLE
+Windows.Win32.System.Threading.Apis.AvSetMmMaxThreadCharacteristicsW : return...HANDLE => AVRT_TASK_HANDLE
+Windows.Win32.System.Threading.Apis.AvSetMmThreadCharacteristicsA : return...HANDLE => AVRT_TASK_HANDLE
+Windows.Win32.System.Threading.Apis.AvSetMmThreadCharacteristicsW : return...HANDLE => AVRT_TASK_HANDLE
+Windows.Win32.System.Threading.Apis.AvSetMmThreadPriority : AvrtHandle...HANDLE => AVRT_TASK_HANDLE
+Windows.Win32.System.Threading.AVRT_TASK_HANDLE added
+Windows.Win32.System.Threading.AVRT_THREAD_ORDERING_GROUP_HANDLE added
 # Annotate RasEnumConnections function parameters
 Windows.Win32.NetworkManagement.Rras.Apis.RasEnumConnectionsA : param0 : [In,Optional,Out] => [In,MemorySize(BytesParamIndex=1),NativeArrayInfo(CountParamIndex=2),Optional,Out]
 Windows.Win32.NetworkManagement.Rras.Apis.RasEnumConnectionsW : param0 : [In,Optional,Out] => [In,MemorySize(BytesParamIndex=1),NativeArrayInfo(CountParamIndex=2),Optional,Out]