Re-generated idl files with () for enum values.

Jeremy.

23 files changed, 1014 insertions, 1014 deletions

diff --git a/librpc/gen_ndr/dcerpc.h b/librpc/gen_ndr/dcerpc.h
index 00df9f8a2e..5408cf4968 100644
--- a/librpc/gen_ndr/dcerpc.h
+++ b/librpc/gen_ndr/dcerpc.h
@@ -124,16 +124,16 @@ struct dcerpc_fault {
 enum dcerpc_AuthType
 #ifndef USE_UINT_ENUMS
  {
-	DCERPC_AUTH_TYPE_NONE=(int)0,
-	DCERPC_AUTH_TYPE_KRB5_1=(int)1,
-	DCERPC_AUTH_TYPE_SPNEGO=(int)9,
-	DCERPC_AUTH_TYPE_NTLMSSP=(int)10,
-	DCERPC_AUTH_TYPE_KRB5=(int)16,
-	DCERPC_AUTH_TYPE_DPA=(int)17,
-	DCERPC_AUTH_TYPE_MSN=(int)18,
-	DCERPC_AUTH_TYPE_DIGEST=(int)21,
-	DCERPC_AUTH_TYPE_SCHANNEL=(int)68,
-	DCERPC_AUTH_TYPE_MSMQ=(int)100
+	DCERPC_AUTH_TYPE_NONE=(int)(0),
+	DCERPC_AUTH_TYPE_KRB5_1=(int)(1),
+	DCERPC_AUTH_TYPE_SPNEGO=(int)(9),
+	DCERPC_AUTH_TYPE_NTLMSSP=(int)(10),
+	DCERPC_AUTH_TYPE_KRB5=(int)(16),
+	DCERPC_AUTH_TYPE_DPA=(int)(17),
+	DCERPC_AUTH_TYPE_MSN=(int)(18),
+	DCERPC_AUTH_TYPE_DIGEST=(int)(21),
+	DCERPC_AUTH_TYPE_SCHANNEL=(int)(68),
+	DCERPC_AUTH_TYPE_MSMQ=(int)(100)
 }
 #else
  { __donnot_use_enum_dcerpc_AuthType=0x7FFFFFFF}
@@ -153,12 +153,12 @@ enum dcerpc_AuthType
 enum dcerpc_AuthLevel
 #ifndef USE_UINT_ENUMS
  {
-	DCERPC_AUTH_LEVEL_NONE=(int)1,
-	DCERPC_AUTH_LEVEL_CONNECT=(int)2,
-	DCERPC_AUTH_LEVEL_CALL=(int)3,
-	DCERPC_AUTH_LEVEL_PACKET=(int)4,
-	DCERPC_AUTH_LEVEL_INTEGRITY=(int)5,
-	DCERPC_AUTH_LEVEL_PRIVACY=(int)6
+	DCERPC_AUTH_LEVEL_NONE=(int)(1),
+	DCERPC_AUTH_LEVEL_CONNECT=(int)(2),
+	DCERPC_AUTH_LEVEL_CALL=(int)(3),
+	DCERPC_AUTH_LEVEL_PACKET=(int)(4),
+	DCERPC_AUTH_LEVEL_INTEGRITY=(int)(5),
+	DCERPC_AUTH_LEVEL_PRIVACY=(int)(6)
 }
 #else
  { __donnot_use_enum_dcerpc_AuthLevel=0x7FFFFFFF}
@@ -236,26 +236,26 @@ struct dcerpc_working {
 enum dcerpc_pkt_type
 #ifndef USE_UINT_ENUMS
  {
-	DCERPC_PKT_REQUEST=(int)0,
-	DCERPC_PKT_PING=(int)1,
-	DCERPC_PKT_RESPONSE=(int)2,
-	DCERPC_PKT_FAULT=(int)3,
-	DCERPC_PKT_WORKING=(int)4,
-	DCERPC_PKT_NOCALL=(int)5,
-	DCERPC_PKT_REJECT=(int)6,
-	DCERPC_PKT_ACK=(int)7,
-	DCERPC_PKT_CL_CANCEL=(int)8,
-	DCERPC_PKT_FACK=(int)9,
-	DCERPC_PKT_CANCEL_ACK=(int)10,
-	DCERPC_PKT_BIND=(int)11,
-	DCERPC_PKT_BIND_ACK=(int)12,
-	DCERPC_PKT_BIND_NAK=(int)13,
-	DCERPC_PKT_ALTER=(int)14,
-	DCERPC_PKT_ALTER_RESP=(int)15,
-	DCERPC_PKT_AUTH3=(int)16,
-	DCERPC_PKT_SHUTDOWN=(int)17,
-	DCERPC_PKT_CO_CANCEL=(int)18,
-	DCERPC_PKT_ORPHANED=(int)19
+	DCERPC_PKT_REQUEST=(int)(0),
+	DCERPC_PKT_PING=(int)(1),
+	DCERPC_PKT_RESPONSE=(int)(2),
+	DCERPC_PKT_FAULT=(int)(3),
+	DCERPC_PKT_WORKING=(int)(4),
+	DCERPC_PKT_NOCALL=(int)(5),
+	DCERPC_PKT_REJECT=(int)(6),
+	DCERPC_PKT_ACK=(int)(7),
+	DCERPC_PKT_CL_CANCEL=(int)(8),
+	DCERPC_PKT_FACK=(int)(9),
+	DCERPC_PKT_CANCEL_ACK=(int)(10),
+	DCERPC_PKT_BIND=(int)(11),
+	DCERPC_PKT_BIND_ACK=(int)(12),
+	DCERPC_PKT_BIND_NAK=(int)(13),
+	DCERPC_PKT_ALTER=(int)(14),
+	DCERPC_PKT_ALTER_RESP=(int)(15),
+	DCERPC_PKT_AUTH3=(int)(16),
+	DCERPC_PKT_SHUTDOWN=(int)(17),
+	DCERPC_PKT_CO_CANCEL=(int)(18),
+	DCERPC_PKT_ORPHANED=(int)(19)
 }
 #else
  { __donnot_use_enum_dcerpc_pkt_type=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/dfs.h b/librpc/gen_ndr/dfs.h
index 23dc90968c..5fa2734094 100644
--- a/librpc/gen_ndr/dfs.h
+++ b/librpc/gen_ndr/dfs.h
@@ -12,10 +12,10 @@
 enum dfs_ManagerVersion
 #ifndef USE_UINT_ENUMS
  {
-	DFS_MANAGER_VERSION_NT4=(int)1,
-	DFS_MANAGER_VERSION_W2K=(int)2,
-	DFS_MANAGER_VERSION_W2K3=(int)4,
-	DFS_MANAGER_VERSION_W2K8=(int)6
+	DFS_MANAGER_VERSION_NT4=(int)(1),
+	DFS_MANAGER_VERSION_W2K=(int)(2),
+	DFS_MANAGER_VERSION_W2K3=(int)(4),
+	DFS_MANAGER_VERSION_W2K8=(int)(6)
 }
 #else
  { __donnot_use_enum_dfs_ManagerVersion=0x7FFFFFFF}
@@ -99,12 +99,12 @@ struct dfs_Info5 {
 enum dfs_Target_PriorityClass
 #ifndef USE_UINT_ENUMS
  {
-	DFS_INVALID_PRIORITY_CLASS=(int)-1,
-	DFS_SITE_COST_NORMAL_PRIORITY_CLASS=(int)0,
-	DFS_GLOBAL_HIGH_PRIORITY_CLASS=(int)1,
-	DFS_SITE_COST_HIGH_PRIORITY_CLASS=(int)2,
-	DFS_SITE_COST_LOW_PRIORITY_CLASS=(int)3,
-	DFS_GLOBAL_LOW_PRIORITY_CLASS=(int)4
+	DFS_INVALID_PRIORITY_CLASS=(int)(-1),
+	DFS_SITE_COST_NORMAL_PRIORITY_CLASS=(int)(0),
+	DFS_GLOBAL_HIGH_PRIORITY_CLASS=(int)(1),
+	DFS_SITE_COST_HIGH_PRIORITY_CLASS=(int)(2),
+	DFS_SITE_COST_LOW_PRIORITY_CLASS=(int)(3),
+	DFS_GLOBAL_LOW_PRIORITY_CLASS=(int)(4)
 }
 #else
  { __donnot_use_enum_dfs_Target_PriorityClass=0x7FFFFFFF}
@@ -184,8 +184,8 @@ struct dfs_Info200 {
 enum dfs_VolumeFlavor
 #ifndef USE_UINT_ENUMS
  {
-	DFS_VOLUME_FLAVOR_STANDALONE=(int)0x100,
-	DFS_VOLUME_FLAVOR_AD_BLOB=(int)0x200
+	DFS_VOLUME_FLAVOR_STANDALONE=(int)(0x100),
+	DFS_VOLUME_FLAVOR_AD_BLOB=(int)(0x200)
 }
 #else
  { __donnot_use_enum_dfs_VolumeFlavor=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/drsblobs.h b/librpc/gen_ndr/drsblobs.h
index c6a48949be..f7570af16f 100644
--- a/librpc/gen_ndr/drsblobs.h
+++ b/librpc/gen_ndr/drsblobs.h
@@ -110,7 +110,7 @@ struct partialAttributeSetBlob {
 enum prefixMapVersion
 #ifndef USE_UINT_ENUMS
  {
-	PREFIX_MAP_VERSION_DSDB=(int)0x44534442
+	PREFIX_MAP_VERSION_DSDB=(int)(0x44534442)
 }
 #else
  { __donnot_use_enum_prefixMapVersion=0x7FFFFFFF}
@@ -159,7 +159,7 @@ struct supplementalCredentialsPackage {
 enum supplementalCredentialsSignature
 #ifndef USE_UINT_ENUMS
  {
-	SUPPLEMENTAL_CREDENTIALS_SIGNATURE=(int)0x0050
+	SUPPLEMENTAL_CREDENTIALS_SIGNATURE=(int)(0x0050)
 }
 #else
  { __donnot_use_enum_supplementalCredentialsSignature=0x7FFFFFFF}
@@ -344,8 +344,8 @@ struct ExtendedErrorBlob {
 enum ExtendedErrorComputerNamePresent
 #ifndef USE_UINT_ENUMS
  {
-	EXTENDED_ERROR_COMPUTER_NAME_PRESENT=(int)1,
-	EXTENDED_ERROR_COMPUTER_NAME_NOT_PRESENT=(int)2
+	EXTENDED_ERROR_COMPUTER_NAME_PRESENT=(int)(1),
+	EXTENDED_ERROR_COMPUTER_NAME_NOT_PRESENT=(int)(2)
 }
 #else
  { __donnot_use_enum_ExtendedErrorComputerNamePresent=0x7FFFFFFF}
@@ -366,13 +366,13 @@ struct ExtendedErrorComputerName {
 enum ExtendedErrorParamType
 #ifndef USE_UINT_ENUMS
  {
-	EXTENDED_ERROR_PARAM_TYPE_ASCII_STRING=(int)1,
-	EXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING=(int)2,
-	EXTENDED_ERROR_PARAM_TYPE_UINT32=(int)3,
-	EXTENDED_ERROR_PARAM_TYPE_UINT16=(int)4,
-	EXTENDED_ERROR_PARAM_TYPE_UINT64=(int)5,
-	EXTENDED_ERROR_PARAM_TYPE_NONE=(int)6,
-	EXTENDED_ERROR_PARAM_TYPE_BLOB=(int)7
+	EXTENDED_ERROR_PARAM_TYPE_ASCII_STRING=(int)(1),
+	EXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING=(int)(2),
+	EXTENDED_ERROR_PARAM_TYPE_UINT32=(int)(3),
+	EXTENDED_ERROR_PARAM_TYPE_UINT16=(int)(4),
+	EXTENDED_ERROR_PARAM_TYPE_UINT64=(int)(5),
+	EXTENDED_ERROR_PARAM_TYPE_NONE=(int)(6),
+	EXTENDED_ERROR_PARAM_TYPE_BLOB=(int)(7)
 }
 #else
  { __donnot_use_enum_ExtendedErrorParamType=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/drsuapi.h b/librpc/gen_ndr/drsuapi.h
index 4c8d232901..258c2731bd 100644
--- a/librpc/gen_ndr/drsuapi.h
+++ b/librpc/gen_ndr/drsuapi.h
@@ -178,14 +178,14 @@ struct drsuapi_DsReplicaCursorCtrEx {
 enum drsuapi_DsExtendedOperation
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_EXOP_NONE=(int)0x00000000,
-	DRSUAPI_EXOP_FSMO_REQ_ROLE=(int)0x00000001,
-	DRSUAPI_EXOP_FSMO_RID_ALLOC=(int)0x00000002,
-	DRSUAPI_EXOP_FSMO_RID_REQ_ROLE=(int)0x00000003,
-	DRSUAPI_EXOP_FSMO_REQ_PDC=(int)0x00000004,
-	DRSUAPI_EXOP_FSMO_ABANDON_ROLE=(int)0x00000005,
-	DRSUAPI_EXOP_REPL_OBJ=(int)0x00000006,
-	DRSUAPI_EXOP_REPL_SECRET=(int)0x00000007
+	DRSUAPI_EXOP_NONE=(int)(0x00000000),
+	DRSUAPI_EXOP_FSMO_REQ_ROLE=(int)(0x00000001),
+	DRSUAPI_EXOP_FSMO_RID_ALLOC=(int)(0x00000002),
+	DRSUAPI_EXOP_FSMO_RID_REQ_ROLE=(int)(0x00000003),
+	DRSUAPI_EXOP_FSMO_REQ_PDC=(int)(0x00000004),
+	DRSUAPI_EXOP_FSMO_ABANDON_ROLE=(int)(0x00000005),
+	DRSUAPI_EXOP_REPL_OBJ=(int)(0x00000006),
+	DRSUAPI_EXOP_REPL_SECRET=(int)(0x00000007)
 }
 #else
  { __donnot_use_enum_drsuapi_DsExtendedOperation=0x7FFFFFFF}
@@ -203,23 +203,23 @@ enum drsuapi_DsExtendedOperation
 enum drsuapi_DsExtendedError
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_EXOP_ERR_NONE=(int)0x00000000,
-	DRSUAPI_EXOP_ERR_SUCCESS=(int)0x00000001,
-	DRSUAPI_EXOP_ERR_UNKNOWN_OP=(int)0x00000002,
-	DRSUAPI_EXOP_ERR_FSMO_NOT_OWNER=(int)0x00000003,
-	DRSUAPI_EXOP_ERR_UPDATE_ERR=(int)0x00000004,
-	DRSUAPI_EXOP_ERR_EXCEPTION=(int)0x00000005,
-	DRSUAPI_EXOP_ERR_UNKNOWN_CALLER=(int)0x00000006,
-	DRSUAPI_EXOP_ERR_RID_ALLOC=(int)0x00000007,
-	DRSUAPI_EXOP_ERR_FSMO_OWNER_DELETED=(int)0x00000008,
-	DRSUAPI_EXOP_ERR_FMSO_PENDING_OP=(int)0x00000009,
-	DRSUAPI_EXOP_ERR_MISMATCH=(int)0x0000000A,
-	DRSUAPI_EXOP_ERR_COULDNT_CONTACT=(int)0x0000000B,
-	DRSUAPI_EXOP_ERR_FSMO_REFUSING_ROLES=(int)0x0000000C,
-	DRSUAPI_EXOP_ERR_DIR_ERROR=(int)0x0000000D,
-	DRSUAPI_EXOP_ERR_FSMO_MISSING_SETTINGS=(int)0x0000000E,
-	DRSUAPI_EXOP_ERR_ACCESS_DENIED=(int)0x0000000F,
-	DRSUAPI_EXOP_ERR_PARAM_ERROR=(int)0x00000010
+	DRSUAPI_EXOP_ERR_NONE=(int)(0x00000000),
+	DRSUAPI_EXOP_ERR_SUCCESS=(int)(0x00000001),
+	DRSUAPI_EXOP_ERR_UNKNOWN_OP=(int)(0x00000002),
+	DRSUAPI_EXOP_ERR_FSMO_NOT_OWNER=(int)(0x00000003),
+	DRSUAPI_EXOP_ERR_UPDATE_ERR=(int)(0x00000004),
+	DRSUAPI_EXOP_ERR_EXCEPTION=(int)(0x00000005),
+	DRSUAPI_EXOP_ERR_UNKNOWN_CALLER=(int)(0x00000006),
+	DRSUAPI_EXOP_ERR_RID_ALLOC=(int)(0x00000007),
+	DRSUAPI_EXOP_ERR_FSMO_OWNER_DELETED=(int)(0x00000008),
+	DRSUAPI_EXOP_ERR_FMSO_PENDING_OP=(int)(0x00000009),
+	DRSUAPI_EXOP_ERR_MISMATCH=(int)(0x0000000A),
+	DRSUAPI_EXOP_ERR_COULDNT_CONTACT=(int)(0x0000000B),
+	DRSUAPI_EXOP_ERR_FSMO_REFUSING_ROLES=(int)(0x0000000C),
+	DRSUAPI_EXOP_ERR_DIR_ERROR=(int)(0x0000000D),
+	DRSUAPI_EXOP_ERR_FSMO_MISSING_SETTINGS=(int)(0x0000000E),
+	DRSUAPI_EXOP_ERR_ACCESS_DENIED=(int)(0x0000000F),
+	DRSUAPI_EXOP_ERR_PARAM_ERROR=(int)(0x00000010)
 }
 #else
  { __donnot_use_enum_drsuapi_DsExtendedError=0x7FFFFFFF}
@@ -274,9 +274,9 @@ struct drsuapi_DsReplicaOIDMapping_Ctr {
 enum drsuapi_DsObjectClassId
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_OBJECTCLASS_top=(int)0x00010000,
-	DRSUAPI_OBJECTCLASS_classSchema=(int)0x0003000d,
-	DRSUAPI_OBJECTCLASS_attributeSchema=(int)0x0003000e
+	DRSUAPI_OBJECTCLASS_top=(int)(0x00010000),
+	DRSUAPI_OBJECTCLASS_classSchema=(int)(0x0003000d),
+	DRSUAPI_OBJECTCLASS_attributeSchema=(int)(0x0003000e)
 }
 #else
  { __donnot_use_enum_drsuapi_DsObjectClassId=0x7FFFFFFF}
@@ -289,75 +289,75 @@ enum drsuapi_DsObjectClassId
 enum drsuapi_DsAttributeId
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_ATTRIBUTE_objectClass=(int)0x00000000,
-	DRSUAPI_ATTRIBUTE_description=(int)0x0000000d,
-	DRSUAPI_ATTRIBUTE_member=(int)0x0000001f,
-	DRSUAPI_ATTRIBUTE_instanceType=(int)0x00020001,
-	DRSUAPI_ATTRIBUTE_whenCreated=(int)0x00020002,
-	DRSUAPI_ATTRIBUTE_possSuperiors=(int)0x00020008,
-	DRSUAPI_ATTRIBUTE_hasMasterNCs=(int)0x0002000e,
-	DRSUAPI_ATTRIBUTE_subClassOf=(int)0x00020015,
-	DRSUAPI_ATTRIBUTE_governsID=(int)0x00020016,
-	DRSUAPI_ATTRIBUTE_mustContain=(int)0x00020018,
-	DRSUAPI_ATTRIBUTE_mayContain=(int)0x00020019,
-	DRSUAPI_ATTRIBUTE_attributeID=(int)0x0002001e,
-	DRSUAPI_ATTRIBUTE_attributeSyntax=(int)0x00020020,
-	DRSUAPI_ATTRIBUTE_isSingleValued=(int)0x00020021,
-	DRSUAPI_ATTRIBUTE_rangeLower=(int)0x00020022,
-	DRSUAPI_ATTRIBUTE_rangeUpper=(int)0x00020023,
-	DRSUAPI_ATTRIBUTE_dMDLocation=(int)0x00020024,
-	DRSUAPI_ATTRIBUTE_objectVersion=(int)0x0002004c,
-	DRSUAPI_ATTRIBUTE_invocationId=(int)0x00020073,
-	DRSUAPI_ATTRIBUTE_showInAdvancedViewOnly=(int)0x000200a9,
-	DRSUAPI_ATTRIBUTE_adminDisplayName=(int)0x000200c2,
-	DRSUAPI_ATTRIBUTE_adminDescription=(int)0x000200e2,
-	DRSUAPI_ATTRIBUTE_oMSyntax=(int)0x000200e7,
-	DRSUAPI_ATTRIBUTE_ntSecurityDescriptor=(int)0x00020119,
-	DRSUAPI_ATTRIBUTE_searchFlags=(int)0x0002014e,
-	DRSUAPI_ATTRIBUTE_auxiliaryClass=(int)0x0002015f,
-	DRSUAPI_ATTRIBUTE_lDAPDisplayName=(int)0x000201cc,
-	DRSUAPI_ATTRIBUTE_name=(int)0x00090001,
-	DRSUAPI_ATTRIBUTE_userAccountControl=(int)0x00090008,
-	DRSUAPI_ATTRIBUTE_currentValue=(int)0x0009001b,
-	DRSUAPI_ATTRIBUTE_homeDirectory=(int)0x0009002c,
-	DRSUAPI_ATTRIBUTE_homeDrive=(int)0x0009002d,
-	DRSUAPI_ATTRIBUTE_scriptPath=(int)0x0009003e,
-	DRSUAPI_ATTRIBUTE_profilePath=(int)0x0009008b,
-	DRSUAPI_ATTRIBUTE_objectSid=(int)0x00090092,
-	DRSUAPI_ATTRIBUTE_schemaIDGUID=(int)0x00090094,
-	DRSUAPI_ATTRIBUTE_dBCSPwd=(int)0x00090037,
-	DRSUAPI_ATTRIBUTE_logonHours=(int)0x00090040,
-	DRSUAPI_ATTRIBUTE_userWorkstations=(int)0x00090056,
-	DRSUAPI_ATTRIBUTE_unicodePwd=(int)0x0009005a,
-	DRSUAPI_ATTRIBUTE_ntPwdHistory=(int)0x0009005e,
-	DRSUAPI_ATTRIBUTE_priorValue=(int)0x00090064,
-	DRSUAPI_ATTRIBUTE_supplementalCredentials=(int)0x0009007d,
-	DRSUAPI_ATTRIBUTE_trustAuthIncoming=(int)0x00090081,
-	DRSUAPI_ATTRIBUTE_trustAuthOutgoing=(int)0x00090087,
-	DRSUAPI_ATTRIBUTE_lmPwdHistory=(int)0x000900a0,
-	DRSUAPI_ATTRIBUTE_systemPossSuperiors=(int)0x000900c3,
-	DRSUAPI_ATTRIBUTE_systemMayContain=(int)0x000900c4,
-	DRSUAPI_ATTRIBUTE_systemMustContain=(int)0x000900c5,
-	DRSUAPI_ATTRIBUTE_sAMAccountName=(int)0x000900dd,
-	DRSUAPI_ATTRIBUTE_sAMAccountType=(int)0x0009012e,
-	DRSUAPI_ATTRIBUTE_fSMORoleOwner=(int)0x00090171,
-	DRSUAPI_ATTRIBUTE_systemFlags=(int)0x00090177,
-	DRSUAPI_ATTRIBUTE_serverReference=(int)0x00090203,
-	DRSUAPI_ATTRIBUTE_serverReferenceBL=(int)0x00090204,
-	DRSUAPI_ATTRIBUTE_initialAuthIncoming=(int)0x0009021b,
-	DRSUAPI_ATTRIBUTE_initialAuthOutgoing=(int)0x0009021c,
-	DRSUAPI_ATTRIBUTE_wellKnownObjects=(int)0x0009026a,
-	DRSUAPI_ATTRIBUTE_dNSHostName=(int)0x0009026b,
-	DRSUAPI_ATTRIBUTE_isMemberOfPartialAttributeSet=(int)0x0009027f,
-	DRSUAPI_ATTRIBUTE_userPrincipalName=(int)0x00090290,
-	DRSUAPI_ATTRIBUTE_groupType=(int)0x000902ee,
-	DRSUAPI_ATTRIBUTE_servicePrincipalName=(int)0x00090303,
-	DRSUAPI_ATTRIBUTE_objectCategory=(int)0x0009030e,
-	DRSUAPI_ATTRIBUTE_gPLink=(int)0x0009037b,
-	DRSUAPI_ATTRIBUTE_msDS_Behavior_Version=(int)0x000905b3,
-	DRSUAPI_ATTRIBUTE_msDS_KeyVersionNumber=(int)0x000906f6,
-	DRSUAPI_ATTRIBUTE_msDS_HasDomainNCs=(int)0x0009071c,
-	DRSUAPI_ATTRIBUTE_msDS_hasMasterNCs=(int)0x0009072c
+	DRSUAPI_ATTRIBUTE_objectClass=(int)(0x00000000),
+	DRSUAPI_ATTRIBUTE_description=(int)(0x0000000d),
+	DRSUAPI_ATTRIBUTE_member=(int)(0x0000001f),
+	DRSUAPI_ATTRIBUTE_instanceType=(int)(0x00020001),
+	DRSUAPI_ATTRIBUTE_whenCreated=(int)(0x00020002),
+	DRSUAPI_ATTRIBUTE_possSuperiors=(int)(0x00020008),
+	DRSUAPI_ATTRIBUTE_hasMasterNCs=(int)(0x0002000e),
+	DRSUAPI_ATTRIBUTE_subClassOf=(int)(0x00020015),
+	DRSUAPI_ATTRIBUTE_governsID=(int)(0x00020016),
+	DRSUAPI_ATTRIBUTE_mustContain=(int)(0x00020018),
+	DRSUAPI_ATTRIBUTE_mayContain=(int)(0x00020019),
+	DRSUAPI_ATTRIBUTE_attributeID=(int)(0x0002001e),
+	DRSUAPI_ATTRIBUTE_attributeSyntax=(int)(0x00020020),
+	DRSUAPI_ATTRIBUTE_isSingleValued=(int)(0x00020021),
+	DRSUAPI_ATTRIBUTE_rangeLower=(int)(0x00020022),
+	DRSUAPI_ATTRIBUTE_rangeUpper=(int)(0x00020023),
+	DRSUAPI_ATTRIBUTE_dMDLocation=(int)(0x00020024),
+	DRSUAPI_ATTRIBUTE_objectVersion=(int)(0x0002004c),
+	DRSUAPI_ATTRIBUTE_invocationId=(int)(0x00020073),
+	DRSUAPI_ATTRIBUTE_showInAdvancedViewOnly=(int)(0x000200a9),
+	DRSUAPI_ATTRIBUTE_adminDisplayName=(int)(0x000200c2),
+	DRSUAPI_ATTRIBUTE_adminDescription=(int)(0x000200e2),
+	DRSUAPI_ATTRIBUTE_oMSyntax=(int)(0x000200e7),
+	DRSUAPI_ATTRIBUTE_ntSecurityDescriptor=(int)(0x00020119),
+	DRSUAPI_ATTRIBUTE_searchFlags=(int)(0x0002014e),
+	DRSUAPI_ATTRIBUTE_auxiliaryClass=(int)(0x0002015f),
+	DRSUAPI_ATTRIBUTE_lDAPDisplayName=(int)(0x000201cc),
+	DRSUAPI_ATTRIBUTE_name=(int)(0x00090001),
+	DRSUAPI_ATTRIBUTE_userAccountControl=(int)(0x00090008),
+	DRSUAPI_ATTRIBUTE_currentValue=(int)(0x0009001b),
+	DRSUAPI_ATTRIBUTE_homeDirectory=(int)(0x0009002c),
+	DRSUAPI_ATTRIBUTE_homeDrive=(int)(0x0009002d),
+	DRSUAPI_ATTRIBUTE_scriptPath=(int)(0x0009003e),
+	DRSUAPI_ATTRIBUTE_profilePath=(int)(0x0009008b),
+	DRSUAPI_ATTRIBUTE_objectSid=(int)(0x00090092),
+	DRSUAPI_ATTRIBUTE_schemaIDGUID=(int)(0x00090094),
+	DRSUAPI_ATTRIBUTE_dBCSPwd=(int)(0x00090037),
+	DRSUAPI_ATTRIBUTE_logonHours=(int)(0x00090040),
+	DRSUAPI_ATTRIBUTE_userWorkstations=(int)(0x00090056),
+	DRSUAPI_ATTRIBUTE_unicodePwd=(int)(0x0009005a),
+	DRSUAPI_ATTRIBUTE_ntPwdHistory=(int)(0x0009005e),
+	DRSUAPI_ATTRIBUTE_priorValue=(int)(0x00090064),
+	DRSUAPI_ATTRIBUTE_supplementalCredentials=(int)(0x0009007d),
+	DRSUAPI_ATTRIBUTE_trustAuthIncoming=(int)(0x00090081),
+	DRSUAPI_ATTRIBUTE_trustAuthOutgoing=(int)(0x00090087),
+	DRSUAPI_ATTRIBUTE_lmPwdHistory=(int)(0x000900a0),
+	DRSUAPI_ATTRIBUTE_systemPossSuperiors=(int)(0x000900c3),
+	DRSUAPI_ATTRIBUTE_systemMayContain=(int)(0x000900c4),
+	DRSUAPI_ATTRIBUTE_systemMustContain=(int)(0x000900c5),
+	DRSUAPI_ATTRIBUTE_sAMAccountName=(int)(0x000900dd),
+	DRSUAPI_ATTRIBUTE_sAMAccountType=(int)(0x0009012e),
+	DRSUAPI_ATTRIBUTE_fSMORoleOwner=(int)(0x00090171),
+	DRSUAPI_ATTRIBUTE_systemFlags=(int)(0x00090177),
+	DRSUAPI_ATTRIBUTE_serverReference=(int)(0x00090203),
+	DRSUAPI_ATTRIBUTE_serverReferenceBL=(int)(0x00090204),
+	DRSUAPI_ATTRIBUTE_initialAuthIncoming=(int)(0x0009021b),
+	DRSUAPI_ATTRIBUTE_initialAuthOutgoing=(int)(0x0009021c),
+	DRSUAPI_ATTRIBUTE_wellKnownObjects=(int)(0x0009026a),
+	DRSUAPI_ATTRIBUTE_dNSHostName=(int)(0x0009026b),
+	DRSUAPI_ATTRIBUTE_isMemberOfPartialAttributeSet=(int)(0x0009027f),
+	DRSUAPI_ATTRIBUTE_userPrincipalName=(int)(0x00090290),
+	DRSUAPI_ATTRIBUTE_groupType=(int)(0x000902ee),
+	DRSUAPI_ATTRIBUTE_servicePrincipalName=(int)(0x00090303),
+	DRSUAPI_ATTRIBUTE_objectCategory=(int)(0x0009030e),
+	DRSUAPI_ATTRIBUTE_gPLink=(int)(0x0009037b),
+	DRSUAPI_ATTRIBUTE_msDS_Behavior_Version=(int)(0x000905b3),
+	DRSUAPI_ATTRIBUTE_msDS_KeyVersionNumber=(int)(0x000906f6),
+	DRSUAPI_ATTRIBUTE_msDS_HasDomainNCs=(int)(0x0009071c),
+	DRSUAPI_ATTRIBUTE_msDS_hasMasterNCs=(int)(0x0009072c)
 }
 #else
  { __donnot_use_enum_drsuapi_DsAttributeId=0x7FFFFFFF}
@@ -646,8 +646,8 @@ struct drsuapi_DsGetNCChangesXPRESSCtr6 {
 enum drsuapi_DsGetNCChangesCompressionType
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_COMPRESSION_TYPE_MSZIP=(int)2,
-	DRSUAPI_COMPRESSION_TYPE_XPRESS=(int)3
+	DRSUAPI_COMPRESSION_TYPE_MSZIP=(int)(2),
+	DRSUAPI_COMPRESSION_TYPE_XPRESS=(int)(3)
 }
 #else
  { __donnot_use_enum_drsuapi_DsGetNCChangesCompressionType=0x7FFFFFFF}
@@ -758,13 +758,13 @@ union drsuapi_DsReplicaModRequest {
 enum drsuapi_DsMembershipType
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_AND_DOMAIN_GROUPS=(int)1,
-	DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS=(int)2,
-	DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_GROUPS=(int)3,
-	DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS2=(int)4,
-	DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_GROUPS=(int)5,
-	DRSUAPI_DS_MEMBERSHIP_TYPE_GROUPMEMBERS=(int)6,
-	DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_GROUPS2=(int)7
+	DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_AND_DOMAIN_GROUPS=(int)(1),
+	DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS=(int)(2),
+	DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_GROUPS=(int)(3),
+	DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS2=(int)(4),
+	DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_GROUPS=(int)(5),
+	DRSUAPI_DS_MEMBERSHIP_TYPE_GROUPMEMBERS=(int)(6),
+	DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_GROUPS2=(int)(7)
 }
 #else
  { __donnot_use_enum_drsuapi_DsMembershipType=0x7FFFFFFF}
@@ -835,14 +835,14 @@ union drsuapi_DsGetNT4ChangeLogInfo {
 enum drsuapi_DsNameStatus
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_DS_NAME_STATUS_OK=(int)0,
-	DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR=(int)1,
-	DRSUAPI_DS_NAME_STATUS_NOT_FOUND=(int)2,
-	DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE=(int)3,
-	DRSUAPI_DS_NAME_STATUS_NO_MAPPING=(int)4,
-	DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY=(int)5,
-	DRSUAPI_DS_NAME_STATUS_NO_SYNTACTICAL_MAPPING=(int)6,
-	DRSUAPI_DS_NAME_STATUS_TRUST_REFERRAL=(int)7
+	DRSUAPI_DS_NAME_STATUS_OK=(int)(0),
+	DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR=(int)(1),
+	DRSUAPI_DS_NAME_STATUS_NOT_FOUND=(int)(2),
+	DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE=(int)(3),
+	DRSUAPI_DS_NAME_STATUS_NO_MAPPING=(int)(4),
+	DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY=(int)(5),
+	DRSUAPI_DS_NAME_STATUS_NO_SYNTACTICAL_MAPPING=(int)(6),
+	DRSUAPI_DS_NAME_STATUS_TRUST_REFERRAL=(int)(7)
 }
 #else
  { __donnot_use_enum_drsuapi_DsNameStatus=0x7FFFFFFF}
@@ -860,11 +860,11 @@ enum drsuapi_DsNameStatus
 enum drsuapi_DsNameFlags
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_DS_NAME_FLAG_NO_FLAGS=(int)0x0,
-	DRSUAPI_DS_NAME_FLAG_SYNTACTICAL_ONLY=(int)0x1,
-	DRSUAPI_DS_NAME_FLAG_EVAL_AT_DC=(int)0x2,
-	DRSUAPI_DS_NAME_FLAG_GCVERIFY=(int)0x4,
-	DRSUAPI_DS_NAME_FLAG_TRUST_REFERRAL=(int)0x8
+	DRSUAPI_DS_NAME_FLAG_NO_FLAGS=(int)(0x0),
+	DRSUAPI_DS_NAME_FLAG_SYNTACTICAL_ONLY=(int)(0x1),
+	DRSUAPI_DS_NAME_FLAG_EVAL_AT_DC=(int)(0x2),
+	DRSUAPI_DS_NAME_FLAG_GCVERIFY=(int)(0x4),
+	DRSUAPI_DS_NAME_FLAG_TRUST_REFERRAL=(int)(0x8)
 }
 #else
  { __donnot_use_enum_drsuapi_DsNameFlags=0x7FFFFFFF}
@@ -879,17 +879,17 @@ enum drsuapi_DsNameFlags
 enum drsuapi_DsNameFormat
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_DS_NAME_FORMAT_UNKNOWN=(int)0,
-	DRSUAPI_DS_NAME_FORMAT_FQDN_1779=(int)1,
-	DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT=(int)2,
-	DRSUAPI_DS_NAME_FORMAT_DISPLAY=(int)3,
-	DRSUAPI_DS_NAME_FORMAT_GUID=(int)6,
-	DRSUAPI_DS_NAME_FORMAT_CANONICAL=(int)7,
-	DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL=(int)8,
-	DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX=(int)9,
-	DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL=(int)10,
-	DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY=(int)11,
-	DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN=(int)12
+	DRSUAPI_DS_NAME_FORMAT_UNKNOWN=(int)(0),
+	DRSUAPI_DS_NAME_FORMAT_FQDN_1779=(int)(1),
+	DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT=(int)(2),
+	DRSUAPI_DS_NAME_FORMAT_DISPLAY=(int)(3),
+	DRSUAPI_DS_NAME_FORMAT_GUID=(int)(6),
+	DRSUAPI_DS_NAME_FORMAT_CANONICAL=(int)(7),
+	DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL=(int)(8),
+	DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX=(int)(9),
+	DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL=(int)(10),
+	DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY=(int)(11),
+	DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN=(int)(12)
 }
 #else
  { __donnot_use_enum_drsuapi_DsNameFormat=0x7FFFFFFF}
@@ -943,9 +943,9 @@ union drsuapi_DsNameCtr {
 enum drsuapi_DsSpnOperation
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_DS_SPN_OPERATION_ADD=(int)0,
-	DRSUAPI_DS_SPN_OPERATION_REPLACE=(int)1,
-	DRSUAPI_DS_SPN_OPERATION_DELETE=(int)2
+	DRSUAPI_DS_SPN_OPERATION_ADD=(int)(0),
+	DRSUAPI_DS_SPN_OPERATION_REPLACE=(int)(1),
+	DRSUAPI_DS_SPN_OPERATION_DELETE=(int)(2)
 }
 #else
  { __donnot_use_enum_drsuapi_DsSpnOperation=0x7FFFFFFF}
@@ -1080,10 +1080,10 @@ struct drsuapi_DsGetDCConnectionCtr01 {
 enum drsuapi_DsGetDCInfoCtrLevels
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_DC_INFO_CTR_1=(int)1,
-	DRSUAPI_DC_INFO_CTR_2=(int)2,
-	DRSUAPI_DC_INFO_CTR_3=(int)3,
-	DRSUAPI_DC_CONNECTION_CTR_01=(int)-1
+	DRSUAPI_DC_INFO_CTR_1=(int)(1),
+	DRSUAPI_DC_INFO_CTR_2=(int)(2),
+	DRSUAPI_DC_INFO_CTR_3=(int)(3),
+	DRSUAPI_DC_CONNECTION_CTR_01=(int)(-1)
 }
 #else
  { __donnot_use_enum_drsuapi_DsGetDCInfoCtrLevels=0x7FFFFFFF}
@@ -1201,8 +1201,8 @@ union drsuapi_DsExecuteKCCRequest {
 enum drsuapi_DsReplicaGetInfoLevel
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_DS_REPLICA_GET_INFO=(int)1,
-	DRSUAPI_DS_REPLICA_GET_INFO2=(int)2
+	DRSUAPI_DS_REPLICA_GET_INFO=(int)(1),
+	DRSUAPI_DS_REPLICA_GET_INFO2=(int)(2)
 }
 #else
  { __donnot_use_enum_drsuapi_DsReplicaGetInfoLevel=0x7FFFFFFF}
@@ -1214,21 +1214,21 @@ enum drsuapi_DsReplicaGetInfoLevel
 enum drsuapi_DsReplicaInfoType
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_DS_REPLICA_INFO_NEIGHBORS=(int)0,
-	DRSUAPI_DS_REPLICA_INFO_CURSORS=(int)1,
-	DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA=(int)2,
-	DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES=(int)3,
-	DRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES=(int)4,
-	DRSUAPI_DS_REPLICA_INFO_PENDING_OPS=(int)5,
-	DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA=(int)6,
-	DRSUAPI_DS_REPLICA_INFO_CURSORS2=(int)7,
-	DRSUAPI_DS_REPLICA_INFO_CURSORS3=(int)8,
-	DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2=(int)9,
-	DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2=(int)10,
-	DRSUAPI_DS_REPLICA_INFO_NEIGHBORS02=(int)-2,
-	DRSUAPI_DS_REPLICA_INFO_CONNECTIONS04=(int)-4,
-	DRSUAPI_DS_REPLICA_INFO_CURSORS05=(int)-5,
-	DRSUAPI_DS_REPLICA_INFO_06=(int)-6
+	DRSUAPI_DS_REPLICA_INFO_NEIGHBORS=(int)(0),
+	DRSUAPI_DS_REPLICA_INFO_CURSORS=(int)(1),
+	DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA=(int)(2),
+	DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES=(int)(3),
+	DRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES=(int)(4),
+	DRSUAPI_DS_REPLICA_INFO_PENDING_OPS=(int)(5),
+	DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA=(int)(6),
+	DRSUAPI_DS_REPLICA_INFO_CURSORS2=(int)(7),
+	DRSUAPI_DS_REPLICA_INFO_CURSORS3=(int)(8),
+	DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2=(int)(9),
+	DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2=(int)(10),
+	DRSUAPI_DS_REPLICA_INFO_NEIGHBORS02=(int)(-2),
+	DRSUAPI_DS_REPLICA_INFO_CONNECTIONS04=(int)(-4),
+	DRSUAPI_DS_REPLICA_INFO_CURSORS05=(int)(-5),
+	DRSUAPI_DS_REPLICA_INFO_06=(int)(-6)
 }
 #else
  { __donnot_use_enum_drsuapi_DsReplicaInfoType=0x7FFFFFFF}
@@ -1334,11 +1334,11 @@ struct drsuapi_DsReplicaKccDsaFailuresCtr {
 enum drsuapi_DsReplicaOpType
 #ifndef USE_UINT_ENUMS
  {
-	DRSUAPI_DS_REPLICA_OP_TYPE_SYNC=(int)0,
-	DRSUAPI_DS_REPLICA_OP_TYPE_ADD=(int)1,
-	DRSUAPI_DS_REPLICA_OP_TYPE_DELETE=(int)2,
-	DRSUAPI_DS_REPLICA_OP_TYPE_MODIFY=(int)3,
-	DRSUAPI_DS_REPLICA_OP_TYPE_UPDATE_REFS=(int)4
+	DRSUAPI_DS_REPLICA_OP_TYPE_SYNC=(int)(0),
+	DRSUAPI_DS_REPLICA_OP_TYPE_ADD=(int)(1),
+	DRSUAPI_DS_REPLICA_OP_TYPE_DELETE=(int)(2),
+	DRSUAPI_DS_REPLICA_OP_TYPE_MODIFY=(int)(3),
+	DRSUAPI_DS_REPLICA_OP_TYPE_UPDATE_REFS=(int)(4)
 }
 #else
  { __donnot_use_enum_drsuapi_DsReplicaOpType=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/dssetup.h b/librpc/gen_ndr/dssetup.h
index 4b3c6446b3..f1d1332c6a 100644
--- a/librpc/gen_ndr/dssetup.h
+++ b/librpc/gen_ndr/dssetup.h
@@ -11,12 +11,12 @@
 enum dssetup_DsRole
 #ifndef USE_UINT_ENUMS
  {
-	DS_ROLE_STANDALONE_WORKSTATION=(int)0,
-	DS_ROLE_MEMBER_WORKSTATION=(int)1,
-	DS_ROLE_STANDALONE_SERVER=(int)2,
-	DS_ROLE_MEMBER_SERVER=(int)3,
-	DS_ROLE_BACKUP_DC=(int)4,
-	DS_ROLE_PRIMARY_DC=(int)5
+	DS_ROLE_STANDALONE_WORKSTATION=(int)(0),
+	DS_ROLE_MEMBER_WORKSTATION=(int)(1),
+	DS_ROLE_STANDALONE_SERVER=(int)(2),
+	DS_ROLE_MEMBER_SERVER=(int)(3),
+	DS_ROLE_BACKUP_DC=(int)(4),
+	DS_ROLE_PRIMARY_DC=(int)(5)
 }
 #else
  { __donnot_use_enum_dssetup_DsRole=0x7FFFFFFF}
@@ -47,8 +47,8 @@ struct dssetup_DsRolePrimaryDomInfoBasic {
 enum dssetup_DsUpgrade
 #ifndef USE_UINT_ENUMS
  {
-	DS_ROLE_NOT_UPGRADING=(int)0,
-	DS_ROLE_UPGRADING=(int)1
+	DS_ROLE_NOT_UPGRADING=(int)(0),
+	DS_ROLE_UPGRADING=(int)(1)
 }
 #else
  { __donnot_use_enum_dssetup_DsUpgrade=0x7FFFFFFF}
@@ -60,9 +60,9 @@ enum dssetup_DsUpgrade
 enum dssetup_DsPrevious
 #ifndef USE_UINT_ENUMS
  {
-	DS_ROLE_PREVIOUS_UNKNOWN=(int)0,
-	DS_ROLE_PREVIOUS_PRIMARY=(int)1,
-	DS_ROLE_PREVIOUS_BACKUP=(int)2
+	DS_ROLE_PREVIOUS_UNKNOWN=(int)(0),
+	DS_ROLE_PREVIOUS_PRIMARY=(int)(1),
+	DS_ROLE_PREVIOUS_BACKUP=(int)(2)
 }
 #else
  { __donnot_use_enum_dssetup_DsPrevious=0x7FFFFFFF}
@@ -80,9 +80,9 @@ struct dssetup_DsRoleUpgradeStatus {
 enum dssetup_DsRoleOp
 #ifndef USE_UINT_ENUMS
  {
-	DS_ROLE_OP_IDLE=(int)0,
-	DS_ROLE_OP_ACTIVE=(int)1,
-	DS_ROLE_OP_NEEDS_REBOOT=(int)2
+	DS_ROLE_OP_IDLE=(int)(0),
+	DS_ROLE_OP_ACTIVE=(int)(1),
+	DS_ROLE_OP_NEEDS_REBOOT=(int)(2)
 }
 #else
  { __donnot_use_enum_dssetup_DsRoleOp=0x7FFFFFFF}
@@ -99,9 +99,9 @@ struct dssetup_DsRoleOpStatus {
 enum dssetup_DsRoleInfoLevel
 #ifndef USE_UINT_ENUMS
  {
-	DS_ROLE_BASIC_INFORMATION=(int)1,
-	DS_ROLE_UPGRADE_STATUS=(int)2,
-	DS_ROLE_OP_STATUS=(int)3
+	DS_ROLE_BASIC_INFORMATION=(int)(1),
+	DS_ROLE_UPGRADE_STATUS=(int)(2),
+	DS_ROLE_OP_STATUS=(int)(3)
 }
 #else
  { __donnot_use_enum_dssetup_DsRoleInfoLevel=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/echo.h b/librpc/gen_ndr/echo.h
index ce9969c8a7..53c6ee73f7 100644
--- a/librpc/gen_ndr/echo.h
+++ b/librpc/gen_ndr/echo.h
@@ -51,8 +51,8 @@ union echo_Info {
 enum echo_Enum1
 #ifndef USE_UINT_ENUMS
  {
-	ECHO_ENUM1=(int)1,
-	ECHO_ENUM2=(int)2
+	ECHO_ENUM1=(int)(1),
+	ECHO_ENUM2=(int)(2)
 }
 #else
  { __donnot_use_enum_echo_Enum1=0x7FFFFFFF}
@@ -64,8 +64,8 @@ enum echo_Enum1
 enum echo_Enum1_32
 #ifndef USE_UINT_ENUMS
  {
-	ECHO_ENUM1_32=(int)1,
-	ECHO_ENUM2_32=(int)2
+	ECHO_ENUM1_32=(int)(1),
+	ECHO_ENUM2_32=(int)(2)
 }
 #else
  { __donnot_use_enum_echo_Enum1_32=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/epmapper.h b/librpc/gen_ndr/epmapper.h
index 09f46a3889..3d00411655 100644
--- a/librpc/gen_ndr/epmapper.h
+++ b/librpc/gen_ndr/epmapper.h
@@ -14,32 +14,32 @@
 enum epm_protocol
 #ifndef USE_UINT_ENUMS
  {
-	EPM_PROTOCOL_DNET_NSP=(int)0x04,
-	EPM_PROTOCOL_OSI_TP4=(int)0x05,
-	EPM_PROTOCOL_OSI_CLNS=(int)0x06,
-	EPM_PROTOCOL_TCP=(int)0x07,
-	EPM_PROTOCOL_UDP=(int)0x08,
-	EPM_PROTOCOL_IP=(int)0x09,
-	EPM_PROTOCOL_NCADG=(int)0x0a,
-	EPM_PROTOCOL_NCACN=(int)0x0b,
-	EPM_PROTOCOL_NCALRPC=(int)0x0c,
-	EPM_PROTOCOL_UUID=(int)0x0d,
-	EPM_PROTOCOL_IPX=(int)0x0e,
-	EPM_PROTOCOL_SMB=(int)0x0f,
-	EPM_PROTOCOL_NAMED_PIPE=(int)0x10,
-	EPM_PROTOCOL_NETBIOS=(int)0x11,
-	EPM_PROTOCOL_NETBEUI=(int)0x12,
-	EPM_PROTOCOL_SPX=(int)0x13,
-	EPM_PROTOCOL_NB_IPX=(int)0x14,
-	EPM_PROTOCOL_DSP=(int)0x16,
-	EPM_PROTOCOL_DDP=(int)0x17,
-	EPM_PROTOCOL_APPLETALK=(int)0x18,
-	EPM_PROTOCOL_VINES_SPP=(int)0x1a,
-	EPM_PROTOCOL_VINES_IPC=(int)0x1b,
-	EPM_PROTOCOL_STREETTALK=(int)0x1c,
-	EPM_PROTOCOL_HTTP=(int)0x1f,
-	EPM_PROTOCOL_UNIX_DS=(int)0x20,
-	EPM_PROTOCOL_NULL=(int)0x21
+	EPM_PROTOCOL_DNET_NSP=(int)(0x04),
+	EPM_PROTOCOL_OSI_TP4=(int)(0x05),
+	EPM_PROTOCOL_OSI_CLNS=(int)(0x06),
+	EPM_PROTOCOL_TCP=(int)(0x07),
+	EPM_PROTOCOL_UDP=(int)(0x08),
+	EPM_PROTOCOL_IP=(int)(0x09),
+	EPM_PROTOCOL_NCADG=(int)(0x0a),
+	EPM_PROTOCOL_NCACN=(int)(0x0b),
+	EPM_PROTOCOL_NCALRPC=(int)(0x0c),
+	EPM_PROTOCOL_UUID=(int)(0x0d),
+	EPM_PROTOCOL_IPX=(int)(0x0e),
+	EPM_PROTOCOL_SMB=(int)(0x0f),
+	EPM_PROTOCOL_NAMED_PIPE=(int)(0x10),
+	EPM_PROTOCOL_NETBIOS=(int)(0x11),
+	EPM_PROTOCOL_NETBEUI=(int)(0x12),
+	EPM_PROTOCOL_SPX=(int)(0x13),
+	EPM_PROTOCOL_NB_IPX=(int)(0x14),
+	EPM_PROTOCOL_DSP=(int)(0x16),
+	EPM_PROTOCOL_DDP=(int)(0x17),
+	EPM_PROTOCOL_APPLETALK=(int)(0x18),
+	EPM_PROTOCOL_VINES_SPP=(int)(0x1a),
+	EPM_PROTOCOL_VINES_IPC=(int)(0x1b),
+	EPM_PROTOCOL_STREETTALK=(int)(0x1c),
+	EPM_PROTOCOL_HTTP=(int)(0x1f),
+	EPM_PROTOCOL_UNIX_DS=(int)(0x20),
+	EPM_PROTOCOL_NULL=(int)(0x21)
 }
 #else
  { __donnot_use_enum_epm_protocol=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/eventlog.h b/librpc/gen_ndr/eventlog.h
index 1629b977c6..dc2e877029 100644
--- a/librpc/gen_ndr/eventlog.h
+++ b/librpc/gen_ndr/eventlog.h
@@ -18,12 +18,12 @@
 enum eventlogEventTypes
 #ifndef USE_UINT_ENUMS
  {
-	EVENTLOG_SUCCESS=(int)0x0000,
-	EVENTLOG_ERROR_TYPE=(int)0x0001,
-	EVENTLOG_WARNING_TYPE=(int)0x0002,
-	EVENTLOG_INFORMATION_TYPE=(int)0x0004,
-	EVENTLOG_AUDIT_SUCCESS=(int)0x0008,
-	EVENTLOG_AUDIT_FAILURE=(int)0x0010
+	EVENTLOG_SUCCESS=(int)(0x0000),
+	EVENTLOG_ERROR_TYPE=(int)(0x0001),
+	EVENTLOG_WARNING_TYPE=(int)(0x0002),
+	EVENTLOG_INFORMATION_TYPE=(int)(0x0004),
+	EVENTLOG_AUDIT_SUCCESS=(int)(0x0008),
+	EVENTLOG_AUDIT_FAILURE=(int)(0x0010)
 }
 #else
  { __donnot_use_enum_eventlogEventTypes=0x7FFFFFFF}
@@ -73,10 +73,10 @@ struct eventlog_Record_tdb {
 enum EVENTLOG_HEADER_FLAGS
 #ifndef USE_UINT_ENUMS
  {
-	ELF_LOGFILE_HEADER_DIRTY=(int)0x0001,
-	ELF_LOGFILE_HEADER_WRAP=(int)0x0002,
-	ELF_LOGFILE_LOGFULL_WRITTEN=(int)0x0004,
-	ELF_LOGFILE_ARCHIVE_SET=(int)0x0008
+	ELF_LOGFILE_HEADER_DIRTY=(int)(0x0001),
+	ELF_LOGFILE_HEADER_WRAP=(int)(0x0002),
+	ELF_LOGFILE_LOGFULL_WRITTEN=(int)(0x0004),
+	ELF_LOGFILE_ARCHIVE_SET=(int)(0x0008)
 }
 #else
  { __donnot_use_enum_EVENTLOG_HEADER_FLAGS=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/initshutdown.h b/librpc/gen_ndr/initshutdown.h
index 9db5a7677d..41fb62c18a 100644
--- a/librpc/gen_ndr/initshutdown.h
+++ b/librpc/gen_ndr/initshutdown.h
@@ -11,14 +11,14 @@
 enum initshutdown_ReasonMajor
 #ifndef USE_UINT_ENUMS
  {
-	SHTDN_REASON_MAJOR_OTHER=(int)0x00000000,
-	SHTDN_REASON_MAJOR_HARDWARE=(int)0x00010000,
-	SHTDN_REASON_MAJOR_OPERATINGSYSTEM=(int)0x00020000,
-	SHTDN_REASON_MAJOR_SOFTWARE=(int)0x00030000,
-	SHTDN_REASON_MAJOR_APPLICATION=(int)0x00040000,
-	SHTDN_REASON_MAJOR_SYSTEM=(int)0x00050000,
-	SHTDN_REASON_MAJOR_POWER=(int)0x00060000,
-	SHTDN_REASON_MAJOR_LEGACY_API=(int)0x00070000
+	SHTDN_REASON_MAJOR_OTHER=(int)(0x00000000),
+	SHTDN_REASON_MAJOR_HARDWARE=(int)(0x00010000),
+	SHTDN_REASON_MAJOR_OPERATINGSYSTEM=(int)(0x00020000),
+	SHTDN_REASON_MAJOR_SOFTWARE=(int)(0x00030000),
+	SHTDN_REASON_MAJOR_APPLICATION=(int)(0x00040000),
+	SHTDN_REASON_MAJOR_SYSTEM=(int)(0x00050000),
+	SHTDN_REASON_MAJOR_POWER=(int)(0x00060000),
+	SHTDN_REASON_MAJOR_LEGACY_API=(int)(0x00070000)
 }
 #else
  { __donnot_use_enum_initshutdown_ReasonMajor=0x7FFFFFFF}
@@ -36,33 +36,33 @@ enum initshutdown_ReasonMajor
 enum initshutdown_ReasonMinor
 #ifndef USE_UINT_ENUMS
  {
-	SHTDN_REASON_MINOR_OTHER=(int)0x00000000,
-	SHTDN_REASON_MINOR_MAINTENANCE=(int)0x00000001,
-	SHTDN_REASON_MINOR_INSTALLATION=(int)0x00000002,
-	SHTDN_REASON_MINOR_UPGRADE=(int)0x00000003,
-	SHTDN_REASON_MINOR_RECONFIG=(int)0x00000004,
-	SHTDN_REASON_MINOR_HUNG=(int)0x00000005,
-	SHTDN_REASON_MINOR_UNSTABLE=(int)0x00000006,
-	SHTDN_REASON_MINOR_DISK=(int)0x00000007,
-	SHTDN_REASON_MINOR_PROCESSOR=(int)0x00000008,
-	SHTDN_REASON_MINOR_NETWORKCARD=(int)0x00000009,
-	SHTDN_REASON_MINOR_POWER_SUPPLY=(int)0x0000000a,
-	SHTDN_REASON_MINOR_CORDUNPLUGGED=(int)0x0000000b,
-	SHTDN_REASON_MINOR_ENVIRONMENT=(int)0x0000000c,
-	SHTDN_REASON_MINOR_HARDWARE_DRIVER=(int)0x0000000d,
-	SHTDN_REASON_MINOR_OTHERDRIVER=(int)0x0000000e,
-	SHTDN_REASON_MINOR_BLUESCREEN=(int)0x0000000f,
-	SHTDN_REASON_MINOR_SERVICEPACK=(int)0x00000010,
-	SHTDN_REASON_MINOR_HOTFIX=(int)0x00000011,
-	SHTDN_REASON_MINOR_SECURITYFIX=(int)0x00000012,
-	SHTDN_REASON_MINOR_SECURITY=(int)0x00000013,
-	SHTDN_REASON_MINOR_NETWORK_CONNECTIVITY=(int)0x00000014,
-	SHTDN_REASON_MINOR_WMI=(int)0x00000015,
-	SHTDN_REASON_MINOR_SERVICEPACK_UNINSTALL=(int)0x00000016,
-	SHTDN_REASON_MINOR_HOTFIX_UNINSTALL=(int)0x00000017,
-	SHTDN_REASON_MINOR_SECURITYFIX_UNINSTALL=(int)0x00000018,
-	SHTDN_REASON_MINOR_MMC=(int)0x00000019,
-	SHTDN_REASON_MINOR_TERMSRV=(int)0x00000020
+	SHTDN_REASON_MINOR_OTHER=(int)(0x00000000),
+	SHTDN_REASON_MINOR_MAINTENANCE=(int)(0x00000001),
+	SHTDN_REASON_MINOR_INSTALLATION=(int)(0x00000002),
+	SHTDN_REASON_MINOR_UPGRADE=(int)(0x00000003),
+	SHTDN_REASON_MINOR_RECONFIG=(int)(0x00000004),
+	SHTDN_REASON_MINOR_HUNG=(int)(0x00000005),
+	SHTDN_REASON_MINOR_UNSTABLE=(int)(0x00000006),
+	SHTDN_REASON_MINOR_DISK=(int)(0x00000007),
+	SHTDN_REASON_MINOR_PROCESSOR=(int)(0x00000008),
+	SHTDN_REASON_MINOR_NETWORKCARD=(int)(0x00000009),
+	SHTDN_REASON_MINOR_POWER_SUPPLY=(int)(0x0000000a),
+	SHTDN_REASON_MINOR_CORDUNPLUGGED=(int)(0x0000000b),
+	SHTDN_REASON_MINOR_ENVIRONMENT=(int)(0x0000000c),
+	SHTDN_REASON_MINOR_HARDWARE_DRIVER=(int)(0x0000000d),
+	SHTDN_REASON_MINOR_OTHERDRIVER=(int)(0x0000000e),
+	SHTDN_REASON_MINOR_BLUESCREEN=(int)(0x0000000f),
+	SHTDN_REASON_MINOR_SERVICEPACK=(int)(0x00000010),
+	SHTDN_REASON_MINOR_HOTFIX=(int)(0x00000011),
+	SHTDN_REASON_MINOR_SECURITYFIX=(int)(0x00000012),
+	SHTDN_REASON_MINOR_SECURITY=(int)(0x00000013),
+	SHTDN_REASON_MINOR_NETWORK_CONNECTIVITY=(int)(0x00000014),
+	SHTDN_REASON_MINOR_WMI=(int)(0x00000015),
+	SHTDN_REASON_MINOR_SERVICEPACK_UNINSTALL=(int)(0x00000016),
+	SHTDN_REASON_MINOR_HOTFIX_UNINSTALL=(int)(0x00000017),
+	SHTDN_REASON_MINOR_SECURITYFIX_UNINSTALL=(int)(0x00000018),
+	SHTDN_REASON_MINOR_MMC=(int)(0x00000019),
+	SHTDN_REASON_MINOR_TERMSRV=(int)(0x00000020)
 }
 #else
  { __donnot_use_enum_initshutdown_ReasonMinor=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/krb5pac.h b/librpc/gen_ndr/krb5pac.h
index 0fca0c5991..fc277325f6 100644
--- a/librpc/gen_ndr/krb5pac.h
+++ b/librpc/gen_ndr/krb5pac.h
@@ -48,12 +48,12 @@ struct PAC_LOGON_INFO_CTR {
 enum PAC_TYPE
 #ifndef USE_UINT_ENUMS
  {
-	PAC_TYPE_LOGON_INFO=(int)1,
-	PAC_TYPE_SRV_CHECKSUM=(int)6,
-	PAC_TYPE_KDC_CHECKSUM=(int)7,
-	PAC_TYPE_LOGON_NAME=(int)10,
-	PAC_TYPE_CONSTRAINED_DELEGATION=(int)11,
-	PAC_TYPE_UNKNOWN_12=(int)12
+	PAC_TYPE_LOGON_INFO=(int)(1),
+	PAC_TYPE_SRV_CHECKSUM=(int)(6),
+	PAC_TYPE_KDC_CHECKSUM=(int)(7),
+	PAC_TYPE_LOGON_NAME=(int)(10),
+	PAC_TYPE_CONSTRAINED_DELEGATION=(int)(11),
+	PAC_TYPE_UNKNOWN_12=(int)(12)
 }
 #else
  { __donnot_use_enum_PAC_TYPE=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/lsa.h b/librpc/gen_ndr/lsa.h
index 3770756488..f101fb6f2c 100644
--- a/librpc/gen_ndr/lsa.h
+++ b/librpc/gen_ndr/lsa.h
@@ -135,11 +135,11 @@ struct lsa_AuditLogInfo {
 enum lsa_PolicyAuditPolicy
 #ifndef USE_UINT_ENUMS
  {
-	LSA_AUDIT_POLICY_NONE=(int)0,
-	LSA_AUDIT_POLICY_SUCCESS=(int)1,
-	LSA_AUDIT_POLICY_FAILURE=(int)2,
-	LSA_AUDIT_POLICY_ALL=(int)(LSA_AUDIT_POLICY_SUCCESS|LSA_AUDIT_POLICY_FAILURE),
-	LSA_AUDIT_POLICY_CLEAR=(int)4
+	LSA_AUDIT_POLICY_NONE=(int)(0),
+	LSA_AUDIT_POLICY_SUCCESS=(int)(1),
+	LSA_AUDIT_POLICY_FAILURE=(int)(2),
+	LSA_AUDIT_POLICY_ALL=(int)((LSA_AUDIT_POLICY_SUCCESS|LSA_AUDIT_POLICY_FAILURE)),
+	LSA_AUDIT_POLICY_CLEAR=(int)(4)
 }
 #else
  { __donnot_use_enum_lsa_PolicyAuditPolicy=0x7FFFFFFF}
@@ -154,15 +154,15 @@ enum lsa_PolicyAuditPolicy
 enum lsa_PolicyAuditEventType
 #ifndef USE_UINT_ENUMS
  {
-	LSA_AUDIT_CATEGORY_SYSTEM=(int)0,
-	LSA_AUDIT_CATEGORY_LOGON=(int)1,
-	LSA_AUDIT_CATEGORY_FILE_AND_OBJECT_ACCESS=(int)2,
-	LSA_AUDIT_CATEGORY_USE_OF_USER_RIGHTS=(int)3,
-	LSA_AUDIT_CATEGORY_PROCCESS_TRACKING=(int)4,
-	LSA_AUDIT_CATEGORY_SECURITY_POLICY_CHANGES=(int)5,
-	LSA_AUDIT_CATEGORY_ACCOUNT_MANAGEMENT=(int)6,
-	LSA_AUDIT_CATEGORY_DIRECTORY_SERVICE_ACCESS=(int)7,
-	LSA_AUDIT_CATEGORY_ACCOUNT_LOGON=(int)8
+	LSA_AUDIT_CATEGORY_SYSTEM=(int)(0),
+	LSA_AUDIT_CATEGORY_LOGON=(int)(1),
+	LSA_AUDIT_CATEGORY_FILE_AND_OBJECT_ACCESS=(int)(2),
+	LSA_AUDIT_CATEGORY_USE_OF_USER_RIGHTS=(int)(3),
+	LSA_AUDIT_CATEGORY_PROCCESS_TRACKING=(int)(4),
+	LSA_AUDIT_CATEGORY_SECURITY_POLICY_CHANGES=(int)(5),
+	LSA_AUDIT_CATEGORY_ACCOUNT_MANAGEMENT=(int)(6),
+	LSA_AUDIT_CATEGORY_DIRECTORY_SERVICE_ACCESS=(int)(7),
+	LSA_AUDIT_CATEGORY_ACCOUNT_LOGON=(int)(8)
 }
 #else
  { __donnot_use_enum_lsa_PolicyAuditEventType=0x7FFFFFFF}
@@ -196,8 +196,8 @@ struct lsa_PDAccountInfo {
 enum lsa_Role
 #ifndef USE_UINT_ENUMS
  {
-	LSA_ROLE_BACKUP=(int)2,
-	LSA_ROLE_PRIMARY=(int)3
+	LSA_ROLE_BACKUP=(int)(2),
+	LSA_ROLE_PRIMARY=(int)(3)
 }
 #else
  { __donnot_use_enum_lsa_Role=0x7FFFFFFF}
@@ -249,20 +249,20 @@ struct lsa_DnsDomainInfo {
 enum lsa_PolicyInfo
 #ifndef USE_UINT_ENUMS
  {
-	LSA_POLICY_INFO_AUDIT_LOG=(int)1,
-	LSA_POLICY_INFO_AUDIT_EVENTS=(int)2,
-	LSA_POLICY_INFO_DOMAIN=(int)3,
-	LSA_POLICY_INFO_PD=(int)4,
-	LSA_POLICY_INFO_ACCOUNT_DOMAIN=(int)5,
-	LSA_POLICY_INFO_ROLE=(int)6,
-	LSA_POLICY_INFO_REPLICA=(int)7,
-	LSA_POLICY_INFO_QUOTA=(int)8,
-	LSA_POLICY_INFO_MOD=(int)9,
-	LSA_POLICY_INFO_AUDIT_FULL_SET=(int)10,
-	LSA_POLICY_INFO_AUDIT_FULL_QUERY=(int)11,
-	LSA_POLICY_INFO_DNS=(int)12,
-	LSA_POLICY_INFO_DNS_INT=(int)13,
-	LSA_POLICY_INFO_L_ACCOUNT_DOMAIN=(int)14
+	LSA_POLICY_INFO_AUDIT_LOG=(int)(1),
+	LSA_POLICY_INFO_AUDIT_EVENTS=(int)(2),
+	LSA_POLICY_INFO_DOMAIN=(int)(3),
+	LSA_POLICY_INFO_PD=(int)(4),
+	LSA_POLICY_INFO_ACCOUNT_DOMAIN=(int)(5),
+	LSA_POLICY_INFO_ROLE=(int)(6),
+	LSA_POLICY_INFO_REPLICA=(int)(7),
+	LSA_POLICY_INFO_QUOTA=(int)(8),
+	LSA_POLICY_INFO_MOD=(int)(9),
+	LSA_POLICY_INFO_AUDIT_FULL_SET=(int)(10),
+	LSA_POLICY_INFO_AUDIT_FULL_QUERY=(int)(11),
+	LSA_POLICY_INFO_DNS=(int)(12),
+	LSA_POLICY_INFO_DNS_INT=(int)(13),
+	LSA_POLICY_INFO_L_ACCOUNT_DOMAIN=(int)(14)
 }
 #else
  { __donnot_use_enum_lsa_PolicyInfo=0x7FFFFFFF}
@@ -316,16 +316,16 @@ struct lsa_DomainList {
 enum lsa_SidType
 #ifndef USE_UINT_ENUMS
  {
-	SID_NAME_USE_NONE=(int)0,
-	SID_NAME_USER=(int)1,
-	SID_NAME_DOM_GRP=(int)2,
-	SID_NAME_DOMAIN=(int)3,
-	SID_NAME_ALIAS=(int)4,
-	SID_NAME_WKN_GRP=(int)5,
-	SID_NAME_DELETED=(int)6,
-	SID_NAME_INVALID=(int)7,
-	SID_NAME_UNKNOWN=(int)8,
-	SID_NAME_COMPUTER=(int)9
+	SID_NAME_USE_NONE=(int)(0),
+	SID_NAME_USER=(int)(1),
+	SID_NAME_DOM_GRP=(int)(2),
+	SID_NAME_DOMAIN=(int)(3),
+	SID_NAME_ALIAS=(int)(4),
+	SID_NAME_WKN_GRP=(int)(5),
+	SID_NAME_DELETED=(int)(6),
+	SID_NAME_INVALID=(int)(7),
+	SID_NAME_UNKNOWN=(int)(8),
+	SID_NAME_COMPUTER=(int)(9)
 }
 #else
  { __donnot_use_enum_lsa_SidType=0x7FFFFFFF}
@@ -362,13 +362,13 @@ struct lsa_RefDomainList {
 enum lsa_LookupNamesLevel
 #ifndef USE_UINT_ENUMS
  {
-	LSA_LOOKUP_NAMES_ALL=(int)1,
-	LSA_LOOKUP_NAMES_DOMAINS_ONLY=(int)2,
-	LSA_LOOKUP_NAMES_PRIMARY_DOMAIN_ONLY=(int)3,
-	LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY=(int)4,
-	LSA_LOOKUP_NAMES_FOREST_TRUSTS_ONLY=(int)5,
-	LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY2=(int)6,
-	LSA_LOOKUP_NAMES_RODC_REFERRAL_TO_FULL_DC=(int)7
+	LSA_LOOKUP_NAMES_ALL=(int)(1),
+	LSA_LOOKUP_NAMES_DOMAINS_ONLY=(int)(2),
+	LSA_LOOKUP_NAMES_PRIMARY_DOMAIN_ONLY=(int)(3),
+	LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY=(int)(4),
+	LSA_LOOKUP_NAMES_FOREST_TRUSTS_ONLY=(int)(5),
+	LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY2=(int)(6),
+	LSA_LOOKUP_NAMES_RODC_REFERRAL_TO_FULL_DC=(int)(7)
 }
 #else
  { __donnot_use_enum_lsa_LookupNamesLevel=0x7FFFFFFF}
@@ -433,19 +433,19 @@ struct lsa_DATA_BUF2 {
 enum lsa_TrustDomInfoEnum
 #ifndef USE_UINT_ENUMS
  {
-	LSA_TRUSTED_DOMAIN_INFO_NAME=(int)1,
-	LSA_TRUSTED_DOMAIN_INFO_CONTROLLERS=(int)2,
-	LSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET=(int)3,
-	LSA_TRUSTED_DOMAIN_INFO_PASSWORD=(int)4,
-	LSA_TRUSTED_DOMAIN_INFO_BASIC=(int)5,
-	LSA_TRUSTED_DOMAIN_INFO_INFO_EX=(int)6,
-	LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO=(int)7,
-	LSA_TRUSTED_DOMAIN_INFO_FULL_INFO=(int)8,
-	LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL=(int)9,
-	LSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL=(int)10,
-	LSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL=(int)11,
-	LSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL=(int)12,
-	LSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES=(int)13
+	LSA_TRUSTED_DOMAIN_INFO_NAME=(int)(1),
+	LSA_TRUSTED_DOMAIN_INFO_CONTROLLERS=(int)(2),
+	LSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET=(int)(3),
+	LSA_TRUSTED_DOMAIN_INFO_PASSWORD=(int)(4),
+	LSA_TRUSTED_DOMAIN_INFO_BASIC=(int)(5),
+	LSA_TRUSTED_DOMAIN_INFO_INFO_EX=(int)(6),
+	LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO=(int)(7),
+	LSA_TRUSTED_DOMAIN_INFO_FULL_INFO=(int)(8),
+	LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL=(int)(9),
+	LSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL=(int)(10),
+	LSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL=(int)(11),
+	LSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL=(int)(12),
+	LSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES=(int)(13)
 }
 #else
  { __donnot_use_enum_lsa_TrustDomInfoEnum=0x7FFFFFFF}
@@ -472,9 +472,9 @@ enum lsa_TrustDomInfoEnum
 enum lsa_TrustType
 #ifndef USE_UINT_ENUMS
  {
-	LSA_TRUST_TYPE_DOWNLEVEL=(int)0x00000001,
-	LSA_TRUST_TYPE_UPLEVEL=(int)0x00000002,
-	LSA_TRUST_TYPE_MIT=(int)0x00000003
+	LSA_TRUST_TYPE_DOWNLEVEL=(int)(0x00000001),
+	LSA_TRUST_TYPE_UPLEVEL=(int)(0x00000002),
+	LSA_TRUST_TYPE_MIT=(int)(0x00000003)
 }
 #else
  { __donnot_use_enum_lsa_TrustType=0x7FFFFFFF}
@@ -529,10 +529,10 @@ struct lsa_TrustDomainInfoInfoEx {
 enum lsa_TrustAuthType
 #ifndef USE_UINT_ENUMS
  {
-	TRUST_AUTH_TYPE_NONE=(int)0,
-	TRUST_AUTH_TYPE_NT4OWF=(int)1,
-	TRUST_AUTH_TYPE_CLEAR=(int)2,
-	TRUST_AUTH_TYPE_VERSION=(int)3
+	TRUST_AUTH_TYPE_NONE=(int)(0),
+	TRUST_AUTH_TYPE_NT4OWF=(int)(1),
+	TRUST_AUTH_TYPE_CLEAR=(int)(2),
+	TRUST_AUTH_TYPE_VERSION=(int)(3)
 }
 #else
  { __donnot_use_enum_lsa_TrustAuthType=0x7FFFFFFF}
@@ -641,8 +641,8 @@ struct lsa_DomainInfoEfs {
 enum lsa_DomainInfoEnum
 #ifndef USE_UINT_ENUMS
  {
-	LSA_DOMAIN_INFO_POLICY_EFS=(int)2,
-	LSA_DOMAIN_INFO_POLICY_KERBEROS=(int)3
+	LSA_DOMAIN_INFO_POLICY_EFS=(int)(2),
+	LSA_DOMAIN_INFO_POLICY_KERBEROS=(int)(3)
 }
 #else
  { __donnot_use_enum_lsa_DomainInfoEnum=0x7FFFFFFF}
@@ -671,8 +671,8 @@ struct lsa_TransNameArray2 {
 enum lsa_LookupOptions
 #ifndef USE_UINT_ENUMS
  {
-	LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES=(int)0x00000000,
-	LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES_LOCAL=(int)0x80000000
+	LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES=(int)(0x00000000),
+	LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES_LOCAL=(int)(0x80000000)
 }
 #else
  { __donnot_use_enum_lsa_LookupOptions=0x7FFFFFFF}
@@ -684,8 +684,8 @@ enum lsa_LookupOptions
 enum lsa_ClientRevision
 #ifndef USE_UINT_ENUMS
  {
-	LSA_CLIENT_REVISION_1=(int)0x00000001,
-	LSA_CLIENT_REVISION_2=(int)0x00000002
+	LSA_CLIENT_REVISION_1=(int)(0x00000001),
+	LSA_CLIENT_REVISION_2=(int)(0x00000002)
 }
 #else
  { __donnot_use_enum_lsa_ClientRevision=0x7FFFFFFF}
@@ -739,10 +739,10 @@ union lsa_ForestTrustData {
 enum lsa_ForestTrustRecordType
 #ifndef USE_UINT_ENUMS
  {
-	LSA_FOREST_TRUST_TOP_LEVEL_NAME=(int)0,
-	LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX=(int)1,
-	LSA_FOREST_TRUST_DOMAIN_INFO=(int)2,
-	LSA_FOREST_TRUST_RECORD_TYPE_LAST=(int)3
+	LSA_FOREST_TRUST_TOP_LEVEL_NAME=(int)(0),
+	LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX=(int)(1),
+	LSA_FOREST_TRUST_DOMAIN_INFO=(int)(2),
+	LSA_FOREST_TRUST_RECORD_TYPE_LAST=(int)(3)
 }
 #else
  { __donnot_use_enum_lsa_ForestTrustRecordType=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/misc.h b/librpc/gen_ndr/misc.h
index 84dc3aee7e..aa24a0fe17 100644
--- a/librpc/gen_ndr/misc.h
+++ b/librpc/gen_ndr/misc.h
@@ -28,11 +28,11 @@ struct policy_handle {
 enum netr_SchannelType
 #ifndef USE_UINT_ENUMS
  {
-	SEC_CHAN_NULL=(int)0,
-	SEC_CHAN_WKSTA=(int)2,
-	SEC_CHAN_DNS_DOMAIN=(int)3,
-	SEC_CHAN_DOMAIN=(int)4,
-	SEC_CHAN_BDC=(int)6
+	SEC_CHAN_NULL=(int)(0),
+	SEC_CHAN_WKSTA=(int)(2),
+	SEC_CHAN_DNS_DOMAIN=(int)(3),
+	SEC_CHAN_DOMAIN=(int)(4),
+	SEC_CHAN_BDC=(int)(6)
 }
 #else
  { __donnot_use_enum_netr_SchannelType=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/nbt.h b/librpc/gen_ndr/nbt.h
index 2ddfe0a31b..e596abd8c1 100644
--- a/librpc/gen_ndr/nbt.h
+++ b/librpc/gen_ndr/nbt.h
@@ -31,13 +31,13 @@
 enum nbt_opcode
 #ifndef USE_UINT_ENUMS
  {
-	NBT_OPCODE_QUERY=(int)(0x0<<11),
-	NBT_OPCODE_REGISTER=(int)(0x5<<11),
-	NBT_OPCODE_RELEASE=(int)(0x6<<11),
-	NBT_OPCODE_WACK=(int)(0x7<<11),
-	NBT_OPCODE_REFRESH=(int)(0x8<<11),
-	NBT_OPCODE_REFRESH2=(int)(0x9<<11),
-	NBT_OPCODE_MULTI_HOME_REG=(int)(0xf<<11)
+	NBT_OPCODE_QUERY=(int)((0x0<<11)),
+	NBT_OPCODE_REGISTER=(int)((0x5<<11)),
+	NBT_OPCODE_RELEASE=(int)((0x6<<11)),
+	NBT_OPCODE_WACK=(int)((0x7<<11)),
+	NBT_OPCODE_REFRESH=(int)((0x8<<11)),
+	NBT_OPCODE_REFRESH2=(int)((0x9<<11)),
+	NBT_OPCODE_MULTI_HOME_REG=(int)((0xf<<11))
 }
 #else
  { __donnot_use_enum_nbt_opcode=0x7FFFFFFF}
@@ -54,14 +54,14 @@ enum nbt_opcode
 enum nbt_rcode
 #ifndef USE_UINT_ENUMS
  {
-	NBT_RCODE_OK=(int)0x0,
-	NBT_RCODE_FMT=(int)0x1,
-	NBT_RCODE_SVR=(int)0x2,
-	NBT_RCODE_NAM=(int)0x3,
-	NBT_RCODE_IMP=(int)0x4,
-	NBT_RCODE_RFS=(int)0x5,
-	NBT_RCODE_ACT=(int)0x6,
-	NBT_RCODE_CFT=(int)0x7
+	NBT_RCODE_OK=(int)(0x0),
+	NBT_RCODE_FMT=(int)(0x1),
+	NBT_RCODE_SVR=(int)(0x2),
+	NBT_RCODE_NAM=(int)(0x3),
+	NBT_RCODE_IMP=(int)(0x4),
+	NBT_RCODE_RFS=(int)(0x5),
+	NBT_RCODE_ACT=(int)(0x6),
+	NBT_RCODE_CFT=(int)(0x7)
 }
 #else
  { __donnot_use_enum_nbt_rcode=0x7FFFFFFF}
@@ -79,14 +79,14 @@ enum nbt_rcode
 enum nbt_name_type
 #ifndef USE_UINT_ENUMS
  {
-	NBT_NAME_CLIENT=(int)0x00,
-	NBT_NAME_MS=(int)0x01,
-	NBT_NAME_USER=(int)0x03,
-	NBT_NAME_SERVER=(int)0x20,
-	NBT_NAME_PDC=(int)0x1B,
-	NBT_NAME_LOGON=(int)0x1C,
-	NBT_NAME_MASTER=(int)0x1D,
-	NBT_NAME_BROWSER=(int)0x1E
+	NBT_NAME_CLIENT=(int)(0x00),
+	NBT_NAME_MS=(int)(0x01),
+	NBT_NAME_USER=(int)(0x03),
+	NBT_NAME_SERVER=(int)(0x20),
+	NBT_NAME_PDC=(int)(0x1B),
+	NBT_NAME_LOGON=(int)(0x1C),
+	NBT_NAME_MASTER=(int)(0x1D),
+	NBT_NAME_BROWSER=(int)(0x1E)
 }
 #else
  { __donnot_use_enum_nbt_name_type=0x7FFFFFFF}
@@ -110,7 +110,7 @@ struct nbt_name {
 enum nbt_qclass
 #ifndef USE_UINT_ENUMS
  {
-	NBT_QCLASS_IP=(int)0x01
+	NBT_QCLASS_IP=(int)(0x01)
 }
 #else
  { __donnot_use_enum_nbt_qclass=0x7FFFFFFF}
@@ -121,11 +121,11 @@ enum nbt_qclass
 enum nbt_qtype
 #ifndef USE_UINT_ENUMS
  {
-	NBT_QTYPE_ADDRESS=(int)0x0001,
-	NBT_QTYPE_NAMESERVICE=(int)0x0002,
-	NBT_QTYPE_NULL=(int)0x000A,
-	NBT_QTYPE_NETBIOS=(int)0x0020,
-	NBT_QTYPE_STATUS=(int)0x0021
+	NBT_QTYPE_ADDRESS=(int)(0x0001),
+	NBT_QTYPE_NAMESERVICE=(int)(0x0002),
+	NBT_QTYPE_NULL=(int)(0x000A),
+	NBT_QTYPE_NETBIOS=(int)(0x0020),
+	NBT_QTYPE_STATUS=(int)(0x0021)
 }
 #else
  { __donnot_use_enum_nbt_qtype=0x7FFFFFFF}
@@ -146,10 +146,10 @@ struct nbt_name_question {
 enum nbt_node_type
 #ifndef USE_UINT_ENUMS
  {
-	NBT_NODE_B=(int)0x0000,
-	NBT_NODE_P=(int)0x2000,
-	NBT_NODE_M=(int)0x4000,
-	NBT_NODE_H=(int)0x6000
+	NBT_NODE_B=(int)(0x0000),
+	NBT_NODE_P=(int)(0x2000),
+	NBT_NODE_M=(int)(0x4000),
+	NBT_NODE_H=(int)(0x6000)
 }
 #else
  { __donnot_use_enum_nbt_node_type=0x7FFFFFFF}
@@ -250,13 +250,13 @@ struct nbt_name_packet {
 enum dgram_msg_type
 #ifndef USE_UINT_ENUMS
  {
-	DGRAM_DIRECT_UNIQUE=(int)0x10,
-	DGRAM_DIRECT_GROUP=(int)0x11,
-	DGRAM_BCAST=(int)0x12,
-	DGRAM_ERROR=(int)0x13,
-	DGRAM_QUERY=(int)0x14,
-	DGRAM_QUERY_POSITIVE=(int)0x15,
-	DGRAM_QUERY_NEGATIVE=(int)0x16
+	DGRAM_DIRECT_UNIQUE=(int)(0x10),
+	DGRAM_DIRECT_GROUP=(int)(0x11),
+	DGRAM_BCAST=(int)(0x12),
+	DGRAM_ERROR=(int)(0x13),
+	DGRAM_QUERY=(int)(0x14),
+	DGRAM_QUERY_POSITIVE=(int)(0x15),
+	DGRAM_QUERY_NEGATIVE=(int)(0x16)
 }
 #else
  { __donnot_use_enum_dgram_msg_type=0x7FFFFFFF}
@@ -278,10 +278,10 @@ enum dgram_msg_type
 enum dgram_node_type
 #ifndef USE_UINT_ENUMS
  {
-	DGRAM_NODE_B=(int)0x00,
-	DGRAM_NODE_P=(int)0x04,
-	DGRAM_NODE_M=(int)0x08,
-	DGRAM_NODE_NBDD=(int)0x0C
+	DGRAM_NODE_B=(int)(0x00),
+	DGRAM_NODE_P=(int)(0x04),
+	DGRAM_NODE_M=(int)(0x08),
+	DGRAM_NODE_NBDD=(int)(0x0C)
 }
 #else
  { __donnot_use_enum_dgram_node_type=0x7FFFFFFF}
@@ -295,7 +295,7 @@ enum dgram_node_type
 enum smb_command
 #ifndef USE_UINT_ENUMS
  {
-	SMB_TRANSACTION=(int)0x25
+	SMB_TRANSACTION=(int)(0x25)
 }
 #else
  { __donnot_use_enum_smb_command=0x7FFFFFFF}
@@ -365,9 +365,9 @@ struct dgram_message {
 enum dgram_err_code
 #ifndef USE_UINT_ENUMS
  {
-	DGRAM_ERROR_NAME_NOT_PRESENT=(int)0x82,
-	DGRAM_ERROR_INVALID_SOURCE=(int)0x83,
-	DGRAM_ERROR_INVALID_DEST=(int)0x84
+	DGRAM_ERROR_NAME_NOT_PRESENT=(int)(0x82),
+	DGRAM_ERROR_INVALID_SOURCE=(int)(0x83),
+	DGRAM_ERROR_INVALID_DEST=(int)(0x84)
 }
 #else
  { __donnot_use_enum_dgram_err_code=0x7FFFFFFF}
@@ -427,16 +427,16 @@ struct nbt_sockaddr {
 enum netlogon_command
 #ifndef USE_UINT_ENUMS
  {
-	LOGON_PRIMARY_QUERY=(int)7,
-	NETLOGON_ANNOUNCE_UAS=(int)10,
-	NETLOGON_RESPONSE_FROM_PDC=(int)12,
-	LOGON_SAM_LOGON_REQUEST=(int)18,
-	LOGON_SAM_LOGON_RESPONSE=(int)19,
-	LOGON_SAM_LOGON_PAUSE_RESPONSE=(int)20,
-	LOGON_SAM_LOGON_USER_UNKNOWN=(int)21,
-	LOGON_SAM_LOGON_RESPONSE_EX=(int)23,
-	LOGON_SAM_LOGON_PAUSE_RESPONSE_EX=(int)24,
-	LOGON_SAM_LOGON_USER_UNKNOWN_EX=(int)25
+	LOGON_PRIMARY_QUERY=(int)(7),
+	NETLOGON_ANNOUNCE_UAS=(int)(10),
+	NETLOGON_RESPONSE_FROM_PDC=(int)(12),
+	LOGON_SAM_LOGON_REQUEST=(int)(18),
+	LOGON_SAM_LOGON_RESPONSE=(int)(19),
+	LOGON_SAM_LOGON_PAUSE_RESPONSE=(int)(20),
+	LOGON_SAM_LOGON_USER_UNKNOWN=(int)(21),
+	LOGON_SAM_LOGON_RESPONSE_EX=(int)(23),
+	LOGON_SAM_LOGON_PAUSE_RESPONSE_EX=(int)(24),
+	LOGON_SAM_LOGON_USER_UNKNOWN_EX=(int)(25)
 }
 #else
  { __donnot_use_enum_netlogon_command=0x7FFFFFFF}
@@ -574,16 +574,16 @@ struct nbt_netlogon_packet {
 enum nbt_browse_opcode
 #ifndef USE_UINT_ENUMS
  {
-	HostAnnouncement=(int)1,
-	AnnouncementRequest=(int)2,
-	Election=(int)8,
-	GetBackupListReq=(int)9,
-	GetBackupListResp=(int)10,
-	BecomeBackup=(int)11,
-	DomainAnnouncement=(int)12,
-	MasterAnnouncement=(int)13,
-	ResetBrowserState=(int)14,
-	LocalMasterAnnouncement=(int)15
+	HostAnnouncement=(int)(1),
+	AnnouncementRequest=(int)(2),
+	Election=(int)(8),
+	GetBackupListReq=(int)(9),
+	GetBackupListResp=(int)(10),
+	BecomeBackup=(int)(11),
+	DomainAnnouncement=(int)(12),
+	MasterAnnouncement=(int)(13),
+	ResetBrowserState=(int)(14),
+	LocalMasterAnnouncement=(int)(15)
 }
 #else
  { __donnot_use_enum_nbt_browse_opcode=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/netlogon.h b/librpc/gen_ndr/netlogon.h
index 36317d6eda..8953fc24db 100644
--- a/librpc/gen_ndr/netlogon.h
+++ b/librpc/gen_ndr/netlogon.h
@@ -108,13 +108,13 @@ struct netr_GenericInfo {
 enum netr_LogonInfoClass
 #ifndef USE_UINT_ENUMS
  {
-	NetlogonInteractiveInformation=(int)1,
-	NetlogonNetworkInformation=(int)2,
-	NetlogonServiceInformation=(int)3,
-	NetlogonGenericInformation=(int)4,
-	NetlogonInteractiveTransitiveInformation=(int)5,
-	NetlogonNetworkTransitiveInformation=(int)6,
-	NetlogonServiceTransitiveInformation=(int)7
+	NetlogonInteractiveInformation=(int)(1),
+	NetlogonNetworkInformation=(int)(2),
+	NetlogonServiceInformation=(int)(3),
+	NetlogonGenericInformation=(int)(4),
+	NetlogonInteractiveTransitiveInformation=(int)(5),
+	NetlogonNetworkTransitiveInformation=(int)(6),
+	NetlogonServiceTransitiveInformation=(int)(7)
 }
 #else
  { __donnot_use_enum_netr_LogonInfoClass=0x7FFFFFFF}
@@ -231,11 +231,11 @@ struct netr_GenericInfo2 {
 enum netr_ValidationInfoClass
 #ifndef USE_UINT_ENUMS
  {
-	NetlogonValidationUasInfo=(int)1,
-	NetlogonValidationSamInfo=(int)2,
-	NetlogonValidationSamInfo2=(int)3,
-	NetlogonValidationGenericInfo2=(int)5,
-	NetlogonValidationSamInfo4=(int)6
+	NetlogonValidationUasInfo=(int)(1),
+	NetlogonValidationSamInfo=(int)(2),
+	NetlogonValidationSamInfo2=(int)(3),
+	NetlogonValidationGenericInfo2=(int)(5),
+	NetlogonValidationSamInfo4=(int)(6)
 }
 #else
  { __donnot_use_enum_netr_ValidationInfoClass=0x7FFFFFFF}
@@ -545,28 +545,28 @@ struct netr_DELTA_SECRET {
 enum netr_DeltaEnum
 #ifndef USE_UINT_ENUMS
  {
-	NETR_DELTA_DOMAIN=(int)1,
-	NETR_DELTA_GROUP=(int)2,
-	NETR_DELTA_DELETE_GROUP=(int)3,
-	NETR_DELTA_RENAME_GROUP=(int)4,
-	NETR_DELTA_USER=(int)5,
-	NETR_DELTA_DELETE_USER=(int)6,
-	NETR_DELTA_RENAME_USER=(int)7,
-	NETR_DELTA_GROUP_MEMBER=(int)8,
-	NETR_DELTA_ALIAS=(int)9,
-	NETR_DELTA_DELETE_ALIAS=(int)10,
-	NETR_DELTA_RENAME_ALIAS=(int)11,
-	NETR_DELTA_ALIAS_MEMBER=(int)12,
-	NETR_DELTA_POLICY=(int)13,
-	NETR_DELTA_TRUSTED_DOMAIN=(int)14,
-	NETR_DELTA_DELETE_TRUST=(int)15,
-	NETR_DELTA_ACCOUNT=(int)16,
-	NETR_DELTA_DELETE_ACCOUNT=(int)17,
-	NETR_DELTA_SECRET=(int)18,
-	NETR_DELTA_DELETE_SECRET=(int)19,
-	NETR_DELTA_DELETE_GROUP2=(int)20,
-	NETR_DELTA_DELETE_USER2=(int)21,
-	NETR_DELTA_MODIFY_COUNT=(int)22
+	NETR_DELTA_DOMAIN=(int)(1),
+	NETR_DELTA_GROUP=(int)(2),
+	NETR_DELTA_DELETE_GROUP=(int)(3),
+	NETR_DELTA_RENAME_GROUP=(int)(4),
+	NETR_DELTA_USER=(int)(5),
+	NETR_DELTA_DELETE_USER=(int)(6),
+	NETR_DELTA_RENAME_USER=(int)(7),
+	NETR_DELTA_GROUP_MEMBER=(int)(8),
+	NETR_DELTA_ALIAS=(int)(9),
+	NETR_DELTA_DELETE_ALIAS=(int)(10),
+	NETR_DELTA_RENAME_ALIAS=(int)(11),
+	NETR_DELTA_ALIAS_MEMBER=(int)(12),
+	NETR_DELTA_POLICY=(int)(13),
+	NETR_DELTA_TRUSTED_DOMAIN=(int)(14),
+	NETR_DELTA_DELETE_TRUST=(int)(15),
+	NETR_DELTA_ACCOUNT=(int)(16),
+	NETR_DELTA_DELETE_ACCOUNT=(int)(17),
+	NETR_DELTA_SECRET=(int)(18),
+	NETR_DELTA_DELETE_SECRET=(int)(19),
+	NETR_DELTA_DELETE_GROUP2=(int)(20),
+	NETR_DELTA_DELETE_USER2=(int)(21),
+	NETR_DELTA_MODIFY_COUNT=(int)(22)
 }
 #else
  { __donnot_use_enum_netr_DeltaEnum=0x7FFFFFFF}
@@ -691,22 +691,22 @@ union netr_CONTROL_QUERY_INFORMATION {
 enum netr_LogonControlCode
 #ifndef USE_UINT_ENUMS
  {
-	NETLOGON_CONTROL_QUERY=(int)0x00000001,
-	NETLOGON_CONTROL_REPLICATE=(int)0x00000002,
-	NETLOGON_CONTROL_SYNCHRONIZE=(int)0x00000003,
-	NETLOGON_CONTROL_PDC_REPLICATE=(int)0x00000004,
-	NETLOGON_CONTROL_REDISCOVER=(int)0x00000005,
-	NETLOGON_CONTROL_TC_QUERY=(int)0x00000006,
-	NETLOGON_CONTROL_TRANSPORT_NOTIFY=(int)0x00000007,
-	NETLOGON_CONTROL_FIND_USER=(int)0x00000008,
-	NETLOGON_CONTROL_CHANGE_PASSWORD=(int)0x00000009,
-	NETLOGON_CONTROL_TC_VERIFY=(int)0x0000000A,
-	NETLOGON_CONTROL_FORCE_DNS_REG=(int)0x0000000B,
-	NETLOGON_CONTROL_QUERY_DNS_REG=(int)0x0000000C,
-	NETLOGON_CONTROL_BACKUP_CHANGE_LOG=(int)0x0000FFFC,
-	NETLOGON_CONTROL_TRUNCATE_LOG=(int)0x0000FFFD,
-	NETLOGON_CONTROL_SET_DBFLAG=(int)0x0000FFFE,
-	NETLOGON_CONTROL_BREAKPOINT=(int)0x0000FFFF
+	NETLOGON_CONTROL_QUERY=(int)(0x00000001),
+	NETLOGON_CONTROL_REPLICATE=(int)(0x00000002),
+	NETLOGON_CONTROL_SYNCHRONIZE=(int)(0x00000003),
+	NETLOGON_CONTROL_PDC_REPLICATE=(int)(0x00000004),
+	NETLOGON_CONTROL_REDISCOVER=(int)(0x00000005),
+	NETLOGON_CONTROL_TC_QUERY=(int)(0x00000006),
+	NETLOGON_CONTROL_TRANSPORT_NOTIFY=(int)(0x00000007),
+	NETLOGON_CONTROL_FIND_USER=(int)(0x00000008),
+	NETLOGON_CONTROL_CHANGE_PASSWORD=(int)(0x00000009),
+	NETLOGON_CONTROL_TC_VERIFY=(int)(0x0000000A),
+	NETLOGON_CONTROL_FORCE_DNS_REG=(int)(0x0000000B),
+	NETLOGON_CONTROL_QUERY_DNS_REG=(int)(0x0000000C),
+	NETLOGON_CONTROL_BACKUP_CHANGE_LOG=(int)(0x0000FFFC),
+	NETLOGON_CONTROL_TRUNCATE_LOG=(int)(0x0000FFFD),
+	NETLOGON_CONTROL_SET_DBFLAG=(int)(0x0000FFFE),
+	NETLOGON_CONTROL_BREAKPOINT=(int)(0x0000FFFF)
 }
 #else
  { __donnot_use_enum_netr_LogonControlCode=0x7FFFFFFF}
@@ -766,15 +766,15 @@ union netr_CONTROL_DATA_INFORMATION {
 enum SyncStateEnum
 #ifndef USE_UINT_ENUMS
  {
-	SYNCSTATE_NORMAL_STATE=(int)0,
-	SYNCSTATE_DOMAIN_STATE=(int)1,
-	SYNCSTATE_GROUP_STATE=(int)2,
-	SYNCSTATE_UAS_BUILT_IN_GROUP_STATE=(int)3,
-	SYNCSTATE_USER_STATE=(int)4,
-	SYNCSTATE_GROUP_MEMBER_STATE=(int)5,
-	SYNCSTATE_ALIAS_STATE=(int)6,
-	SYNCSTATE_ALIAS_MEMBER_STATE=(int)7,
-	SYNCSTATE_SAM_DONE_STATE=(int)8
+	SYNCSTATE_NORMAL_STATE=(int)(0),
+	SYNCSTATE_DOMAIN_STATE=(int)(1),
+	SYNCSTATE_GROUP_STATE=(int)(2),
+	SYNCSTATE_UAS_BUILT_IN_GROUP_STATE=(int)(3),
+	SYNCSTATE_USER_STATE=(int)(4),
+	SYNCSTATE_GROUP_MEMBER_STATE=(int)(5),
+	SYNCSTATE_ALIAS_STATE=(int)(6),
+	SYNCSTATE_ALIAS_MEMBER_STATE=(int)(7),
+	SYNCSTATE_SAM_DONE_STATE=(int)(8)
 }
 #else
  { __donnot_use_enum_SyncStateEnum=0x7FFFFFFF}
@@ -842,8 +842,8 @@ struct netr_Blob {
 enum netr_DsRGetDCNameInfo_AddressType
 #ifndef USE_UINT_ENUMS
  {
-	DS_ADDRESS_TYPE_INET=(int)1,
-	DS_ADDRESS_TYPE_NETBIOS=(int)2
+	DS_ADDRESS_TYPE_INET=(int)(1),
+	DS_ADDRESS_TYPE_NETBIOS=(int)(2)
 }
 #else
  { __donnot_use_enum_netr_DsRGetDCNameInfo_AddressType=0x7FFFFFFF}
@@ -1051,10 +1051,10 @@ struct netr_DsRAddress {
 enum netr_TrustType
 #ifndef USE_UINT_ENUMS
  {
-	NETR_TRUST_TYPE_DOWNLEVEL=(int)1,
-	NETR_TRUST_TYPE_UPLEVEL=(int)2,
-	NETR_TRUST_TYPE_MIT=(int)3,
-	NETR_TRUST_TYPE_DCE=(int)4
+	NETR_TRUST_TYPE_DOWNLEVEL=(int)(1),
+	NETR_TRUST_TYPE_UPLEVEL=(int)(2),
+	NETR_TRUST_TYPE_MIT=(int)(3),
+	NETR_TRUST_TYPE_DCE=(int)(4)
 }
 #else
  { __donnot_use_enum_netr_TrustType=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/ntlmssp.h b/librpc/gen_ndr/ntlmssp.h
index 88d9a22830..c3d639b913 100644
--- a/librpc/gen_ndr/ntlmssp.h
+++ b/librpc/gen_ndr/ntlmssp.h
@@ -13,9 +13,9 @@
 enum ntlmssp_MessageType
 #ifndef USE_UINT_ENUMS
  {
-	NtLmNegotiate=(int)0x00000001,
-	NtLmChallenge=(int)0x00000002,
-	NtLmAuthenticate=(int)0x00000003
+	NtLmNegotiate=(int)(0x00000001),
+	NtLmChallenge=(int)(0x00000002),
+	NtLmAuthenticate=(int)(0x00000003)
 }
 #else
  { __donnot_use_enum_ntlmssp_MessageType=0x7FFFFFFF}
@@ -56,8 +56,8 @@ enum ntlmssp_MessageType
 enum ntlmssp_WindowsMajorVersion
 #ifndef USE_UINT_ENUMS
  {
-	NTLMSSP_WINDOWS_MAJOR_VERSION_5=(int)0x05,
-	NTLMSSP_WINDOWS_MAJOR_VERSION_6=(int)0x06
+	NTLMSSP_WINDOWS_MAJOR_VERSION_5=(int)(0x05),
+	NTLMSSP_WINDOWS_MAJOR_VERSION_6=(int)(0x06)
 }
 #else
  { __donnot_use_enum_ntlmssp_WindowsMajorVersion=0x7FFFFFFF}
@@ -69,9 +69,9 @@ enum ntlmssp_WindowsMajorVersion
 enum ntlmssp_WindowsMinorVersion
 #ifndef USE_UINT_ENUMS
  {
-	NTLMSSP_WINDOWS_MINOR_VERSION_0=(int)0x00,
-	NTLMSSP_WINDOWS_MINOR_VERSION_1=(int)0x01,
-	NTLMSSP_WINDOWS_MINOR_VERSION_2=(int)0x02
+	NTLMSSP_WINDOWS_MINOR_VERSION_0=(int)(0x00),
+	NTLMSSP_WINDOWS_MINOR_VERSION_1=(int)(0x01),
+	NTLMSSP_WINDOWS_MINOR_VERSION_2=(int)(0x02)
 }
 #else
  { __donnot_use_enum_ntlmssp_WindowsMinorVersion=0x7FFFFFFF}
@@ -84,8 +84,8 @@ enum ntlmssp_WindowsMinorVersion
 enum ntlmssp_NTLMRevisionCurrent
 #ifndef USE_UINT_ENUMS
  {
-	NTLMSSP_REVISION_W2K3_RC1=(int)0x0A,
-	NTLMSSP_REVISION_W2K3=(int)0x0F
+	NTLMSSP_REVISION_W2K3_RC1=(int)(0x0A),
+	NTLMSSP_REVISION_W2K3=(int)(0x0F)
 }
 #else
  { __donnot_use_enum_ntlmssp_NTLMRevisionCurrent=0x7FFFFFFF}
@@ -122,17 +122,17 @@ struct NEGOTIATE_MESSAGE {
 enum ntlmssp_AvId
 #ifndef USE_UINT_ENUMS
  {
-	MsvAvEOL=(int)0,
-	MsvAvNbComputerName=(int)1,
-	MsvAvNbDomainName=(int)2,
-	MsvAvDnsComputerName=(int)3,
-	MsvAvDnsDomainName=(int)4,
-	MsvAvDnsTreeName=(int)5,
-	MsvAvFlags=(int)6,
-	MsvAvTimestamp=(int)7,
-	MsAvRestrictions=(int)8,
-	MsvAvTargetName=(int)9,
-	MsvChannelBindings=(int)10
+	MsvAvEOL=(int)(0),
+	MsvAvNbComputerName=(int)(1),
+	MsvAvNbDomainName=(int)(2),
+	MsvAvDnsComputerName=(int)(3),
+	MsvAvDnsDomainName=(int)(4),
+	MsvAvDnsTreeName=(int)(5),
+	MsvAvFlags=(int)(6),
+	MsvAvTimestamp=(int)(7),
+	MsAvRestrictions=(int)(8),
+	MsvAvTargetName=(int)(9),
+	MsvChannelBindings=(int)(10)
 }
 #else
  { __donnot_use_enum_ntlmssp_AvId=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/samr.h b/librpc/gen_ndr/samr.h
index f3192c45ea..33b21d2d05 100644
--- a/librpc/gen_ndr/samr.h
+++ b/librpc/gen_ndr/samr.h
@@ -41,9 +41,9 @@
 enum netr_SamDatabaseID
 #ifndef USE_UINT_ENUMS
  {
-	SAM_DATABASE_DOMAIN=(int)0,
-	SAM_DATABASE_BUILTIN=(int)1,
-	SAM_DATABASE_PRIVS=(int)2
+	SAM_DATABASE_DOMAIN=(int)(0),
+	SAM_DATABASE_BUILTIN=(int)(1),
+	SAM_DATABASE_PRIVS=(int)(2)
 }
 #else
  { __donnot_use_enum_netr_SamDatabaseID=0x7FFFFFFF}
@@ -56,10 +56,10 @@ enum netr_SamDatabaseID
 enum samr_RejectReason
 #ifndef USE_UINT_ENUMS
  {
-	SAMR_REJECT_OTHER=(int)0,
-	SAMR_REJECT_TOO_SHORT=(int)1,
-	SAMR_REJECT_IN_HISTORY=(int)2,
-	SAMR_REJECT_COMPLEXITY=(int)5
+	SAMR_REJECT_OTHER=(int)(0),
+	SAMR_REJECT_TOO_SHORT=(int)(1),
+	SAMR_REJECT_IN_HISTORY=(int)(2),
+	SAMR_REJECT_COMPLEXITY=(int)(5)
 }
 #else
  { __donnot_use_enum_samr_RejectReason=0x7FFFFFFF}
@@ -152,19 +152,19 @@ struct samr_SamArray {
 enum samr_DomainInfoClass
 #ifndef USE_UINT_ENUMS
  {
-	DomainPasswordInformation=(int)1,
-	DomainGeneralInformation=(int)2,
-	DomainLogoffInformation=(int)3,
-	DomainOemInformation=(int)4,
-	DomainNameInformation=(int)5,
-	DomainReplicationInformation=(int)6,
-	DomainServerRoleInformation=(int)7,
-	DomainModifiedInformation=(int)8,
-	DomainStateInformation=(int)9,
-	DomainUasInformation=(int)10,
-	DomainGeneralInformation2=(int)11,
-	DomainLockoutInformation=(int)12,
-	DomainModifiedInformation2=(int)13
+	DomainPasswordInformation=(int)(1),
+	DomainGeneralInformation=(int)(2),
+	DomainLogoffInformation=(int)(3),
+	DomainOemInformation=(int)(4),
+	DomainNameInformation=(int)(5),
+	DomainReplicationInformation=(int)(6),
+	DomainServerRoleInformation=(int)(7),
+	DomainModifiedInformation=(int)(8),
+	DomainStateInformation=(int)(9),
+	DomainUasInformation=(int)(10),
+	DomainGeneralInformation2=(int)(11),
+	DomainLockoutInformation=(int)(12),
+	DomainModifiedInformation2=(int)(13)
 }
 #else
  { __donnot_use_enum_samr_DomainInfoClass=0x7FFFFFFF}
@@ -187,10 +187,10 @@ enum samr_DomainInfoClass
 enum samr_Role
 #ifndef USE_UINT_ENUMS
  {
-	SAMR_ROLE_STANDALONE=(int)0,
-	SAMR_ROLE_DOMAIN_MEMBER=(int)1,
-	SAMR_ROLE_DOMAIN_BDC=(int)2,
-	SAMR_ROLE_DOMAIN_PDC=(int)3
+	SAMR_ROLE_STANDALONE=(int)(0),
+	SAMR_ROLE_DOMAIN_MEMBER=(int)(1),
+	SAMR_ROLE_DOMAIN_BDC=(int)(2),
+	SAMR_ROLE_DOMAIN_PDC=(int)(3)
 }
 #else
  { __donnot_use_enum_samr_Role=0x7FFFFFFF}
@@ -212,8 +212,8 @@ enum samr_Role
 enum samr_DomainServerState
 #ifndef USE_UINT_ENUMS
  {
-	DOMAIN_SERVER_ENABLED=(int)1,
-	DOMAIN_SERVER_DISABLED=(int)2
+	DOMAIN_SERVER_ENABLED=(int)(1),
+	DOMAIN_SERVER_DISABLED=(int)(2)
 }
 #else
  { __donnot_use_enum_samr_DomainServerState=0x7FFFFFFF}
@@ -339,11 +339,11 @@ struct samr_GroupInfoDescription {
 enum samr_GroupInfoEnum
 #ifndef USE_UINT_ENUMS
  {
-	GROUPINFOALL=(int)1,
-	GROUPINFONAME=(int)2,
-	GROUPINFOATTRIBUTES=(int)3,
-	GROUPINFODESCRIPTION=(int)4,
-	GROUPINFOALL2=(int)5
+	GROUPINFOALL=(int)(1),
+	GROUPINFONAME=(int)(2),
+	GROUPINFOATTRIBUTES=(int)(3),
+	GROUPINFODESCRIPTION=(int)(4),
+	GROUPINFOALL2=(int)(5)
 }
 #else
  { __donnot_use_enum_samr_GroupInfoEnum=0x7FFFFFFF}
@@ -378,9 +378,9 @@ struct samr_AliasInfoAll {
 enum samr_AliasInfoEnum
 #ifndef USE_UINT_ENUMS
  {
-	ALIASINFOALL=(int)1,
-	ALIASINFONAME=(int)2,
-	ALIASINFODESCRIPTION=(int)3
+	ALIASINFOALL=(int)(1),
+	ALIASINFONAME=(int)(2),
+	ALIASINFODESCRIPTION=(int)(3)
 }
 #else
  { __donnot_use_enum_samr_AliasInfoEnum=0x7FFFFFFF}
@@ -399,29 +399,29 @@ union samr_AliasInfo {
 enum samr_UserInfoLevel
 #ifndef USE_UINT_ENUMS
  {
-	UserGeneralInformation=(int)1,
-	UserPreferencesInformation=(int)2,
-	UserLogonInformation=(int)3,
-	UserLogonHoursInformation=(int)4,
-	UserAccountInformation=(int)5,
-	UserNameInformation=(int)6,
-	UserAccountNameInformation=(int)7,
-	UserFullNameInformation=(int)8,
-	UserPrimaryGroupInformation=(int)9,
-	UserHomeInformation=(int)10,
-	UserScriptInformation=(int)11,
-	UserProfileInformation=(int)12,
-	UserAdminCommentInformation=(int)13,
-	UserWorkStationsInformation=(int)14,
-	UserControlInformation=(int)16,
-	UserExpiresInformation=(int)17,
-	UserInternal1Information=(int)18,
-	UserParametersInformation=(int)20,
-	UserAllInformation=(int)21,
-	UserInternal4Information=(int)23,
-	UserInternal5Information=(int)24,
-	UserInternal4InformationNew=(int)25,
-	UserInternal5InformationNew=(int)26
+	UserGeneralInformation=(int)(1),
+	UserPreferencesInformation=(int)(2),
+	UserLogonInformation=(int)(3),
+	UserLogonHoursInformation=(int)(4),
+	UserAccountInformation=(int)(5),
+	UserNameInformation=(int)(6),
+	UserAccountNameInformation=(int)(7),
+	UserFullNameInformation=(int)(8),
+	UserPrimaryGroupInformation=(int)(9),
+	UserHomeInformation=(int)(10),
+	UserScriptInformation=(int)(11),
+	UserProfileInformation=(int)(12),
+	UserAdminCommentInformation=(int)(13),
+	UserWorkStationsInformation=(int)(14),
+	UserControlInformation=(int)(16),
+	UserExpiresInformation=(int)(17),
+	UserInternal1Information=(int)(18),
+	UserParametersInformation=(int)(20),
+	UserAllInformation=(int)(21),
+	UserInternal4Information=(int)(23),
+	UserInternal5Information=(int)(24),
+	UserInternal4InformationNew=(int)(25),
+	UserInternal5InformationNew=(int)(26)
 }
 #else
  { __donnot_use_enum_samr_UserInfoLevel=0x7FFFFFFF}
@@ -778,9 +778,9 @@ struct samr_PwInfo {
 enum samr_ConnectVersion
 #ifndef USE_UINT_ENUMS
  {
-	SAMR_CONNECT_PRE_W2K=(int)1,
-	SAMR_CONNECT_W2K=(int)2,
-	SAMR_CONNECT_AFTER_W2K=(int)3
+	SAMR_CONNECT_PRE_W2K=(int)(1),
+	SAMR_CONNECT_W2K=(int)(2),
+	SAMR_CONNECT_AFTER_W2K=(int)(3)
 }
 #else
  { __donnot_use_enum_samr_ConnectVersion=0x7FFFFFFF}
@@ -816,9 +816,9 @@ union samr_ConnectInfo {
 enum samr_ValidatePasswordLevel
 #ifndef USE_UINT_ENUMS
  {
-	NetValidateAuthentication=(int)1,
-	NetValidatePasswordChange=(int)2,
-	NetValidatePasswordReset=(int)3
+	NetValidateAuthentication=(int)(1),
+	NetValidatePasswordChange=(int)(2),
+	NetValidatePasswordReset=(int)(3)
 }
 #else
  { __donnot_use_enum_samr_ValidatePasswordLevel=0x7FFFFFFF}
@@ -831,17 +831,17 @@ enum samr_ValidatePasswordLevel
 enum samr_ValidationStatus
 #ifndef USE_UINT_ENUMS
  {
-	SAMR_VALIDATION_STATUS_SUCCESS=(int)0,
-	SAMR_VALIDATION_STATUS_PASSWORD_MUST_CHANGE=(int)1,
-	SAMR_VALIDATION_STATUS_ACCOUNT_LOCKED_OUT=(int)2,
-	SAMR_VALIDATION_STATUS_PASSWORD_EXPIRED=(int)3,
-	SAMR_VALIDATION_STATUS_BAD_PASSWORD=(int)4,
-	SAMR_VALIDATION_STATUS_PWD_HISTORY_CONFLICT=(int)5,
-	SAMR_VALIDATION_STATUS_PWD_TOO_SHORT=(int)6,
-	SAMR_VALIDATION_STATUS_PWD_TOO_LONG=(int)7,
-	SAMR_VALIDATION_STATUS_NOT_COMPLEX_ENOUGH=(int)8,
-	SAMR_VALIDATION_STATUS_PASSWORD_TOO_RECENT=(int)9,
-	SAMR_VALIDATION_STATUS_PASSWORD_FILTER_ERROR=(int)10
+	SAMR_VALIDATION_STATUS_SUCCESS=(int)(0),
+	SAMR_VALIDATION_STATUS_PASSWORD_MUST_CHANGE=(int)(1),
+	SAMR_VALIDATION_STATUS_ACCOUNT_LOCKED_OUT=(int)(2),
+	SAMR_VALIDATION_STATUS_PASSWORD_EXPIRED=(int)(3),
+	SAMR_VALIDATION_STATUS_BAD_PASSWORD=(int)(4),
+	SAMR_VALIDATION_STATUS_PWD_HISTORY_CONFLICT=(int)(5),
+	SAMR_VALIDATION_STATUS_PWD_TOO_SHORT=(int)(6),
+	SAMR_VALIDATION_STATUS_PWD_TOO_LONG=(int)(7),
+	SAMR_VALIDATION_STATUS_NOT_COMPLEX_ENOUGH=(int)(8),
+	SAMR_VALIDATION_STATUS_PASSWORD_TOO_RECENT=(int)(9),
+	SAMR_VALIDATION_STATUS_PASSWORD_FILTER_ERROR=(int)(10)
 }
 #else
  { __donnot_use_enum_samr_ValidationStatus=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/schannel.h b/librpc/gen_ndr/schannel.h
index 64c5489d1b..4aab8243af 100644
--- a/librpc/gen_ndr/schannel.h
+++ b/librpc/gen_ndr/schannel.h
@@ -25,8 +25,8 @@ struct netlogon_creds_CredentialState {
 enum NL_AUTH_MESSAGE_TYPE
 #ifndef USE_UINT_ENUMS
  {
-	NL_NEGOTIATE_REQUEST=(int)0x00000000,
-	NL_NEGOTIATE_RESPONSE=(int)0x00000001
+	NL_NEGOTIATE_REQUEST=(int)(0x00000000),
+	NL_NEGOTIATE_RESPONSE=(int)(0x00000001)
 }
 #else
  { __donnot_use_enum_NL_AUTH_MESSAGE_TYPE=0x7FFFFFFF}
@@ -65,8 +65,8 @@ struct NL_AUTH_MESSAGE {
 enum NL_SIGNATURE_ALGORITHM
 #ifndef USE_UINT_ENUMS
  {
-	NL_SIGN_HMAC_SHA256=(int)0x0013,
-	NL_SIGN_HMAC_MD5=(int)0x0077
+	NL_SIGN_HMAC_SHA256=(int)(0x0013),
+	NL_SIGN_HMAC_MD5=(int)(0x0077)
 }
 #else
  { __donnot_use_enum_NL_SIGNATURE_ALGORITHM=0x7FFFFFFF}
@@ -78,9 +78,9 @@ enum NL_SIGNATURE_ALGORITHM
 enum NL_SEAL_ALGORITHM
 #ifndef USE_UINT_ENUMS
  {
-	NL_SEAL_AES128=(int)0x001A,
-	NL_SEAL_RC4=(int)0x007A,
-	NL_SEAL_NONE=(int)0xFFFF
+	NL_SEAL_AES128=(int)(0x001A),
+	NL_SEAL_RC4=(int)(0x007A),
+	NL_SEAL_NONE=(int)(0xFFFF)
 }
 #else
  { __donnot_use_enum_NL_SEAL_ALGORITHM=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/security.h b/librpc/gen_ndr/security.h
index 5bd2cbafd5..05df02ae8f 100644
--- a/librpc/gen_ndr/security.h
+++ b/librpc/gen_ndr/security.h
@@ -153,31 +153,31 @@ struct dom_sid {
 enum sec_privilege
 #ifndef USE_UINT_ENUMS
  {
-	SEC_PRIV_SECURITY=(int)1,
-	SEC_PRIV_BACKUP=(int)2,
-	SEC_PRIV_RESTORE=(int)3,
-	SEC_PRIV_SYSTEMTIME=(int)4,
-	SEC_PRIV_SHUTDOWN=(int)5,
-	SEC_PRIV_REMOTE_SHUTDOWN=(int)6,
-	SEC_PRIV_TAKE_OWNERSHIP=(int)7,
-	SEC_PRIV_DEBUG=(int)8,
-	SEC_PRIV_SYSTEM_ENVIRONMENT=(int)9,
-	SEC_PRIV_SYSTEM_PROFILE=(int)10,
-	SEC_PRIV_PROFILE_SINGLE_PROCESS=(int)11,
-	SEC_PRIV_INCREASE_BASE_PRIORITY=(int)12,
-	SEC_PRIV_LOAD_DRIVER=(int)13,
-	SEC_PRIV_CREATE_PAGEFILE=(int)14,
-	SEC_PRIV_INCREASE_QUOTA=(int)15,
-	SEC_PRIV_CHANGE_NOTIFY=(int)16,
-	SEC_PRIV_UNDOCK=(int)17,
-	SEC_PRIV_MANAGE_VOLUME=(int)18,
-	SEC_PRIV_IMPERSONATE=(int)19,
-	SEC_PRIV_CREATE_GLOBAL=(int)20,
-	SEC_PRIV_ENABLE_DELEGATION=(int)21,
-	SEC_PRIV_INTERACTIVE_LOGON=(int)22,
-	SEC_PRIV_NETWORK_LOGON=(int)23,
-	SEC_PRIV_REMOTE_INTERACTIVE_LOGON=(int)24,
-	SEC_PRIV_MACHINE_ACCOUNT=(int)25
+	SEC_PRIV_SECURITY=(int)(1),
+	SEC_PRIV_BACKUP=(int)(2),
+	SEC_PRIV_RESTORE=(int)(3),
+	SEC_PRIV_SYSTEMTIME=(int)(4),
+	SEC_PRIV_SHUTDOWN=(int)(5),
+	SEC_PRIV_REMOTE_SHUTDOWN=(int)(6),
+	SEC_PRIV_TAKE_OWNERSHIP=(int)(7),
+	SEC_PRIV_DEBUG=(int)(8),
+	SEC_PRIV_SYSTEM_ENVIRONMENT=(int)(9),
+	SEC_PRIV_SYSTEM_PROFILE=(int)(10),
+	SEC_PRIV_PROFILE_SINGLE_PROCESS=(int)(11),
+	SEC_PRIV_INCREASE_BASE_PRIORITY=(int)(12),
+	SEC_PRIV_LOAD_DRIVER=(int)(13),
+	SEC_PRIV_CREATE_PAGEFILE=(int)(14),
+	SEC_PRIV_INCREASE_QUOTA=(int)(15),
+	SEC_PRIV_CHANGE_NOTIFY=(int)(16),
+	SEC_PRIV_UNDOCK=(int)(17),
+	SEC_PRIV_MANAGE_VOLUME=(int)(18),
+	SEC_PRIV_IMPERSONATE=(int)(19),
+	SEC_PRIV_CREATE_GLOBAL=(int)(20),
+	SEC_PRIV_ENABLE_DELEGATION=(int)(21),
+	SEC_PRIV_INTERACTIVE_LOGON=(int)(22),
+	SEC_PRIV_NETWORK_LOGON=(int)(23),
+	SEC_PRIV_REMOTE_INTERACTIVE_LOGON=(int)(24),
+	SEC_PRIV_MACHINE_ACCOUNT=(int)(25)
 }
 #else
  { __donnot_use_enum_sec_privilege=0x7FFFFFFF}
@@ -222,15 +222,15 @@ enum sec_privilege
 enum security_ace_type
 #ifndef USE_UINT_ENUMS
  {
-	SEC_ACE_TYPE_ACCESS_ALLOWED=(int)0,
-	SEC_ACE_TYPE_ACCESS_DENIED=(int)1,
-	SEC_ACE_TYPE_SYSTEM_AUDIT=(int)2,
-	SEC_ACE_TYPE_SYSTEM_ALARM=(int)3,
-	SEC_ACE_TYPE_ALLOWED_COMPOUND=(int)4,
-	SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT=(int)5,
-	SEC_ACE_TYPE_ACCESS_DENIED_OBJECT=(int)6,
-	SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT=(int)7,
-	SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT=(int)8
+	SEC_ACE_TYPE_ACCESS_ALLOWED=(int)(0),
+	SEC_ACE_TYPE_ACCESS_DENIED=(int)(1),
+	SEC_ACE_TYPE_SYSTEM_AUDIT=(int)(2),
+	SEC_ACE_TYPE_SYSTEM_ALARM=(int)(3),
+	SEC_ACE_TYPE_ALLOWED_COMPOUND=(int)(4),
+	SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT=(int)(5),
+	SEC_ACE_TYPE_ACCESS_DENIED_OBJECT=(int)(6),
+	SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT=(int)(7),
+	SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT=(int)(8)
 }
 #else
  { __donnot_use_enum_security_ace_type=0x7FFFFFFF}
@@ -280,8 +280,8 @@ struct security_ace {
 enum security_acl_revision
 #ifndef USE_UINT_ENUMS
  {
-	SECURITY_ACL_REVISION_NT4=(int)2,
-	SECURITY_ACL_REVISION_ADS=(int)4
+	SECURITY_ACL_REVISION_NT4=(int)(2),
+	SECURITY_ACL_REVISION_ADS=(int)(4)
 }
 #else
  { __donnot_use_enum_security_acl_revision=0x7FFFFFFF}
@@ -300,7 +300,7 @@ struct security_acl {
 enum security_descriptor_revision
 #ifndef USE_UINT_ENUMS
  {
-	SECURITY_DESCRIPTOR_REVISION_1=(int)1
+	SECURITY_DESCRIPTOR_REVISION_1=(int)(1)
 }
 #else
  { __donnot_use_enum_security_descriptor_revision=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 57c42695b8..2b9fc5108f 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -68,9 +68,9 @@ struct spoolss_TimeCtr {
 enum spoolss_ProcessorArchitecture
 #ifndef USE_UINT_ENUMS
  {
-	PROCESSOR_ARCHITECTURE_INTEL=(int)0x0000,
-	PROCESSOR_ARCHITECTURE_IA64=(int)0x0006,
-	PROCESSOR_ARCHITECTURE_AMD64=(int)0x0009
+	PROCESSOR_ARCHITECTURE_INTEL=(int)(0x0000),
+	PROCESSOR_ARCHITECTURE_IA64=(int)(0x0006),
+	PROCESSOR_ARCHITECTURE_AMD64=(int)(0x0009)
 }
 #else
  { __donnot_use_enum_spoolss_ProcessorArchitecture=0x7FFFFFFF}
@@ -83,11 +83,11 @@ enum spoolss_ProcessorArchitecture
 enum spoolss_ProcessorType
 #ifndef USE_UINT_ENUMS
  {
-	PROCESSOR_INTEL_386=(int)0x00000182,
-	PROCESSOR_INTEL_486=(int)0x000001E6,
-	PROCESSOR_INTEL_PENTIUM=(int)0x0000024A,
-	PROCESSOR_INTEL_IA64=(int)0x00000898,
-	PROCESSOR_AMD_X8664=(int)0x000022A0
+	PROCESSOR_INTEL_386=(int)(0x00000182),
+	PROCESSOR_INTEL_486=(int)(0x000001E6),
+	PROCESSOR_INTEL_PENTIUM=(int)(0x0000024A),
+	PROCESSOR_INTEL_IA64=(int)(0x00000898),
+	PROCESSOR_AMD_X8664=(int)(0x000022A0)
 }
 #else
  { __donnot_use_enum_spoolss_ProcessorType=0x7FFFFFFF}
@@ -102,9 +102,9 @@ enum spoolss_ProcessorType
 enum spoolss_MajorVersion
 #ifndef USE_UINT_ENUMS
  {
-	SPOOLSS_MAJOR_VERSION_NT4_95_98_ME=(int)0x00000004,
-	SPOOLSS_MAJOR_VERSION_2000_2003_XP=(int)0x00000005,
-	SPOOLSS_MAJOR_VERSION_2008_VISTA=(int)0x00000006
+	SPOOLSS_MAJOR_VERSION_NT4_95_98_ME=(int)(0x00000004),
+	SPOOLSS_MAJOR_VERSION_2000_2003_XP=(int)(0x00000005),
+	SPOOLSS_MAJOR_VERSION_2008_VISTA=(int)(0x00000006)
 }
 #else
  { __donnot_use_enum_spoolss_MajorVersion=0x7FFFFFFF}
@@ -117,11 +117,11 @@ enum spoolss_MajorVersion
 enum spoolss_MinorVersion
 #ifndef USE_UINT_ENUMS
  {
-	SPOOLSS_MINOR_VERSION_0=(int)0x00000000,
-	SPOOLSS_MINOR_VERSION_XP=(int)0x00000001,
-	SPOOLSS_MINOR_VERSION_2003_XP64=(int)0x00000002,
-	SPOOLSS_MINOR_VERSION_98=(int)0x0000000a,
-	SPOOLSS_MINOR_VERSION_ME=(int)0x0000005a
+	SPOOLSS_MINOR_VERSION_0=(int)(0x00000000),
+	SPOOLSS_MINOR_VERSION_XP=(int)(0x00000001),
+	SPOOLSS_MINOR_VERSION_2003_XP64=(int)(0x00000002),
+	SPOOLSS_MINOR_VERSION_98=(int)(0x0000000a),
+	SPOOLSS_MINOR_VERSION_ME=(int)(0x0000005a)
 }
 #else
  { __donnot_use_enum_spoolss_MinorVersion=0x7FFFFFFF}
@@ -240,9 +240,9 @@ struct spoolss_PrinterInfo0 {
 enum spoolss_DeviceModeSpecVersion
 #ifndef USE_UINT_ENUMS
  {
-	DMSPEC_NT3=(int)0x320,
-	DMSPEC_WIN95_98_ME=(int)0x400,
-	DMSPEC_NT4_AND_ABOVE=(int)0x401
+	DMSPEC_NT3=(int)(0x320),
+	DMSPEC_WIN95_98_ME=(int)(0x400),
+	DMSPEC_NT4_AND_ABOVE=(int)(0x401)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeSpecVersion=0x7FFFFFFF}
@@ -255,8 +255,8 @@ enum spoolss_DeviceModeSpecVersion
 enum spoolss_DeviceModeOrientation
 #ifndef USE_UINT_ENUMS
  {
-	DMORIENT_PORTRAIT=(int)0x0001,
-	DMORIENT_LANDSCAPE=(int)0x0002
+	DMORIENT_PORTRAIT=(int)(0x0001),
+	DMORIENT_LANDSCAPE=(int)(0x0002)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeOrientation=0x7FFFFFFF}
@@ -268,97 +268,97 @@ enum spoolss_DeviceModeOrientation
 enum spoolss_DeviceModePaperSize
 #ifndef USE_UINT_ENUMS
  {
-	DMPAPER_LETTER=(int)0x0001,
-	DMPAPER_LETTERSMALL=(int)0x0002,
-	DMPAPER_TABLOID=(int)0x0003,
-	DMPAPER_LEDGER=(int)0x0004,
-	DMPAPER_LEGAL=(int)0x0005,
-	DMPAPER_STATEMENT=(int)0x0006,
-	DMPAPER_EXECUTIVE=(int)0x0007,
-	DMPAPER_A3=(int)0x0008,
-	DMPAPER_A4=(int)0x0009,
-	DMPAPER_A4SMALL=(int)0x000A,
-	DMPAPER_A5=(int)0x000B,
-	DMPAPER_B4=(int)0x000C,
-	DMPAPER_B5=(int)0x000D,
-	DMPAPER_FOLIO=(int)0x000E,
-	DMPAPER_QUARTO=(int)0x000F,
-	DMPAPER_10X14=(int)0x0010,
-	DMPAPER_11X17=(int)0x0011,
-	DMPAPER_NOTE=(int)0x0012,
-	DMPAPER_ENV_9=(int)0x0013,
-	DMPAPER_ENV_10=(int)0x0014,
-	DMPAPER_ENV_11=(int)0x0015,
-	DMPAPER_ENV_12=(int)0x0016,
-	DMPAPER_ENV_14=(int)0x0017,
-	DMPAPER_CSHEET=(int)0x0018,
-	DMPAPER_DSHEET=(int)0x0019,
-	DMPAPER_ESHEET=(int)0x001A,
-	DMPAPER_ENV_DL=(int)0x001B,
-	DMPAPER_ENV_C5=(int)0x001C,
-	DMPAPER_ENV_C3=(int)0x001D,
-	DMPAPER_ENV_C4=(int)0x001E,
-	DMPAPER_ENV_C6=(int)0x001F,
-	DMPAPER_ENV_C65=(int)0x0020,
-	DMPAPER_ENV_B4=(int)0x0021,
-	DMPAPER_ENV_B5=(int)0x0022,
-	DMPAPER_ENV_B6=(int)0x0023,
-	DMPAPER_ENV_ITALY=(int)0x0024,
-	DMPAPER_ENV_MONARCH=(int)0x0025,
-	DMPAPER_ENV_PERSONAL=(int)0x0026,
-	DMPAPER_FANFOLD_US=(int)0x0027,
-	DMPAPER_FANFOLD_STD_GERMAN=(int)0x0028,
-	DMPAPER_FANFOLD_LGL_GERMAN=(int)0x0029,
-	DMPAPER_DBL_JAPANESE_POSTCARD=(int)0x0045,
-	DMPAPER_A6=(int)0x0046,
-	DMPAPER_JENV_KAKU2=(int)0x0047,
-	DMPAPER_JENV_KAKU3=(int)0x0048,
-	DMPAPER_JENV_CHOU3=(int)0x0049,
-	DMPAPER_JENV_CHOU4=(int)0x004A,
-	DMPAPER_LETTER_ROTATED=(int)0x004B,
-	DMPAPER_A3_ROTATED=(int)0x004C,
-	DMPAPER_A4_ROTATED=(int)0x004D,
-	DMPAPER_A5_ROTATED=(int)0x004E,
-	DMPAPER_B4_JIS_ROTATED=(int)0x004F,
-	DMPAPER_B5_JIS_ROTATED=(int)0x0050,
-	DMPAPER_JAPANESE_POSTCARD_ROTATED=(int)0x0051,
-	DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED=(int)0x0052,
-	DMPAPER_A6_ROTATED=(int)0x0053,
-	DMPAPER_JENV_KAKU2_ROTATED=(int)0x0054,
-	DMPAPER_JENV_KAKU3_ROTATED=(int)0x0055,
-	DMPAPER_JENV_CHOU3_ROTATED=(int)0x0056,
-	DMPAPER_JENV_CHOU4_ROTATED=(int)0x0057,
-	DMPAPER_B6_JIS=(int)0x0058,
-	DMPAPER_B6_JIS_ROTATED=(int)0x0059,
-	DMPAPER_12X11=(int)0x005A,
-	DMPAPER_JENV_YOU4=(int)0x005B,
-	DMPAPER_JENV_YOU4_ROTATED=(int)0x005C,
-	DMPAPER_P16K=(int)0x005D,
-	DMPAPER_P32K=(int)0x005E,
-	DMPAPER_P32KBIG=(int)0x005F,
-	DMPAPER_PENV_1=(int)0x0060,
-	DMPAPER_PENV_2=(int)0x0061,
-	DMPAPER_PENV_3=(int)0x0062,
-	DMPAPER_PENV_4=(int)0x0063,
-	DMPAPER_PENV_5=(int)0x0064,
-	DMPAPER_PENV_6=(int)0x0065,
-	DMPAPER_PENV_7=(int)0x0066,
-	DMPAPER_PENV_8=(int)0x0067,
-	DMPAPER_PENV_9=(int)0x0068,
-	DMPAPER_PENV_10=(int)0x0069,
-	DMPAPER_P16K_ROTATED=(int)0x006A,
-	DMPAPER_P32K_ROTATED=(int)0x006B,
-	DMPAPER_P32KBIG_ROTATED=(int)0x006C,
-	DMPAPER_PENV_1_ROTATED=(int)0x006D,
-	DMPAPER_PENV_2_ROTATED=(int)0x006E,
-	DMPAPER_PENV_3_ROTATED=(int)0x006F,
-	DMPAPER_PENV_4_ROTATED=(int)0x0070,
-	DMPAPER_PENV_5_ROTATED=(int)0x0071,
-	DMPAPER_PENV_6_ROTATED=(int)0x0072,
-	DMPAPER_PENV_7_ROTATED=(int)0x0073,
-	DMPAPER_PENV_8_ROTATED=(int)0x0074,
-	DMPAPER_PENV_9_ROTATED=(int)0x0075,
-	DMPAPER_PENV_10_ROTATED=(int)0x0076
+	DMPAPER_LETTER=(int)(0x0001),
+	DMPAPER_LETTERSMALL=(int)(0x0002),
+	DMPAPER_TABLOID=(int)(0x0003),
+	DMPAPER_LEDGER=(int)(0x0004),
+	DMPAPER_LEGAL=(int)(0x0005),
+	DMPAPER_STATEMENT=(int)(0x0006),
+	DMPAPER_EXECUTIVE=(int)(0x0007),
+	DMPAPER_A3=(int)(0x0008),
+	DMPAPER_A4=(int)(0x0009),
+	DMPAPER_A4SMALL=(int)(0x000A),
+	DMPAPER_A5=(int)(0x000B),
+	DMPAPER_B4=(int)(0x000C),
+	DMPAPER_B5=(int)(0x000D),
+	DMPAPER_FOLIO=(int)(0x000E),
+	DMPAPER_QUARTO=(int)(0x000F),
+	DMPAPER_10X14=(int)(0x0010),
+	DMPAPER_11X17=(int)(0x0011),
+	DMPAPER_NOTE=(int)(0x0012),
+	DMPAPER_ENV_9=(int)(0x0013),
+	DMPAPER_ENV_10=(int)(0x0014),
+	DMPAPER_ENV_11=(int)(0x0015),
+	DMPAPER_ENV_12=(int)(0x0016),
+	DMPAPER_ENV_14=(int)(0x0017),
+	DMPAPER_CSHEET=(int)(0x0018),
+	DMPAPER_DSHEET=(int)(0x0019),
+	DMPAPER_ESHEET=(int)(0x001A),
+	DMPAPER_ENV_DL=(int)(0x001B),
+	DMPAPER_ENV_C5=(int)(0x001C),
+	DMPAPER_ENV_C3=(int)(0x001D),
+	DMPAPER_ENV_C4=(int)(0x001E),
+	DMPAPER_ENV_C6=(int)(0x001F),
+	DMPAPER_ENV_C65=(int)(0x0020),
+	DMPAPER_ENV_B4=(int)(0x0021),
+	DMPAPER_ENV_B5=(int)(0x0022),
+	DMPAPER_ENV_B6=(int)(0x0023),
+	DMPAPER_ENV_ITALY=(int)(0x0024),
+	DMPAPER_ENV_MONARCH=(int)(0x0025),
+	DMPAPER_ENV_PERSONAL=(int)(0x0026),
+	DMPAPER_FANFOLD_US=(int)(0x0027),
+	DMPAPER_FANFOLD_STD_GERMAN=(int)(0x0028),
+	DMPAPER_FANFOLD_LGL_GERMAN=(int)(0x0029),
+	DMPAPER_DBL_JAPANESE_POSTCARD=(int)(0x0045),
+	DMPAPER_A6=(int)(0x0046),
+	DMPAPER_JENV_KAKU2=(int)(0x0047),
+	DMPAPER_JENV_KAKU3=(int)(0x0048),
+	DMPAPER_JENV_CHOU3=(int)(0x0049),
+	DMPAPER_JENV_CHOU4=(int)(0x004A),
+	DMPAPER_LETTER_ROTATED=(int)(0x004B),
+	DMPAPER_A3_ROTATED=(int)(0x004C),
+	DMPAPER_A4_ROTATED=(int)(0x004D),
+	DMPAPER_A5_ROTATED=(int)(0x004E),
+	DMPAPER_B4_JIS_ROTATED=(int)(0x004F),
+	DMPAPER_B5_JIS_ROTATED=(int)(0x0050),
+	DMPAPER_JAPANESE_POSTCARD_ROTATED=(int)(0x0051),
+	DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED=(int)(0x0052),
+	DMPAPER_A6_ROTATED=(int)(0x0053),
+	DMPAPER_JENV_KAKU2_ROTATED=(int)(0x0054),
+	DMPAPER_JENV_KAKU3_ROTATED=(int)(0x0055),
+	DMPAPER_JENV_CHOU3_ROTATED=(int)(0x0056),
+	DMPAPER_JENV_CHOU4_ROTATED=(int)(0x0057),
+	DMPAPER_B6_JIS=(int)(0x0058),
+	DMPAPER_B6_JIS_ROTATED=(int)(0x0059),
+	DMPAPER_12X11=(int)(0x005A),
+	DMPAPER_JENV_YOU4=(int)(0x005B),
+	DMPAPER_JENV_YOU4_ROTATED=(int)(0x005C),
+	DMPAPER_P16K=(int)(0x005D),
+	DMPAPER_P32K=(int)(0x005E),
+	DMPAPER_P32KBIG=(int)(0x005F),
+	DMPAPER_PENV_1=(int)(0x0060),
+	DMPAPER_PENV_2=(int)(0x0061),
+	DMPAPER_PENV_3=(int)(0x0062),
+	DMPAPER_PENV_4=(int)(0x0063),
+	DMPAPER_PENV_5=(int)(0x0064),
+	DMPAPER_PENV_6=(int)(0x0065),
+	DMPAPER_PENV_7=(int)(0x0066),
+	DMPAPER_PENV_8=(int)(0x0067),
+	DMPAPER_PENV_9=(int)(0x0068),
+	DMPAPER_PENV_10=(int)(0x0069),
+	DMPAPER_P16K_ROTATED=(int)(0x006A),
+	DMPAPER_P32K_ROTATED=(int)(0x006B),
+	DMPAPER_P32KBIG_ROTATED=(int)(0x006C),
+	DMPAPER_PENV_1_ROTATED=(int)(0x006D),
+	DMPAPER_PENV_2_ROTATED=(int)(0x006E),
+	DMPAPER_PENV_3_ROTATED=(int)(0x006F),
+	DMPAPER_PENV_4_ROTATED=(int)(0x0070),
+	DMPAPER_PENV_5_ROTATED=(int)(0x0071),
+	DMPAPER_PENV_6_ROTATED=(int)(0x0072),
+	DMPAPER_PENV_7_ROTATED=(int)(0x0073),
+	DMPAPER_PENV_8_ROTATED=(int)(0x0074),
+	DMPAPER_PENV_9_ROTATED=(int)(0x0075),
+	DMPAPER_PENV_10_ROTATED=(int)(0x0076)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModePaperSize=0x7FFFFFFF}
@@ -459,19 +459,19 @@ enum spoolss_DeviceModePaperSize
 enum spoolss_DeviceModeDefaultSource
 #ifndef USE_UINT_ENUMS
  {
-	DMBIN_UPPER=(int)0x0001,
-	DMBIN_LOWER=(int)0x0002,
-	DMBIN_MIDDLE=(int)0x0003,
-	DMBIN_MANUAL=(int)0x0004,
-	DMBIN_ENVELOPE=(int)0x0005,
-	DMBIN_ENVMANUAL=(int)0x0006,
-	DMBIN_AUTO=(int)0x0007,
-	DMBIN_TRACTOR=(int)0x0008,
-	DMBIN_SMALLFMT=(int)0x0009,
-	DMBIN_LARGEFMT=(int)0x000a,
-	DMBIN_LARGECAPACITY=(int)0x000b,
-	DMBIN_CASSETTE=(int)0x000e,
-	DMBIN_FORMSOURCE=(int)0x000f
+	DMBIN_UPPER=(int)(0x0001),
+	DMBIN_LOWER=(int)(0x0002),
+	DMBIN_MIDDLE=(int)(0x0003),
+	DMBIN_MANUAL=(int)(0x0004),
+	DMBIN_ENVELOPE=(int)(0x0005),
+	DMBIN_ENVMANUAL=(int)(0x0006),
+	DMBIN_AUTO=(int)(0x0007),
+	DMBIN_TRACTOR=(int)(0x0008),
+	DMBIN_SMALLFMT=(int)(0x0009),
+	DMBIN_LARGEFMT=(int)(0x000a),
+	DMBIN_LARGECAPACITY=(int)(0x000b),
+	DMBIN_CASSETTE=(int)(0x000e),
+	DMBIN_FORMSOURCE=(int)(0x000f)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeDefaultSource=0x7FFFFFFF}
@@ -494,10 +494,10 @@ enum spoolss_DeviceModeDefaultSource
 enum spoolss_DeviceModePrintQuality
 #ifndef USE_UINT_ENUMS
  {
-	DMRES_HIGH=(int)0xfffc,
-	DMRES_MEDIUM=(int)0xfffd,
-	DMRES_LOW=(int)0xfffe,
-	DMRES_DRAFT=(int)0xffff
+	DMRES_HIGH=(int)(0xfffc),
+	DMRES_MEDIUM=(int)(0xfffd),
+	DMRES_LOW=(int)(0xfffe),
+	DMRES_DRAFT=(int)(0xffff)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModePrintQuality=0x7FFFFFFF}
@@ -511,8 +511,8 @@ enum spoolss_DeviceModePrintQuality
 enum spoolss_DeviceModeColor
 #ifndef USE_UINT_ENUMS
  {
-	DMRES_MONOCHROME=(int)0x0001,
-	DMRES_COLOR=(int)0x0002
+	DMRES_MONOCHROME=(int)(0x0001),
+	DMRES_COLOR=(int)(0x0002)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeColor=0x7FFFFFFF}
@@ -524,9 +524,9 @@ enum spoolss_DeviceModeColor
 enum spoolss_DeviceModeDuplex
 #ifndef USE_UINT_ENUMS
  {
-	DMDUP_SIMPLEX=(int)0x0001,
-	DMDUP_VERTICAL=(int)0x0002,
-	DMDUP_HORIZONTAL=(int)0x0003
+	DMDUP_SIMPLEX=(int)(0x0001),
+	DMDUP_VERTICAL=(int)(0x0002),
+	DMDUP_HORIZONTAL=(int)(0x0003)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeDuplex=0x7FFFFFFF}
@@ -539,10 +539,10 @@ enum spoolss_DeviceModeDuplex
 enum spoolss_DeviceModeTTOption
 #ifndef USE_UINT_ENUMS
  {
-	DMTT_BITMAP=(int)0x0001,
-	DMTT_DOWNLOAD=(int)0x0002,
-	DMTT_SUBDEV=(int)0x0003,
-	DMTT_DOWNLOAD_OUTLINE=(int)0x0004
+	DMTT_BITMAP=(int)(0x0001),
+	DMTT_DOWNLOAD=(int)(0x0002),
+	DMTT_SUBDEV=(int)(0x0003),
+	DMTT_DOWNLOAD_OUTLINE=(int)(0x0004)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeTTOption=0x7FFFFFFF}
@@ -556,8 +556,8 @@ enum spoolss_DeviceModeTTOption
 enum spoolss_DeviceModeCollate
 #ifndef USE_UINT_ENUMS
  {
-	DMCOLLATE_FALSE=(int)0x0000,
-	DMCOLLATE_TRUE=(int)0x0001
+	DMCOLLATE_FALSE=(int)(0x0000),
+	DMCOLLATE_TRUE=(int)(0x0001)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeCollate=0x7FFFFFFF}
@@ -569,8 +569,8 @@ enum spoolss_DeviceModeCollate
 enum spoolss_DeviceModeNUp
 #ifndef USE_UINT_ENUMS
  {
-	DMNUP_SYSTEM=(int)0x00000001,
-	DMNUP_ONEUP=(int)0x00000002
+	DMNUP_SYSTEM=(int)(0x00000001),
+	DMNUP_ONEUP=(int)(0x00000002)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeNUp=0x7FFFFFFF}
@@ -582,10 +582,10 @@ enum spoolss_DeviceModeNUp
 enum spoolss_DeviceModeICMMethod
 #ifndef USE_UINT_ENUMS
  {
-	DMICMMETHOD_NONE=(int)0x00000001,
-	DMICMMETHOD_SYSTEM=(int)0x00000002,
-	DMICMMETHOD_DRIVER=(int)0x00000003,
-	DMICMMETHOD_DEVICE=(int)0x00000004
+	DMICMMETHOD_NONE=(int)(0x00000001),
+	DMICMMETHOD_SYSTEM=(int)(0x00000002),
+	DMICMMETHOD_DRIVER=(int)(0x00000003),
+	DMICMMETHOD_DEVICE=(int)(0x00000004)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeICMMethod=0x7FFFFFFF}
@@ -599,10 +599,10 @@ enum spoolss_DeviceModeICMMethod
 enum spoolss_DeviceModeICMIntent
 #ifndef USE_UINT_ENUMS
  {
-	DMICM_SATURATE=(int)0x00000001,
-	DMICM_CONTRAST=(int)0x00000002,
-	DMICM_COLORIMETRIC=(int)0x00000003,
-	DMICM_ABS_COLORIMETRIC=(int)0x00000004
+	DMICM_SATURATE=(int)(0x00000001),
+	DMICM_CONTRAST=(int)(0x00000002),
+	DMICM_COLORIMETRIC=(int)(0x00000003),
+	DMICM_ABS_COLORIMETRIC=(int)(0x00000004)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeICMIntent=0x7FFFFFFF}
@@ -616,9 +616,9 @@ enum spoolss_DeviceModeICMIntent
 enum spoolss_DeviceModeMediaType
 #ifndef USE_UINT_ENUMS
  {
-	DMMEDIA_STANDARD=(int)0x00000001,
-	DMMEDIA_TRANSPARENCY=(int)0x00000002,
-	DMMEDIA_GLOSSY=(int)0x00000003
+	DMMEDIA_STANDARD=(int)(0x00000001),
+	DMMEDIA_TRANSPARENCY=(int)(0x00000002),
+	DMMEDIA_GLOSSY=(int)(0x00000003)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeMediaType=0x7FFFFFFF}
@@ -631,16 +631,16 @@ enum spoolss_DeviceModeMediaType
 enum spoolss_DeviceModeDitherType
 #ifndef USE_UINT_ENUMS
  {
-	DMDITHER_NONE=(int)0x00000001,
-	DMDITHER_COARSE=(int)0x00000002,
-	DMDITHER_FINE=(int)0x00000003,
-	DMDITHER_LINEART=(int)0x00000004,
-	DMDITHER_ERRORDIFFUSION=(int)0x00000005,
-	DMDITHER_RESERVED6=(int)0x00000006,
-	DMDITHER_RESERVED7=(int)0x00000007,
-	DMDITHER_RESERVED8=(int)0x00000008,
-	DMDITHER_RESERVED9=(int)0x00000009,
-	DMDITHER_GRAYSCALE=(int)0x0000000A
+	DMDITHER_NONE=(int)(0x00000001),
+	DMDITHER_COARSE=(int)(0x00000002),
+	DMDITHER_FINE=(int)(0x00000003),
+	DMDITHER_LINEART=(int)(0x00000004),
+	DMDITHER_ERRORDIFFUSION=(int)(0x00000005),
+	DMDITHER_RESERVED6=(int)(0x00000006),
+	DMDITHER_RESERVED7=(int)(0x00000007),
+	DMDITHER_RESERVED8=(int)(0x00000008),
+	DMDITHER_RESERVED9=(int)(0x00000009),
+	DMDITHER_GRAYSCALE=(int)(0x0000000A)
 }
 #else
  { __donnot_use_enum_spoolss_DeviceModeDitherType=0x7FFFFFFF}
@@ -987,15 +987,15 @@ struct spoolss_JobInfoContainer {
 enum spoolss_JobControl
 #ifndef USE_UINT_ENUMS
  {
-	SPOOLSS_JOB_CONTROL_PAUSE=(int)1,
-	SPOOLSS_JOB_CONTROL_RESUME=(int)2,
-	SPOOLSS_JOB_CONTROL_CANCEL=(int)3,
-	SPOOLSS_JOB_CONTROL_RESTART=(int)4,
-	SPOOLSS_JOB_CONTROL_DELETE=(int)5,
-	SPOOLSS_JOB_CONTROL_SEND_TO_PRINTER=(int)6,
-	SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED=(int)7,
-	SPOOLSS_JOB_CONTROL_RETAIN=(int)8,
-	SPOOLSS_JOB_CONTROL_RELEASE=(int)9
+	SPOOLSS_JOB_CONTROL_PAUSE=(int)(1),
+	SPOOLSS_JOB_CONTROL_RESUME=(int)(2),
+	SPOOLSS_JOB_CONTROL_CANCEL=(int)(3),
+	SPOOLSS_JOB_CONTROL_RESTART=(int)(4),
+	SPOOLSS_JOB_CONTROL_DELETE=(int)(5),
+	SPOOLSS_JOB_CONTROL_SEND_TO_PRINTER=(int)(6),
+	SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED=(int)(7),
+	SPOOLSS_JOB_CONTROL_RETAIN=(int)(8),
+	SPOOLSS_JOB_CONTROL_RELEASE=(int)(9)
 }
 #else
  { __donnot_use_enum_spoolss_JobControl=0x7FFFFFFF}
@@ -1014,11 +1014,11 @@ enum spoolss_JobControl
 enum spoolss_PrinterControl
 #ifndef USE_UINT_ENUMS
  {
-	SPOOLSS_PRINTER_CONTROL_UNPAUSE=(int)0,
-	SPOOLSS_PRINTER_CONTROL_PAUSE=(int)1,
-	SPOOLSS_PRINTER_CONTROL_RESUME=(int)2,
-	SPOOLSS_PRINTER_CONTROL_PURGE=(int)3,
-	SPOOLSS_PRINTER_CONTROL_SET_STATUS=(int)4
+	SPOOLSS_PRINTER_CONTROL_UNPAUSE=(int)(0),
+	SPOOLSS_PRINTER_CONTROL_PAUSE=(int)(1),
+	SPOOLSS_PRINTER_CONTROL_RESUME=(int)(2),
+	SPOOLSS_PRINTER_CONTROL_PURGE=(int)(3),
+	SPOOLSS_PRINTER_CONTROL_SET_STATUS=(int)(4)
 }
 #else
  { __donnot_use_enum_spoolss_PrinterControl=0x7FFFFFFF}
@@ -1150,10 +1150,10 @@ struct spoolss_AddDriverInfo1 {
 enum spoolss_DriverOSVersion
 #ifndef USE_UINT_ENUMS
  {
-	SPOOLSS_DRIVER_VERSION_9X=(int)0,
-	SPOOLSS_DRIVER_VERSION_NT35=(int)1,
-	SPOOLSS_DRIVER_VERSION_NT4=(int)2,
-	SPOOLSS_DRIVER_VERSION_200X=(int)3
+	SPOOLSS_DRIVER_VERSION_9X=(int)(0),
+	SPOOLSS_DRIVER_VERSION_NT35=(int)(1),
+	SPOOLSS_DRIVER_VERSION_NT4=(int)(2),
+	SPOOLSS_DRIVER_VERSION_200X=(int)(3)
 }
 #else
  { __donnot_use_enum_spoolss_DriverOSVersion=0x7FFFFFFF}
@@ -1389,11 +1389,11 @@ struct spoolss_DriverInfo8 {
 enum spoolss_DriverFileType
 #ifndef USE_UINT_ENUMS
  {
-	SPOOLSS_DRIVER_FILE_TYPE_RENDERING=(int)0x00000000,
-	SPOOLSS_DRIVER_FILE_TYPE_CONFIGURATION=(int)0x00000001,
-	SPOOLSS_DRIVER_FILE_TYPE_DATA=(int)0x00000002,
-	SPOOLSS_DRIVER_FILE_TYPE_HELP=(int)0x00000003,
-	SPOOLSS_DRIVER_FILE_TYPE_OTHER=(int)0x00000004
+	SPOOLSS_DRIVER_FILE_TYPE_RENDERING=(int)(0x00000000),
+	SPOOLSS_DRIVER_FILE_TYPE_CONFIGURATION=(int)(0x00000001),
+	SPOOLSS_DRIVER_FILE_TYPE_DATA=(int)(0x00000002),
+	SPOOLSS_DRIVER_FILE_TYPE_HELP=(int)(0x00000003),
+	SPOOLSS_DRIVER_FILE_TYPE_OTHER=(int)(0x00000004)
 }
 #else
  { __donnot_use_enum_spoolss_DriverFileType=0x7FFFFFFF}
@@ -1507,9 +1507,9 @@ union spoolss_PrinterData {
 enum spoolss_FormFlags
 #ifndef USE_UINT_ENUMS
  {
-	SPOOLSS_FORM_USER=(int)0,
-	SPOOLSS_FORM_BUILTIN=(int)1,
-	SPOOLSS_FORM_PRINTER=(int)2
+	SPOOLSS_FORM_USER=(int)(0),
+	SPOOLSS_FORM_BUILTIN=(int)(1),
+	SPOOLSS_FORM_PRINTER=(int)(2)
 }
 #else
  { __donnot_use_enum_spoolss_FormFlags=0x7FFFFFFF}
@@ -1607,19 +1607,19 @@ struct spoolss_PortInfo2 {
 enum spoolss_PortStatus
 #ifndef USE_UINT_ENUMS
  {
-	PORT_STATUS_CLEAR=(int)0x00000000,
-	PORT_STATUS_OFFLINE=(int)0x00000001,
-	PORT_STATUS_PAPER_JAM=(int)0x00000002,
-	PORT_STATUS_PAPER_OUT=(int)0x00000003,
-	PORT_STATUS_OUTPUT_BIN_FULL=(int)0x00000004,
-	PORT_STATUS_PAPER_PROBLEM=(int)0x00000005,
-	PORT_STATUS_NO_TONER=(int)0x00000006,
-	PORT_STATUS_DOOR_OPEN=(int)0x00000007,
-	PORT_STATUS_USER_INTERVENTION=(int)0x00000008,
-	PORT_STATUS_OUT_OF_MEMORY=(int)0x00000009,
-	PORT_STATUS_TONER_LOW=(int)0x0000000A,
-	PORT_STATUS_WARMING_UP=(int)0x0000000B,
-	PORT_STATUS_POWER_SAVE=(int)0x0000000C
+	PORT_STATUS_CLEAR=(int)(0x00000000),
+	PORT_STATUS_OFFLINE=(int)(0x00000001),
+	PORT_STATUS_PAPER_JAM=(int)(0x00000002),
+	PORT_STATUS_PAPER_OUT=(int)(0x00000003),
+	PORT_STATUS_OUTPUT_BIN_FULL=(int)(0x00000004),
+	PORT_STATUS_PAPER_PROBLEM=(int)(0x00000005),
+	PORT_STATUS_NO_TONER=(int)(0x00000006),
+	PORT_STATUS_DOOR_OPEN=(int)(0x00000007),
+	PORT_STATUS_USER_INTERVENTION=(int)(0x00000008),
+	PORT_STATUS_OUT_OF_MEMORY=(int)(0x00000009),
+	PORT_STATUS_TONER_LOW=(int)(0x0000000A),
+	PORT_STATUS_WARMING_UP=(int)(0x0000000B),
+	PORT_STATUS_POWER_SAVE=(int)(0x0000000C)
 }
 #else
  { __donnot_use_enum_spoolss_PortStatus=0x7FFFFFFF}
@@ -1642,9 +1642,9 @@ enum spoolss_PortStatus
 enum spoolss_PortSeverity
 #ifndef USE_UINT_ENUMS
  {
-	PORT_STATUS_TYPE_ERROR=(int)0x00000001,
-	PORT_STATUS_TYPE_WARNING=(int)0x00000002,
-	PORT_STATUS_TYPE_INFO=(int)0x00000003
+	PORT_STATUS_TYPE_ERROR=(int)(0x00000001),
+	PORT_STATUS_TYPE_WARNING=(int)(0x00000002),
+	PORT_STATUS_TYPE_INFO=(int)(0x00000003)
 }
 #else
  { __donnot_use_enum_spoolss_PortSeverity=0x7FFFFFFF}
@@ -1721,30 +1721,30 @@ union spoolss_PrintProcDataTypesInfo {
 enum spoolss_JobNotifyField
 #ifndef USE_UINT_ENUMS
  {
-	JOB_NOTIFY_FIELD_PRINTER_NAME=(int)0x00,
-	JOB_NOTIFY_FIELD_MACHINE_NAME=(int)0x01,
-	JOB_NOTIFY_FIELD_PORT_NAME=(int)0x02,
-	JOB_NOTIFY_FIELD_USER_NAME=(int)0x03,
-	JOB_NOTIFY_FIELD_NOTIFY_NAME=(int)0x04,
-	JOB_NOTIFY_FIELD_DATATYPE=(int)0x05,
-	JOB_NOTIFY_FIELD_PRINT_PROCESSOR=(int)0x06,
-	JOB_NOTIFY_FIELD_PARAMETERS=(int)0x07,
-	JOB_NOTIFY_FIELD_DRIVER_NAME=(int)0x08,
-	JOB_NOTIFY_FIELD_DEVMODE=(int)0x09,
-	JOB_NOTIFY_FIELD_STATUS=(int)0x0a,
-	JOB_NOTIFY_FIELD_STATUS_STRING=(int)0x0b,
-	JOB_NOTIFY_FIELD_SECURITY_DESCRIPTOR=(int)0x0c,
-	JOB_NOTIFY_FIELD_DOCUMENT=(int)0x0d,
-	JOB_NOTIFY_FIELD_PRIORITY=(int)0x0e,
-	JOB_NOTIFY_FIELD_POSITION=(int)0x0f,
-	JOB_NOTIFY_FIELD_SUBMITTED=(int)0x10,
-	JOB_NOTIFY_FIELD_START_TIME=(int)0x11,
-	JOB_NOTIFY_FIELD_UNTIL_TIME=(int)0x12,
-	JOB_NOTIFY_FIELD_TIME=(int)0x13,
-	JOB_NOTIFY_FIELD_TOTAL_PAGES=(int)0x14,
-	JOB_NOTIFY_FIELD_PAGES_PRINTED=(int)0x15,
-	JOB_NOTIFY_FIELD_TOTAL_BYTES=(int)0x16,
-	JOB_NOTIFY_FIELD_BYTES_PRINTED=(int)0x17
+	JOB_NOTIFY_FIELD_PRINTER_NAME=(int)(0x00),
+	JOB_NOTIFY_FIELD_MACHINE_NAME=(int)(0x01),
+	JOB_NOTIFY_FIELD_PORT_NAME=(int)(0x02),
+	JOB_NOTIFY_FIELD_USER_NAME=(int)(0x03),
+	JOB_NOTIFY_FIELD_NOTIFY_NAME=(int)(0x04),
+	JOB_NOTIFY_FIELD_DATATYPE=(int)(0x05),
+	JOB_NOTIFY_FIELD_PRINT_PROCESSOR=(int)(0x06),
+	JOB_NOTIFY_FIELD_PARAMETERS=(int)(0x07),
+	JOB_NOTIFY_FIELD_DRIVER_NAME=(int)(0x08),
+	JOB_NOTIFY_FIELD_DEVMODE=(int)(0x09),
+	JOB_NOTIFY_FIELD_STATUS=(int)(0x0a),
+	JOB_NOTIFY_FIELD_STATUS_STRING=(int)(0x0b),
+	JOB_NOTIFY_FIELD_SECURITY_DESCRIPTOR=(int)(0x0c),
+	JOB_NOTIFY_FIELD_DOCUMENT=(int)(0x0d),
+	JOB_NOTIFY_FIELD_PRIORITY=(int)(0x0e),
+	JOB_NOTIFY_FIELD_POSITION=(int)(0x0f),
+	JOB_NOTIFY_FIELD_SUBMITTED=(int)(0x10),
+	JOB_NOTIFY_FIELD_START_TIME=(int)(0x11),
+	JOB_NOTIFY_FIELD_UNTIL_TIME=(int)(0x12),
+	JOB_NOTIFY_FIELD_TIME=(int)(0x13),
+	JOB_NOTIFY_FIELD_TOTAL_PAGES=(int)(0x14),
+	JOB_NOTIFY_FIELD_PAGES_PRINTED=(int)(0x15),
+	JOB_NOTIFY_FIELD_TOTAL_BYTES=(int)(0x16),
+	JOB_NOTIFY_FIELD_BYTES_PRINTED=(int)(0x17)
 }
 #else
  { __donnot_use_enum_spoolss_JobNotifyField=0x7FFFFFFF}
@@ -1778,34 +1778,34 @@ enum spoolss_JobNotifyField
 enum spoolss_PrintNotifyField
 #ifndef USE_UINT_ENUMS
  {
-	PRINTER_NOTIFY_FIELD_SERVER_NAME=(int)0x00,
-	PRINTER_NOTIFY_FIELD_PRINTER_NAME=(int)0x01,
-	PRINTER_NOTIFY_FIELD_SHARE_NAME=(int)0x02,
-	PRINTER_NOTIFY_FIELD_PORT_NAME=(int)0x03,
-	PRINTER_NOTIFY_FIELD_DRIVER_NAME=(int)0x04,
-	PRINTER_NOTIFY_FIELD_COMMENT=(int)0x05,
-	PRINTER_NOTIFY_FIELD_LOCATION=(int)0x06,
-	PRINTER_NOTIFY_FIELD_DEVMODE=(int)0x07,
-	PRINTER_NOTIFY_FIELD_SEPFILE=(int)0x08,
-	PRINTER_NOTIFY_FIELD_PRINT_PROCESSOR=(int)0x09,
-	PRINTER_NOTIFY_FIELD_PARAMETERS=(int)0x0a,
-	PRINTER_NOTIFY_FIELD_DATATYPE=(int)0x0b,
-	PRINTER_NOTIFY_FIELD_SECURITY_DESCRIPTOR=(int)0x0c,
-	PRINTER_NOTIFY_FIELD_ATTRIBUTES=(int)0x0d,
-	PRINTER_NOTIFY_FIELD_PRIORITY=(int)0x0e,
-	PRINTER_NOTIFY_FIELD_DEFAULT_PRIORITY=(int)0x0f,
-	PRINTER_NOTIFY_FIELD_START_TIME=(int)0x10,
-	PRINTER_NOTIFY_FIELD_UNTIL_TIME=(int)0x11,
-	PRINTER_NOTIFY_FIELD_STATUS=(int)0x12,
-	PRINTER_NOTIFY_FIELD_STATUS_STRING=(int)0x13,
-	PRINTER_NOTIFY_FIELD_CJOBS=(int)0x14,
-	PRINTER_NOTIFY_FIELD_AVERAGE_PPM=(int)0x15,
-	PRINTER_NOTIFY_FIELD_TOTAL_PAGES=(int)0x16,
-	PRINTER_NOTIFY_FIELD_PAGES_PRINTED=(int)0x17,
-	PRINTER_NOTIFY_FIELD_TOTAL_BYTES=(int)0x18,
-	PRINTER_NOTIFY_FIELD_BYTES_PRINTED=(int)0x19,
-	PRINTER_NOTIFY_FIELD_OBJECT_GUID=(int)0x1a,
-	PRINTER_NOTIFY_FIELD_FRIENDLY_NAME=(int)0x1b
+	PRINTER_NOTIFY_FIELD_SERVER_NAME=(int)(0x00),
+	PRINTER_NOTIFY_FIELD_PRINTER_NAME=(int)(0x01),
+	PRINTER_NOTIFY_FIELD_SHARE_NAME=(int)(0x02),
+	PRINTER_NOTIFY_FIELD_PORT_NAME=(int)(0x03),
+	PRINTER_NOTIFY_FIELD_DRIVER_NAME=(int)(0x04),
+	PRINTER_NOTIFY_FIELD_COMMENT=(int)(0x05),
+	PRINTER_NOTIFY_FIELD_LOCATION=(int)(0x06),
+	PRINTER_NOTIFY_FIELD_DEVMODE=(int)(0x07),
+	PRINTER_NOTIFY_FIELD_SEPFILE=(int)(0x08),
+	PRINTER_NOTIFY_FIELD_PRINT_PROCESSOR=(int)(0x09),
+	PRINTER_NOTIFY_FIELD_PARAMETERS=(int)(0x0a),
+	PRINTER_NOTIFY_FIELD_DATATYPE=(int)(0x0b),
+	PRINTER_NOTIFY_FIELD_SECURITY_DESCRIPTOR=(int)(0x0c),
+	PRINTER_NOTIFY_FIELD_ATTRIBUTES=(int)(0x0d),
+	PRINTER_NOTIFY_FIELD_PRIORITY=(int)(0x0e),
+	PRINTER_NOTIFY_FIELD_DEFAULT_PRIORITY=(int)(0x0f),
+	PRINTER_NOTIFY_FIELD_START_TIME=(int)(0x10),
+	PRINTER_NOTIFY_FIELD_UNTIL_TIME=(int)(0x11),
+	PRINTER_NOTIFY_FIELD_STATUS=(int)(0x12),
+	PRINTER_NOTIFY_FIELD_STATUS_STRING=(int)(0x13),
+	PRINTER_NOTIFY_FIELD_CJOBS=(int)(0x14),
+	PRINTER_NOTIFY_FIELD_AVERAGE_PPM=(int)(0x15),
+	PRINTER_NOTIFY_FIELD_TOTAL_PAGES=(int)(0x16),
+	PRINTER_NOTIFY_FIELD_PAGES_PRINTED=(int)(0x17),
+	PRINTER_NOTIFY_FIELD_TOTAL_BYTES=(int)(0x18),
+	PRINTER_NOTIFY_FIELD_BYTES_PRINTED=(int)(0x19),
+	PRINTER_NOTIFY_FIELD_OBJECT_GUID=(int)(0x1a),
+	PRINTER_NOTIFY_FIELD_FRIENDLY_NAME=(int)(0x1b)
 }
 #else
  { __donnot_use_enum_spoolss_PrintNotifyField=0x7FFFFFFF}
@@ -1843,8 +1843,8 @@ enum spoolss_PrintNotifyField
 enum spoolss_NotifyType
 #ifndef USE_UINT_ENUMS
  {
-	PRINTER_NOTIFY_TYPE=(int)0x00,
-	JOB_NOTIFY_TYPE=(int)0x01
+	PRINTER_NOTIFY_TYPE=(int)(0x00),
+	JOB_NOTIFY_TYPE=(int)(0x01)
 }
 #else
  { __donnot_use_enum_spoolss_NotifyType=0x7FFFFFFF}
@@ -1884,11 +1884,11 @@ struct spoolss_NotifyString {
 enum spoolss_NotifyTable
 #ifndef USE_UINT_ENUMS
  {
-	NOTIFY_TABLE_DWORD=(int)0x0001,
-	NOTIFY_TABLE_STRING=(int)0x0002,
-	NOTIFY_TABLE_DEVMODE=(int)0x0003,
-	NOTIFY_TABLE_TIME=(int)0x0004,
-	NOTIFY_TABLE_SECURITYDESCRIPTOR=(int)0x0005
+	NOTIFY_TABLE_DWORD=(int)(0x0001),
+	NOTIFY_TABLE_STRING=(int)(0x0002),
+	NOTIFY_TABLE_DEVMODE=(int)(0x0003),
+	NOTIFY_TABLE_TIME=(int)(0x0004),
+	NOTIFY_TABLE_SECURITYDESCRIPTOR=(int)(0x0005)
 }
 #else
  { __donnot_use_enum_spoolss_NotifyTable=0x7FFFFFFF}
@@ -1994,8 +1994,8 @@ struct spoolss_PrinterEnumValues {
 enum spoolss_PortProtocol
 #ifndef USE_UINT_ENUMS
  {
-	PROTOCOL_RAWTCP_TYPE=(int)1,
-	PROTOCOL_LPR_TYPE=(int)2
+	PROTOCOL_RAWTCP_TYPE=(int)(1),
+	PROTOCOL_LPR_TYPE=(int)(2)
 }
 #else
  { __donnot_use_enum_spoolss_PortProtocol=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/srvsvc.h b/librpc/gen_ndr/srvsvc.h
index cfb1a7a095..be3dae4fd3 100644
--- a/librpc/gen_ndr/srvsvc.h
+++ b/librpc/gen_ndr/srvsvc.h
@@ -239,18 +239,18 @@ struct srvsvc_NetSessInfoCtr {
 enum srvsvc_ShareType
 #ifndef USE_UINT_ENUMS
  {
-	STYPE_DISKTREE=(int)0,
-	STYPE_DISKTREE_TEMPORARY=(int)STYPE_DISKTREE|STYPE_TEMPORARY,
-	STYPE_DISKTREE_HIDDEN=(int)STYPE_DISKTREE|STYPE_HIDDEN,
-	STYPE_PRINTQ=(int)1,
-	STYPE_PRINTQ_TEMPORARY=(int)STYPE_PRINTQ|STYPE_TEMPORARY,
-	STYPE_PRINTQ_HIDDEN=(int)STYPE_PRINTQ|STYPE_HIDDEN,
-	STYPE_DEVICE=(int)2,
-	STYPE_DEVICE_TEMPORARY=(int)STYPE_DEVICE|STYPE_TEMPORARY,
-	STYPE_DEVICE_HIDDEN=(int)STYPE_DEVICE|STYPE_HIDDEN,
-	STYPE_IPC=(int)3,
-	STYPE_IPC_TEMPORARY=(int)STYPE_IPC|STYPE_TEMPORARY,
-	STYPE_IPC_HIDDEN=(int)STYPE_IPC|STYPE_HIDDEN
+	STYPE_DISKTREE=(int)(0),
+	STYPE_DISKTREE_TEMPORARY=(int)(STYPE_DISKTREE|STYPE_TEMPORARY),
+	STYPE_DISKTREE_HIDDEN=(int)(STYPE_DISKTREE|STYPE_HIDDEN),
+	STYPE_PRINTQ=(int)(1),
+	STYPE_PRINTQ_TEMPORARY=(int)(STYPE_PRINTQ|STYPE_TEMPORARY),
+	STYPE_PRINTQ_HIDDEN=(int)(STYPE_PRINTQ|STYPE_HIDDEN),
+	STYPE_DEVICE=(int)(2),
+	STYPE_DEVICE_TEMPORARY=(int)(STYPE_DEVICE|STYPE_TEMPORARY),
+	STYPE_DEVICE_HIDDEN=(int)(STYPE_DEVICE|STYPE_HIDDEN),
+	STYPE_IPC=(int)(3),
+	STYPE_IPC_TEMPORARY=(int)(STYPE_IPC|STYPE_TEMPORARY),
+	STYPE_IPC_HIDDEN=(int)(STYPE_IPC|STYPE_HIDDEN)
 }
 #else
  { __donnot_use_enum_srvsvc_ShareType=0x7FFFFFFF}
@@ -414,11 +414,11 @@ struct srvsvc_NetShareInfoCtr {
 enum srvsvc_PlatformId
 #ifndef USE_UINT_ENUMS
  {
-	PLATFORM_ID_DOS=(int)300,
-	PLATFORM_ID_OS2=(int)400,
-	PLATFORM_ID_NT=(int)500,
-	PLATFORM_ID_OSF=(int)600,
-	PLATFORM_ID_VMS=(int)700
+	PLATFORM_ID_DOS=(int)(300),
+	PLATFORM_ID_OS2=(int)(400),
+	PLATFORM_ID_NT=(int)(500),
+	PLATFORM_ID_OSF=(int)(600),
+	PLATFORM_ID_VMS=(int)(700)
 }
 #else
  { __donnot_use_enum_srvsvc_PlatformId=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/svcctl.h b/librpc/gen_ndr/svcctl.h
index 4de6004077..f047701ed5 100644
--- a/librpc/gen_ndr/svcctl.h
+++ b/librpc/gen_ndr/svcctl.h
@@ -39,14 +39,14 @@ struct SERVICE_LOCK_STATUS {
 enum svcctl_ServiceStatus
 #ifndef USE_UINT_ENUMS
  {
-	SVCCTL_STATE_UNKNOWN=(int)0x00000000,
-	SVCCTL_STOPPED=(int)0x00000001,
-	SVCCTL_START_PENDING=(int)0x00000002,
-	SVCCTL_STOP_PENDING=(int)0x00000003,
-	SVCCTL_RUNNING=(int)0x00000004,
-	SVCCTL_CONTINUE_PENDING=(int)0x00000005,
-	SVCCTL_PAUSE_PENDING=(int)0x00000006,
-	SVCCTL_PAUSED=(int)0x00000007
+	SVCCTL_STATE_UNKNOWN=(int)(0x00000000),
+	SVCCTL_STOPPED=(int)(0x00000001),
+	SVCCTL_START_PENDING=(int)(0x00000002),
+	SVCCTL_STOP_PENDING=(int)(0x00000003),
+	SVCCTL_RUNNING=(int)(0x00000004),
+	SVCCTL_CONTINUE_PENDING=(int)(0x00000005),
+	SVCCTL_PAUSE_PENDING=(int)(0x00000006),
+	SVCCTL_PAUSED=(int)(0x00000007)
 }
 #else
  { __donnot_use_enum_svcctl_ServiceStatus=0x7FFFFFFF}
@@ -130,11 +130,11 @@ struct ENUM_SERVICE_STATUSA {
 enum SERVICE_CONTROL
 #ifndef USE_UINT_ENUMS
  {
-	SVCCTL_CONTROL_STOP=(int)0x00000001,
-	SVCCTL_CONTROL_PAUSE=(int)0x00000002,
-	SVCCTL_CONTROL_CONTINUE=(int)0x00000003,
-	SVCCTL_CONTROL_INTERROGATE=(int)0x00000004,
-	SVCCTL_CONTROL_SHUTDOWN=(int)0x00000005
+	SVCCTL_CONTROL_STOP=(int)(0x00000001),
+	SVCCTL_CONTROL_PAUSE=(int)(0x00000002),
+	SVCCTL_CONTROL_CONTINUE=(int)(0x00000003),
+	SVCCTL_CONTROL_INTERROGATE=(int)(0x00000004),
+	SVCCTL_CONTROL_SHUTDOWN=(int)(0x00000005)
 }
 #else
  { __donnot_use_enum_SERVICE_CONTROL=0x7FFFFFFF}
@@ -149,10 +149,10 @@ enum SERVICE_CONTROL
 enum svcctl_ErrorControl
 #ifndef USE_UINT_ENUMS
  {
-	SVCCTL_SVC_ERROR_IGNORE=(int)0x00000000,
-	SVCCTL_SVC_ERROR_NORMAL=(int)0x00000001,
-	SVCCTL_SVC_ERROR_CRITICAL=(int)0x00000002,
-	SVCCTL_SVC_ERROR_SEVERE=(int)0x00000003
+	SVCCTL_SVC_ERROR_IGNORE=(int)(0x00000000),
+	SVCCTL_SVC_ERROR_NORMAL=(int)(0x00000001),
+	SVCCTL_SVC_ERROR_CRITICAL=(int)(0x00000002),
+	SVCCTL_SVC_ERROR_SEVERE=(int)(0x00000003)
 }
 #else
  { __donnot_use_enum_svcctl_ErrorControl=0x7FFFFFFF}
@@ -166,11 +166,11 @@ enum svcctl_ErrorControl
 enum svcctl_StartType
 #ifndef USE_UINT_ENUMS
  {
-	SVCCTL_BOOT_START=(int)0x00000000,
-	SVCCTL_SYSTEM_START=(int)0x00000001,
-	SVCCTL_AUTO_START=(int)0x00000002,
-	SVCCTL_DEMAND_START=(int)0x00000003,
-	SVCCTL_DISABLED=(int)0x00000004
+	SVCCTL_BOOT_START=(int)(0x00000000),
+	SVCCTL_SYSTEM_START=(int)(0x00000001),
+	SVCCTL_AUTO_START=(int)(0x00000002),
+	SVCCTL_DEMAND_START=(int)(0x00000003),
+	SVCCTL_DISABLED=(int)(0x00000004)
 }
 #else
  { __donnot_use_enum_svcctl_StartType=0x7FFFFFFF}
@@ -185,9 +185,9 @@ enum svcctl_StartType
 enum svcctl_ServiceState
 #ifndef USE_UINT_ENUMS
  {
-	SERVICE_STATE_ACTIVE=(int)0x00000001,
-	SERVICE_STATE_INACTIVE=(int)0x00000002,
-	SERVICE_STATE_ALL=(int)(SERVICE_STATE_ACTIVE|SERVICE_STATE_INACTIVE)
+	SERVICE_STATE_ACTIVE=(int)(0x00000001),
+	SERVICE_STATE_INACTIVE=(int)(0x00000002),
+	SERVICE_STATE_ALL=(int)((SERVICE_STATE_ACTIVE|SERVICE_STATE_INACTIVE))
 }
 #else
  { __donnot_use_enum_svcctl_ServiceState=0x7FFFFFFF}
@@ -235,8 +235,8 @@ struct svcctl_ArgumentString {
 enum svcctl_ConfigLevel
 #ifndef USE_UINT_ENUMS
  {
-	SERVICE_CONFIG_DESCRIPTION=(int)0x00000001,
-	SERVICE_CONFIG_FAILURE_ACTIONS=(int)0x00000002
+	SERVICE_CONFIG_DESCRIPTION=(int)(0x00000001),
+	SERVICE_CONFIG_FAILURE_ACTIONS=(int)(0x00000002)
 }
 #else
  { __donnot_use_enum_svcctl_ConfigLevel=0x7FFFFFFF}
@@ -252,10 +252,10 @@ struct SERVICE_DESCRIPTION {
 enum SC_ACTION_TYPE
 #ifndef USE_UINT_ENUMS
  {
-	SC_ACTION_NONE=(int)0,
-	SC_ACTION_RESTART=(int)1,
-	SC_ACTION_REBOOT=(int)2,
-	SC_ACTION_RUN_COMMAND=(int)3
+	SC_ACTION_NONE=(int)(0),
+	SC_ACTION_RESTART=(int)(1),
+	SC_ACTION_REBOOT=(int)(2),
+	SC_ACTION_RUN_COMMAND=(int)(3)
 }
 #else
  { __donnot_use_enum_SC_ACTION_TYPE=0x7FFFFFFF}
@@ -282,7 +282,7 @@ struct SERVICE_FAILURE_ACTIONS {
 enum svcctl_StatusLevel
 #ifndef USE_UINT_ENUMS
  {
-	SVC_STATUS_PROCESS_INFO=(int)0x00000000
+	SVC_STATUS_PROCESS_INFO=(int)(0x00000000)
 }
 #else
  { __donnot_use_enum_svcctl_StatusLevel=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/winreg.h b/librpc/gen_ndr/winreg.h
index e967be5b59..9962927008 100644
--- a/librpc/gen_ndr/winreg.h
+++ b/librpc/gen_ndr/winreg.h
@@ -26,18 +26,18 @@
 enum winreg_Type
 #ifndef USE_UINT_ENUMS
  {
-	REG_NONE=(int)0,
-	REG_SZ=(int)1,
-	REG_EXPAND_SZ=(int)2,
-	REG_BINARY=(int)3,
-	REG_DWORD=(int)4,
-	REG_DWORD_BIG_ENDIAN=(int)5,
-	REG_LINK=(int)6,
-	REG_MULTI_SZ=(int)7,
-	REG_RESOURCE_LIST=(int)8,
-	REG_FULL_RESOURCE_DESCRIPTOR=(int)9,
-	REG_RESOURCE_REQUIREMENTS_LIST=(int)10,
-	REG_QWORD=(int)11
+	REG_NONE=(int)(0),
+	REG_SZ=(int)(1),
+	REG_EXPAND_SZ=(int)(2),
+	REG_BINARY=(int)(3),
+	REG_DWORD=(int)(4),
+	REG_DWORD_BIG_ENDIAN=(int)(5),
+	REG_LINK=(int)(6),
+	REG_MULTI_SZ=(int)(7),
+	REG_RESOURCE_LIST=(int)(8),
+	REG_FULL_RESOURCE_DESCRIPTOR=(int)(9),
+	REG_RESOURCE_REQUIREMENTS_LIST=(int)(10),
+	REG_QWORD=(int)(11)
 }
 #else
  { __donnot_use_enum_winreg_Type=0x7FFFFFFF}
@@ -77,9 +77,9 @@ struct winreg_SecBuf {
 enum winreg_CreateAction
 #ifndef USE_UINT_ENUMS
  {
-	REG_ACTION_NONE=(int)0,
-	REG_CREATED_NEW_KEY=(int)1,
-	REG_OPENED_EXISTING_KEY=(int)2
+	REG_ACTION_NONE=(int)(0),
+	REG_CREATED_NEW_KEY=(int)(1),
+	REG_OPENED_EXISTING_KEY=(int)(2)
 }
 #else
  { __donnot_use_enum_winreg_CreateAction=0x7FFFFFFF}
diff --git a/librpc/gen_ndr/wkssvc.h b/librpc/gen_ndr/wkssvc.h
index f6f77b5548..00db294646 100644
--- a/librpc/gen_ndr/wkssvc.h
+++ b/librpc/gen_ndr/wkssvc.h
@@ -418,12 +418,12 @@ struct wkssvc_NetrWorkstationStatistics {
 enum wkssvc_NetValidateNameType
 #ifndef USE_UINT_ENUMS
  {
-	NetSetupUnknown=(int)0,
-	NetSetupMachine=(int)1,
-	NetSetupWorkgroup=(int)2,
-	NetSetupDomain=(int)3,
-	NetSetupNonExistentDomain=(int)4,
-	NetSetupDnsMachine=(int)5
+	NetSetupUnknown=(int)(0),
+	NetSetupMachine=(int)(1),
+	NetSetupWorkgroup=(int)(2),
+	NetSetupDomain=(int)(3),
+	NetSetupNonExistentDomain=(int)(4),
+	NetSetupDnsMachine=(int)(5)
 }
 #else
  { __donnot_use_enum_wkssvc_NetValidateNameType=0x7FFFFFFF}
@@ -439,10 +439,10 @@ enum wkssvc_NetValidateNameType
 enum wkssvc_NetJoinStatus
 #ifndef USE_UINT_ENUMS
  {
-	NET_SETUP_UNKNOWN_STATUS=(int)0,
-	NET_SETUP_UNJOINED=(int)1,
-	NET_SETUP_WORKGROUP_NAME=(int)2,
-	NET_SETUP_DOMAIN_NAME=(int)3
+	NET_SETUP_UNKNOWN_STATUS=(int)(0),
+	NET_SETUP_UNJOINED=(int)(1),
+	NET_SETUP_WORKGROUP_NAME=(int)(2),
+	NET_SETUP_DOMAIN_NAME=(int)(3)
 }
 #else
  { __donnot_use_enum_wkssvc_NetJoinStatus=0x7FFFFFFF}
@@ -473,10 +473,10 @@ struct wkssvc_PasswordBuffer {
 enum wkssvc_ComputerNameType
 #ifndef USE_UINT_ENUMS
  {
-	NetPrimaryComputerName=(int)0,
-	NetAlternateComputerNames=(int)1,
-	NetAllComputerNames=(int)2,
-	NetComputerNameTypeMax=(int)3
+	NetPrimaryComputerName=(int)(0),
+	NetAlternateComputerNames=(int)(1),
+	NetAllComputerNames=(int)(2),
+	NetComputerNameTypeMax=(int)(3)
 }
 #else
  { __donnot_use_enum_wkssvc_ComputerNameType=0x7FFFFFFF}