diff --git a/generation/um/RestartManager/generate.rsp b/generation/um/RestartManager/generate.rsp
index cbad683a13..12f183398c 100644
--- a/generation/um/RestartManager/generate.rsp
+++ b/generation/um/RestartManager/generate.rsp
@@ -9,7 +9,8 @@ um-RestartManager.h
 --traverse
 C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/RestartManager.h
 --with-attribute
-RM_APP_TYPE=Flags
+RM_APP_STATUS=Flags
+RM_REBOOT_REASON=Flags
 RM_SHUTDOWN_TYPE=Flags
 --with-librarypath
 *=rstrtmgr
diff --git a/sources/Interop/Windows/um/RestartManager/RM_APP_STATUS.cs b/sources/Interop/Windows/um/RestartManager/RM_APP_STATUS.cs
index 9144f69492..fb86acbe9a 100644
--- a/sources/Interop/Windows/um/RestartManager/RM_APP_STATUS.cs
+++ b/sources/Interop/Windows/um/RestartManager/RM_APP_STATUS.cs
@@ -3,8 +3,11 @@
 // Ported from um/RestartManager.h in the Windows SDK for Windows 10.0.19041.0
 // Original source is Copyright © Microsoft. All rights reserved.
 
+using System;
+
 namespace TerraFX.Interop
 {
+    [Flags]
     public enum RM_APP_STATUS
     {
         RmStatusUnknown = 0x0,
diff --git a/sources/Interop/Windows/um/RestartManager/RM_APP_TYPE.cs b/sources/Interop/Windows/um/RestartManager/RM_APP_TYPE.cs
index c4682a27df..6945b03ee4 100644
--- a/sources/Interop/Windows/um/RestartManager/RM_APP_TYPE.cs
+++ b/sources/Interop/Windows/um/RestartManager/RM_APP_TYPE.cs
@@ -3,11 +3,8 @@
 // Ported from um/RestartManager.h in the Windows SDK for Windows 10.0.19041.0
 // Original source is Copyright © Microsoft. All rights reserved.
 
-using System;
-
 namespace TerraFX.Interop
 {
-    [Flags]
     public enum RM_APP_TYPE
     {
         RmUnknownApp = 0,
diff --git a/sources/Interop/Windows/um/RestartManager/RM_REBOOT_REASON.cs b/sources/Interop/Windows/um/RestartManager/RM_REBOOT_REASON.cs
index 6594dba875..f2bcbd88ef 100644
--- a/sources/Interop/Windows/um/RestartManager/RM_REBOOT_REASON.cs
+++ b/sources/Interop/Windows/um/RestartManager/RM_REBOOT_REASON.cs
@@ -3,8 +3,11 @@
 // Ported from um/RestartManager.h in the Windows SDK for Windows 10.0.19041.0
 // Original source is Copyright © Microsoft. All rights reserved.
 
+using System;
+
 namespace TerraFX.Interop
 {
+    [Flags]
     public enum RM_REBOOT_REASON
     {
         RmRebootReasonNone = 0x0,