diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
index a1b1131c13..a4bb19ad60 100644
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
@@ -26,8 +26,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     0x0d510a4f, 0xa81b, 0x473f, { 0x87, 0x07, 0xb7, 0xfd, 0xfb, 0xc0, 0x45, 0xba } \
   }
 
+#define OPAL_REQUEST_VARIABLE_NAME     L"OpalRequest"
+
 #pragma pack(1)
 
+typedef struct {
+  UINT32                   Length;
+  OPAL_REQUEST             OpalRequest;
+  //EFI_DEVICE_PATH_PROTOCOL OpalDevicePath;
+} OPAL_REQUEST_VARIABLE;
+
 typedef struct {
   UINT16 Id: HII_KEY_ID_BITS;
   UINT16 Index: HII_KEY_INDEX_BITS;
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h
index 3ff7d4726d..a2313fed29 100644
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h
@@ -20,8 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define FORMID_VALUE_MAIN_MENU                             0x01
 #define FORMID_VALUE_DISK_INFO_FORM_MAIN                   0x02
 
-#define OPAL_REQUEST_VARIABLE_NAME                         L"OpalRequest"
-
 #pragma pack(1)
 typedef struct {
   UINT16    Lock:1;
@@ -48,12 +46,6 @@ typedef struct {
   UINT8           EnableBlockSid;
 } OPAL_HII_CONFIGURATION;
 
-typedef struct {
-  UINT32                   Length;
-  OPAL_REQUEST             OpalRequest;
-  //EFI_DEVICE_PATH_PROTOCOL OpalDevicePath;
-} OPAL_REQUEST_VARIABLE;
-
 #pragma pack()
 
 /* Action Flags */