diff --git a/compiler2/record.c b/compiler2/record.c
index 82a709dbd0c812e1eb0a3873dfbc1c6599aa3a22..977fba9b98a06a61fa1b0f07893b4342969e5ae0 100644
--- a/compiler2/record.c
+++ b/compiler2/record.c
@@ -2418,7 +2418,7 @@ void gen_xer(const struct_def *sdef, char **pdef, char **psrc)
     /* Remove XER_LIST, XER_RECOF from p_flavor. This is not required
      * for is_exer (which tests another bit), but for subsequent code. */
     "  int e_xer = is_exer(p_flavor);\n"
-    "  int xerbits = p_td.xer_bits;\n"
+    "  unsigned long xerbits = p_td.xer_bits;\n"
     "  if (p_flavor & XER_TOPLEVEL) xerbits &= ~UNTAGGED;\n"
     "  const boolean omit_tag = e_xer && ((xerbits & (UNTAGGED|XER_ATTRIBUTE)) "
     "|| (p_flavor & (USE_NIL|USE_TYPE_ATTR)));\n"
diff --git a/compiler2/record_of.c b/compiler2/record_of.c
index a20d9bf7ea4c0a5ee0855db3d90f044ced221c44..4d335175c37736e624ecb1c0a10e1b47a77503a3 100644
--- a/compiler2/record_of.c
+++ b/compiler2/record_of.c
@@ -1349,7 +1349,7 @@ void defRecordOfClass1(const struct_of_def *sdef, output_struct *output)
       "int %s::XER_decode(const XERdescriptor_t& p_td, XmlReaderWrap& p_reader, "
       "unsigned int p_flavor, unsigned int p_flavor2, embed_values_dec_struct_t* emb_val)\n{\n"
       "  boolean e_xer = is_exer(p_flavor);\n"
-      "  int xerbits = p_td.xer_bits;\n"
+      "  unsigned long xerbits = p_td.xer_bits;\n"
       "  if (p_flavor & XER_TOPLEVEL) xerbits &= ~UNTAGGED;\n"
       "  boolean own_tag = !(e_xer && ((xerbits & (ANY_ELEMENT|ANY_ATTRIBUTES|UNTAGGED))\n"
       "    || (p_flavor & USE_TYPE_ATTR)));\n" /* incase the parent has USE-UNION */
@@ -2812,7 +2812,7 @@ void defRecordOfClassMemAllocOptimized(const struct_of_def *sdef, output_struct
       "int %s::XER_decode(const XERdescriptor_t& p_td, XmlReaderWrap& p_reader, "
       "unsigned int p_flavor, unsigned int p_flavor2, embed_values_dec_struct_t* emb_val)\n{\n"
       "  boolean e_xer = is_exer(p_flavor);\n"
-      "  int xerbits = p_td.xer_bits;\n"
+      "  unsigned long xerbits = p_td.xer_bits;\n"
       "  if (p_flavor & XER_TOPLEVEL) xerbits &= ~UNTAGGED;\n"
       "  boolean own_tag = !(e_xer && ((xerbits & (ANY_ELEMENT|ANY_ATTRIBUTES|UNTAGGED))"
       "    || (p_flavor & USE_TYPE_ATTR)));\n" /* incase the parent has USE-UNION */
diff --git a/compiler2/union.c b/compiler2/union.c
index 62f3c3543badf97aeb0c851819fb7bde60ee2125..1d60990978316c8ed796041431fe580cf0aba019 100644
--- a/compiler2/union.c
+++ b/compiler2/union.c
@@ -1729,7 +1729,7 @@ void defUnionClass(struct_def const *sdef, output_struct *output)
       "  int type = 0;\n" /* None */
       "  int rd_ok=1, xml_depth=-1;\n"
       "%s%s"
-      "  int xerbits = p_td.xer_bits;\n"
+      "  unsigned long xerbits = p_td.xer_bits;\n"
       "  if (p_flavor & XER_TOPLEVEL) xerbits &= ~UNTAGGED;\n"
       "  if (xerbits & USE_TYPE_ATTR) p_flavor &= ~XER_RECOF;\n"
       "  boolean own_tag = !(e_xer && ((xerbits & (ANY_ELEMENT | UNTAGGED)) "
diff --git a/core2/Basetype2.cc b/core2/Basetype2.cc
index a77485d95e69a7a0c73008560c4d5b2c93cb223c..4a800d14df189fc27d6cf312433784b20c3438bd 100644
--- a/core2/Basetype2.cc
+++ b/core2/Basetype2.cc
@@ -2256,7 +2256,7 @@ int Record_Of_Type::XER_decode(const XERdescriptor_t& p_td,
   XmlReaderWrap& reader, unsigned int flavor, unsigned int flavor2, embed_values_dec_struct_t* emb_val)
 {
   int exer = is_exer(flavor);
-  int xerbits = p_td.xer_bits;
+  unsigned long xerbits = p_td.xer_bits;
   if (flavor & XER_TOPLEVEL) xerbits &= ~UNTAGGED;
   boolean own_tag =
     !(exer && ((xerbits & (ANY_ELEMENT | ANY_ATTRIBUTES | UNTAGGED))
@@ -5142,7 +5142,7 @@ int Record_Type::XER_decode(const XERdescriptor_t& p_td, XmlReaderWrap& reader,
   int exer = is_exer(flavor);
   int success, type;
   int depth=-1; // depth of the start tag
-  int xerbits = p_td.xer_bits;
+  unsigned long xerbits = p_td.xer_bits;
   if (flavor & XER_TOPLEVEL) xerbits &= ~UNTAGGED;
   const boolean own_tag = !(exer
     && ( (xerbits & (ANY_ELEMENT | UNTAGGED | XER_ATTRIBUTE))