Cleanup to remover CommonHeader.h files

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2906 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
index c516c35e546cd14e346c9051677de070265640f8..629f999da33c37499dd0ae26e6c5730ed948f253 100644 (file)
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "BaseUefiTianoCustomDecompressLibInternals.h"\r
 \r
 VOID\r

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
index f66fc084e0b01fb11afe03c70ec441a1260f8cf6..069a798bd657e0c72ccf72f383f490a44e8261ef 100644 (file)
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
@@ -45,7 +45,6 @@
 [Sources.common]\r
   BaseUefiTianoCustomDecompressLibInternals.h\r
   BaseUefiTianoCustomDecompressLib.c\r
-  CommonHeader.h\r
 \r
 \r
 ################################################################################\r

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
index cc5037ad81856c62330ceba4d42d34cc886ade0b..713da98af924044001832f796410d5657e49305b 100644 (file)
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
@@ -18,9 +18,16 @@
 #define __BASE_UEFI_TIANO_CUSTOM_DECOMPRESS_LIB_INTERNALS_H__\r
 \r
 //\r
-// Include common header file for this module.\r
+// The package level header files this module uses\r
 //\r
-#include "CommonHeader.h"\r
+#include <Base.h>\r
+//\r
+// The Library classes this module consumes\r
+//\r
+#include <Library/UefiDecompressLib.h>\r
+#include <Library/CustomDecompressLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
 \r
 //\r
 // Decompression algorithm begins here\r

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/CommonHeader.h b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/CommonHeader.h
deleted file mode 100644 (file)
index baf3f0e..0000000
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/CommonHeader.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006, Intel Corporation.\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Base.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/UefiDecompressLib.h>\r
-#include <Library/CustomDecompressLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/CommonHeader.h b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/CommonHeader.h
deleted file mode 100644 (file)
index 6fd8551..0000000
--- a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/CommonHeader.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation.\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiPei.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/OemHookStatusCodeLib.h>\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
index 165e4a48a84a6095ce61562d9a891e2febb7efa7..deaccfac4eaa1191a3b6aaca5aad407808ec3448 100644 (file)
--- a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
+++ b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
@@ -14,10 +14,7 @@
 \r
 **/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <PiPei.h>\r
 \r
 /**\r
 \r

diff --git a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
index 7da7f0982f94d02fc9174d2fb1ded47ee6ca7df7..3bd46725036cb5cb67239f52bc33c71141bf3316 100644 (file)
--- a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
+++ b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
@@ -44,7 +44,6 @@
 \r
 [Sources.common]\r
   OemHookStatusCodeLibNull.c\r
-  CommonHeader.h\r
 \r
 \r
 ################################################################################\r

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/CommonHeader.h b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/CommonHeader.h
deleted file mode 100644 (file)
index 3119b03..0000000
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/CommonHeader.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2007, Intel Corporation.\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/PciIncompatibleDeviceSupportLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h
index df30a9d69eeab52676a61a7c8b402dc88b830762..d43918d2c3bba5479ea39b4eda58e0d0654f5ac9 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h
+++ b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h
@@ -16,9 +16,15 @@ Intel Corporation.
 #define _EFI_INCOMPATIBLE_PCI_DEVICE_LIST_H\r
 \r
 //\r
-// Include common header file for this module.\r
+// The package level header files this module uses\r
 //\r
-#include "CommonHeader.h"\r
+#include <PiDxe.h>\r
+//\r
+// The Library classes this module consumes\r
+//\r
+#include <Library/PciIncompatibleDeviceSupportLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/DebugLib.h>\r
 \r
 #include <IndustryStandard/pci22.h>\r
 #include <IndustryStandard/Acpi.h>\r

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
index 8c974584dadbaf28d706e83375761e5d18c110e6..f6638c160706eef64cb21fca38a89666f7d57b21 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
+++ b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
@@ -12,11 +12,6 @@ Intel Corporation.
 \r
 **/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "IncompatiblePciDeviceList.h"\r
 \r
 /**\r

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
index 7b6ec3c0c818e50918ba61423a030ede34eb135f..97d53f7347b3fdd77c266a2930966660151191e5 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
+++ b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
@@ -45,8 +45,6 @@
 [Sources.common]\r
   IncompatiblePciDeviceList.h\r
   PciIncompatibleDeviceSupportLib.c\r
-  CommonHeader.h\r
-\r
 \r
 ################################################################################\r
 #\r