Cleanup to remover CommonHeader.h files

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

11 files changed, 18 insertions, 111 deletions

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
index c516c35e54..629f999da3 100644
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "BaseUefiTianoCustomDecompressLibInternals.h"

 

 VOID

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
index f66fc084e0..069a798bd6 100644
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
@@ -45,7 +45,6 @@
 [Sources.common]

   BaseUefiTianoCustomDecompressLibInternals.h

   BaseUefiTianoCustomDecompressLib.c

-  CommonHeader.h

 

 

 ################################################################################

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
index cc5037ad81..713da98af9 100644
--- 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__

 

 //

-// Include common header file for this module.

+// The package level header files this module uses

 //

-#include "CommonHeader.h"

+#include <Base.h>

+//

+// The Library classes this module consumes

+//

+#include <Library/UefiDecompressLib.h>

+#include <Library/CustomDecompressLib.h>

+#include <Library/DebugLib.h>

+#include <Library/BaseMemoryLib.h>

 

 //

 // Decompression algorithm begins here

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/CommonHeader.h b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/CommonHeader.h
deleted file mode 100644
index baf3f0edfb..0000000000
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/CommonHeader.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**@file

-  Common header file shared by all source files.

-

-  This file includes package header files, library classes and protocol, PPI & GUID definitions.

-

-  Copyright (c) 2006, Intel Corporation.

-  All rights reserved. This program and the accompanying materials

-   are licensed and made available under the terms and conditions of the BSD License

-   which accompanies this distribution. The full text of the license may be found at

-   http://opensource.org/licenses/bsd-license.php

-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-**/

-

-#ifndef __COMMON_HEADER_H_

-#define __COMMON_HEADER_H_

-

-

-//

-// The package level header files this module uses

-//

-#include <Base.h>

-//

-// The Library classes this module consumes

-//

-#include <Library/UefiDecompressLib.h>

-#include <Library/CustomDecompressLib.h>

-#include <Library/DebugLib.h>

-#include <Library/BaseMemoryLib.h>

-

-#endif

diff --git a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/CommonHeader.h b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/CommonHeader.h
deleted file mode 100644
index 6fd8551788..0000000000
--- a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/CommonHeader.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**@file

-  Common header file shared by all source files.

-

-  This file includes package header files, library classes and protocol, PPI & GUID definitions.

-

-  Copyright (c) 2006 - 2007, Intel Corporation.

-  All rights reserved. This program and the accompanying materials

-   are licensed and made available under the terms and conditions of the BSD License

-   which accompanies this distribution. The full text of the license may be found at

-   http://opensource.org/licenses/bsd-license.php

-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-**/

-

-#ifndef __COMMON_HEADER_H_

-#define __COMMON_HEADER_H_

-

-

-//

-// The package level header files this module uses

-//

-#include <PiPei.h>

-//

-// The Library classes this module consumes

-//

-#include <Library/OemHookStatusCodeLib.h>

-

-#endif

diff --git a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
index 165e4a48a8..deaccfac4e 100644
--- a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
+++ b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
@@ -14,10 +14,7 @@
 

 **/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

+#include <PiPei.h>

 

 /**

 

diff --git a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
index 7da7f0982f..3bd4672503 100644
--- a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
+++ b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
@@ -44,7 +44,6 @@
 

 [Sources.common]

   OemHookStatusCodeLibNull.c

-  CommonHeader.h

 

 

 ################################################################################

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/CommonHeader.h b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/CommonHeader.h
deleted file mode 100644
index 3119b033da..0000000000
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/CommonHeader.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/**@file

-  Common header file shared by all source files.

-

-  This file includes package header files, library classes and protocol, PPI & GUID definitions.

-

-  Copyright (c) 2007, Intel Corporation.

-  All rights reserved. This program and the accompanying materials

-   are licensed and made available under the terms and conditions of the BSD License

-   which accompanies this distribution. The full text of the license may be found at

-   http://opensource.org/licenses/bsd-license.php

-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-**/

-

-#ifndef __COMMON_HEADER_H_

-#define __COMMON_HEADER_H_

-

-

-//

-// The package level header files this module uses

-//

-#include <PiDxe.h>

-//

-// The Library classes this module consumes

-//

-#include <Library/PciIncompatibleDeviceSupportLib.h>

-#include <Library/MemoryAllocationLib.h>

-#include <Library/DebugLib.h>

-

-#endif

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h
index df30a9d69e..d43918d2c3 100644
--- 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

 

 //

-// Include common header file for this module.

+// The package level header files this module uses

 //

-#include "CommonHeader.h"

+#include <PiDxe.h>

+//

+// The Library classes this module consumes

+//

+#include <Library/PciIncompatibleDeviceSupportLib.h>

+#include <Library/MemoryAllocationLib.h>

+#include <Library/DebugLib.h>

 

 #include <IndustryStandard/pci22.h>

 #include <IndustryStandard/Acpi.h>

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
index 8c974584da..f6638c1607 100644
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
+++ b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
@@ -12,11 +12,6 @@ Intel Corporation.
 

 **/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "IncompatiblePciDeviceList.h"

 

 /**

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
index 7b6ec3c0c8..97d53f7347 100644
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
+++ b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
@@ -45,8 +45,6 @@
 [Sources.common]

   IncompatiblePciDeviceList.h

   PciIncompatibleDeviceSupportLib.c

-  CommonHeader.h

-

 

 ################################################################################

 #