diff --git a/mingw-w64-headers/include/adsiid.h b/mingw-w64-headers/include/adsiid.h
index 41bf1d9..ffbf503 100644
--- a/mingw-w64-headers/include/adsiid.h
+++ b/mingw-w64-headers/include/adsiid.h
@@ -1,11 +1,13 @@
 /**
- * This file has no copyright assigned and is placed in the Public Domain.
  * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
  */
 #ifndef __ADSIID_H__
 #define __ADSIID_H__
 
+#include <winapifamily.h>
+
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -62,3 +64,5 @@
 }
 #endif
 #endif
+
+#endif
diff --git a/mingw-w64-headers/include/adsnms.h b/mingw-w64-headers/include/adsnms.h
index e0986f8..24db27c 100644
--- a/mingw-w64-headers/include/adsnms.h
+++ b/mingw-w64-headers/include/adsnms.h
@@ -1,55 +1,58 @@
 /**
- * This file has no copyright assigned and is placed in the Public Domain.
  * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
  */
+#include <winapifamily.h>
+
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define NAMESPACE_CLASS_NAME TEXT("Namespace")
-#define COUNTRY_CLASS_NAME TEXT("Country")
-#define LOCALITY_CLASS_NAME TEXT("Locality")
-#define ORGANIZATION_CLASS_NAME TEXT("Organization")
-#define ORGANIZATIONUNIT_CLASS_NAME TEXT("Organizational Unit")
-#define DOMAIN_CLASS_NAME TEXT("Domain")
-#define COMPUTER_CLASS_NAME TEXT("Computer")
-#define USER_CLASS_NAME TEXT("User")
-#define GROUP_CLASS_NAME TEXT("Group")
-#define GLOBALGROUP_CLASS_NAME TEXT("GlobalGroup")
-#define LOCALGROUP_CLASS_NAME TEXT("LocalGroup")
-#define SERVICE_CLASS_NAME TEXT("Service")
-#define FILESERVICE_CLASS_NAME TEXT("FileService")
-#define SESSION_CLASS_NAME TEXT("Session")
-#define RESOURCE_CLASS_NAME TEXT("Resource")
-#define FILESHARE_CLASS_NAME TEXT("FileShare")
-#define PRINTER_CLASS_NAME TEXT("PrintQueue")
-#define PRINTJOB_CLASS_NAME TEXT("PrintJob")
-#define SCHEMA_CLASS_NAME TEXT("Schema")
-#define CLASS_CLASS_NAME TEXT("Class")
-#define PROPERTY_CLASS_NAME TEXT("Property")
-#define SYNTAX_CLASS_NAME TEXT("Syntax")
-#define ROOTDSE_CLASS_NAME TEXT("RootDSE")
+#define NAMESPACE_CLASS_NAME TEXT ("Namespace")
+#define COUNTRY_CLASS_NAME TEXT ("Country")
+#define LOCALITY_CLASS_NAME TEXT ("Locality")
+#define ORGANIZATION_CLASS_NAME TEXT ("Organization")
+#define ORGANIZATIONUNIT_CLASS_NAME TEXT ("Organizational Unit")
+#define DOMAIN_CLASS_NAME TEXT ("Domain")
+#define COMPUTER_CLASS_NAME TEXT ("Computer")
+#define USER_CLASS_NAME TEXT ("User")
+#define GROUP_CLASS_NAME TEXT ("Group")
+#define GLOBALGROUP_CLASS_NAME TEXT ("GlobalGroup")
+#define LOCALGROUP_CLASS_NAME TEXT ("LocalGroup")
+#define SERVICE_CLASS_NAME TEXT ("Service")
+#define FILESERVICE_CLASS_NAME TEXT ("FileService")
+#define SESSION_CLASS_NAME TEXT ("Session")
+#define RESOURCE_CLASS_NAME TEXT ("Resource")
+#define FILESHARE_CLASS_NAME TEXT ("FileShare")
+#define PRINTER_CLASS_NAME TEXT ("PrintQueue")
+#define PRINTJOB_CLASS_NAME TEXT ("PrintJob")
+#define SCHEMA_CLASS_NAME TEXT ("Schema")
+#define CLASS_CLASS_NAME TEXT ("Class")
+#define PROPERTY_CLASS_NAME TEXT ("Property")
+#define SYNTAX_CLASS_NAME TEXT ("Syntax")
+#define ROOTDSE_CLASS_NAME TEXT ("RootDSE")
 
-#define NO_SCHEMA TEXT("")
-#define DOMAIN_SCHEMA_NAME TEXT("Domain")
-#define COMPUTER_SCHEMA_NAME TEXT("Computer")
-#define USER_SCHEMA_NAME TEXT("User")
-#define GROUP_SCHEMA_NAME TEXT("Group")
-#define GLOBALGROUP_SCHEMA_NAME TEXT("GlobalGroup")
-#define LOCALGROUP_SCHEMA_NAME TEXT("LocalGroup")
-#define SERVICE_SCHEMA_NAME TEXT("Service")
-#define PRINTER_SCHEMA_NAME TEXT("PrintQueue")
-#define PRINTJOB_SCHEMA_NAME TEXT("PrintJob")
-#define FILESERVICE_SCHEMA_NAME TEXT("FileService")
-#define SESSION_SCHEMA_NAME TEXT("Session")
-#define RESOURCE_SCHEMA_NAME TEXT("Resource")
-#define FILESHARE_SCHEMA_NAME TEXT("FileShare")
-#define FPNW_FILESERVICE_SCHEMA_NAME TEXT("FPNWFileService")
-#define FPNW_SESSION_SCHEMA_NAME TEXT("FPNWSession")
-#define FPNW_RESOURCE_SCHEMA_NAME TEXT("FPNWResource")
-#define FPNW_FILESHARE_SCHEMA_NAME TEXT("FPNWFileShare")
+#define NO_SCHEMA TEXT ("")
+#define DOMAIN_SCHEMA_NAME TEXT ("Domain")
+#define COMPUTER_SCHEMA_NAME TEXT ("Computer")
+#define USER_SCHEMA_NAME TEXT ("User")
+#define GROUP_SCHEMA_NAME TEXT ("Group")
+#define GLOBALGROUP_SCHEMA_NAME TEXT ("GlobalGroup")
+#define LOCALGROUP_SCHEMA_NAME TEXT ("LocalGroup")
+#define SERVICE_SCHEMA_NAME TEXT ("Service")
+#define PRINTER_SCHEMA_NAME TEXT ("PrintQueue")
+#define PRINTJOB_SCHEMA_NAME TEXT ("PrintJob")
+#define FILESERVICE_SCHEMA_NAME TEXT ("FileService")
+#define SESSION_SCHEMA_NAME TEXT ("Session")
+#define RESOURCE_SCHEMA_NAME TEXT ("Resource")
+#define FILESHARE_SCHEMA_NAME TEXT ("FileShare")
+#define FPNW_FILESERVICE_SCHEMA_NAME TEXT ("FPNWFileService")
+#define FPNW_SESSION_SCHEMA_NAME TEXT ("FPNWSession")
+#define FPNW_RESOURCE_SCHEMA_NAME TEXT ("FPNWResource")
+#define FPNW_FILESHARE_SCHEMA_NAME TEXT ("FPNWFileShare")
 
 #ifdef __cplusplus
 }
 #endif
+#endif
diff --git a/mingw-w64-headers/include/audevcod.h b/mingw-w64-headers/include/audevcod.h
new file mode 100755
index 0000000..f0afd8e
--- /dev/null
+++ b/mingw-w64-headers/include/audevcod.h
@@ -0,0 +1,35 @@
+/**
+ * This file is part of the mingw-w64 runtime package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
+ */
+#ifndef __AUDEVCOD__
+#define __AUDEVCOD__
+
+#include <winapifamily.h>
+
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+
+typedef enum _tagSND_DEVICE_ERROR {
+  SNDDEV_ERROR_Open=1,
+  SNDDEV_ERROR_Close=2,
+  SNDDEV_ERROR_GetCaps=3,
+  SNDDEV_ERROR_PrepareHeader=4,
+  SNDDEV_ERROR_UnprepareHeader=5,
+  SNDDEV_ERROR_Reset=6,
+  SNDDEV_ERROR_Restart=7,
+  SNDDEV_ERROR_GetPosition=8,
+  SNDDEV_ERROR_Write=9,
+  SNDDEV_ERROR_Pause=10,
+  SNDDEV_ERROR_Stop=11,
+  SNDDEV_ERROR_Start=12,
+  SNDDEV_ERROR_AddBuffer=13,
+  SNDDEV_ERROR_Query=14,
+} SNDDEV_ERR;
+
+#define EC_SND_DEVICE_ERROR_BASE 0x200
+
+#define EC_SNDDEV_IN_ERROR (EC_SND_DEVICE_ERROR_BASE)
+#define EC_SNDDEV_OUT_ERROR (EC_SND_DEVICE_ERROR_BASE + 1)
+#endif
+
+#endif