diff --git a/mingw-w64-headers/include/activation.h b/mingw-w64-headers/include/activation.h
index 37b11c5..48538d2 100644
--- a/mingw-w64-headers/include/activation.h
+++ b/mingw-w64-headers/include/activation.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activation.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/activation.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/activaut.h b/mingw-w64-headers/include/activaut.h
index c79aafd..1043fe5 100644
--- a/mingw-w64-headers/include/activaut.h
+++ b/mingw-w64-headers/include/activaut.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activaut.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/activaut.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/activdbg.h b/mingw-w64-headers/include/activdbg.h
index 24fdda1..fe1371a 100644
--- a/mingw-w64-headers/include/activdbg.h
+++ b/mingw-w64-headers/include/activdbg.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activdbg.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/activdbg.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -9223,6 +9223,8 @@
 
 #endif  /* __IProvideExpressionContexts_INTERFACE_DEFINED__ */
 
+#ifndef __ProcessDebugManagerLib_LIBRARY_DEFINED__
+#define __ProcessDebugManagerLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_ProcessDebugManagerLib, 0x78a51821, 0x51f4, 0x11d0, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64);
 
@@ -9776,6 +9778,7 @@
 #endif
 #endif
 
+#endif /* __ProcessDebugManagerLib_LIBRARY_DEFINED__ */
 #endif
 #endif
 /* Begin additional prototypes for all interfaces */
diff --git a/mingw-w64-headers/include/activdbg100.h b/mingw-w64-headers/include/activdbg100.h
index 83ac56f..9cf8064 100644
--- a/mingw-w64-headers/include/activdbg100.h
+++ b/mingw-w64-headers/include/activdbg100.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activdbg100.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/activdbg100.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/activprof.h b/mingw-w64-headers/include/activprof.h
index 75ebbb0..8942ac6 100644
--- a/mingw-w64-headers/include/activprof.h
+++ b/mingw-w64-headers/include/activprof.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activprof.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/activprof.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -105,14 +105,14 @@
 DEFINE_GUID(IID_IActiveScriptProfilerControl3, 0xb403015, 0xf381, 0x4023, 0xa5, 0xd0, 0x6f, 0xed, 0x7, 0x6d, 0xe7, 0x16);
 #endif
 
-typedef enum __WIDL_activprof_generated_name_00000002 {
+typedef enum __WIDL_activprof_generated_name_0000000C {
     PROFILER_SCRIPT_TYPE_USER = 0,
     PROFILER_SCRIPT_TYPE_DYNAMIC = 1,
     PROFILER_SCRIPT_TYPE_NATIVE = 2,
     PROFILER_SCRIPT_TYPE_DOM = 3
 } PROFILER_SCRIPT_TYPE;
 
-typedef enum __WIDL_activprof_generated_name_00000003 {
+typedef enum __WIDL_activprof_generated_name_0000000D {
     PROFILER_EVENT_MASK_TRACE_SCRIPT_FUNCTION_CALL = 0x1,
     PROFILER_EVENT_MASK_TRACE_NATIVE_FUNCTION_CALL = 0x2,
     PROFILER_EVENT_MASK_TRACE_DOM_FUNCTION_CALL = 0x4,
@@ -346,7 +346,7 @@
 typedef UINT PROFILER_HEAP_OBJECT_NAME_ID;
 typedef void *PROFILER_EXTERNAL_OBJECT_ADDRESS;
 
-typedef enum __WIDL_activprof_generated_name_00000004 {
+typedef enum __WIDL_activprof_generated_name_0000000E {
     PROFILER_HEAP_OBJECT_FLAGS_NEW_OBJECT = 0x1,
     PROFILER_HEAP_OBJECT_FLAGS_IS_ROOT = 0x2,
     PROFILER_HEAP_OBJECT_FLAGS_SITE_CLOSED = 0x4,
@@ -362,7 +362,7 @@
     PROFILER_HEAP_OBJECT_FLAGS_WINRT_NAMESPACE = 0x1000
 } PROFILER_HEAP_OBJECT_FLAGS;
 
-typedef enum __WIDL_activprof_generated_name_00000005 {
+typedef enum __WIDL_activprof_generated_name_0000000F {
     PROFILER_HEAP_OBJECT_OPTIONAL_INFO_PROTOTYPE = 0x1,
     PROFILER_HEAP_OBJECT_OPTIONAL_INFO_FUNCTION_NAME = 0x2,
     PROFILER_HEAP_OBJECT_OPTIONAL_INFO_SCOPE_LIST = 0x3,
@@ -381,7 +381,7 @@
     PROFILER_HEAP_OBJECT_ID scopes[1];
 } PROFILER_HEAP_OBJECT_SCOPE_LIST;
 
-typedef enum __WIDL_activprof_generated_name_00000006 {
+typedef enum __WIDL_activprof_generated_name_00000010 {
     PROFILER_PROPERTY_TYPE_NUMBER = 0x1,
     PROFILER_PROPERTY_TYPE_STRING = 0x2,
     PROFILER_PROPERTY_TYPE_HEAP_OBJECT = 0x3,
diff --git a/mingw-w64-headers/include/activscp.h b/mingw-w64-headers/include/activscp.h
index 8d8c15e..b7230d1 100644
--- a/mingw-w64-headers/include/activscp.h
+++ b/mingw-w64-headers/include/activscp.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activscp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/activscp.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/adhoc.h b/mingw-w64-headers/include/adhoc.h
index d4cd448..4a588d3 100644
--- a/mingw-w64-headers/include/adhoc.h
+++ b/mingw-w64-headers/include/adhoc.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/adhoc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/adhoc.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -1438,6 +1438,8 @@
 
 #endif  /* __IDot11AdHocInterfaceNotificationSink_INTERFACE_DEFINED__ */
 
+#ifndef __ADHOCLib_LIBRARY_DEFINED__
+#define __ADHOCLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_ADHOCLib, 0x45357166, 0xff38, 0x4302, 0x8f,0x5c, 0xdf,0x5b,0x70,0x3a,0x6e,0x3d);
 
@@ -1454,6 +1456,7 @@
 #endif
 #endif
 
+#endif /* __ADHOCLib_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 
diff --git a/mingw-w64-headers/include/alg.h b/mingw-w64-headers/include/alg.h
index fb96c4d..4095d28 100644
--- a/mingw-w64-headers/include/alg.h
+++ b/mingw-w64-headers/include/alg.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/alg.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/alg.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -1477,6 +1477,8 @@
 
 #endif  /* __IApplicationGateway_INTERFACE_DEFINED__ */
 
+#ifndef __ALGLib_LIBRARY_DEFINED__
+#define __ALGLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_ALGLib, 0xb6d1d098, 0xe235, 0x4b99, 0xba,0x98, 0x7c,0x62,0x4f,0xd8,0x75,0xdb);
 
@@ -1584,6 +1586,7 @@
 #endif
 #endif
 
+#endif /* __ALGLib_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 
diff --git a/mingw-w64-headers/include/audioendpoints.h b/mingw-w64-headers/include/audioendpoints.h
index afc0804..6ccd4a4 100644
--- a/mingw-w64-headers/include/audioendpoints.h
+++ b/mingw-w64-headers/include/audioendpoints.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/audioendpoints.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/audioendpoints.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/audiopolicy.h b/mingw-w64-headers/include/audiopolicy.h
index 72051db..cacb7f9 100644
--- a/mingw-w64-headers/include/audiopolicy.h
+++ b/mingw-w64-headers/include/audiopolicy.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/audiopolicy.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/audiopolicy.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/comadmin.h b/mingw-w64-headers/include/comadmin.h
index 4f5be2e..3d1d574 100644
--- a/mingw-w64-headers/include/comadmin.h
+++ b/mingw-w64-headers/include/comadmin.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/comadmin.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/comadmin.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -2092,6 +2092,8 @@
 
 #endif  /* __ICatalogCollection_INTERFACE_DEFINED__ */
 
+#ifndef __COMAdmin_LIBRARY_DEFINED__
+#define __COMAdmin_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_COMAdmin, 0xf618c513, 0xdfb8, 0x11d1, 0xa2,0xcf, 0x00,0x80,0x5f,0xc7,0x92,0x35);
 
@@ -2172,6 +2174,7 @@
 
 #define COMAdminCollectionPartitions ("Partitions")
 
+#endif /* __COMAdmin_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 
diff --git a/mingw-w64-headers/include/comcat.h b/mingw-w64-headers/include/comcat.h
index c867b57..9c492e6 100644
--- a/mingw-w64-headers/include/comcat.h
+++ b/mingw-w64-headers/include/comcat.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/comcat.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/comcat.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/commoncontrols.h b/mingw-w64-headers/include/commoncontrols.h
index 39f432d..5ddd8bf 100644
--- a/mingw-w64-headers/include/commoncontrols.h
+++ b/mingw-w64-headers/include/commoncontrols.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/commoncontrols.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/commoncontrols.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -1114,6 +1114,8 @@
 
 #endif  /* __IImageList2_INTERFACE_DEFINED__ */
 
+#ifndef __CommonControlObjects_LIBRARY_DEFINED__
+#define __CommonControlObjects_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_CommonControlObjects, 0xbcada15b, 0xb428, 0x420c, 0x8d,0x28, 0x02,0x35,0x90,0x92,0x4c,0x9f);
 
@@ -1130,6 +1132,7 @@
 #endif
 #endif
 
+#endif /* __CommonControlObjects_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 
diff --git a/mingw-w64-headers/include/control.h b/mingw-w64-headers/include/control.h
index 48231e8..3144550 100644
--- a/mingw-w64-headers/include/control.h
+++ b/mingw-w64-headers/include/control.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/control.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/control.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -123,6 +123,8 @@
 #define __IAMStats_FWD_DEFINED__
 typedef struct IAMStats IAMStats;
 #endif
+#ifndef __QuartzTypeLib_LIBRARY_DEFINED__
+#define __QuartzTypeLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_QuartzTypeLib, 0x56a868b0, 0x0ad4, 0x11ce, 0xb0,0x3a, 0x00,0x20,0xaf,0x0b,0xa7,0x70);
 
@@ -1600,6 +1602,7 @@
   HRESULT WINAPI IAMStats_AddValue_Proxy(IAMStats *This,__LONG32 lIndex,double dValue);
   void __RPC_STUB IAMStats_AddValue_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);
 #endif
+#endif /* __QuartzTypeLib_LIBRARY_DEFINED__ */
 /* Begin additional prototypes for all interfaces */
 
 ULONG           __RPC_USER BSTR_UserSize     (ULONG *, ULONG, BSTR *);
diff --git a/mingw-w64-headers/include/dbgprop.h b/mingw-w64-headers/include/dbgprop.h
index 562e799..7bc9c07 100644
--- a/mingw-w64-headers/include/dbgprop.h
+++ b/mingw-w64-headers/include/dbgprop.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/dbgprop.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/dbgprop.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/dcompanimation.h b/mingw-w64-headers/include/dcompanimation.h
index 4d57175..5580797 100644
--- a/mingw-w64-headers/include/dcompanimation.h
+++ b/mingw-w64-headers/include/dcompanimation.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/dcompanimation.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/dcompanimation.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/dimm.h b/mingw-w64-headers/include/dimm.h
index 271e61b..d6aac38 100644
--- a/mingw-w64-headers/include/dimm.h
+++ b/mingw-w64-headers/include/dimm.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/dimm.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/dimm.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -131,21 +131,23 @@
 #include <winapifamily.h>
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#ifndef __ActiveIMM_LIBRARY_DEFINED__
+#define __ActiveIMM_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_ActiveIMM, 0x4955dd30, 0xb159, 0x11d0, 0x8f,0xcf, 0x00,0xaa,0x00,0x6b,0xcc,0x59);
 
 #include <imm.h>
 #if 0
 typedef WORD LANGID;
-typedef struct __WIDL_dimm_generated_name_00000002 {
+typedef struct __WIDL_dimm_generated_name_0000000C {
     LPSTR lpReading;
     LPSTR lpWord;
 } REGISTERWORDA;
-typedef struct __WIDL_dimm_generated_name_00000003 {
+typedef struct __WIDL_dimm_generated_name_0000000D {
     LPWSTR lpReading;
     LPWSTR lpWord;
 } REGISTERWORDW;
-typedef struct __WIDL_dimm_generated_name_00000004 {
+typedef struct __WIDL_dimm_generated_name_0000000E {
     LONG lfHeight;
     LONG lfWidth;
     LONG lfEscapement;
@@ -161,7 +163,7 @@
     BYTE lfPitchAndFamily;
     CHAR lfFaceName[32];
 } LOGFONTA;
-typedef struct __WIDL_dimm_generated_name_00000005 {
+typedef struct __WIDL_dimm_generated_name_0000000F {
     LONG lfHeight;
     LONG lfWidth;
     LONG lfEscapement;
@@ -179,18 +181,18 @@
 } LOGFONTW;
 typedef DWORD HIMC;
 typedef DWORD HIMCC;
-typedef struct __WIDL_dimm_generated_name_00000006 {
+typedef struct __WIDL_dimm_generated_name_00000010 {
     DWORD dwIndex;
     DWORD dwStyle;
     POINT ptCurrentPos;
     RECT rcArea;
 } CANDIDATEFORM;
-typedef struct __WIDL_dimm_generated_name_00000007 {
+typedef struct __WIDL_dimm_generated_name_00000011 {
     DWORD dwStyle;
     POINT ptCurrentPos;
     RECT rcArea;
 } COMPOSITIONFORM;
-typedef struct __WIDL_dimm_generated_name_00000008 {
+typedef struct __WIDL_dimm_generated_name_00000012 {
     DWORD dwSize;
     DWORD dwStyle;
     DWORD dwCount;
@@ -199,16 +201,16 @@
     DWORD dwPageSize;
     DWORD dwOffset[1];
 } CANDIDATELIST;
-typedef struct __WIDL_dimm_generated_name_00000009 {
+typedef struct __WIDL_dimm_generated_name_00000013 {
     DWORD dwStyle;
     CHAR szDescription[32];
 } STYLEBUFA;
-typedef struct __WIDL_dimm_generated_name_0000000A {
+typedef struct __WIDL_dimm_generated_name_00000014 {
     DWORD dwStyle;
     WCHAR szDescription[32];
 } STYLEBUFW;
 typedef WORD ATOM;
-typedef struct __WIDL_dimm_generated_name_0000000B {
+typedef struct __WIDL_dimm_generated_name_00000015 {
     UINT cbSize;
     UINT fType;
     UINT fState;
@@ -219,7 +221,7 @@
     CHAR szString[80];
     HBITMAP hbmpItem;
 } IMEMENUITEMINFOA;
-typedef struct __WIDL_dimm_generated_name_0000000C {
+typedef struct __WIDL_dimm_generated_name_00000016 {
     UINT cbSize;
     UINT fType;
     UINT fState;
@@ -232,7 +234,7 @@
 } IMEMENUITEMINFOW;
 #endif
 #ifndef _DDKIMM_H_
-typedef struct __WIDL_dimm_generated_name_0000000D {
+typedef struct __WIDL_dimm_generated_name_00000017 {
     HWND hWnd;
     WINBOOL fOpen;
     POINT ptStatusWndPos;
@@ -254,7 +256,7 @@
     DWORD fdwInit;
     DWORD dwReserve[3];
 } INPUTCONTEXT;
-typedef struct __WIDL_dimm_generated_name_0000000E {
+typedef struct __WIDL_dimm_generated_name_00000018 {
     DWORD dwPrivateDataSize;
     DWORD fdwProperty;
     DWORD fdwConversionCaps;
@@ -4001,6 +4003,7 @@
 #endif
 #endif
 
+#endif /* __ActiveIMM_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 
diff --git a/mingw-w64-headers/include/dinputd.h b/mingw-w64-headers/include/dinputd.h
index 91d4fa0..409f5bf 100644
--- a/mingw-w64-headers/include/dinputd.h
+++ b/mingw-w64-headers/include/dinputd.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.0-rc1 from dinputd.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/dinputd.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/dispex.h b/mingw-w64-headers/include/dispex.h
index 3d40f29..8057dac 100644
--- a/mingw-w64-headers/include/dispex.h
+++ b/mingw-w64-headers/include/dispex.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/dispex.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/dispex.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/dmodshow.h b/mingw-w64-headers/include/dmodshow.h
index d9f620d..1f02341 100644
--- a/mingw-w64-headers/include/dmodshow.h
+++ b/mingw-w64-headers/include/dmodshow.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from direct-x/include/dmodshow.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/dmodshow.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/docobj.h b/mingw-w64-headers/include/docobj.h
index 502d405..7bc47b3 100644
--- a/mingw-w64-headers/include/docobj.h
+++ b/mingw-w64-headers/include/docobj.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/docobj.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/docobj.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -195,7 +195,7 @@
 
 typedef IOleDocument *LPOLEDOCUMENT;
 
-typedef enum __WIDL_docobj_generated_name_00000013 {
+typedef enum __WIDL_docobj_generated_name_00000020 {
     DOCMISC_CANCREATEMULTIPLEVIEWS = 1,
     DOCMISC_SUPPORTCOMPLEXRECTANGLES = 2,
     DOCMISC_CANTOPENEDIT = 4,
@@ -856,7 +856,7 @@
 
 typedef IPrint *LPPRINT;
 
-typedef enum __WIDL_docobj_generated_name_00000014 {
+typedef enum __WIDL_docobj_generated_name_00000021 {
     PRINTFLAG_MAYBOTHERUSER = 1,
     PRINTFLAG_PROMPTUSER = 2,
     PRINTFLAG_USERMAYCHANGEPRINTER = 4,
diff --git a/mingw-w64-headers/include/docobjectservice.h b/mingw-w64-headers/include/docobjectservice.h
index 518db10..ae813a9 100644
--- a/mingw-w64-headers/include/docobjectservice.h
+++ b/mingw-w64-headers/include/docobjectservice.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.19 from include/docobjectservice.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/docobjectservice.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/documenttarget.h b/mingw-w64-headers/include/documenttarget.h
index e651f41..17b2d14 100644
--- a/mingw-w64-headers/include/documenttarget.h
+++ b/mingw-w64-headers/include/documenttarget.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/documenttarget.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/documenttarget.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -194,7 +194,7 @@
     PrintDocumentPackageCompletion_Canceled = 2,
     PrintDocumentPackageCompletion_Failed = 3
 } PrintDocumentPackageCompletion;
-typedef struct __WIDL_documenttarget_generated_name_00000013 {
+typedef struct __WIDL_documenttarget_generated_name_00000020 {
     UINT32 JobId;
     INT32 CurrentDocument;
     INT32 CurrentPage;
@@ -413,6 +413,8 @@
 #endif  /* __IPrintDocumentPackageTargetFactory_INTERFACE_DEFINED__ */
 
 #endif
+#ifndef __PrintDocumentTargetLib_LIBRARY_DEFINED__
+#define __PrintDocumentTargetLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_PrintDocumentTargetLib, 0x410d76f7, 0x8bb5, 0x4a7d, 0x9d,0x37, 0x9c,0x71,0xb1,0xb1,0x4d,0x14);
 
@@ -470,6 +472,7 @@
 #endif
 
 #endif
+#endif /* __PrintDocumentTargetLib_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 
diff --git a/mingw-w64-headers/include/dxvahd.h b/mingw-w64-headers/include/dxvahd.h
index 599036b..bacf127 100644
--- a/mingw-w64-headers/include/dxvahd.h
+++ b/mingw-w64-headers/include/dxvahd.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.0-rc1 from include/dxvahd.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/dxvahd.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/evr.h b/mingw-w64-headers/include/evr.h
index 45f6a48..936dedf 100644
--- a/mingw-w64-headers/include/evr.h
+++ b/mingw-w64-headers/include/evr.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/evr.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/evr.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/filter.h b/mingw-w64-headers/include/filter.h
index 2993842..64def55 100644
--- a/mingw-w64-headers/include/filter.h
+++ b/mingw-w64-headers/include/filter.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/filter.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/filter.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/fsrm.h b/mingw-w64-headers/include/fsrm.h
index b7dfb12..f27d000 100644
--- a/mingw-w64-headers/include/fsrm.h
+++ b/mingw-w64-headers/include/fsrm.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/fsrm.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/fsrm.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/fsrmenums.h b/mingw-w64-headers/include/fsrmenums.h
index 5e3272a..09c2cbd 100644
--- a/mingw-w64-headers/include/fsrmenums.h
+++ b/mingw-w64-headers/include/fsrmenums.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/fsrmenums.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/fsrmenums.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/fsrmquota.h b/mingw-w64-headers/include/fsrmquota.h
index 43db564..d7a5355 100644
--- a/mingw-w64-headers/include/fsrmquota.h
+++ b/mingw-w64-headers/include/fsrmquota.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/fsrmquota.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/fsrmquota.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/fsrmreports.h b/mingw-w64-headers/include/fsrmreports.h
index d8c7a48..65bf8af 100644
--- a/mingw-w64-headers/include/fsrmreports.h
+++ b/mingw-w64-headers/include/fsrmreports.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/fsrmreports.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/fsrmreports.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/fsrmscreen.h b/mingw-w64-headers/include/fsrmscreen.h
index be93c52..6bd9eb9 100644
--- a/mingw-w64-headers/include/fsrmscreen.h
+++ b/mingw-w64-headers/include/fsrmscreen.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/fsrmscreen.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/fsrmscreen.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/fwptypes.h b/mingw-w64-headers/include/fwptypes.h
index 873018c..a652b8c 100644
--- a/mingw-w64-headers/include/fwptypes.h
+++ b/mingw-w64-headers/include/fwptypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/fwptypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/fwptypes.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/hstring.h b/mingw-w64-headers/include/hstring.h
index c5f1342..5257859 100644
--- a/mingw-w64-headers/include/hstring.h
+++ b/mingw-w64-headers/include/hstring.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/hstring.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/hstring.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/icodecapi.h b/mingw-w64-headers/include/icodecapi.h
index 049e4c8..eda5f97 100644
--- a/mingw-w64-headers/include/icodecapi.h
+++ b/mingw-w64-headers/include/icodecapi.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/icodecapi.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/icodecapi.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/iketypes.h b/mingw-w64-headers/include/iketypes.h
index 8572ff4..64d97cb 100644
--- a/mingw-w64-headers/include/iketypes.h
+++ b/mingw-w64-headers/include/iketypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/iketypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/iketypes.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/inputscope.h b/mingw-w64-headers/include/inputscope.h
index 83c34ff..0d9963b 100644
--- a/mingw-w64-headers/include/inputscope.h
+++ b/mingw-w64-headers/include/inputscope.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.0-rc1 from inputscope.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/inputscope.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/inspectable.h b/mingw-w64-headers/include/inspectable.h
index 508f7ac..3e9ec10 100644
--- a/mingw-w64-headers/include/inspectable.h
+++ b/mingw-w64-headers/include/inspectable.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/inspectable.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/inspectable.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/locationapi.h b/mingw-w64-headers/include/locationapi.h
index 6f6dd6e..e8e0dc7 100644
--- a/mingw-w64-headers/include/locationapi.h
+++ b/mingw-w64-headers/include/locationapi.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/locationapi.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/locationapi.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/medparam.h b/mingw-w64-headers/include/medparam.h
index 341acd9..f221faa 100644
--- a/mingw-w64-headers/include/medparam.h
+++ b/mingw-w64-headers/include/medparam.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from direct-x/include/medparam.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/medparam.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mfidl.h b/mingw-w64-headers/include/mfidl.h
index e5143be..ffd17dc 100644
--- a/mingw-w64-headers/include/mfidl.h
+++ b/mingw-w64-headers/include/mfidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.0-rc1 from mfidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/mfidl.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mfobjects.h b/mingw-w64-headers/include/mfobjects.h
index 01f13d0..bd43efa 100644
--- a/mingw-w64-headers/include/mfobjects.h
+++ b/mingw-w64-headers/include/mfobjects.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.19 from mfobjects.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/mfobjects.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mfplay.h b/mingw-w64-headers/include/mfplay.h
index 3a711fa..6e40578 100644
--- a/mingw-w64-headers/include/mfplay.h
+++ b/mingw-w64-headers/include/mfplay.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/mfplay.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/mfplay.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mfreadwrite.h b/mingw-w64-headers/include/mfreadwrite.h
index 4c8e4e8..1193096 100644
--- a/mingw-w64-headers/include/mfreadwrite.h
+++ b/mingw-w64-headers/include/mfreadwrite.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.0-rc1 from mfreadwrite.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/mfreadwrite.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mftransform.h b/mingw-w64-headers/include/mftransform.h
index 6a5bb6f..d7e3b2d 100644
--- a/mingw-w64-headers/include/mftransform.h
+++ b/mingw-w64-headers/include/mftransform.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.0-rc1 from mftransform.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/mftransform.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mshtmhst.h b/mingw-w64-headers/include/mshtmhst.h
index 85569e5..be9157d 100644
--- a/mingw-w64-headers/include/mshtmhst.h
+++ b/mingw-w64-headers/include/mshtmhst.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/mshtmhst.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/mshtmhst.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -164,7 +164,7 @@
 STDAPI RunHTMLApplication (HINSTANCE hinst, HINSTANCE hPrevInst, LPSTR szCmdLine, int nCmdShow);
 #endif
 STDAPI CreateHTMLPropertyPage (IMoniker *pmk, IPropertyPage **ppPP);
-STDAPI EarlyStartDisplaySystem (void);
+STDAPI EarlyStartDisplaySystem ();
 STDAPI IERegisterXMLNS (LPCWSTR lpszURI, GUID clsid, BOOL fMachine);
 STDAPI IEIsXMLNSRegistered (LPCWSTR lpszURI, GUID *pCLSID);
 STDAPI GetColorValueFromString (LPCWSTR lpszColor, BOOL fStrictCSS1, BOOL fIsStandardsCSS, COLORREF *pColor);
diff --git a/mingw-w64-headers/include/mshtml.h b/mingw-w64-headers/include/mshtml.h
index b9c849c..f09b951 100644
--- a/mingw-w64-headers/include/mshtml.h
+++ b/mingw-w64-headers/include/mshtml.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.19 from include/mshtml.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/mshtml.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -10196,6 +10196,8 @@
 
 #endif  /* __IIE80DispatchEx_INTERFACE_DEFINED__ */
 
+#ifndef __MSHTML_LIBRARY_DEFINED__
+#define __MSHTML_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_MSHTML, 0x3050f1c5, 0x98b5, 0x11cf, 0xbb,0x82, 0x00,0xaa,0x00,0xbd,0xce,0x0b);
 
@@ -179856,6 +179858,7 @@
 
 #endif  /* __ITrackingProtection_INTERFACE_DEFINED__ */
 
+#endif /* __MSHTML_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 
diff --git a/mingw-w64-headers/include/msinkaut.h b/mingw-w64-headers/include/msinkaut.h
index e3829a9..677bf99 100644
--- a/mingw-w64-headers/include/msinkaut.h
+++ b/mingw-w64-headers/include/msinkaut.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/msinkaut.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/msinkaut.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msxml.h b/mingw-w64-headers/include/msxml.h
index 23884b4..f21020a 100644
--- a/mingw-w64-headers/include/msxml.h
+++ b/mingw-w64-headers/include/msxml.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/msxml.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/msxml.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/napcertrelyingparty.h b/mingw-w64-headers/include/napcertrelyingparty.h
index f078233..368682e 100644
--- a/mingw-w64-headers/include/napcertrelyingparty.h
+++ b/mingw-w64-headers/include/napcertrelyingparty.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/napcertrelyingparty.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/napcertrelyingparty.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/napcommon.h b/mingw-w64-headers/include/napcommon.h
index c8defd5..9897dcf 100644
--- a/mingw-w64-headers/include/napcommon.h
+++ b/mingw-w64-headers/include/napcommon.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/napcommon.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/napcommon.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/napenforcementclient.h b/mingw-w64-headers/include/napenforcementclient.h
index 58a635d..0e18508 100644
--- a/mingw-w64-headers/include/napenforcementclient.h
+++ b/mingw-w64-headers/include/napenforcementclient.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/napenforcementclient.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/napenforcementclient.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/napmanagement.h b/mingw-w64-headers/include/napmanagement.h
index f11306b..830ada2 100644
--- a/mingw-w64-headers/include/napmanagement.h
+++ b/mingw-w64-headers/include/napmanagement.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/napmanagement.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/napmanagement.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/napprotocol.h b/mingw-w64-headers/include/napprotocol.h
index a28302f..1975cd1 100644
--- a/mingw-w64-headers/include/napprotocol.h
+++ b/mingw-w64-headers/include/napprotocol.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/napprotocol.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/napprotocol.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/napservermanagement.h b/mingw-w64-headers/include/napservermanagement.h
index 78d37cd..bb02236 100644
--- a/mingw-w64-headers/include/napservermanagement.h
+++ b/mingw-w64-headers/include/napservermanagement.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/napservermanagement.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/napservermanagement.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/napsystemhealthagent.h b/mingw-w64-headers/include/napsystemhealthagent.h
index 2d34aed..ab7be5c 100644
--- a/mingw-w64-headers/include/napsystemhealthagent.h
+++ b/mingw-w64-headers/include/napsystemhealthagent.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/napsystemhealthagent.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/napsystemhealthagent.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/napsystemhealthvalidator.h b/mingw-w64-headers/include/napsystemhealthvalidator.h
index c3e7bdf..94c13f5 100644
--- a/mingw-w64-headers/include/napsystemhealthvalidator.h
+++ b/mingw-w64-headers/include/napsystemhealthvalidator.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/napsystemhealthvalidator.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/napsystemhealthvalidator.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/naptypes.h b/mingw-w64-headers/include/naptypes.h
index ef33d71..26199e8 100644
--- a/mingw-w64-headers/include/naptypes.h
+++ b/mingw-w64-headers/include/naptypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/naptypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/naptypes.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/netcfgn.h b/mingw-w64-headers/include/netcfgn.h
index a974b4f..fcb44cc 100644
--- a/mingw-w64-headers/include/netcfgn.h
+++ b/mingw-w64-headers/include/netcfgn.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.0-rc1 from netcfgn.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/netcfgn.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/netcfgx.h b/mingw-w64-headers/include/netcfgx.h
index b39de7a..dcb5354 100644
--- a/mingw-w64-headers/include/netcfgx.h
+++ b/mingw-w64-headers/include/netcfgx.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.0-rc1 from netcfgx.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/netcfgx.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/oaidl.h b/mingw-w64-headers/include/oaidl.h
index 243b893..6419cf6 100644
--- a/mingw-w64-headers/include/oaidl.h
+++ b/mingw-w64-headers/include/oaidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/oaidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/oaidl.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -412,7 +412,7 @@
 
 typedef struct _wireSAFEARRAY_UNION {
     ULONG sfType;
-    union {
+    union __WIDL_oaidl_generated_name_0000000E {
         SAFEARR_BSTR BstrStr;
         SAFEARR_UNKNOWN UnknownStr;
         SAFEARR_DISPATCH DispatchStr;
diff --git a/mingw-w64-headers/include/objidlbase.h b/mingw-w64-headers/include/objidlbase.h
index 4510c46..5f6fa18 100644
--- a/mingw-w64-headers/include/objidlbase.h
+++ b/mingw-w64-headers/include/objidlbase.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/objidlbase.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/objidlbase.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/ocidl.h b/mingw-w64-headers/include/ocidl.h
index a0f801a..8cffa25 100644
--- a/mingw-w64-headers/include/ocidl.h
+++ b/mingw-w64-headers/include/ocidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/ocidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/ocidl.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/oleacc.h b/mingw-w64-headers/include/oleacc.h
index 7719fd3..ae69dc4 100644
--- a/mingw-w64-headers/include/oleacc.h
+++ b/mingw-w64-headers/include/oleacc.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/oleacc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/oleacc.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/oleidl.h b/mingw-w64-headers/include/oleidl.h
index b9a9cac..41115ca 100644
--- a/mingw-w64-headers/include/oleidl.h
+++ b/mingw-w64-headers/include/oleidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/oleidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/oleidl.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/portabledevicetypes.h b/mingw-w64-headers/include/portabledevicetypes.h
index af05861..253b59d 100644
--- a/mingw-w64-headers/include/portabledevicetypes.h
+++ b/mingw-w64-headers/include/portabledevicetypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/portabledevicetypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/portabledevicetypes.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -1062,6 +1062,8 @@
 
 #endif  /* __IPortableDeviceValuesCollection_INTERFACE_DEFINED__ */
 
+#ifndef __PortableDeviceTypesLib_LIBRARY_DEFINED__
+#define __PortableDeviceTypesLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_PortableDeviceTypesLib, 0x2b00ba2f, 0xe750, 0x4beb, 0x92,0x35, 0x97,0x14,0x2e,0xde,0x1d,0x3e);
 
@@ -1078,6 +1080,7 @@
 #endif
 #endif
 
+#endif /* __PortableDeviceTypesLib_LIBRARY_DEFINED__ */
 /* Begin additional prototypes for all interfaces */
 
 ULONG           __RPC_USER BSTR_UserSize     (ULONG *, ULONG, BSTR *);
diff --git a/mingw-w64-headers/include/propidl.h b/mingw-w64-headers/include/propidl.h
index b5287e9..987ccb3 100644
--- a/mingw-w64-headers/include/propidl.h
+++ b/mingw-w64-headers/include/propidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/propidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/propidl.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/propsys.h b/mingw-w64-headers/include/propsys.h
index c5aaddd..1bb4640 100644
--- a/mingw-w64-headers/include/propsys.h
+++ b/mingw-w64-headers/include/propsys.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/propsys.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/propsys.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -4218,6 +4218,8 @@
 PSSTDAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch);
 PSSTDAPI PSUnregisterPropertySchema(PCWSTR pszPath);
 
+#ifndef __PropSysObjects_LIBRARY_DEFINED__
+#define __PropSysObjects_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_PropSysObjects, 0x2cda3294, 0x6c4f, 0x4020, 0xb1,0x61, 0x27,0xc5,0x30,0xc8,0x1f,0xa6);
 
@@ -4247,6 +4249,7 @@
 #endif
 #endif
 
+#endif /* __PropSysObjects_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 
diff --git a/mingw-w64-headers/include/qnetwork.h b/mingw-w64-headers/include/qnetwork.h
index aab4ecc..55b6a06 100644
--- a/mingw-w64-headers/include/qnetwork.h
+++ b/mingw-w64-headers/include/qnetwork.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.0-rc1 from include/qnetwork.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/qnetwork.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/regbag.h b/mingw-w64-headers/include/regbag.h
index 56f8b34..fc1b4b7 100644
--- a/mingw-w64-headers/include/regbag.h
+++ b/mingw-w64-headers/include/regbag.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/regbag.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/regbag.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/sapi51.h b/mingw-w64-headers/include/sapi51.h
index 0592443..d023550 100644
--- a/mingw-w64-headers/include/sapi51.h
+++ b/mingw-w64-headers/include/sapi51.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/sapi51.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/sapi51.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -8140,6 +8140,8 @@
 
 #endif  /* __ISpRecognizer_INTERFACE_DEFINED__ */
 
+#ifndef __SpeechLib_LIBRARY_DEFINED__
+#define __SpeechLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_SpeechLib, 0xc866ca3a, 0x32f7, 0x11d2, 0x96,0x02, 0x00,0xc0,0x4f,0x8e,0xe6,0x28);
 
@@ -19677,6 +19679,7 @@
 #endif
 #endif
 
+#endif /* __SpeechLib_LIBRARY_DEFINED__ */
 /* Begin additional prototypes for all interfaces */
 
 ULONG           __RPC_USER HWND_UserSize     (ULONG *, ULONG, HWND *);
diff --git a/mingw-w64-headers/include/sapi53.h b/mingw-w64-headers/include/sapi53.h
index f71a72a..570503a 100644
--- a/mingw-w64-headers/include/sapi53.h
+++ b/mingw-w64-headers/include/sapi53.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/sapi53.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/sapi53.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -10614,6 +10614,8 @@
 
 #endif  /* __ISpDisplayAlternates_INTERFACE_DEFINED__ */
 
+#ifndef __SpeechLib_LIBRARY_DEFINED__
+#define __SpeechLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_SpeechLib, 0xc866ca3a, 0x32f7, 0x11d2, 0x96,0x02, 0x00,0xc0,0x4f,0x8e,0xe6,0x28);
 
@@ -22980,6 +22982,7 @@
 #endif /* __cplusplus */
 #endif
 
+#endif /* __SpeechLib_LIBRARY_DEFINED__ */
 /* Begin additional prototypes for all interfaces */
 
 ULONG           __RPC_USER HWND_UserSize     (ULONG *, ULONG, HWND *);
diff --git a/mingw-w64-headers/include/sapi54.h b/mingw-w64-headers/include/sapi54.h
index 0a9cf7c..166aab0 100644
--- a/mingw-w64-headers/include/sapi54.h
+++ b/mingw-w64-headers/include/sapi54.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/sapi54.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/sapi54.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -10852,6 +10852,8 @@
 
 #endif  /* __ISpDisplayAlternates_INTERFACE_DEFINED__ */
 
+#ifndef __SpeechLib_LIBRARY_DEFINED__
+#define __SpeechLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_SpeechLib, 0xc866ca3a, 0x32f7, 0x11d2, 0x96,0x02, 0x00,0xc0,0x4f,0x8e,0xe6,0x28);
 
@@ -23218,6 +23220,7 @@
 #endif /* __cplusplus */
 #endif
 
+#endif /* __SpeechLib_LIBRARY_DEFINED__ */
 /* Begin additional prototypes for all interfaces */
 
 ULONG           __RPC_USER HWND_UserSize     (ULONG *, ULONG, HWND *);
diff --git a/mingw-w64-headers/include/sensorsapi.h b/mingw-w64-headers/include/sensorsapi.h
index 2d598c0..36b8e6e 100644
--- a/mingw-w64-headers/include/sensorsapi.h
+++ b/mingw-w64-headers/include/sensorsapi.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/sensorsapi.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/sensorsapi.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -86,7 +86,7 @@
 extern "C" {
 #endif
 
-typedef enum __WIDL_sensorsapi_generated_name_00000013 {
+typedef enum __WIDL_sensorsapi_generated_name_00000020 {
     SENSOR_STATE_MIN = 0,
     SENSOR_STATE_READY = SENSOR_STATE_MIN,
     SENSOR_STATE_NOT_AVAILABLE = SENSOR_STATE_READY + 1,
@@ -96,7 +96,7 @@
     SENSOR_STATE_ERROR = SENSOR_STATE_ACCESS_DENIED + 1,
     SENSOR_STATE_MAX = SENSOR_STATE_ERROR
 } SensorState;
-typedef enum __WIDL_sensorsapi_generated_name_00000014 {
+typedef enum __WIDL_sensorsapi_generated_name_00000021 {
     SENSOR_CONNECTION_TYPE_PC_INTEGRATED = 0,
     SENSOR_CONNECTION_TYPE_PC_ATTACHED = SENSOR_CONNECTION_TYPE_PC_INTEGRATED + 1,
     SENSOR_CONNECTION_TYPE_PC_EXTERNAL = SENSOR_CONNECTION_TYPE_PC_ATTACHED + 1
@@ -960,6 +960,8 @@
 
 #endif  /* __ISensorEvents_INTERFACE_DEFINED__ */
 
+#ifndef __SensorsApiLib_LIBRARY_DEFINED__
+#define __SensorsApiLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_SensorsApiLib, 0x15092592, 0x5270, 0x4c6c, 0xaa,0xa0, 0x11,0x76,0x4f,0x18,0x9a,0x8f);
 
@@ -976,6 +978,7 @@
 #endif
 #endif
 
+#endif /* __SensorsApiLib_LIBRARY_DEFINED__ */
 /* Begin additional prototypes for all interfaces */
 
 ULONG           __RPC_USER HWND_UserSize     (ULONG *, ULONG, HWND *);
diff --git a/mingw-w64-headers/include/servprov.h b/mingw-w64-headers/include/servprov.h
index b13a5c4..7875add 100644
--- a/mingw-w64-headers/include/servprov.h
+++ b/mingw-w64-headers/include/servprov.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/servprov.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/servprov.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/shldisp.h b/mingw-w64-headers/include/shldisp.h
index 3ade29f..f581129 100644
--- a/mingw-w64-headers/include/shldisp.h
+++ b/mingw-w64-headers/include/shldisp.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/shldisp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/shldisp.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -388,6 +388,8 @@
 #endif /* __cplusplus */
 #endif
 
+#ifndef __Shell32_LIBRARY_DEFINED__
+#define __Shell32_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_Shell32, 0x50a7e9b0, 0x70ef, 0x11d1, 0xb7,0x5a, 0x00,0xa0,0xc9,0x05,0x64,0xfe);
 
@@ -7543,6 +7545,7 @@
 
 #endif  /* __INewWDEvents_INTERFACE_DEFINED__ */
 
+#endif /* __Shell32_LIBRARY_DEFINED__ */
 /*****************************************************************************
  * IAutoComplete interface
  */
diff --git a/mingw-w64-headers/include/shobjidl.h b/mingw-w64-headers/include/shobjidl.h
index 7c60452..af88408 100644
--- a/mingw-w64-headers/include/shobjidl.h
+++ b/mingw-w64-headers/include/shobjidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/shobjidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/shobjidl.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -31907,6 +31907,8 @@
 
 #endif
 
+#ifndef __ShellObjects_LIBRARY_DEFINED__
+#define __ShellObjects_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_ShellObjects, 0x50a7e9b1, 0x70ef, 0x11d1, 0xb7,0x5a, 0x00,0xa0,0xc9,0x05,0x64,0xfe);
 
@@ -32795,6 +32797,7 @@
 #endif
 #endif
 
+#endif /* __ShellObjects_LIBRARY_DEFINED__ */
 
 #if NTDDI_VERSION >= NTDDI_VISTA
   SHSTDAPI SHGetTemporaryPropertyForItem(IShellItem *psi, REFPROPERTYKEY propkey, PROPVARIANT *ppropvar);
diff --git a/mingw-w64-headers/include/shtypes.h b/mingw-w64-headers/include/shtypes.h
index cd11186..35853c7 100644
--- a/mingw-w64-headers/include/shtypes.h
+++ b/mingw-w64-headers/include/shtypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.5 from shtypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/shtypes.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/strmif.h b/mingw-w64-headers/include/strmif.h
index b05d572..4e26cb9 100644
--- a/mingw-w64-headers/include/strmif.h
+++ b/mingw-w64-headers/include/strmif.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.0-rc1 from include/strmif.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/strmif.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/structuredquerycondition.h b/mingw-w64-headers/include/structuredquerycondition.h
index f24a8fc..79720f9 100644
--- a/mingw-w64-headers/include/structuredquerycondition.h
+++ b/mingw-w64-headers/include/structuredquerycondition.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/structuredquerycondition.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/structuredquerycondition.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/textstor.h b/mingw-w64-headers/include/textstor.h
index 6da0b86..ceeb6f0 100644
--- a/mingw-w64-headers/include/textstor.h
+++ b/mingw-w64-headers/include/textstor.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/textstor.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/textstor.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -102,12 +102,12 @@
 
 #define GXFPF_NEAREST (0x2)
 
-typedef enum __WIDL_textstor_generated_name_00000002 {
+typedef enum __WIDL_textstor_generated_name_0000000F {
     TS_AE_NONE = 0,
     TS_AE_START = 1,
     TS_AE_END = 2
 } TsActiveSelEnd;
-typedef enum __WIDL_textstor_generated_name_00000003 {
+typedef enum __WIDL_textstor_generated_name_00000010 {
     TS_RT_PLAIN = 0,
     TS_RT_HIDDEN = 1,
     TS_RT_OPAQUE = 2
@@ -152,7 +152,7 @@
 
 #define TS_ATTR_FIND_HIDDEN (0x20)
 
-typedef enum __WIDL_textstor_generated_name_00000004 {
+typedef enum __WIDL_textstor_generated_name_00000011 {
     TS_LC_CREATE = 0,
     TS_LC_CHANGE = 1,
     TS_LC_DESTROY = 2
diff --git a/mingw-w64-headers/include/tlbref.h b/mingw-w64-headers/include/tlbref.h
index 8e9d6c0..eb48f17 100644
--- a/mingw-w64-headers/include/tlbref.h
+++ b/mingw-w64-headers/include/tlbref.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/tlbref.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/tlbref.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/tlogstg.h b/mingw-w64-headers/include/tlogstg.h
index 5d7605b..76aec33 100644
--- a/mingw-w64-headers/include/tlogstg.h
+++ b/mingw-w64-headers/include/tlogstg.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/tlogstg.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/tlogstg.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/tpcshrd.h b/mingw-w64-headers/include/tpcshrd.h
index e9e4dac..3ba4a82 100644
--- a/mingw-w64-headers/include/tpcshrd.h
+++ b/mingw-w64-headers/include/tpcshrd.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/tpcshrd.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/tpcshrd.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/uianimation.h b/mingw-w64-headers/include/uianimation.h
index 3831ab3..e759107 100644
--- a/mingw-w64-headers/include/uianimation.h
+++ b/mingw-w64-headers/include/uianimation.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/uianimation.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/uianimation.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -602,14 +602,14 @@
 #endif
 
 typedef DOUBLE UI_ANIMATION_SECONDS;
-typedef enum __WIDL_uianimation_generated_name_00000002 {
+typedef enum __WIDL_uianimation_generated_name_0000000C {
     UI_ANIMATION_SCHEDULING_UNEXPECTED_FAILURE = 0,
     UI_ANIMATION_SCHEDULING_INSUFFICIENT_PRIORITY = 1,
     UI_ANIMATION_SCHEDULING_ALREADY_SCHEDULED = 2,
     UI_ANIMATION_SCHEDULING_SUCCEEDED = 3,
     UI_ANIMATION_SCHEDULING_DEFERRED = 4
 } UI_ANIMATION_SCHEDULING_RESULT;
-typedef enum __WIDL_uianimation_generated_name_00000003 {
+typedef enum __WIDL_uianimation_generated_name_0000000D {
     UI_ANIMATION_STORYBOARD_BUILDING = 0,
     UI_ANIMATION_STORYBOARD_SCHEDULED = 1,
     UI_ANIMATION_STORYBOARD_CANCELLED = 2,
@@ -619,52 +619,52 @@
     UI_ANIMATION_STORYBOARD_READY = 6,
     UI_ANIMATION_STORYBOARD_INSUFFICIENT_PRIORITY = 7
 } UI_ANIMATION_STORYBOARD_STATUS;
-typedef enum __WIDL_uianimation_generated_name_00000004 {
+typedef enum __WIDL_uianimation_generated_name_0000000E {
     UI_ANIMATION_ROUNDING_NEAREST = 0,
     UI_ANIMATION_ROUNDING_FLOOR = 1,
     UI_ANIMATION_ROUNDING_CEILING = 2
 } UI_ANIMATION_ROUNDING_MODE;
-typedef enum __WIDL_uianimation_generated_name_00000005 {
+typedef enum __WIDL_uianimation_generated_name_0000000F {
     UI_ANIMATION_UPDATE_NO_CHANGE = 0,
     UI_ANIMATION_UPDATE_VARIABLES_CHANGED = 1
 } UI_ANIMATION_UPDATE_RESULT;
-typedef enum __WIDL_uianimation_generated_name_00000006 {
+typedef enum __WIDL_uianimation_generated_name_00000010 {
     UI_ANIMATION_MANAGER_IDLE = 0,
     UI_ANIMATION_MANAGER_BUSY = 1
 } UI_ANIMATION_MANAGER_STATUS;
-typedef enum __WIDL_uianimation_generated_name_00000007 {
+typedef enum __WIDL_uianimation_generated_name_00000011 {
     UI_ANIMATION_MODE_DISABLED = 0,
     UI_ANIMATION_MODE_SYSTEM_DEFAULT = 1,
     UI_ANIMATION_MODE_ENABLED = 2
 } UI_ANIMATION_MODE;
-typedef enum __WIDL_uianimation_generated_name_00000008 {
+typedef enum __WIDL_uianimation_generated_name_00000012 {
     UI_ANIMATION_PRIORITY_EFFECT_FAILURE = 0,
     UI_ANIMATION_PRIORITY_EFFECT_DELAY = 1
 } UI_ANIMATION_PRIORITY_EFFECT;
-typedef enum __WIDL_uianimation_generated_name_00000009 {
+typedef enum __WIDL_uianimation_generated_name_00000013 {
     UI_ANIMATION_REPEAT_MODE_NORMAL = 0,
     UI_ANIMATION_REPEAT_MODE_ALTERNATE = 1
 } UI_ANIMATION_REPEAT_MODE;
-typedef enum __WIDL_uianimation_generated_name_0000000A {
+typedef enum __WIDL_uianimation_generated_name_00000014 {
     UI_ANIMATION_SLOPE_INCREASING = 0,
     UI_ANIMATION_SLOPE_DECREASING = 1
 } UI_ANIMATION_SLOPE;
-typedef enum __WIDL_uianimation_generated_name_0000000B {
+typedef enum __WIDL_uianimation_generated_name_00000015 {
     UI_ANIMATION_DEPENDENCY_NONE = 0,
     UI_ANIMATION_DEPENDENCY_INTERMEDIATE_VALUES = 0x1,
     UI_ANIMATION_DEPENDENCY_FINAL_VALUE = 0x2,
     UI_ANIMATION_DEPENDENCY_FINAL_VELOCITY = 0x4,
     UI_ANIMATION_DEPENDENCY_DURATION = 0x8
 } UI_ANIMATION_DEPENDENCIES;
-typedef enum __WIDL_uianimation_generated_name_0000000C {
+typedef enum __WIDL_uianimation_generated_name_00000016 {
     UI_ANIMATION_TIMER_CLIENT_IDLE = 0,
     UI_ANIMATION_TIMER_CLIENT_BUSY = 1
 } UI_ANIMATION_TIMER_CLIENT_STATUS;
-typedef enum __WIDL_uianimation_generated_name_0000000D {
+typedef enum __WIDL_uianimation_generated_name_00000017 {
     UI_ANIMATION_IDLE_BEHAVIOR_CONTINUE = 0,
     UI_ANIMATION_IDLE_BEHAVIOR_DISABLE = 1
 } UI_ANIMATION_IDLE_BEHAVIOR;
-typedef struct __WIDL_uianimation_generated_name_0000000E {
+typedef struct __WIDL_uianimation_generated_name_00000018 {
     int _;
 } *UI_ANIMATION_KEYFRAME;
 #define UI_ANIMATION_KEYFRAME_STORYBOARD_START ((UI_ANIMATION_KEYFRAME)-1)
@@ -675,6 +675,8 @@
 
 #define UI_ANIMATION_REPEAT_INDEFINITELY_CONCLUDE_AT_START (-2)
 
+#ifndef __uianimation_LIBRARY_DEFINED__
+#define __uianimation_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_uianimation, 0x44ca24db, 0x1a92, 0x4149, 0xba,0xb5, 0xfb,0x14,0xd6,0x4b,0x40,0x1e);
 
@@ -769,6 +771,7 @@
 #endif
 #endif
 
+#endif /* __uianimation_LIBRARY_DEFINED__ */
 /*****************************************************************************
  * IUIAnimationManager interface
  */
diff --git a/mingw-w64-headers/include/uiviewsettingsinterop.h b/mingw-w64-headers/include/uiviewsettingsinterop.h
index 5b6e1d2..ef5d3c1 100644
--- a/mingw-w64-headers/include/uiviewsettingsinterop.h
+++ b/mingw-w64-headers/include/uiviewsettingsinterop.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/uiviewsettingsinterop.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/uiviewsettingsinterop.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/unknwnbase.h b/mingw-w64-headers/include/unknwnbase.h
index e672b9c..b827355 100644
--- a/mingw-w64-headers/include/unknwnbase.h
+++ b/mingw-w64-headers/include/unknwnbase.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.14 from include/unknwnbase.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/unknwnbase.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/urlmon.h b/mingw-w64-headers/include/urlmon.h
index 79ee2b4..65c644c 100644
--- a/mingw-w64-headers/include/urlmon.h
+++ b/mingw-w64-headers/include/urlmon.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/urlmon.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/urlmon.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -943,7 +943,7 @@
 
 typedef IMonikerProp *LPMONIKERPROP;
 
-typedef enum __WIDL_urlmon_generated_name_00000002 {
+typedef enum __WIDL_urlmon_generated_name_0000000F {
     MIMETYPEPROP = 0x0,
     USE_SRC_URL = 0x1,
     CLASSIDPROP = 0x2,
@@ -1292,7 +1292,7 @@
 
 typedef IBindStatusCallback *LPBINDSTATUSCALLBACK;
 
-typedef enum __WIDL_urlmon_generated_name_00000003 {
+typedef enum __WIDL_urlmon_generated_name_00000010 {
     BINDVERB_GET = 0x0,
     BINDVERB_POST = 0x1,
     BINDVERB_PUT = 0x2,
@@ -1300,12 +1300,12 @@
     BINDVERB_RESERVED1 = 0x4
 } BINDVERB;
 
-typedef enum __WIDL_urlmon_generated_name_00000004 {
+typedef enum __WIDL_urlmon_generated_name_00000011 {
     BINDINFOF_URLENCODESTGMEDDATA = 0x1,
     BINDINFOF_URLENCODEDEXTRAINFO = 0x2
 } BINDINFOF;
 
-typedef enum __WIDL_urlmon_generated_name_00000005 {
+typedef enum __WIDL_urlmon_generated_name_00000012 {
     BINDF_ASYNCHRONOUS = 0x1,
     BINDF_ASYNCSTORAGE = 0x2,
     BINDF_NOPROGRESSIVERENDERING = 0x4,
@@ -1339,7 +1339,7 @@
     BINDF_RESERVED_8 = 0x20000000
 } BINDF;
 
-typedef enum __WIDL_urlmon_generated_name_00000006 {
+typedef enum __WIDL_urlmon_generated_name_00000013 {
     URL_ENCODING_NONE = 0x0,
     URL_ENCODING_ENABLE_UTF8 = 0x10000000,
     URL_ENCODING_DISABLE_UTF8 = 0x20000000
@@ -1395,7 +1395,7 @@
 } RemFORMATETC;
 typedef struct tagRemFORMATETC *LPREMFORMATETC;
 
-typedef enum __WIDL_urlmon_generated_name_00000007 {
+typedef enum __WIDL_urlmon_generated_name_00000014 {
     BINDINFO_OPTIONS_WININETFLAG = 0x10000,
     BINDINFO_OPTIONS_ENABLE_UTF8 = 0x20000,
     BINDINFO_OPTIONS_DISABLE_UTF8 = 0x40000,
@@ -1413,7 +1413,7 @@
     BINDINFO_OPTIONS_SHDOCVW_NAVIGATE = (int)0x80000000
 } BINDINFO_OPTIONS;
 
-typedef enum __WIDL_urlmon_generated_name_00000008 {
+typedef enum __WIDL_urlmon_generated_name_00000015 {
     BSCF_FIRSTDATANOTIFICATION = 0x1,
     BSCF_INTERMEDIATEDATANOTIFICATION = 0x2,
     BSCF_LASTDATANOTIFICATION = 0x4,
@@ -1719,7 +1719,7 @@
 
 typedef IBindStatusCallbackEx *LPBINDSTATUSCALLBACKEX;
 
-typedef enum __WIDL_urlmon_generated_name_00000009 {
+typedef enum __WIDL_urlmon_generated_name_00000016 {
     BINDF2_DISABLEBASICOVERHTTP = 0x1,
     BINDF2_DISABLEAUTOCOOKIEHANDLING = 0x2,
     BINDF2_READ_DATA_GREATER_THAN_4GB = 0x4,
@@ -2025,7 +2025,7 @@
 
 typedef IAuthenticateEx *LPAUTHENTICATIONEX;
 
-typedef enum __WIDL_urlmon_generated_name_0000000A {
+typedef enum __WIDL_urlmon_generated_name_00000017 {
     AUTHENTICATEF_PROXY = 0x1,
     AUTHENTICATEF_BASIC = 0x2,
     AUTHENTICATEF_HTTP = 0x4
@@ -2666,7 +2666,7 @@
 
 typedef ICodeInstall *LPCODEINSTALL;
 
-typedef enum __WIDL_urlmon_generated_name_0000000B {
+typedef enum __WIDL_urlmon_generated_name_00000018 {
     CIP_DISK_FULL = 0,
     CIP_ACCESS_DENIED = 1,
     CIP_NEWER_VERSION_EXISTS = 2,
@@ -2781,7 +2781,7 @@
 #ifndef __IUri_INTERFACE_DEFINED__
 #define __IUri_INTERFACE_DEFINED__
 
-typedef enum __WIDL_urlmon_generated_name_0000000C {
+typedef enum __WIDL_urlmon_generated_name_00000019 {
     Uri_PROPERTY_ABSOLUTE_URI = 0,
     Uri_PROPERTY_STRING_START = Uri_PROPERTY_ABSOLUTE_URI,
     Uri_PROPERTY_AUTHORITY = 1,
@@ -2807,7 +2807,7 @@
     Uri_PROPERTY_DWORD_LAST = Uri_PROPERTY_ZONE
 } Uri_PROPERTY;
 
-typedef enum __WIDL_urlmon_generated_name_0000000D {
+typedef enum __WIDL_urlmon_generated_name_0000001A {
     Uri_HOST_UNKNOWN = 0,
     Uri_HOST_DNS = 1,
     Uri_HOST_IPV4 = 2,
@@ -6650,7 +6650,7 @@
 #define MAX_SIZE_SECURITY_ID 512
 
 
-typedef enum __WIDL_urlmon_generated_name_0000000E {
+typedef enum __WIDL_urlmon_generated_name_0000001B {
     PUAF_DEFAULT = 0x0,
     PUAF_NOUI = 0x1,
     PUAF_ISFILE = 0x2,
@@ -6673,13 +6673,13 @@
     PUAF_NOUIIFLOCKED = 0x100000,
     PUAF_DRAGPROTOCOLCHECK = 0x200000
 } PUAF;
-typedef enum __WIDL_urlmon_generated_name_0000000F {
+typedef enum __WIDL_urlmon_generated_name_0000001C {
     PUAFOUT_DEFAULT = 0x0,
     PUAFOUT_ISLOCKZONEPOLICY = 0x1
 } PUAFOUT;
 
 
-typedef enum __WIDL_urlmon_generated_name_00000010 {
+typedef enum __WIDL_urlmon_generated_name_0000001D {
     SZM_CREATE = 0x0,
     SZM_DELETE = 0x1
 } SZM_FLAGS;
@@ -7810,7 +7810,7 @@
     MAX_ZONE_DESCRIPTION = 200
 };
 
-typedef enum __WIDL_urlmon_generated_name_00000011 {
+typedef enum __WIDL_urlmon_generated_name_0000001E {
     ZAFLAGS_CUSTOM_EDIT = 0x1,
     ZAFLAGS_ADD_SITES = 0x2,
     ZAFLAGS_REQUIRE_VERIFICATION = 0x4,
@@ -9289,7 +9289,7 @@
 
 typedef IGetBindHandle *LPGETBINDHANDLE;
 
-typedef enum __WIDL_urlmon_generated_name_00000012 {
+typedef enum __WIDL_urlmon_generated_name_0000001F {
     BINDHANDLETYPES_APPCACHE = 0x0,
     BINDHANDLETYPES_DEPENDENCY = 0x1,
     BINDHANDLETYPES_COUNT = 0x2
diff --git a/mingw-w64-headers/include/vss.h b/mingw-w64-headers/include/vss.h
index b0437b8..4b7d24f 100644
--- a/mingw-w64-headers/include/vss.h
+++ b/mingw-w64-headers/include/vss.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.0-rc1 from vss.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/vss.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wbemads.h b/mingw-w64-headers/include/wbemads.h
index 3d913f3..e6b2fa3 100644
--- a/mingw-w64-headers/include/wbemads.h
+++ b/mingw-w64-headers/include/wbemads.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wbemads.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wbemads.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -53,6 +53,8 @@
 #include <winapifamily.h>
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#ifndef __WMIEXTENSIONLib_LIBRARY_DEFINED__
+#define __WMIEXTENSIONLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_WMIEXTENSIONLib, 0xe503d000, 0x5c7f, 0x11d2, 0x8b,0x74, 0x00,0x10,0x4b,0x2a,0xfb,0x41);
 
@@ -77,6 +79,7 @@
 #endif
 #endif
 
+#endif /* __WMIEXTENSIONLib_LIBRARY_DEFINED__ */
 /*****************************************************************************
  * IWMIExtension interface
  */
diff --git a/mingw-w64-headers/include/wbemcli.h b/mingw-w64-headers/include/wbemcli.h
index b365e5b..ac0a3ed 100644
--- a/mingw-w64-headers/include/wbemcli.h
+++ b/mingw-w64-headers/include/wbemcli.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wbemcli.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wbemcli.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -446,6 +446,8 @@
 #include <winapifamily.h>
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#ifndef __WbemClient_v1_LIBRARY_DEFINED__
+#define __WbemClient_v1_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_WbemClient_v1, 0x7ec196fe, 0x7005, 0x11d1, 0xad,0x90, 0x00,0xc0,0x4f,0xd8,0xfd,0xff);
 
@@ -966,6 +968,7 @@
 #endif
 #endif
 
+#endif /* __WbemClient_v1_LIBRARY_DEFINED__ */
 /*****************************************************************************
  * IWbemClassObject interface
  */
diff --git a/mingw-w64-headers/include/wbemdisp.h b/mingw-w64-headers/include/wbemdisp.h
index 99cb4ef..c03f729 100644
--- a/mingw-w64-headers/include/wbemdisp.h
+++ b/mingw-w64-headers/include/wbemdisp.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wbemdisp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wbemdisp.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -450,6 +450,8 @@
 #include <winapifamily.h>
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#ifndef __WbemScripting_LIBRARY_DEFINED__
+#define __WbemScripting_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_WbemScripting, 0x565783c6, 0xcb41, 0x11d1, 0x8b,0x02, 0x00,0x60,0x08,0x06,0xd9,0xb6);
 
@@ -1223,6 +1225,7 @@
 #endif
 #endif
 
+#endif /* __WbemScripting_LIBRARY_DEFINED__ */
 /*****************************************************************************
  * ISWbemLocator interface
  */
diff --git a/mingw-w64-headers/include/wbemprov.h b/mingw-w64-headers/include/wbemprov.h
index e90f802..2d16eb3 100644
--- a/mingw-w64-headers/include/wbemprov.h
+++ b/mingw-w64-headers/include/wbemprov.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wbemprov.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wbemprov.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -274,6 +274,8 @@
 #endif /* __cplusplus */
 #endif
 
+#ifndef __WbemProviders_v1_LIBRARY_DEFINED__
+#define __WbemProviders_v1_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_WbemProviders_v1, 0x092df710, 0x7010, 0x11d1, 0xad,0x90, 0x00,0xc0,0x4f,0xd8,0xfd,0xff);
 
@@ -342,6 +344,7 @@
 #endif
 #endif
 
+#endif /* __WbemProviders_v1_LIBRARY_DEFINED__ */
 typedef enum tag_WBEM_BATCH_TYPE {
     WBEM_FLAG_BATCH_IF_NEEDED = 0,
     WBEM_FLAG_MUST_BATCH = 0x1,
diff --git a/mingw-w64-headers/include/wbemtran.h b/mingw-w64-headers/include/wbemtran.h
index c13219b..c3c19ad 100644
--- a/mingw-w64-headers/include/wbemtran.h
+++ b/mingw-w64-headers/include/wbemtran.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wbemtran.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wbemtran.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -185,6 +185,8 @@
     WBEM_FLAG_USE_MULTIPLE_CHALLENGES = 0x10
 } WBEM_LOGIN_TYPE;
 typedef BYTE *WBEM_128BITS;
+#ifndef __WbemTransports_v1_LIBRARY_DEFINED__
+#define __WbemTransports_v1_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_WbemTransports_v1, 0x027947f3, 0xd731, 0x11ce, 0xa3,0x57, 0x00,0x00,0x00,0x00,0x00,0x01);
 
@@ -240,6 +242,7 @@
 #endif
 #endif
 
+#endif /* __WbemTransports_v1_LIBRARY_DEFINED__ */
 /*****************************************************************************
  * IWbemLevel1Login interface
  */
diff --git a/mingw-w64-headers/include/wdstptmgmt.h b/mingw-w64-headers/include/wdstptmgmt.h
index bef2508..c625c24 100644
--- a/mingw-w64-headers/include/wdstptmgmt.h
+++ b/mingw-w64-headers/include/wdstptmgmt.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wdstptmgmt.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wdstptmgmt.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -622,59 +622,59 @@
 #endif
 
 
-typedef enum __WIDL_wdstptmgmt_generated_name_00000013 {
+typedef enum __WIDL_wdstptmgmt_generated_name_00000020 {
     WdsTptProtocolUnicast = 0x1,
     WdsTptProtocolMulticast = 0x2
 } WDSTRANSPORT_PROTOCOL_FLAGS;
 
-typedef enum __WIDL_wdstptmgmt_generated_name_00000014 {
+typedef enum __WIDL_wdstptmgmt_generated_name_00000021 {
     WdsTptNamespaceTypeUnknown = 0,
     WdsTptNamespaceTypeAutoCast = 1,
     WdsTptNamespaceTypeScheduledCastManualStart = 2,
     WdsTptNamespaceTypeScheduledCastAutoStart = 3
 } WDSTRANSPORT_NAMESPACE_TYPE;
 
-typedef enum __WIDL_wdstptmgmt_generated_name_00000015 {
+typedef enum __WIDL_wdstptmgmt_generated_name_00000022 {
     WdsTptDisconnectUnknown = 0,
     WdsTptDisconnectFallback = 1,
     WdsTptDisconnectAbort = 2
 } WDSTRANSPORT_DISCONNECT_TYPE;
 
-typedef enum __WIDL_wdstptmgmt_generated_name_00000016 {
+typedef enum __WIDL_wdstptmgmt_generated_name_00000023 {
     WdsTptSlowClientHandlingUnknown = 0,
     WdsTptSlowClientHandlingNone = 1,
     WdsTptSlowClientHandlingAutoDisconnect = 2,
     WdsTptSlowClientHandlingMultistream = 3
 } WDSTRANSPORT_SLOW_CLIENT_HANDLING_TYPE;
 
-typedef enum __WIDL_wdstptmgmt_generated_name_00000017 {
+typedef enum __WIDL_wdstptmgmt_generated_name_00000024 {
     WdsTptUdpPortPolicyDynamic = 0,
     WdsTptUdpPortPolicyFixed = 1
 } WDSTRANSPORT_UDP_PORT_POLICY;
 
-typedef enum __WIDL_wdstptmgmt_generated_name_00000018 {
+typedef enum __WIDL_wdstptmgmt_generated_name_00000025 {
     WdsTptTftpCapMaximumBlockSize = 0x1,
     WdsTptTftpCapVariableWindow = 0x2
 } WDSTRANSPORT_TFTP_CAPABILITY;
 
-typedef enum __WIDL_wdstptmgmt_generated_name_00000019 {
+typedef enum __WIDL_wdstptmgmt_generated_name_00000026 {
     WdsTptServiceNotifyUnknown = 0,
     WdsTptServiceNotifyReadSettings = 1
 } WDSTRANSPORT_SERVICE_NOTIFICATION;
 
-typedef enum __WIDL_wdstptmgmt_generated_name_0000001A {
+typedef enum __WIDL_wdstptmgmt_generated_name_00000027 {
     WdsTptIpAddressUnknown = 0,
     WdsTptIpAddressIpv4 = 1,
     WdsTptIpAddressIpv6 = 2
 } WDSTRANSPORT_IP_ADDRESS_TYPE;
 
-typedef enum __WIDL_wdstptmgmt_generated_name_0000001B {
+typedef enum __WIDL_wdstptmgmt_generated_name_00000028 {
     WdsTptIpAddressSourceUnknown = 0,
     WdsTptIpAddressSourceDhcp = 1,
     WdsTptIpAddressSourceRange = 2
 } WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE;
 
-typedef enum __WIDL_wdstptmgmt_generated_name_0000001C {
+typedef enum __WIDL_wdstptmgmt_generated_name_00000029 {
     WdsTptNetworkProfileUnknown = 0,
     WdsTptNetworkProfileCustom = 1,
     WdsTptNetworkProfile10Mbps = 2,
@@ -682,7 +682,7 @@
     WdsTptNetworkProfile1Gbps = 4
 } WDSTRANSPORT_NETWORK_PROFILE_TYPE;
 
-typedef enum __WIDL_wdstptmgmt_generated_name_0000001D {
+typedef enum __WIDL_wdstptmgmt_generated_name_0000002A {
     WdsTptFeatureAdminPack = 0x1,
     WdsTptFeatureTransportServer = 0x2,
     WdsTptFeatureDeploymentServer = 0x4
@@ -690,7 +690,7 @@
 
 #define WDSTRANSPORT_FEATURE_FLAGS_ALL (WdsTptFeatureAdminPack | WdsTptFeatureTransportServer | WdsTptFeatureDeploymentServer)
 
-typedef enum __WIDL_wdstptmgmt_generated_name_0000001E {
+typedef enum __WIDL_wdstptmgmt_generated_name_0000002B {
     WdsTptDiagnosticsComponentPxe = 0x1,
     WdsTptDiagnosticsComponentTftp = 0x2,
     WdsTptDiagnosticsComponentImageServer = 0x4,
@@ -6098,6 +6098,8 @@
 #endif  /* __IWdsTransportContentProvider_INTERFACE_DEFINED__ */
 
 
+#ifndef __WdsTptMgmtLib_LIBRARY_DEFINED__
+#define __WdsTptMgmtLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_WdsTptMgmtLib, 0x9212887f, 0xf5bc, 0x45dd, 0xa5,0x10, 0x26,0x54,0x13,0xa1,0x8e,0xd7);
 
@@ -6374,6 +6376,7 @@
 #endif
 #endif
 
+#endif /* __WdsTptMgmtLib_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 
diff --git a/mingw-w64-headers/include/windows.system.h b/mingw-w64-headers/include/windows.system.h
index 314321d..e20c34a 100644
--- a/mingw-w64-headers/include/windows.system.h
+++ b/mingw-w64-headers/include/windows.system.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.4 from include/windows.system.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/windows.system.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -42,6 +42,7 @@
 
 /*****************************************************************************
  * IDispatcherQueueController interface
+ *
  */
 #ifndef ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_INTERFACE_DEFINED__
 #define ____x_ABI_CWindows_CSystem_CIDispatcherQueueController_INTERFACE_DEFINED__
diff --git a/mingw-w64-headers/include/wmcodecdsp.h b/mingw-w64-headers/include/wmcodecdsp.h
index 50375a5..f9eadb7 100644
--- a/mingw-w64-headers/include/wmcodecdsp.h
+++ b/mingw-w64-headers/include/wmcodecdsp.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.16 from wmcodecdsp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wmcodecdsp.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wmcontainer.h b/mingw-w64-headers/include/wmcontainer.h
index 0cf8aa8..c4a7247 100644
--- a/mingw-w64-headers/include/wmcontainer.h
+++ b/mingw-w64-headers/include/wmcontainer.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wmcontainer.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wmcontainer.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wsdattachment.h b/mingw-w64-headers/include/wsdattachment.h
index f06e862..4a0deed 100644
--- a/mingw-w64-headers/include/wsdattachment.h
+++ b/mingw-w64-headers/include/wsdattachment.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wsdattachment.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wsdattachment.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wsdclient.h b/mingw-w64-headers/include/wsdclient.h
index 6f9f148..8ce4dc6 100644
--- a/mingw-w64-headers/include/wsdclient.h
+++ b/mingw-w64-headers/include/wsdclient.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wsdclient.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wsdclient.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wsddisco.h b/mingw-w64-headers/include/wsddisco.h
index 604fb67..2526701 100644
--- a/mingw-w64-headers/include/wsddisco.h
+++ b/mingw-w64-headers/include/wsddisco.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wsddisco.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wsddisco.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wsdhost.h b/mingw-w64-headers/include/wsdhost.h
index 7778e7d..059d41d 100644
--- a/mingw-w64-headers/include/wsdhost.h
+++ b/mingw-w64-headers/include/wsdhost.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wsdhost.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wsdhost.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wsdxml.h b/mingw-w64-headers/include/wsdxml.h
index 741b190..9fa93df 100644
--- a/mingw-w64-headers/include/wsdxml.h
+++ b/mingw-w64-headers/include/wsdxml.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wsdxml.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wsdxml.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wsmandisp.h b/mingw-w64-headers/include/wsmandisp.h
index 643eb0e..bfd4606 100644
--- a/mingw-w64-headers/include/wsmandisp.h
+++ b/mingw-w64-headers/include/wsmandisp.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wsmandisp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wsmandisp.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -143,6 +143,8 @@
 #include <winapifamily.h>
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#ifndef __WSManAutomation_LIBRARY_DEFINED__
+#define __WSManAutomation_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_WSManAutomation, 0xf010be25, 0x296d, 0x4036, 0x98,0x0f, 0x5a,0x06,0x69,0xa1,0x75,0x77);
 
@@ -317,6 +319,7 @@
 #endif
 #endif
 
+#endif /* __WSManAutomation_LIBRARY_DEFINED__ */
 /*****************************************************************************
  * IWSMan interface
  */
diff --git a/mingw-w64-headers/include/wtypes.h b/mingw-w64-headers/include/wtypes.h
index ee3c9ff..d3bbbd9 100644
--- a/mingw-w64-headers/include/wtypes.h
+++ b/mingw-w64-headers/include/wtypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wtypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wtypes.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -226,7 +226,7 @@
 
 typedef struct _userCLIPFORMAT {
     LONG fContext;
-    union {
+    union __WIDL_wtypes_generated_name_00000001 {
         DWORD dwValue;
         wchar_t *pwszName;
     } u;
@@ -237,7 +237,7 @@
 
 typedef struct _GDI_NONREMOTE {
     LONG fContext;
-    union {
+    union __WIDL_wtypes_generated_name_00000002 {
         LONG hInproc;
         DWORD_BLOB *hRemote;
     } u;
@@ -245,7 +245,7 @@
 
 typedef struct _userHGLOBAL {
     LONG fContext;
-    union {
+    union __WIDL_wtypes_generated_name_00000003 {
         LONG hInproc;
         FLAGGED_BYTE_BLOB *hRemote;
         INT64 hInproc64;
@@ -256,7 +256,7 @@
 
 typedef struct _userHMETAFILE {
     LONG fContext;
-    union {
+    union __WIDL_wtypes_generated_name_00000004 {
         LONG hInproc;
         BYTE_BLOB *hRemote;
         INT64 hInproc64;
@@ -272,7 +272,7 @@
 
 typedef struct _userHMETAFILEPICT {
     LONG fContext;
-    union {
+    union __WIDL_wtypes_generated_name_00000005 {
         LONG hInproc;
         remoteMETAFILEPICT *hRemote;
         INT64 hInproc64;
@@ -281,7 +281,7 @@
 
 typedef struct _userHENHMETAFILE {
     LONG fContext;
-    union {
+    union __WIDL_wtypes_generated_name_00000006 {
         LONG hInproc;
         BYTE_BLOB *hRemote;
         INT64 hInproc64;
@@ -301,7 +301,7 @@
 
 typedef struct _userHBITMAP {
     LONG fContext;
-    union {
+    union __WIDL_wtypes_generated_name_00000007 {
         LONG hInproc;
         userBITMAP *hRemote;
         INT64 hInproc64;
@@ -310,7 +310,7 @@
 
 typedef struct _userHPALETTE {
     LONG fContext;
-    union {
+    union __WIDL_wtypes_generated_name_00000008 {
         LONG hInproc;
         LOGPALETTE *hRemote;
         INT64 hInproc64;
@@ -319,7 +319,7 @@
 
 typedef struct _RemotableHandle {
     LONG fContext;
-    union {
+    union __WIDL_wtypes_generated_name_00000009 {
         LONG hInproc;
         LONG hRemote;
     } u;
@@ -601,9 +601,9 @@
     TYSPEC_OBJECTID = 6
 } TYSPEC;
 
-typedef struct __WIDL_wtypes_generated_name_00000001 {
+typedef struct __WIDL_wtypes_generated_name_0000000B {
     DWORD tyspec;
-    union {
+    union __WIDL_wtypes_generated_name_0000000A {
         CLSID clsid;
         LPOLESTR pFileExt;
         LPOLESTR pMimeType;
diff --git a/mingw-w64-headers/include/wtypesbase.h b/mingw-w64-headers/include/wtypesbase.h
index a18ccb9..ac4a23c 100644
--- a/mingw-w64-headers/include/wtypesbase.h
+++ b/mingw-w64-headers/include/wtypesbase.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/wtypesbase.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/wtypesbase.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__