//\r
// The protocols, PPI and GUID defintions for this module\r
//\r
-#include <Protocol/FormCallback.h>\r
+#include <Protocol/FormCallbackFramework.h>\r
#include <Guid/FileSystemVolumeLabelInfo.h>\r
#include <Protocol/DevicePath.h>\r
#include <Guid/BootState.h>\r
#include <Guid/FileInfo.h>\r
#include <Protocol/Bds.h>\r
#include <Protocol/DataHub.h>\r
-#include <Protocol/FormBrowser.h>\r
+#include <Protocol/FormBrowserFramework.h>\r
#include <Guid/Bmp.h>\r
#include <Protocol/UgaDraw.h>\r
#include <Protocol/BlockIo.h>\r
#include <Protocol/GenericMemoryTest.h>\r
#include <Protocol/GraphicsOutput.h>\r
#include <Protocol/SimpleFileSystem.h>\r
-#include <Protocol/Hii.h>\r
+#include <Protocol/HiiFramework.h>\r
#include <Guid/GenericPlatformVariable.h>\r
#include <Guid/FlashMapHob.h>\r
#include <Protocol/SerialIo.h>\r
#include <Library/UefiLib.h>\r
#include <Library/UefiDriverEntryPoint.h>\r
#include <Library/BaseLib.h>\r
-#include <Library/EdkGraphicsLib.h>\r
+#include <Library/GraphicsLib.h>\r
#include <Library/DxeServicesTableLib.h>\r
#include <Library/PerformanceLib.h>\r
#include <Library/PrintLib.h>\r
#include <Library/UefiBootServicesTableLib.h>\r
#include <Library/UefiRuntimeServicesTableLib.h>\r
#include <Library/DevicePathLib.h>\r
-#include <Library/HiiLib.h>\r
+#include <Library/HiiLibFramework.h>\r
#include <Library/PeCoffLib.h>\r
\r
#endif\r