diff --git a/runtime/bcutil/attrlookup.gperf b/runtime/bcutil/attrlookup.gperf
index 24386de5d12..15014e36c21 100644
--- a/runtime/bcutil/attrlookup.gperf
+++ b/runtime/bcutil/attrlookup.gperf
@@ -24,9 +24,6 @@
  * This file is the input to the gperf utility for generating a perfect
  * hash table of attribute names, which is used by attributeTagFor().
  *
- * Types generated by gperf cause compiler issues in the OpenJ9 Windows builds,
- * use the existing types.
- *
  * To generate attrlookup.h, use the following command-line with the latest version of gperf:
  *
  *   gperf -CD -t --output-file=attrlookup.h attrlookup.gperf
diff --git a/runtime/bcutil/attrlookup.h b/runtime/bcutil/attrlookup.h
index ff2b0825641..6b3b4c0ed07 100644
--- a/runtime/bcutil/attrlookup.h
+++ b/runtime/bcutil/attrlookup.h
@@ -51,7 +51,7 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
-#line 42 "attrlookup.gperf"
+#line 39 "attrlookup.gperf"
 struct AttribType
 {
 	const char *name;
@@ -119,67 +119,67 @@ lookupKnownAttribute (register const char *str, register size_t len)
 {
   static const struct AttribType wordlist[] =
     {
-#line 50 "attrlookup.gperf"
+#line 47 "attrlookup.gperf"
       {"Code", CFR_ATTRIBUTE_Code, CFR_ATTRIBUTE_Code},
-#line 79 "attrlookup.gperf"
+#line 76 "attrlookup.gperf"
       {"Preload", CFR_ATTRIBUTE_Preload, CFR_ATTRIBUTE_Preload},
-#line 52 "attrlookup.gperf"
+#line 49 "attrlookup.gperf"
       {"Synthetic", CFR_ATTRIBUTE_Synthetic, CFR_ATTRIBUTE_Synthetic},
-#line 56 "attrlookup.gperf"
+#line 53 "attrlookup.gperf"
       {"SourceFile", CFR_ATTRIBUTE_SourceFile, CFR_ATTRIBUTE_SourceFile},
-#line 57 "attrlookup.gperf"
+#line 54 "attrlookup.gperf"
       {"InnerClasses", CFR_ATTRIBUTE_InnerClasses, CFR_ATTRIBUTE_InnerClasses},
-#line 58 "attrlookup.gperf"
+#line 55 "attrlookup.gperf"
       {"ConstantValue", CFR_ATTRIBUTE_ConstantValue, CFR_ATTRIBUTE_ConstantValue},
-#line 80 "attrlookup.gperf"
+#line 77 "attrlookup.gperf"
       {"NullRestricted", CFR_ATTRIBUTE_NullRestricted, CFR_ATTRIBUTE_NullRestricted},
-#line 60 "attrlookup.gperf"
+#line 57 "attrlookup.gperf"
       {"EnclosingMethod", CFR_ATTRIBUTE_EnclosingMethod, CFR_ATTRIBUTE_EnclosingMethod},
-#line 62 "attrlookup.gperf"
+#line 59 "attrlookup.gperf"
       {"BootstrapMethods", CFR_ATTRIBUTE_BootstrapMethods, CFR_ATTRIBUTE_BootstrapMethods},
-#line 63 "attrlookup.gperf"
+#line 60 "attrlookup.gperf"
       {"AnnotationDefault", CFR_ATTRIBUTE_AnnotationDefault, CFR_ATTRIBUTE_AnnotationDefault},
-#line 64 "attrlookup.gperf"
+#line 61 "attrlookup.gperf"
       {"LocalVariableTable", CFR_ATTRIBUTE_LocalVariableTable, CFR_ATTRIBUTE_StrippedLocalVariableTable},
-#line 65 "attrlookup.gperf"
+#line 62 "attrlookup.gperf"
       {"SourceDebugExtension", CFR_ATTRIBUTE_SourceDebugExtension, CFR_ATTRIBUTE_StrippedSourceDebugExtension},
-#line 78 "attrlookup.gperf"
+#line 75 "attrlookup.gperf"
       {"ImplicitCreation", CFR_ATTRIBUTE_ImplicitCreation, CFR_ATTRIBUTE_ImplicitCreation},
-#line 66 "attrlookup.gperf"
+#line 63 "attrlookup.gperf"
       {"LocalVariableTypeTable", CFR_ATTRIBUTE_LocalVariableTypeTable, CFR_ATTRIBUTE_StrippedLocalVariableTypeTable},
-#line 51 "attrlookup.gperf"
+#line 48 "attrlookup.gperf"
       {"StackMap", CFR_ATTRIBUTE_StackMap, CFR_ATTRIBUTE_StackMap},
-#line 53 "attrlookup.gperf"
+#line 50 "attrlookup.gperf"
       {"Signature", CFR_ATTRIBUTE_Signature, CFR_ATTRIBUTE_Signature},
-#line 67 "attrlookup.gperf"
+#line 64 "attrlookup.gperf"
       {"RuntimeVisibleAnnotations", CFR_ATTRIBUTE_RuntimeVisibleAnnotations, CFR_ATTRIBUTE_RuntimeVisibleAnnotations},
-#line 68 "attrlookup.gperf"
+#line 65 "attrlookup.gperf"
       {"RuntimeInvisibleAnnotations", CFR_ATTRIBUTE_RuntimeInvisibleAnnotations, CFR_ATTRIBUTE_RuntimeInvisibleAnnotations},
-#line 59 "attrlookup.gperf"
+#line 56 "attrlookup.gperf"
       {"StackMapTable", CFR_ATTRIBUTE_StackMapTable, CFR_ATTRIBUTE_StackMapTable},
-#line 69 "attrlookup.gperf"
+#line 66 "attrlookup.gperf"
       {"RuntimeVisibleTypeAnnotations", CFR_ATTRIBUTE_RuntimeVisibleTypeAnnotations, CFR_ATTRIBUTE_RuntimeVisibleTypeAnnotations},
-#line 61 "attrlookup.gperf"
+#line 58 "attrlookup.gperf"
       {"LineNumberTable", CFR_ATTRIBUTE_LineNumberTable, CFR_ATTRIBUTE_StrippedLineNumberTable},
-#line 70 "attrlookup.gperf"
+#line 67 "attrlookup.gperf"
       {"RuntimeInvisibleTypeAnnotations", CFR_ATTRIBUTE_RuntimeInvisibleTypeAnnotations, CFR_ATTRIBUTE_RuntimeInvisibleTypeAnnotations},
-#line 71 "attrlookup.gperf"
+#line 68 "attrlookup.gperf"
       {"RuntimeVisibleParameterAnnotations", CFR_ATTRIBUTE_RuntimeVisibleParameterAnnotations, CFR_ATTRIBUTE_RuntimeVisibleParameterAnnotations},
-#line 55 "attrlookup.gperf"
+#line 52 "attrlookup.gperf"
       {"Exceptions", CFR_ATTRIBUTE_Exceptions, CFR_ATTRIBUTE_Exceptions},
-#line 72 "attrlookup.gperf"
+#line 69 "attrlookup.gperf"
       {"RuntimeInvisibleParameterAnnotations", CFR_ATTRIBUTE_RuntimeInvisibleParameterAnnotations, CFR_ATTRIBUTE_RuntimeInvisibleParameterAnnotations},
-#line 76 "attrlookup.gperf"
+#line 73 "attrlookup.gperf"
       {"Record", CFR_ATTRIBUTE_Record, CFR_ATTRIBUTE_Record},
-#line 75 "attrlookup.gperf"
+#line 72 "attrlookup.gperf"
       {"NestHost", CFR_ATTRIBUTE_NestHost, CFR_ATTRIBUTE_NestHost},
-#line 54 "attrlookup.gperf"
+#line 51 "attrlookup.gperf"
       {"Deprecated", CFR_ATTRIBUTE_Deprecated, CFR_ATTRIBUTE_Deprecated},
-#line 74 "attrlookup.gperf"
+#line 71 "attrlookup.gperf"
       {"NestMembers", CFR_ATTRIBUTE_NestMembers, CFR_ATTRIBUTE_NestMembers},
-#line 73 "attrlookup.gperf"
+#line 70 "attrlookup.gperf"
       {"MethodParameters", CFR_ATTRIBUTE_MethodParameters, CFR_ATTRIBUTE_MethodParameters},
-#line 77 "attrlookup.gperf"
+#line 74 "attrlookup.gperf"
       {"PermittedSubclasses", CFR_ATTRIBUTE_PermittedSubclasses, CFR_ATTRIBUTE_PermittedSubclasses}
     };