diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
index 7007b0e0..7cb8425d 100644
--- a/scripts/ChangesSinceLastRelease.txt
+++ b/scripts/ChangesSinceLastRelease.txt
@@ -511,3 +511,48 @@ Windows.Win32.System.Registry.Apis.CONFIGFLAG_REINSTALL removed
 Windows.Win32.System.Registry.Apis.CONFIGFLAG_REMOVED removed
 Windows.Win32.System.Registry.Apis.CONFIGFLAG_SUPPRESS_SURPRISE removed
 Windows.Win32.System.Registry.Apis.CONFIGFLAG_VERIFY_HARDWARE removed
+# Fixed #1793.
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_AcsCapabilityRegister added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_AcsCompatibleUpHierarchy added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_AcsSupport added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_AERCapabilityPresent added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_AriSupport added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_AtomicsSupported added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_AtsSupport added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_BarTypes added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_BaseClass added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_Correctable_Error_Mask added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_CurrentLinkSpeed added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_CurrentLinkWidth added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_CurrentPayloadSize added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_CurrentSpeedAndMode added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_D3ColdSupport added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_DeviceType added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_ECRC_Errors added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_Error_Reporting added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_ExpressSpecVersion added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_FirmwareErrorHandling added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_InterruptMessageMaximum added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_InterruptSupport added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_Label_Id added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_Label_String added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_MaxLinkSpeed added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_MaxLinkWidth added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_MaxPayloadSize added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_MaxReadRequestSize added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_OnPostPath added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_ParentSerialNumber added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_ProgIf added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_RequiresReservedMemoryRegion added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_RootError_Reporting added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_S0WakeupSupported added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_SerialNumber added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_SriovSupport added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_SubClass added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_SupportedLinkSubState added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_Uncorrectable_Error_Mask added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_Uncorrectable_Error_Severity added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_UsbComponentRelation added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_UsbDvsecPortSpecificAttributes added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_UsbDvsecPortType added
+Windows.Win32.NetworkManagement.WiFi.Apis.DEVPKEY_PciDevice_UsbHostRouterName added
diff --git a/sources/MetadataUtils/ConstantsScraper.cs b/sources/MetadataUtils/ConstantsScraper.cs
index 376d346a..0771da68 100644
--- a/sources/MetadataUtils/ConstantsScraper.cs
+++ b/sources/MetadataUtils/ConstantsScraper.cs
@@ -53,6 +53,10 @@ namespace MetadataUtils
                 new Regex(
                     @"^\s*(DEFINE_PCI_ROOT_BUS_DEVPKEY)\s*\(\s*(.*),\s*(.*)\s*\);");
 
+            private static readonly Regex DefinePciDeviceDevPkeyRegex =
+                new Regex(
+                    @"^\s*(DEFINE_PCI_DEVICE_DEVPKEY)\s*\(\s*(.*),\s*(.*)\s*\);");
+
             private static readonly Regex FccRegex =
                 new Regex(
                     @"FCC\(\'(.{4})\'\)");
@@ -636,6 +640,17 @@ namespace MetadataUtils
                             continue;
                         }
 
+                        Match definePciDeviceDevPkeyRegexMatch = DefinePciDeviceDevPkeyRegex.Match(line);
+                        if (definePciDeviceDevPkeyRegexMatch.Success)
+                        {
+                            defineGuidKeyword = "DEFINE_DEVPROPKEY";
+                            var guidName = definePciDeviceDevPkeyRegexMatch.Groups[2].Value;
+                            var pid = definePciDeviceDevPkeyRegexMatch.Groups[3].Value;
+                            var defineGuidLine = $"{guidName}, 0x3ab22e31, 0x8264, 0x4b4e, 0x9a, 0xf5, 0xa8, 0xd2, 0xd8, 0xe3, 0x3e, 0x62, {pid})";
+                            this.AddConstantGuid(defineGuidKeyword, currentNamespace, defineGuidLine);
+                            continue;
+                        }
+
                         line = defineRegexContinuation == null ? line : defineRegexContinuation + line;
                         if (line.EndsWith("\\"))
                         {