\r
#include <PiDxe.h>\r
#include <Common/MaxBbsEntries.h>\r
-#include <Protocol/FormCallbackFramework.h>\r
+#include <Protocol/FrameworkFormCallback.h>\r
#include <Protocol/DevicePath.h>\r
#include <Protocol/LoadFile.h>\r
#include <Protocol/CpuIo.h>\r
#include <Protocol/Bds.h>\r
#include <Protocol/DataHub.h>\r
-#include <Protocol/FormBrowserFramework.h>\r
+#include <Protocol/FrameworkFormBrowser.h>\r
#include <Protocol/BlockIo.h>\r
#include <Protocol/ConsoleControl.h>\r
#include <Protocol/GenericMemoryTest.h>\r
#include <Protocol/GraphicsOutput.h>\r
#include <Protocol/SimpleFileSystem.h>\r
-#include <Protocol/HiiFramework.h>\r
+#include <Protocol/FrameworkHii.h>\r
#include <Protocol/SerialIo.h>\r
#include <Protocol/LegacyBios.h>\r
#include <Protocol/Performance.h>\r
#include <Library/DxeServicesTableLib.h>\r
#include <Library/PerformanceLib.h>\r
#include <Library/PrintLib.h>\r
-#include <Library/IfrSupportLibFramework.h>\r
+#include <Library/FrameworkIfrSupportLib.h>\r
#include <Library/ReportStatusCodeLib.h>\r
#include <Library/HobLib.h>\r
#include <Library/EdkGenericBdsLib.h>\r
#include <Library/UefiBootServicesTableLib.h>\r
#include <Library/UefiRuntimeServicesTableLib.h>\r
#include <Library/DevicePathLib.h>\r
-#include <Library/HiiLibFramework.h>\r
+#include <Library/FrameworkHiiLib.h>\r
#include <Library/PeCoffLib.h>\r
#include <Library/PcdLib.h>\r
\r