diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c
index de4bb2e0ef..bf95be158c 100644
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c
@@ -12,11 +12,6 @@
 
 **/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "DiskIo.h"
 
 //
diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
index 5df48c61c5..c1a572f846 100644
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
@@ -16,11 +16,6 @@
 #ifndef _DISK_IO_H
 #define _DISK_IO_H
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include <Uefi.h>
 #include <Protocol/BlockIo.h>
 #include <Protocol/ComponentName.h>
diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
index 3030bda1dd..ad73679302 100644
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
@@ -1,13 +1,12 @@
 #/** @file
-# Component description file for DiskIo module.
-#
-# DiskIo driver that layers it's self on every Block IO protocol in the system.
-# Copyright (c) 2006 - 2007, Intel Corporation
+#  Component description file for DiskIo module.
 #
+#  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.
 #
@@ -35,8 +34,8 @@
 #
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
-#  DRIVER_BINDING                =  gDiskIoDriverBinding                         
-#  COMPONENT_NAME                =  gDiskIoComponentName                         
+#  DRIVER_BINDING                =  gDiskIoDriverBinding
+#  COMPONENT_NAME                =  gDiskIoComponentName
 #
 
 ################################################################################
@@ -49,8 +48,6 @@
   ComponentName.c
   DiskIo.h
   diskio.c
-  CommonHeader.h
-  EntryPoint.c
 
 
 ################################################################################
@@ -63,6 +60,18 @@
 [Includes]
   $(WORKSPACE)/MdePkg/Include/Library
 
+################################################################################
+#
+# Package Dependency Section - list of Package files that are required for
+#                              this module.
+#
+################################################################################
+
+[Packages]
+  $(WORKSPACE)/MdeModulePkg/MdeModulePkg.dec
+  $(WORKSPACE)/MdePkg/MdePkg.dec
+
+
 ################################################################################
 #
 # Library Class Section - list of Library Classes that are required for
diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c
index d5efd634cf..0cb49224ca 100644
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c
@@ -20,11 +20,6 @@
 
 **/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "DiskIo.h"
 
 EFI_DRIVER_BINDING_PROTOCOL gDiskIoDriverBinding = {
diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c
index 8e8153fbc0..e922cb0f92 100644
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c
@@ -12,11 +12,6 @@
 
 **/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Partition.h"
 
 //
diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c
index ab93c08931..37ac710ff0 100644
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c
@@ -13,11 +13,6 @@
 **/
 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Partition.h"
 
 
diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c
index c5978a16be..581007e92a 100644
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c
@@ -14,11 +14,6 @@
 **/
 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Partition.h"
 
 
diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c
index bc08963e54..d71698c826 100644
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c
@@ -29,11 +29,6 @@ Abstract:
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Partition.h"
 
 STATIC
diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c
index de2c802b7d..4d0c76f251 100644
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c
@@ -16,11 +16,6 @@
 **/
 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Partition.h"
 
 //
diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h
index 289c9a5443..570d0194b5 100644
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h
@@ -18,11 +18,6 @@
 #ifndef _PARTITION_H 
 #define _PARTITION_H 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include <Uefi.h>
 #include <Protocol/BlockIo.h>
 #include <Guid/Gpt.h>
diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf
index 2036fa7afb..1e00fccfd6 100644
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf
@@ -5,12 +5,13 @@
 #  that represents the bytes Start to End of the Parent Block IO 
 #  device (one partition of physical BlockIo device, 
 #  which can be one of GPT, MBR, ElTorito partition).
-# Copyright (c) 2006 - 2007, Intel Corporation
 #
+#  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.
 #
@@ -55,8 +56,6 @@
   ElTorito.c
   Partition.c
   Partition.h
-  CommonHeader.h
-  EntryPoint.c
 
 
 ################################################################################
@@ -69,6 +68,17 @@
 [Includes]
   $(WORKSPACE)/MdePkg/Include/Library
 
+################################################################################
+#
+# Package Dependency Section - list of Package files that are required for
+#                              this module.
+#
+################################################################################
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+
 ################################################################################
 #
 # Library Class Section - list of Library Classes that are required for
diff --git a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c
index 88811f1611..2eb325ec56 100644
--- a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c
+++ b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c
@@ -13,11 +13,6 @@
 **/
 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "SecurityStub.h"
 
 //
diff --git a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h
index df57d9e9aa..dedc14afdb 100644
--- a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h
+++ b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h
@@ -16,11 +16,6 @@
 #define _SECURITY_STUB_ARCH_PROTOCOL_H
 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 //
 // Common header files for this module.
 //
diff --git a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf
index 36504f9860..ec17ceacf8 100644
--- a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf
+++ b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf
@@ -1,13 +1,12 @@
 #/** @file
-# Component description file for SecurityStub module
-#
-# This driver supports platform security service.
-# Copyright (c) 2006 - 2007, Intel Corporation
+#  Component description file for SecurityStub module
 #
+#  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.
 #
@@ -46,7 +45,6 @@
   SecurityStub.c
   SecurityStub.h
   SecurityStub.dxs
-  CommonHeader.h
 
 
 ################################################################################
@@ -59,6 +57,17 @@
 [Includes]
   $(WORKSPACE)/MdePkg/Include/Library
 
+################################################################################
+#
+# Package Dependency Section - list of Package files that are required for
+#                              this module.
+#
+################################################################################
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+
 ################################################################################
 #
 # Library Class Section - list of Library Classes that are required for