From e638b5e129b2c53093ddacd5a4690b6e194a0643 Mon Sep 17 00:00:00 2001
From: qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 2 Jul 2007 13:06:49 +0000
Subject: [PATCH] Remove CommonHeader.h from VFR files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2967 6f19259b-4bc3-4df7-8a09-765794883524
---
 Nt32Pkg/PlatformBdsDxe/CommonHeader.h                  | 10 +++++-----
 Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FE.vfr        |  5 -----
 Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/bm.vfr        |  5 -----
 .../PlatformBdsDxe/Generic/BootMngr/BootManagerVfr.Vfr |  5 -----
 .../Generic/DeviceMngr/DeviceManagerVfr.Vfr            |  6 ------
 Nt32Pkg/PlatformBdsDxe/Generic/FrontPageVfr.Vfr        |  6 ------
 6 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
index 5d3facb946..2234acd860 100644
--- a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
+++ b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
@@ -23,7 +23,7 @@
 //
 // The protocols, PPI and GUID defintions for this module
 //
-#include <Protocol/FormCallback.h>
+#include <Protocol/FormCallbackFramework.h>
 #include <Guid/FileSystemVolumeLabelInfo.h>
 #include <Protocol/DevicePath.h>
 #include <Guid/BootState.h>
@@ -32,7 +32,7 @@
 #include <Guid/FileInfo.h>
 #include <Protocol/Bds.h>
 #include <Protocol/DataHub.h>
-#include <Protocol/FormBrowser.h>
+#include <Protocol/FormBrowserFramework.h>
 #include <Guid/Bmp.h>
 #include <Protocol/UgaDraw.h>
 #include <Protocol/BlockIo.h>
@@ -41,7 +41,7 @@
 #include <Protocol/GenericMemoryTest.h>
 #include <Protocol/GraphicsOutput.h>
 #include <Protocol/SimpleFileSystem.h>
-#include <Protocol/Hii.h>
+#include <Protocol/HiiFramework.h>
 #include <Guid/GenericPlatformVariable.h>
 #include <Guid/FlashMapHob.h>
 #include <Protocol/SerialIo.h>
@@ -53,7 +53,7 @@
 #include <Library/UefiLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseLib.h>
-#include <Library/EdkGraphicsLib.h>
+#include <Library/GraphicsLib.h>
 #include <Library/DxeServicesTableLib.h>
 #include <Library/PerformanceLib.h>
 #include <Library/PrintLib.h>
@@ -66,7 +66,7 @@
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/DevicePathLib.h>
-#include <Library/HiiLib.h>
+#include <Library/HiiLibFramework.h>
 #include <Library/PeCoffLib.h>
 
 #endif
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FE.vfr b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FE.vfr
index 0b2f4a5ea8..998a4a68f5 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FE.vfr
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FE.vfr
@@ -1,8 +1,3 @@
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 // *++
 //
 // Copyright (c) 2006, Intel Corporation                                                         
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/bm.vfr b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/bm.vfr
index f9a36a0217..e907e18d6c 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/bm.vfr
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/bm.vfr
@@ -1,8 +1,3 @@
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 // *++
 //
 // Copyright (c) 2006, Intel Corporation                                                         
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManagerVfr.Vfr b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManagerVfr.Vfr
index 6e863e90fa..7fb193ac1b 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManagerVfr.Vfr
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManagerVfr.Vfr
@@ -1,8 +1,3 @@
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 // *++
 //
 // Copyright (c) 2006, Intel Corporation                                                         
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManagerVfr.Vfr b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManagerVfr.Vfr
index 20bce22e98..8b73751f4c 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManagerVfr.Vfr
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManagerVfr.Vfr
@@ -1,8 +1,3 @@
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 // *++
 //
 // Copyright (c) 2006, Intel Corporation                                                         
@@ -26,7 +21,6 @@
 // 
 // --*/
 
-#include "BdsStrDefs.h"
 
 #define FORMSET_GUID  { 0x3ebfa8e6, 0x511d, 0x4b5b, { 0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27 } }
 
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPageVfr.Vfr b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPageVfr.Vfr
index 71116b2c36..03fd8a1888 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPageVfr.Vfr
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPageVfr.Vfr
@@ -1,8 +1,3 @@
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 // *++
 //
 // Copyright (c) 2006, Intel Corporation                                                         
@@ -26,7 +21,6 @@
 // 
 // --*/
 
-#include "BdsStrDefs.h"
 
 #define FORMSET_GUID  { 0x9e0c30bc, 0x3f06, 0x4ba6, { 0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe } }
 
-- 
2.39.2