diff --git a/mingw-w64-headers/include/bits.h b/mingw-w64-headers/include/bits.h
index f6d75fe..f2c01c9 100644
--- a/mingw-w64-headers/include/bits.h
+++ b/mingw-w64-headers/include/bits.h
@@ -271,24 +271,23 @@
   } BG_JOB_TIMES;
 
   typedef enum __MIDL_IBackgroundCopyJob_0001 {
-    BG_JOB_PRIORITY_FOREGROUND = 0,BG_JOB_PRIORITY_HIGH = BG_JOB_PRIORITY_FOREGROUND + 1,BG_JOB_PRIORITY_NORMAL = BG_JOB_PRIORITY_HIGH + 1,
-    BG_JOB_PRIORITY_LOW = BG_JOB_PRIORITY_NORMAL + 1
+    BG_JOB_PRIORITY_FOREGROUND = 0,
+    BG_JOB_PRIORITY_HIGH,BG_JOB_PRIORITY_NORMAL,BG_JOB_PRIORITY_LOW
   } BG_JOB_PRIORITY;
 
   typedef enum __MIDL_IBackgroundCopyJob_0002 {
-    BG_JOB_STATE_QUEUED = 0,BG_JOB_STATE_CONNECTING = BG_JOB_STATE_QUEUED + 1,BG_JOB_STATE_TRANSFERRING = BG_JOB_STATE_CONNECTING + 1,
-    BG_JOB_STATE_SUSPENDED = BG_JOB_STATE_TRANSFERRING + 1,BG_JOB_STATE_ERROR = BG_JOB_STATE_SUSPENDED + 1,
-    BG_JOB_STATE_TRANSIENT_ERROR = BG_JOB_STATE_ERROR + 1,BG_JOB_STATE_TRANSFERRED = BG_JOB_STATE_TRANSIENT_ERROR + 1,
-    BG_JOB_STATE_ACKNOWLEDGED = BG_JOB_STATE_TRANSFERRED + 1,BG_JOB_STATE_CANCELLED = BG_JOB_STATE_ACKNOWLEDGED + 1
+    BG_JOB_STATE_QUEUED = 0,BG_JOB_STATE_CONNECTING,BG_JOB_STATE_TRANSFERRING,
+    BG_JOB_STATE_SUSPENDED,BG_JOB_STATE_ERROR,BG_JOB_STATE_TRANSIENT_ERROR,
+    BG_JOB_STATE_TRANSFERRED,BG_JOB_STATE_ACKNOWLEDGED,BG_JOB_STATE_CANCELLED
   } BG_JOB_STATE;
 
   typedef enum __MIDL_IBackgroundCopyJob_0003 {
-    BG_JOB_TYPE_DOWNLOAD = 0,BG_JOB_TYPE_UPLOAD = BG_JOB_TYPE_DOWNLOAD + 1,BG_JOB_TYPE_UPLOAD_REPLY = BG_JOB_TYPE_UPLOAD + 1
+    BG_JOB_TYPE_DOWNLOAD = 0,BG_JOB_TYPE_UPLOAD,BG_JOB_TYPE_UPLOAD_REPLY
   } BG_JOB_TYPE;
 
   typedef enum __MIDL_IBackgroundCopyJob_0004 {
-    BG_JOB_PROXY_USAGE_PRECONFIG = 0,BG_JOB_PROXY_USAGE_NO_PROXY = BG_JOB_PROXY_USAGE_PRECONFIG + 1,
-    BG_JOB_PROXY_USAGE_OVERRIDE = BG_JOB_PROXY_USAGE_NO_PROXY + 1,BG_JOB_PROXY_USAGE_AUTODETECT = BG_JOB_PROXY_USAGE_OVERRIDE + 1
+    BG_JOB_PROXY_USAGE_PRECONFIG = 0,BG_JOB_PROXY_USAGE_NO_PROXY,
+    BG_JOB_PROXY_USAGE_OVERRIDE,BG_JOB_PROXY_USAGE_AUTODETECT
   } BG_JOB_PROXY_USAGE;
 
   EXTERN_C const IID IID_IBackgroundCopyJob;
diff --git a/mingw-w64-headers/include/bits1_5.h b/mingw-w64-headers/include/bits1_5.h
index 6db76b8..dbe5cc1 100644
--- a/mingw-w64-headers/include/bits1_5.h
+++ b/mingw-w64-headers/include/bits1_5.h
@@ -66,8 +66,8 @@
   } BG_AUTH_TARGET;
 
   typedef enum __MIDL_IBackgroundCopyJob2_0002 {
-    BG_AUTH_SCHEME_BASIC = 1,BG_AUTH_SCHEME_DIGEST = BG_AUTH_SCHEME_BASIC + 1,BG_AUTH_SCHEME_NTLM = BG_AUTH_SCHEME_DIGEST + 1,
-    BG_AUTH_SCHEME_NEGOTIATE = BG_AUTH_SCHEME_NTLM + 1,BG_AUTH_SCHEME_PASSPORT = BG_AUTH_SCHEME_NEGOTIATE + 1
+    BG_AUTH_SCHEME_BASIC = 1,BG_AUTH_SCHEME_DIGEST,BG_AUTH_SCHEME_NTLM,
+    BG_AUTH_SCHEME_NEGOTIATE,BG_AUTH_SCHEME_PASSPORT
   } BG_AUTH_SCHEME;
 
   typedef struct __MIDL_IBackgroundCopyJob2_0003 {
diff --git a/mingw-w64-headers/include/chanmgr.h b/mingw-w64-headers/include/chanmgr.h
index 8481bb0..8758d15 100644
--- a/mingw-w64-headers/include/chanmgr.h
+++ b/mingw-w64-headers/include/chanmgr.h
@@ -137,7 +137,7 @@
 #ifndef __IEnumChannels_INTERFACE_DEFINED__
 #define __IEnumChannels_INTERFACE_DEFINED__
   typedef enum _tagSubcriptionState {
-    SUBSTATE_NOTSUBSCRIBED = 0,SUBSTATE_PARTIALSUBSCRIPTION = SUBSTATE_NOTSUBSCRIBED + 1,SUBSTATE_FULLSUBSCRIPTION = SUBSTATE_PARTIALSUBSCRIPTION + 1
+    SUBSTATE_NOTSUBSCRIBED = 0,SUBSTATE_PARTIALSUBSCRIPTION,SUBSTATE_FULLSUBSCRIPTION
   } SUBSCRIPTIONSTATE;
 
   typedef struct _tagChannelInfo {
diff --git a/mingw-w64-headers/include/cluadmex.h b/mingw-w64-headers/include/cluadmex.h
index 98dc279..d3cdb38 100644
--- a/mingw-w64-headers/include/cluadmex.h
+++ b/mingw-w64-headers/include/cluadmex.h
@@ -121,9 +121,9 @@
 #endif
 
   typedef enum _CLUADMEX_OBJECT_TYPE {
-    CLUADMEX_OT_NONE = 0,CLUADMEX_OT_CLUSTER = CLUADMEX_OT_NONE + 1,CLUADMEX_OT_NODE = CLUADMEX_OT_CLUSTER + 1,CLUADMEX_OT_GROUP = CLUADMEX_OT_NODE + 1,
-    CLUADMEX_OT_RESOURCE = CLUADMEX_OT_GROUP + 1,CLUADMEX_OT_RESOURCETYPE = CLUADMEX_OT_RESOURCE + 1,CLUADMEX_OT_NETWORK = CLUADMEX_OT_RESOURCETYPE + 1,
-    CLUADMEX_OT_NETINTERFACE = CLUADMEX_OT_NETWORK + 1
+    CLUADMEX_OT_NONE = 0,CLUADMEX_OT_CLUSTER,CLUADMEX_OT_NODE,CLUADMEX_OT_GROUP,
+    CLUADMEX_OT_RESOURCE,CLUADMEX_OT_RESOURCETYPE,CLUADMEX_OT_NETWORK,
+    CLUADMEX_OT_NETINTERFACE
   } CLUADMEX_OBJECT_TYPE;
 
   extern RPC_IF_HANDLE __MIDL_itf_cluadmex_0000_v0_0_c_ifspec;
diff --git a/mingw-w64-headers/include/cluscfgserver.h b/mingw-w64-headers/include/cluscfgserver.h
index 700698d..92269af 100644
--- a/mingw-w64-headers/include/cluscfgserver.h
+++ b/mingw-w64-headers/include/cluscfgserver.h
@@ -285,13 +285,14 @@
 #endif
 
   typedef enum __MIDL___MIDL_itf_cluscfgserver_0000_0001 {
-    dluUNKNOWN = 0,dluNO_ROOT_DIRECTORY = dluUNKNOWN + 1,dluREMOVABLE_DISK = dluNO_ROOT_DIRECTORY + 1,dluFIXED_DISK = dluREMOVABLE_DISK + 1,
-    dluNETWORK_DRIVE = dluFIXED_DISK + 1,dluCOMPACT_DISC = dluNETWORK_DRIVE + 1,dluRAM_DISK = dluCOMPACT_DISC + 1,dluSYSTEM = dluRAM_DISK + 1,
-    dluUNUSED = dluSYSTEM + 1,dluSTART_OF_SYSTEM_BUS = 50,dluNO_ROOT_DIRECTORY_SYSTEM_BUS = dluSTART_OF_SYSTEM_BUS + 1,
-    dluREMOVABLE_DISK_SYSTEM_BUS = dluNO_ROOT_DIRECTORY_SYSTEM_BUS + 1,dluFIXED_DISK_SYSTEM_BUS = dluREMOVABLE_DISK_SYSTEM_BUS + 1,
-    dluNETWORK_DRIVE_SYSTEM_BUS = dluFIXED_DISK_SYSTEM_BUS + 1,dluCOMPACT_DISC_SYSTEM_BUS = dluNETWORK_DRIVE_SYSTEM_BUS + 1,
-    dluRAM_DISK_SYSTEM_BUS = dluCOMPACT_DISC_SYSTEM_BUS + 1,dluSYSTEM_SYSTEM_BUS = dluRAM_DISK_SYSTEM_BUS + 1,
-    dluUNUSED_SYSTEM_BUS = dluSYSTEM_SYSTEM_BUS + 1,dluMAX = dluUNUSED_SYSTEM_BUS + 1
+    dluUNKNOWN = 0,dluNO_ROOT_DIRECTORY,dluREMOVABLE_DISK,dluFIXED_DISK,
+    dluNETWORK_DRIVE,dluCOMPACT_DISC,dluRAM_DISK,dluSYSTEM,
+    dluUNUSED,
+    dluSTART_OF_SYSTEM_BUS = 50,dluNO_ROOT_DIRECTORY_SYSTEM_BUS = 51,
+    dluREMOVABLE_DISK_SYSTEM_BUS = 52,dluFIXED_DISK_SYSTEM_BUS = 53,
+    dluNETWORK_DRIVE_SYSTEM_BUS = 54,dluCOMPACT_DISC_SYSTEM_BUS =  55,
+    dluRAM_DISK_SYSTEM_BUS = 56,dluSYSTEM_SYSTEM_BUS = 57,
+    dluUNUSED_SYSTEM_BUS = 58,dluMAX = 59
   } EDriveLetterUsage;
 
   typedef struct _DRIVELETTERMAPPING {
@@ -299,8 +300,8 @@
   } SDriveLetterMapping;
 
   typedef enum __MIDL___MIDL_itf_cluscfgserver_0000_0002 {
-    cmUNKNOWN = 0,cmCREATE_CLUSTER = cmUNKNOWN + 1,cmADD_NODE_TO_CLUSTER = cmCREATE_CLUSTER + 1,cmCLEANUP_NODE_AFTER_EVICT = cmADD_NODE_TO_CLUSTER + 1,
-    cmMAX = cmCLEANUP_NODE_AFTER_EVICT + 1
+    cmUNKNOWN = 0,cmCREATE_CLUSTER,cmADD_NODE_TO_CLUSTER,cmCLEANUP_NODE_AFTER_EVICT,
+    cmMAX
   } ECommitMode;
 
   typedef enum EClusCfgCleanupReason {
diff --git a/mingw-w64-headers/include/cmdtree.h b/mingw-w64-headers/include/cmdtree.h
index 1c677a8..b2ae07f 100644
--- a/mingw-w64-headers/include/cmdtree.h
+++ b/mingw-w64-headers/include/cmdtree.h
@@ -59,88 +59,86 @@
   typedef WORD DBCOMMANDOP;
 
   enum DBCOMMANDOPENUM {
-    DBOP_scalar_constant = 0,DBOP_DEFAULT = DBOP_scalar_constant + 1,DBOP_NULL = DBOP_DEFAULT + 1,DBOP_bookmark_name = DBOP_NULL + 1,
-    DBOP_catalog_name = DBOP_bookmark_name + 1,DBOP_column_name = DBOP_catalog_name + 1,DBOP_schema_name = DBOP_column_name + 1,
-    DBOP_outall_name = DBOP_schema_name + 1,DBOP_qualifier_name = DBOP_outall_name + 1,DBOP_qualified_column_name = DBOP_qualifier_name + 1,
-    DBOP_table_name = DBOP_qualified_column_name + 1,DBOP_nested_table_name = DBOP_table_name + 1,DBOP_nested_column_name = DBOP_nested_table_name + 1,
-    DBOP_row = DBOP_nested_column_name + 1,DBOP_table = DBOP_row + 1,DBOP_sort = DBOP_table + 1,DBOP_distinct = DBOP_sort + 1,
-    DBOP_distinct_order_preserving = DBOP_distinct + 1,DBOP_alias = DBOP_distinct_order_preserving + 1,DBOP_cross_join = DBOP_alias + 1,
-    DBOP_union_join = DBOP_cross_join + 1,DBOP_inner_join = DBOP_union_join + 1,DBOP_left_semi_join = DBOP_inner_join + 1,
-    DBOP_right_semi_join = DBOP_left_semi_join + 1,DBOP_left_anti_semi_join = DBOP_right_semi_join + 1,
-    DBOP_right_anti_semi_join = DBOP_left_anti_semi_join + 1,DBOP_left_outer_join = DBOP_right_anti_semi_join + 1,
-    DBOP_right_outer_join = DBOP_left_outer_join + 1,DBOP_full_outer_join = DBOP_right_outer_join + 1,DBOP_natural_join = DBOP_full_outer_join + 1,
-    DBOP_natural_left_outer_join = DBOP_natural_join + 1,DBOP_natural_right_outer_join = DBOP_natural_left_outer_join + 1,
-    DBOP_natural_full_outer_join = DBOP_natural_right_outer_join + 1,DBOP_set_intersection = DBOP_natural_full_outer_join + 1,
-    DBOP_set_union = DBOP_set_intersection + 1,DBOP_set_left_difference = DBOP_set_union + 1,DBOP_set_right_difference = DBOP_set_left_difference + 1,
-    DBOP_set_anti_difference = DBOP_set_right_difference + 1,DBOP_bag_intersection = DBOP_set_anti_difference + 1,
-    DBOP_bag_union = DBOP_bag_intersection + 1,DBOP_bag_left_difference = DBOP_bag_union + 1,DBOP_bag_right_difference = DBOP_bag_left_difference + 1,
-    DBOP_bag_anti_difference = DBOP_bag_right_difference + 1,DBOP_division = DBOP_bag_anti_difference + 1,DBOP_relative_sampling = DBOP_division + 1,
-    DBOP_absolute_sampling = DBOP_relative_sampling + 1,DBOP_transitive_closure = DBOP_absolute_sampling + 1,
-    DBOP_recursive_union = DBOP_transitive_closure + 1,DBOP_aggregate = DBOP_recursive_union + 1,DBOP_remote_table = DBOP_aggregate + 1,
-    DBOP_select = DBOP_remote_table + 1,DBOP_order_preserving_select = DBOP_select + 1,DBOP_project = DBOP_order_preserving_select + 1,
-    DBOP_project_order_preserving = DBOP_project + 1,DBOP_top = DBOP_project_order_preserving + 1,DBOP_top_percent = DBOP_top + 1,
-    DBOP_top_plus_ties = DBOP_top_percent + 1,DBOP_top_percent_plus_ties = DBOP_top_plus_ties + 1,DBOP_rank = DBOP_top_percent_plus_ties + 1,
-    DBOP_rank_ties_equally = DBOP_rank + 1,DBOP_rank_ties_equally_and_skip = DBOP_rank_ties_equally + 1,
-    DBOP_navigate = DBOP_rank_ties_equally_and_skip + 1,DBOP_nesting = DBOP_navigate + 1,DBOP_unnesting = DBOP_nesting + 1,
-    DBOP_nested_apply = DBOP_unnesting + 1,DBOP_cross_tab = DBOP_nested_apply + 1,DBOP_is_NULL = DBOP_cross_tab + 1,DBOP_is_NOT_NULL = DBOP_is_NULL + 1,
-    DBOP_equal = DBOP_is_NOT_NULL + 1,DBOP_not_equal = DBOP_equal + 1,DBOP_less = DBOP_not_equal + 1,DBOP_less_equal = DBOP_less + 1,
-    DBOP_greater = DBOP_less_equal + 1,DBOP_greater_equal = DBOP_greater + 1,DBOP_equal_all = DBOP_greater_equal + 1,
-    DBOP_not_equal_all = DBOP_equal_all + 1,DBOP_less_all = DBOP_not_equal_all + 1,DBOP_less_equal_all = DBOP_less_all + 1,
-    DBOP_greater_all = DBOP_less_equal_all + 1,DBOP_greater_equal_all = DBOP_greater_all + 1,DBOP_equal_any = DBOP_greater_equal_all + 1,
-    DBOP_not_equal_any = DBOP_equal_any + 1,DBOP_less_any = DBOP_not_equal_any + 1,DBOP_less_equal_any = DBOP_less_any + 1,
-    DBOP_greater_any = DBOP_less_equal_any + 1,DBOP_greater_equal_any = DBOP_greater_any + 1,DBOP_anybits = DBOP_greater_equal_any + 1,
-    DBOP_allbits = DBOP_anybits + 1,DBOP_anybits_any = DBOP_allbits + 1,DBOP_allbits_any = DBOP_anybits_any + 1,
-    DBOP_anybits_all = DBOP_allbits_any + 1,DBOP_allbits_all = DBOP_anybits_all + 1,DBOP_between = DBOP_allbits_all + 1,
-    DBOP_between_unordered = DBOP_between + 1,DBOP_match = DBOP_between_unordered + 1,DBOP_match_unique = DBOP_match + 1,
-    DBOP_match_partial = DBOP_match_unique + 1,DBOP_match_partial_unique = DBOP_match_partial + 1,DBOP_match_full = DBOP_match_partial_unique + 1,
-    DBOP_match_full_unique = DBOP_match_full + 1,DBOP_scalar_parameter = DBOP_match_full_unique + 1,DBOP_scalar_function = DBOP_scalar_parameter + 1,
-    DBOP_plus = DBOP_scalar_function + 1,DBOP_minus = DBOP_plus + 1,DBOP_times = DBOP_minus + 1,DBOP_over = DBOP_times + 1,DBOP_div = DBOP_over + 1,
-    DBOP_modulo = DBOP_div + 1,DBOP_power = DBOP_modulo + 1,DBOP_like = DBOP_power + 1,DBOP_sounds_like = DBOP_like + 1,
-    DBOP_like_any = DBOP_sounds_like + 1,DBOP_like_all = DBOP_like_any + 1,DBOP_is_INVALID = DBOP_like_all + 1,DBOP_is_TRUE = DBOP_is_INVALID + 1,
-    DBOP_is_FALSE = DBOP_is_TRUE + 1,DBOP_and = DBOP_is_FALSE + 1,DBOP_or = DBOP_and + 1,DBOP_xor = DBOP_or + 1,DBOP_equivalent = DBOP_xor + 1,
-    DBOP_not = DBOP_equivalent + 1,DBOP_implies = DBOP_not + 1,DBOP_overlaps = DBOP_implies + 1,DBOP_case_condition = DBOP_overlaps + 1,
-    DBOP_case_value = DBOP_case_condition + 1,DBOP_nullif = DBOP_case_value + 1,DBOP_cast = DBOP_nullif + 1,DBOP_coalesce = DBOP_cast + 1,
-    DBOP_position = DBOP_coalesce + 1,DBOP_extract = DBOP_position + 1,DBOP_char_length = DBOP_extract + 1,DBOP_octet_length = DBOP_char_length + 1,
-    DBOP_bit_length = DBOP_octet_length + 1,DBOP_substring = DBOP_bit_length + 1,DBOP_upper = DBOP_substring + 1,DBOP_lower = DBOP_upper + 1,
-    DBOP_trim = DBOP_lower + 1,DBOP_translate = DBOP_trim + 1,DBOP_convert = DBOP_translate + 1,DBOP_string_concat = DBOP_convert + 1,
-    DBOP_current_date = DBOP_string_concat + 1,DBOP_current_time = DBOP_current_date + 1,DBOP_current_timestamp = DBOP_current_time + 1,
-    DBOP_content_select = DBOP_current_timestamp + 1,DBOP_content = DBOP_content_select + 1,DBOP_content_freetext = DBOP_content + 1,
-    DBOP_content_proximity = DBOP_content_freetext + 1,DBOP_content_vector_or = DBOP_content_proximity + 1,DBOP_delete = DBOP_content_vector_or + 1,
-    DBOP_update = DBOP_delete + 1,DBOP_insert = DBOP_update + 1,DBOP_min = DBOP_insert + 1,DBOP_max = DBOP_min + 1,DBOP_count = DBOP_max + 1,
-    DBOP_sum = DBOP_count + 1,DBOP_avg = DBOP_sum + 1,DBOP_any_sample = DBOP_avg + 1,DBOP_stddev = DBOP_any_sample + 1,DBOP_stddev_pop = DBOP_stddev + 1,
-    DBOP_var = DBOP_stddev_pop + 1,DBOP_var_pop = DBOP_var + 1,DBOP_first = DBOP_var_pop + 1,DBOP_last = DBOP_first + 1,DBOP_in = DBOP_last + 1,
-    DBOP_exists = DBOP_in + 1,DBOP_unique = DBOP_exists + 1,DBOP_subset = DBOP_unique + 1,DBOP_proper_subset = DBOP_subset + 1,
-    DBOP_superset = DBOP_proper_subset + 1,DBOP_proper_superset = DBOP_superset + 1,DBOP_disjoint = DBOP_proper_superset + 1,
-    DBOP_pass_through = DBOP_disjoint + 1,DBOP_defined_by_GUID = DBOP_pass_through + 1,DBOP_text_command = DBOP_defined_by_GUID + 1,
-    DBOP_SQL_select = DBOP_text_command + 1,DBOP_prior_command_tree = DBOP_SQL_select + 1,DBOP_add_columns = DBOP_prior_command_tree + 1,
-    DBOP_column_list_anchor = DBOP_add_columns + 1,DBOP_column_list_element = DBOP_column_list_anchor + 1,
-    DBOP_command_list_anchor = DBOP_column_list_element + 1,DBOP_command_list_element = DBOP_command_list_anchor + 1,
-    DBOP_from_list_anchor = DBOP_command_list_element + 1,DBOP_from_list_element = DBOP_from_list_anchor + 1,
-    DBOP_project_list_anchor = DBOP_from_list_element + 1,DBOP_project_list_element = DBOP_project_list_anchor + 1,
-    DBOP_row_list_anchor = DBOP_project_list_element + 1,DBOP_row_list_element = DBOP_row_list_anchor + 1,
-    DBOP_scalar_list_anchor = DBOP_row_list_element + 1,DBOP_scalar_list_element = DBOP_scalar_list_anchor + 1,
-    DBOP_set_list_anchor = DBOP_scalar_list_element + 1,DBOP_set_list_element = DBOP_set_list_anchor + 1,
-    DBOP_sort_list_anchor = DBOP_set_list_element + 1,DBOP_sort_list_element = DBOP_sort_list_anchor + 1,
-    DBOP_alter_character_set = DBOP_sort_list_element + 1,DBOP_alter_collation = DBOP_alter_character_set + 1,
-    DBOP_alter_domain = DBOP_alter_collation + 1,DBOP_alter_index = DBOP_alter_domain + 1,DBOP_alter_procedure = DBOP_alter_index + 1,
-    DBOP_alter_schema = DBOP_alter_procedure + 1,DBOP_alter_table = DBOP_alter_schema + 1,DBOP_alter_trigger = DBOP_alter_table + 1,
-    DBOP_alter_view = DBOP_alter_trigger + 1,DBOP_coldef_list_anchor = DBOP_alter_view + 1,DBOP_coldef_list_element = DBOP_coldef_list_anchor + 1,
-    DBOP_create_assertion = DBOP_coldef_list_element + 1,DBOP_create_character_set = DBOP_create_assertion + 1,
-    DBOP_create_collation = DBOP_create_character_set + 1,DBOP_create_domain = DBOP_create_collation + 1,DBOP_create_index = DBOP_create_domain + 1,
-    DBOP_create_procedure = DBOP_create_index + 1,DBOP_create_schema = DBOP_create_procedure + 1,DBOP_create_synonym = DBOP_create_schema + 1,
-    DBOP_create_table = DBOP_create_synonym + 1,DBOP_create_temporary_table = DBOP_create_table + 1,
-    DBOP_create_translation = DBOP_create_temporary_table + 1,DBOP_create_trigger = DBOP_create_translation + 1,
-    DBOP_create_view = DBOP_create_trigger + 1,DBOP_drop_assertion = DBOP_create_view + 1,DBOP_drop_character_set = DBOP_drop_assertion + 1,
-    DBOP_drop_collation = DBOP_drop_character_set + 1,DBOP_drop_domain = DBOP_drop_collation + 1,DBOP_drop_index = DBOP_drop_domain + 1,
-    DBOP_drop_procedure = DBOP_drop_index + 1,DBOP_drop_schema = DBOP_drop_procedure + 1,DBOP_drop_synonym = DBOP_drop_schema + 1,
-    DBOP_drop_table = DBOP_drop_synonym + 1,DBOP_drop_translation = DBOP_drop_table + 1,DBOP_drop_trigger = DBOP_drop_translation + 1,
-    DBOP_drop_view = DBOP_drop_trigger + 1,DBOP_foreign_key = DBOP_drop_view + 1,DBOP_grant_privileges = DBOP_foreign_key + 1,
-    DBOP_index_list_anchor = DBOP_grant_privileges + 1,DBOP_index_list_element = DBOP_index_list_anchor + 1,
-    DBOP_primary_key = DBOP_index_list_element + 1,DBOP_property_list_anchor = DBOP_primary_key + 1,
-    DBOP_property_list_element = DBOP_property_list_anchor + 1,DBOP_referenced_table = DBOP_property_list_element + 1,
-    DBOP_rename_object = DBOP_referenced_table + 1,DBOP_revoke_privileges = DBOP_rename_object + 1,
-    DBOP_schema_authorization = DBOP_revoke_privileges + 1,DBOP_unique_key = DBOP_schema_authorization + 1,DBOP_scope_list_anchor = DBOP_unique_key + 1,
-    DBOP_scope_list_element = DBOP_scope_list_anchor + 1,DBOP_content_table = DBOP_scope_list_element + 1
+    DBOP_scalar_constant = 0,DBOP_DEFAULT,DBOP_NULL,DBOP_bookmark_name,
+    DBOP_catalog_name,DBOP_column_name,DBOP_schema_name,
+    DBOP_outall_name,DBOP_qualifier_name,DBOP_qualified_column_name,
+    DBOP_table_name,DBOP_nested_table_name,DBOP_nested_column_name,
+    DBOP_row,DBOP_table,DBOP_sort,DBOP_distinct,DBOP_distinct_order_preserving,
+    DBOP_alias,DBOP_cross_join,DBOP_union_join,DBOP_inner_join,DBOP_left_semi_join,
+    DBOP_right_semi_join,DBOP_left_anti_semi_join,DBOP_right_anti_semi_join,
+    DBOP_left_outer_join,DBOP_right_outer_join,DBOP_full_outer_join,DBOP_natural_join,
+    DBOP_natural_left_outer_join,DBOP_natural_right_outer_join,
+    DBOP_natural_full_outer_join,DBOP_set_intersection,
+    DBOP_set_union,DBOP_set_left_difference,DBOP_set_right_difference,
+    DBOP_set_anti_difference,DBOP_bag_intersection,
+    DBOP_bag_union,DBOP_bag_left_difference,DBOP_bag_right_difference,
+    DBOP_bag_anti_difference,DBOP_division,DBOP_relative_sampling,
+    DBOP_absolute_sampling,DBOP_transitive_closure,
+    DBOP_recursive_union,DBOP_aggregate,DBOP_remote_table,
+    DBOP_select,DBOP_order_preserving_select,DBOP_project,
+    DBOP_project_order_preserving,DBOP_top,DBOP_top_percent,
+    DBOP_top_plus_ties,DBOP_top_percent_plus_ties,DBOP_rank,
+    DBOP_rank_ties_equally,DBOP_rank_ties_equally_and_skip,
+    DBOP_navigate,DBOP_nesting,DBOP_unnesting,
+    DBOP_nested_apply,DBOP_cross_tab,DBOP_is_NULL,DBOP_is_NOT_NULL,
+    DBOP_equal,DBOP_not_equal,DBOP_less,DBOP_less_equal,
+    DBOP_greater,DBOP_greater_equal,DBOP_equal_all,
+    DBOP_not_equal_all,DBOP_less_all,DBOP_less_equal_all,
+    DBOP_greater_all,DBOP_greater_equal_all,DBOP_equal_any,
+    DBOP_not_equal_any,DBOP_less_any,DBOP_less_equal_any,
+    DBOP_greater_any,DBOP_greater_equal_any,DBOP_anybits,
+    DBOP_allbits,DBOP_anybits_any,DBOP_allbits_any,
+    DBOP_anybits_all,DBOP_allbits_all,DBOP_between,
+    DBOP_between_unordered,DBOP_match,DBOP_match_unique,
+    DBOP_match_partial,DBOP_match_partial_unique,DBOP_match_full,
+    DBOP_match_full_unique,DBOP_scalar_parameter,DBOP_scalar_function,
+    DBOP_plus,DBOP_minus,DBOP_times,DBOP_over,DBOP_div,
+    DBOP_modulo,DBOP_power,DBOP_like,DBOP_sounds_like,
+    DBOP_like_any,DBOP_like_all,DBOP_is_INVALID,DBOP_is_TRUE,
+    DBOP_is_FALSE,DBOP_and,DBOP_or,DBOP_xor,DBOP_equivalent,
+    DBOP_not,DBOP_implies,DBOP_overlaps,DBOP_case_condition,
+    DBOP_case_value,DBOP_nullif,DBOP_cast,DBOP_coalesce,
+    DBOP_position,DBOP_extract,DBOP_char_length,DBOP_octet_length,
+    DBOP_bit_length,DBOP_substring,DBOP_upper,DBOP_lower,
+    DBOP_trim,DBOP_translate,DBOP_convert,DBOP_string_concat,
+    DBOP_current_date,DBOP_current_time,DBOP_current_timestamp,
+    DBOP_content_select,DBOP_content,DBOP_content_freetext,
+    DBOP_content_proximity,DBOP_content_vector_or,DBOP_delete,
+    DBOP_update,DBOP_insert,DBOP_min,DBOP_max,DBOP_count,
+    DBOP_sum,DBOP_avg,DBOP_any_sample,DBOP_stddev,DBOP_stddev_pop,
+    DBOP_var,DBOP_var_pop,DBOP_first,DBOP_last,DBOP_in,
+    DBOP_exists,DBOP_unique,DBOP_subset,DBOP_proper_subset,
+    DBOP_superset,DBOP_proper_superset,DBOP_disjoint,
+    DBOP_pass_through,DBOP_defined_by_GUID,DBOP_text_command,
+    DBOP_SQL_select,DBOP_prior_command_tree,DBOP_add_columns,
+    DBOP_column_list_anchor,DBOP_column_list_element,
+    DBOP_command_list_anchor,DBOP_command_list_element,
+    DBOP_from_list_anchor,DBOP_from_list_element,
+    DBOP_project_list_anchor,DBOP_project_list_element,
+    DBOP_row_list_anchor,DBOP_row_list_element,
+    DBOP_scalar_list_anchor,DBOP_scalar_list_element,
+    DBOP_set_list_anchor,DBOP_set_list_element,
+    DBOP_sort_list_anchor,DBOP_sort_list_element,
+    DBOP_alter_character_set,DBOP_alter_collation,
+    DBOP_alter_domain,DBOP_alter_index,DBOP_alter_procedure,
+    DBOP_alter_schema,DBOP_alter_table,DBOP_alter_trigger,
+    DBOP_alter_view,DBOP_coldef_list_anchor,DBOP_coldef_list_element,
+    DBOP_create_assertion,DBOP_create_character_set,
+    DBOP_create_collation,DBOP_create_domain,DBOP_create_index,
+    DBOP_create_procedure,DBOP_create_schema,DBOP_create_synonym,
+    DBOP_create_table,DBOP_create_temporary_table,
+    DBOP_create_translation,DBOP_create_trigger,
+    DBOP_create_view,DBOP_drop_assertion,DBOP_drop_character_set,
+    DBOP_drop_collation,DBOP_drop_domain,DBOP_drop_index,
+    DBOP_drop_procedure,DBOP_drop_schema,DBOP_drop_synonym,
+    DBOP_drop_table,DBOP_drop_translation,DBOP_drop_trigger,
+    DBOP_drop_view,DBOP_foreign_key,DBOP_grant_privileges,
+    DBOP_index_list_anchor,DBOP_index_list_element,
+    DBOP_primary_key,DBOP_property_list_anchor,
+    DBOP_property_list_element,DBOP_referenced_table,
+    DBOP_rename_object,DBOP_revoke_privileges,
+    DBOP_schema_authorization,DBOP_unique_key,DBOP_scope_list_anchor,
+    DBOP_scope_list_element,DBOP_content_table
   };
 #ifdef DBINITCONSTANTS
   extern const OLEDBDECLSPEC GUID DBGUID_LIKE_SQL = {0xc8b521f6,0x5cf3,0x11ce,{0xad,0xe5,0x00,0xaa,0x00,0x44,0x77,0x3d}};
@@ -167,18 +165,23 @@
   };
   typedef DWORD DBVALUEKIND;
   enum DBVALUEKINDENUM {
-    DBVALUEKIND_BYGUID = 256,DBVALUEKIND_COLDESC = DBVALUEKIND_BYGUID + 1,DBVALUEKIND_ID = DBVALUEKIND_COLDESC + 1,
-    DBVALUEKIND_CONTENT = DBVALUEKIND_ID + 1,DBVALUEKIND_CONTENTVECTOR = DBVALUEKIND_CONTENT + 1,DBVALUEKIND_GROUPINFO = DBVALUEKIND_CONTENTVECTOR + 1,
-    DBVALUEKIND_PARAMETER = DBVALUEKIND_GROUPINFO + 1,DBVALUEKIND_PROPERTY = DBVALUEKIND_PARAMETER + 1,DBVALUEKIND_SETFUNC = DBVALUEKIND_PROPERTY + 1,
-    DBVALUEKIND_SORTINFO = DBVALUEKIND_SETFUNC + 1,DBVALUEKIND_TEXT = DBVALUEKIND_SORTINFO + 1,DBVALUEKIND_COMMAND = DBVALUEKIND_TEXT + 1,
-    DBVALUEKIND_MONIKER = DBVALUEKIND_COMMAND + 1,DBVALUEKIND_ROWSET = DBVALUEKIND_MONIKER + 1,DBVALUEKIND_LIKE = DBVALUEKIND_ROWSET + 1,
-    DBVALUEKIND_CONTENTPROXIMITY = DBVALUEKIND_LIKE + 1,DBVALUEKIND_CONTENTSCOPE = DBVALUEKIND_CONTENTPROXIMITY + 1,
-    DBVALUEKIND_CONTENTTABLE = DBVALUEKIND_CONTENTSCOPE + 1,DBVALUEKIND_IDISPATCH = 9,DBVALUEKIND_IUNKNOWN = 13,DBVALUEKIND_EMPTY = 0,
-    DBVALUEKIND_NULL = 1,DBVALUEKIND_I2 = 2,DBVALUEKIND_I4 = 3,DBVALUEKIND_R4 = 4,DBVALUEKIND_R8 = 5,DBVALUEKIND_CY = 6,DBVALUEKIND_DATE = 7,
-    DBVALUEKIND_BSTR = 8,DBVALUEKIND_ERROR = 10,DBVALUEKIND_BOOL = 11,DBVALUEKIND_VARIANT = 12,DBVALUEKIND_VECTOR = 0x1000,DBVALUEKIND_ARRAY = 0x2000,
-    DBVALUEKIND_BYREF = 0x4000,DBVALUEKIND_I1 = 16,DBVALUEKIND_UI1 = 17,DBVALUEKIND_UI2 = 18,DBVALUEKIND_UI4 = DBVALUEKIND_UI2 + 1,
-    DBVALUEKIND_I8 = DBVALUEKIND_UI4 + 1,DBVALUEKIND_UI8 = DBVALUEKIND_I8 + 1,DBVALUEKIND_GUID = 72,DBVALUEKIND_BYTES = 128,DBVALUEKIND_STR = 129,
-    DBVALUEKIND_WSTR = 130,DBVALUEKIND_NUMERIC = 131,DBVALUEKIND_DBDATE = 133,DBVALUEKIND_DBTIME = 134,DBVALUEKIND_DBTIMESTAMP = 135,
+    DBVALUEKIND_BYGUID = 256,DBVALUEKIND_COLDESC,DBVALUEKIND_ID,
+    DBVALUEKIND_CONTENT,DBVALUEKIND_CONTENTVECTOR,DBVALUEKIND_GROUPINFO,
+    DBVALUEKIND_PARAMETER,DBVALUEKIND_PROPERTY,DBVALUEKIND_SETFUNC,
+    DBVALUEKIND_SORTINFO,DBVALUEKIND_TEXT,DBVALUEKIND_COMMAND,
+    DBVALUEKIND_MONIKER,DBVALUEKIND_ROWSET,DBVALUEKIND_LIKE,
+    DBVALUEKIND_CONTENTPROXIMITY,DBVALUEKIND_CONTENTSCOPE,
+    DBVALUEKIND_CONTENTTABLE,
+    DBVALUEKIND_IDISPATCH = 9,DBVALUEKIND_IUNKNOWN = 13,DBVALUEKIND_EMPTY = 0,
+    DBVALUEKIND_NULL = 1,DBVALUEKIND_I2 = 2,DBVALUEKIND_I4 = 3,DBVALUEKIND_R4 = 4,
+    DBVALUEKIND_R8 = 5,DBVALUEKIND_CY = 6,DBVALUEKIND_DATE = 7,
+    DBVALUEKIND_BSTR = 8,DBVALUEKIND_ERROR = 10,DBVALUEKIND_BOOL = 11,
+    DBVALUEKIND_VARIANT = 12,DBVALUEKIND_VECTOR = 0x1000,DBVALUEKIND_ARRAY = 0x2000, DBVALUEKIND_BYREF = 0x4000,
+    DBVALUEKIND_I1 = 16,DBVALUEKIND_UI1 = 17,DBVALUEKIND_UI2 = 18,
+    DBVALUEKIND_UI4 = 19,DBVALUEKIND_I8 = 20,DBVALUEKIND_UI8 = 21,
+    DBVALUEKIND_GUID = 72,DBVALUEKIND_BYTES = 128,DBVALUEKIND_STR = 129,
+    DBVALUEKIND_WSTR = 130,DBVALUEKIND_NUMERIC = 131,DBVALUEKIND_DBDATE = 133,
+    DBVALUEKIND_DBTIME = 134,DBVALUEKIND_DBTIMESTAMP = 135,
     DBVALUEKIND_PROBABILISTIC = 136,DBVALUEKIND_RELEVANTDOCUMENT = 137
   };
   typedef struct tagDBBYGUID {
diff --git a/mingw-w64-headers/include/comadmin.h b/mingw-w64-headers/include/comadmin.h
index d4a721d..efcf3ca 100644
--- a/mingw-w64-headers/include/comadmin.h
+++ b/mingw-w64-headers/include/comadmin.h
@@ -709,10 +709,9 @@
   } COMAdminTransactionOptions;
 
   typedef enum COMAdminTxIsolationLevelOptions {
-    COMAdminTxIsolationLevelAny = 0,COMAdminTxIsolationLevelReadUnCommitted = COMAdminTxIsolationLevelAny + 1,
-    COMAdminTxIsolationLevelReadCommitted = COMAdminTxIsolationLevelReadUnCommitted + 1,
-    COMAdminTxIsolationLevelRepeatableRead = COMAdminTxIsolationLevelReadCommitted + 1,
-    COMAdminTxIsolationLevelSerializable = COMAdminTxIsolationLevelRepeatableRead + 1
+    COMAdminTxIsolationLevelAny = 0,COMAdminTxIsolationLevelReadUnCommitted,
+    COMAdminTxIsolationLevelReadCommitted,COMAdminTxIsolationLevelRepeatableRead,
+    COMAdminTxIsolationLevelSerializable
   } COMAdminTxIsolationLevelOptions;
 
   typedef enum COMAdminSynchronizationOptions {
@@ -756,10 +755,9 @@
   } COMAdminServiceOptions;
 
   typedef enum COMAdminServiceStatusOptions {
-    COMAdminServiceStopped = 0,COMAdminServiceStartPending = COMAdminServiceStopped + 1,COMAdminServiceStopPending = COMAdminServiceStartPending + 1,
-    COMAdminServiceRunning = COMAdminServiceStopPending + 1,COMAdminServiceContinuePending = COMAdminServiceRunning + 1,
-    COMAdminServicePausePending = COMAdminServiceContinuePending + 1,COMAdminServicePaused = COMAdminServicePausePending + 1,
-    COMAdminServiceUnknownState = COMAdminServicePaused + 1
+    COMAdminServiceStopped = 0,COMAdminServiceStartPending,COMAdminServiceStopPending,
+    COMAdminServiceRunning,COMAdminServiceContinuePending,COMAdminServicePausePending,
+    COMAdminServicePaused,COMAdminServiceUnknownState
   } COMAdminServiceStatusOptions;
 
   typedef enum COMAdminQCMessageAuthenticateOptions {
diff --git a/mingw-w64-headers/include/comsvcs.h b/mingw-w64-headers/include/comsvcs.h
index 89c5517..9260751 100644
--- a/mingw-w64-headers/include/comsvcs.h
+++ b/mingw-w64-headers/include/comsvcs.h
@@ -2466,7 +2466,7 @@
 #endif
 
   typedef enum __MIDL___MIDL_itf_autosvcs_0325_0001 {
-    TRKCOLL_PROCESSES = 0,TRKCOLL_APPLICATIONS = TRKCOLL_PROCESSES + 1,TRKCOLL_COMPONENTS = TRKCOLL_APPLICATIONS + 1
+    TRKCOLL_PROCESSES = 0,TRKCOLL_APPLICATIONS,TRKCOLL_COMPONENTS
   } TRACKING_COLL_TYPE;
 
   extern RPC_IF_HANDLE __MIDL_itf_autosvcs_0325_v0_0_c_ifspec;
@@ -4561,7 +4561,7 @@
 #ifndef _tagCrmTransactionState_
 #define _tagCrmTransactionState_
   typedef enum tagCrmTransactionState {
-    TxState_Active = 0,TxState_Committed = TxState_Active + 1,TxState_Aborted = TxState_Committed + 1,TxState_Indoubt = TxState_Aborted + 1
+    TxState_Active = 0,TxState_Committed,TxState_Aborted,TxState_Indoubt
   } CrmTransactionState;
 #endif
 
@@ -4775,8 +4775,8 @@
   } CSC_InheritanceConfig;
 
   typedef enum tagCSC_ThreadPool {
-    CSC_ThreadPoolNone = 0,CSC_ThreadPoolInherit = CSC_ThreadPoolNone + 1,CSC_STAThreadPool = CSC_ThreadPoolInherit + 1,
-    CSC_MTAThreadPool = CSC_STAThreadPool + 1
+    CSC_ThreadPoolNone = 0,CSC_ThreadPoolInherit,CSC_STAThreadPool,
+    CSC_MTAThreadPool
   } CSC_ThreadPool;
 
   typedef enum tagCSC_Binding {
@@ -4784,12 +4784,13 @@
   } CSC_Binding;
 
   typedef enum tagCSC_TransactionConfig {
-    CSC_NoTransaction = 0,CSC_IfContainerIsTransactional = CSC_NoTransaction + 1,CSC_CreateTransactionIfNecessary = CSC_IfContainerIsTransactional + 1,CSC_NewTransaction = CSC_CreateTransactionIfNecessary + 1
+    CSC_NoTransaction = 0,CSC_IfContainerIsTransactional,CSC_CreateTransactionIfNecessary,
+    CSC_NewTransaction
   } CSC_TransactionConfig;
 
   typedef enum tagCSC_SynchronizationConfig {
-    CSC_NoSynchronization = 0,CSC_IfContainerIsSynchronized = CSC_NoSynchronization + 1,
-    CSC_NewSynchronizationIfNecessary = CSC_IfContainerIsSynchronized + 1,CSC_NewSynchronization = CSC_NewSynchronizationIfNecessary + 1
+    CSC_NoSynchronization = 0,CSC_IfContainerIsSynchronized,
+    CSC_NewSynchronizationIfNecessary,CSC_NewSynchronization
   } CSC_SynchronizationConfig;
 
   typedef enum tagCSC_TrackerConfig {
@@ -4797,7 +4798,7 @@
   } CSC_TrackerConfig;
 
   typedef enum tagCSC_PartitionConfig {
-    CSC_NoPartition = 0,CSC_InheritPartition = CSC_NoPartition + 1,CSC_NewPartition = CSC_InheritPartition + 1
+    CSC_NoPartition = 0,CSC_InheritPartition,CSC_NewPartition
   } CSC_PartitionConfig;
 
   typedef enum tagCSC_IISIntrinsicsConfig {
@@ -4809,7 +4810,7 @@
   } CSC_COMTIIntrinsicsConfig;
 
   typedef enum tagCSC_SxsConfig {
-    CSC_NoSxs = 0,CSC_InheritSxs = CSC_NoSxs + 1,CSC_NewSxs = CSC_InheritSxs + 1
+    CSC_NoSxs = 0,CSC_InheritSxs,CSC_NewSxs
   } CSC_SxsConfig;
 
   extern RPC_IF_HANDLE __MIDL_itf_autosvcs_0378_v0_0_c_ifspec;
diff --git a/mingw-w64-headers/include/confpriv.h b/mingw-w64-headers/include/confpriv.h
index 22922f3..885288b 100644
--- a/mingw-w64-headers/include/confpriv.h
+++ b/mingw-w64-headers/include/confpriv.h
@@ -70,7 +70,7 @@
 #endif
 
   typedef enum MULTICAST_LOOPBACK_MODE {
-    MM_NO_LOOPBACK = 0,MM_FULL_LOOPBACK = MM_NO_LOOPBACK + 1,MM_SELECTIVE_LOOPBACK = MM_FULL_LOOPBACK + 1
+    MM_NO_LOOPBACK = 0,MM_FULL_LOOPBACK,MM_SELECTIVE_LOOPBACK
   } MULTICAST_LOOPBACK_MODE;
 
   extern RPC_IF_HANDLE __MIDL_itf_confpriv_0000_v0_0_c_ifspec;
diff --git a/mingw-w64-headers/include/dhtmled.h b/mingw-w64-headers/include/dhtmled.h
index deb1c3d..fdbeac7 100644
--- a/mingw-w64-headers/include/dhtmled.h
+++ b/mingw-w64-headers/include/dhtmled.h
@@ -135,22 +135,18 @@
 #ifndef __DHTMLEDLib_LIBRARY_DEFINED__
 #define __DHTMLEDLib_LIBRARY_DEFINED__
   typedef enum DHTMLEDITCMDID {
-    DECMD_BOLD = 5000,DECMD_COPY = 5002,DECMD_CUT = DECMD_COPY + 1,DECMD_DELETE = DECMD_CUT + 1,DECMD_DELETECELLS = DECMD_DELETE + 1,
-    DECMD_DELETECOLS = DECMD_DELETECELLS + 1,DECMD_DELETEROWS = DECMD_DELETECOLS + 1,DECMD_FINDTEXT = DECMD_DELETEROWS + 1,
-    DECMD_FONT = DECMD_FINDTEXT + 1,DECMD_GETBACKCOLOR = DECMD_FONT + 1,DECMD_GETBLOCKFMT = DECMD_GETBACKCOLOR + 1,
-    DECMD_GETBLOCKFMTNAMES = DECMD_GETBLOCKFMT + 1,DECMD_GETFONTNAME = DECMD_GETBLOCKFMTNAMES + 1,DECMD_GETFONTSIZE = DECMD_GETFONTNAME + 1,
-    DECMD_GETFORECOLOR = DECMD_GETFONTSIZE + 1,DECMD_HYPERLINK = DECMD_GETFORECOLOR + 1,DECMD_IMAGE = DECMD_HYPERLINK + 1,DECMD_INDENT = DECMD_IMAGE + 1,
-    DECMD_INSERTCELL = DECMD_INDENT + 1,DECMD_INSERTCOL = DECMD_INSERTCELL + 1,DECMD_INSERTROW = DECMD_INSERTCOL + 1,
-    DECMD_INSERTTABLE = DECMD_INSERTROW + 1,DECMD_ITALIC = DECMD_INSERTTABLE + 1,DECMD_JUSTIFYCENTER = DECMD_ITALIC + 1,
-    DECMD_JUSTIFYLEFT = DECMD_JUSTIFYCENTER + 1,DECMD_JUSTIFYRIGHT = DECMD_JUSTIFYLEFT + 1,DECMD_LOCK_ELEMENT = DECMD_JUSTIFYRIGHT + 1,
-    DECMD_MAKE_ABSOLUTE = DECMD_LOCK_ELEMENT + 1,DECMD_MERGECELLS = DECMD_MAKE_ABSOLUTE + 1,DECMD_ORDERLIST = DECMD_MERGECELLS + 1,
-    DECMD_OUTDENT = DECMD_ORDERLIST + 1,DECMD_PASTE = DECMD_OUTDENT + 1,DECMD_REDO = DECMD_PASTE + 1,DECMD_REMOVEFORMAT = DECMD_REDO + 1,
-    DECMD_SELECTALL = DECMD_REMOVEFORMAT + 1,DECMD_SEND_BACKWARD = DECMD_SELECTALL + 1,DECMD_BRING_FORWARD = DECMD_SEND_BACKWARD + 1,
-    DECMD_SEND_BELOW_TEXT = DECMD_BRING_FORWARD + 1,DECMD_BRING_ABOVE_TEXT = DECMD_SEND_BELOW_TEXT + 1,DECMD_SEND_TO_BACK = DECMD_BRING_ABOVE_TEXT + 1,
-    DECMD_BRING_TO_FRONT = DECMD_SEND_TO_BACK + 1,DECMD_SETBACKCOLOR = DECMD_BRING_TO_FRONT + 1,DECMD_SETBLOCKFMT = DECMD_SETBACKCOLOR + 1,
-    DECMD_SETFONTNAME = DECMD_SETBLOCKFMT + 1,DECMD_SETFONTSIZE = DECMD_SETFONTNAME + 1,DECMD_SETFORECOLOR = DECMD_SETFONTSIZE + 1,
-    DECMD_SPLITCELL = DECMD_SETFORECOLOR + 1,DECMD_UNDERLINE = DECMD_SPLITCELL + 1,DECMD_UNDO = DECMD_UNDERLINE + 1,DECMD_UNLINK = DECMD_UNDO + 1,
-    DECMD_UNORDERLIST = DECMD_UNLINK + 1,DECMD_PROPERTIES = DECMD_UNORDERLIST + 1
+    DECMD_BOLD = 5000,DECMD_COPY = 5002,DECMD_CUT,DECMD_DELETE,DECMD_DELETECELLS,
+    DECMD_DELETECOLS,DECMD_DELETEROWS,DECMD_FINDTEXT,DECMD_FONT,DECMD_GETBACKCOLOR,
+    DECMD_GETBLOCKFMT,DECMD_GETBLOCKFMTNAMES,DECMD_GETFONTNAME,DECMD_GETFONTSIZE,
+    DECMD_GETFORECOLOR,DECMD_HYPERLINK,DECMD_IMAGE,DECMD_INDENT,DECMD_INSERTCELL,
+    DECMD_INSERTCOL,DECMD_INSERTROW,DECMD_INSERTTABLE,DECMD_ITALIC,DECMD_JUSTIFYCENTER,
+    DECMD_JUSTIFYLEFT,DECMD_JUSTIFYRIGHT,DECMD_LOCK_ELEMENT,DECMD_MAKE_ABSOLUTE,
+    DECMD_MERGECELLS,DECMD_ORDERLIST,DECMD_OUTDENT,DECMD_PASTE,
+    DECMD_REDO,DECMD_REMOVEFORMAT,DECMD_SELECTALL,DECMD_SEND_BACKWARD,
+    DECMD_BRING_FORWARD,DECMD_SEND_BELOW_TEXT,DECMD_BRING_ABOVE_TEXT,
+    DECMD_SEND_TO_BACK,DECMD_BRING_TO_FRONT,DECMD_SETBACKCOLOR,DECMD_SETBLOCKFMT,
+    DECMD_SETFONTNAME,DECMD_SETFONTSIZE,DECMD_SETFORECOLOR,DECMD_SPLITCELL,
+    DECMD_UNDERLINE,DECMD_UNDO,DECMD_UNLINK,DECMD_UNORDERLIST,DECMD_PROPERTIES
   } DHTMLEDITCMDID;
 
   typedef enum DHTMLEDITCMDF {
diff --git a/mingw-w64-headers/include/eventsys.h b/mingw-w64-headers/include/eventsys.h
index a93f102..5fca7bc 100644
--- a/mingw-w64-headers/include/eventsys.h
+++ b/mingw-w64-headers/include/eventsys.h
@@ -869,9 +869,8 @@
 
 #ifndef __IEventObjectChange_INTERFACE_DEFINED__
 #define __IEventObjectChange_INTERFACE_DEFINED__
-  typedef
-    enum __MIDL_IEventObjectChange_0001 {
-      EOC_NewObject = 0,EOC_ModifiedObject = EOC_NewObject + 1,EOC_DeletedObject = EOC_ModifiedObject + 1
+  typedef enum __MIDL_IEventObjectChange_0001 {
+    EOC_NewObject = 0,EOC_ModifiedObject,EOC_DeletedObject
   } EOC_ChangeType;
   EXTERN_C const IID IID_IEventObjectChange;
 #if defined(__cplusplus) && !defined(CINTERFACE)