\r
#include <PiDxe.h>\r
\r
-#include <Protocol/FormCallbackFramework.h>\r
-#include <Protocol/HiiFramework.h>\r
+#include <Protocol/FrameworkFormCallback.h>\r
+#include <Protocol/FrameworkHii.h>\r
\r
#include <Library/UefiBootServicesTableLib.h>\r
#include <Library/UefiRuntimeServicesTableLib.h>\r
#include <Library/UefiDriverEntryPoint.h>\r
#include <Library/BaseLib.h>\r
#include <Library/PrintLib.h>\r
-#include <Library/IfrSupportLibFramework.h>\r
+#include <Library/FrameworkIfrSupportLib.h>\r
#include <Library/BaseMemoryLib.h>\r
#include <Library/MemoryAllocationLib.h>\r
-#include <Library/HiiLibFramework.h>\r
+#include <Library/FrameworkHiiLib.h>\r
\r
#include "NVDataStruc.h"\r
\r