diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/__NamespaceMapping__.cs
index 4c11e5976..d7a37a175 100644
--- a/tests/generator-Tests/expected.xaji/AccessModifiers/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/AccessModifiers/__NamespaceMapping__.cs
@@ -7,7 +7,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Adapters/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Adapters/__NamespaceMapping__.cs
index e270a7de4..b3744898d 100644
--- a/tests/generator-Tests/expected.xaji/Adapters/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/Adapters/__NamespaceMapping__.cs
@@ -8,7 +8,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/__NamespaceMapping__.cs
index ab541b01c..b77cc8ae4 100644
--- a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/__NamespaceMapping__.cs
@@ -8,7 +8,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Arrays/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Arrays/__NamespaceMapping__.cs
index e9b0e4292..9fa410728 100644
--- a/tests/generator-Tests/expected.xaji/Arrays/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/Arrays/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/__NamespaceMapping__.cs
index db411e906..873216e5e 100644
--- a/tests/generator-Tests/expected.xaji/CSharpKeywords/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/CSharpKeywords/__NamespaceMapping__.cs
@@ -8,7 +8,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Constructors/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Constructors/__NamespaceMapping__.cs
index e9b0e4292..9fa410728 100644
--- a/tests/generator-Tests/expected.xaji/Constructors/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/Constructors/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Core_ClassParse/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Core_ClassParse/__NamespaceMapping__.cs
index 4ebe1a2cc..c8b2117a0 100644
--- a/tests/generator-Tests/expected.xaji/Core_ClassParse/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/Core_ClassParse/__NamespaceMapping__.cs
@@ -7,7 +7,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/__NamespaceMapping__.cs
index 10bb4305e..8400b35b2 100644
--- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/__NamespaceMapping__.cs
@@ -9,7 +9,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/GenericArguments/__NamespaceMapping__.cs
index 34146efa8..e4861000c 100644
--- a/tests/generator-Tests/expected.xaji/GenericArguments/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/GenericArguments/__NamespaceMapping__.cs
@@ -9,7 +9,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/__NamespaceMapping__.cs
index 4c11e5976..d7a37a175 100644
--- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/__NamespaceMapping__.cs
@@ -7,7 +7,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/NestedTypes/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/NestedTypes/__NamespaceMapping__.cs
index 6ae237a9d..a7dc99417 100644
--- a/tests/generator-Tests/expected.xaji/NestedTypes/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/NestedTypes/__NamespaceMapping__.cs
@@ -7,7 +7,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/NonStaticFields/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/NonStaticFields/__NamespaceMapping__.cs
index e9b0e4292..9fa410728 100644
--- a/tests/generator-Tests/expected.xaji/NonStaticFields/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/NonStaticFields/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/NormalMethods/__NamespaceMapping__.cs
index 85b6a37af..7fe4a370f 100644
--- a/tests/generator-Tests/expected.xaji/NormalMethods/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/NormalMethods/__NamespaceMapping__.cs
@@ -13,7 +13,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/NormalProperties/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/NormalProperties/__NamespaceMapping__.cs
index 8c8e6cce3..9378e8754 100644
--- a/tests/generator-Tests/expected.xaji/NormalProperties/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/NormalProperties/__NamespaceMapping__.cs
@@ -10,7 +10,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/ParameterXPath/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/ParameterXPath/__NamespaceMapping__.cs
index f66004a12..3f42b984d 100644
--- a/tests/generator-Tests/expected.xaji/ParameterXPath/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/ParameterXPath/__NamespaceMapping__.cs
@@ -7,7 +7,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/StaticFields/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/StaticFields/__NamespaceMapping__.cs
index e9b0e4292..9fa410728 100644
--- a/tests/generator-Tests/expected.xaji/StaticFields/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/StaticFields/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/StaticMethods/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/StaticMethods/__NamespaceMapping__.cs
index e9b0e4292..9fa410728 100644
--- a/tests/generator-Tests/expected.xaji/StaticMethods/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/StaticMethods/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/StaticProperties/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/StaticProperties/__NamespaceMapping__.cs
index e9b0e4292..9fa410728 100644
--- a/tests/generator-Tests/expected.xaji/StaticProperties/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/StaticProperties/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Streams/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Streams/__NamespaceMapping__.cs
index 814865162..3fd58207c 100644
--- a/tests/generator-Tests/expected.xaji/Streams/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/Streams/__NamespaceMapping__.cs
@@ -16,7 +16,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/TestInterface/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/TestInterface/__NamespaceMapping__.cs
index e4d9dc265..ad1055e4f 100644
--- a/tests/generator-Tests/expected.xaji/TestInterface/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/TestInterface/__NamespaceMapping__.cs
@@ -12,7 +12,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/java.lang.Enum/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/java.lang.Enum/__NamespaceMapping__.cs
index 23b7b4538..de0f73f2d 100644
--- a/tests/generator-Tests/expected.xaji/java.lang.Enum/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/java.lang.Enum/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/java.util.List/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/java.util.List/__NamespaceMapping__.cs
index e9b0e4292..9fa410728 100644
--- a/tests/generator-Tests/expected.xaji/java.util.List/__NamespaceMapping__.cs
+++ b/tests/generator-Tests/expected.xaji/java.util.List/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/NamespaceMapping.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/NamespaceMapping.cs
index 1326f04ac..1c0672e8e 100644
--- a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/NamespaceMapping.cs
+++ b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/NamespaceMapping.cs
@@ -41,7 +41,7 @@ public void Generate (CodeGenerationOptions opt, GenerationInfo gen_info)
 					sw.WriteLine ("#if !NET");
 					sw.WriteLine ("namespace System.Runtime.Versioning {");
 					sw.WriteLine ("    [System.Diagnostics.Conditional(\"NEVER\")]");
-					sw.WriteLine ("    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]");
+					sw.WriteLine ("    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]");
 					sw.WriteLine ("    internal sealed class SupportedOSPlatformAttribute : Attribute {");
 					sw.WriteLine ("        public SupportedOSPlatformAttribute (string platformName) { }");
 					sw.WriteLine ("    }");