Remove extra #includes where possible to make build more efficient

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / Bds.h

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
index 50e5689ccedb92af29db32bdea50a0af8bfa59b0..31d6df57058c7f164e9008046d0f4479203f271a 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
@@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _BDS_MODULE_H_\r
 #define _BDS_MODULE_H_\r
 \r
-#include <PiDxe.h>\r
-\r
+#include <FrameworkDxe.h>\r
+#include <IndustryStandard/PeImage.h>\r
 #include <Guid/MdeModuleHii.h>\r
 #include <Guid/FileSystemVolumeLabelInfo.h>\r
 #include <Protocol/DevicePath.h>\r
@@ -31,6 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/BlockIo.h>\r
 #include <Guid/GlobalVariable.h>\r
 #include <Guid/CapsuleVendor.h>\r
+#include <Guid/StatusCodeDataTypeId.h>\r
 #include <Protocol/GenericMemoryTest.h>\r
 #include <Protocol/FormBrowser2.h>\r
 #include <Protocol/HiiConfigAccess.h>\r
@@ -51,8 +52,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/PerformanceLib.h>\r
 #include <Library/ReportStatusCodeLib.h>\r
-#include <Library/IfrSupportLib.h>\r
-#include <Library/ExtendedIfrSupportLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 #include <Library/HobLib.h>\r
 #include <Library/BaseLib.h>\r
@@ -60,18 +59,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PcdLib.h>\r
 #include <Library/CapsuleLib.h>\r
 #include <Library/HiiLib.h>\r
-#include <Library/ExtendedHiiLib.h>\r
+#include <Library/DevicePathLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
 #include <Library/GenericBdsLib.h>\r
 #include <Library/PlatformBdsLib.h>\r
 \r
-#define EFI_BDS_ARCH_PROTOCOL_INSTANCE_FROM_THIS(_this) \\r
-  CR ((_this),                                          \\r
-      EFI_BDS_ARCH_PROTOCOL_INSTANCE,                   \\r
-      Bds,                                              \\r
-      EFI_BDS_ARCH_PROTOCOL_INSTANCE_SIGNATURE          \\r
-      )\r
+#pragma pack(1)\r
+\r
+///\r
+/// HII specific Vendor Device Path definition.\r
+///\r
+typedef struct {\r
+  VENDOR_DEVICE_PATH             VendorDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL       End;\r
+} HII_VENDOR_DEVICE_PATH;\r
+\r
+#pragma pack()\r
 \r
 /**\r
 \r