2 files changed, 6 insertions, 5 deletions
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
index 162c5ecd1f..0a5d46bc96 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
@@ -25,6 +25,8 @@ Revision History:
 #ifndef _NVDATASTRUC_H_
 #define _NVDATASTRUC_H_
 
+#include <Guid/HiiPlatformSetupFormset.h>
+
 #define FORMSET_GUID \
   { \
     0xA04A27f4, 0xDF00, 0x4D42, {0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D} \
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index fc6b5da766..71a4c91057 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -51,11 +51,10 @@
 #define LABEL_UPDATE_BBS            0x2222
 
 formset
-  guid     = FORMSET_GUID,
-  title    = STRING_TOKEN(STR_FORM_SET_TITLE),
-  help     = STRING_TOKEN(STR_FORM_SET_TITLE_HELP),
-  class    = EFI_ON_BOARD_DEVICE_CLASS,
-  subclass = EFI_SETUP_APPLICATION_SUBCLASS,
+  guid      = FORMSET_GUID,
+  title     = STRING_TOKEN(STR_FORM_SET_TITLE),
+  help      = STRING_TOKEN(STR_FORM_SET_TITLE_HELP),
+  classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,
   
   //
   // Notes: VfrCompiler will insert a Standard Default Storage declaration