4 files changed, 23 insertions, 17 deletions
diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c
index bf95be158c..de4bb2e0ef 100644
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c
@@ -12,6 +12,11 @@
 
 **/
 
+//
+// 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 c1a572f846..5df48c61c5 100644
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
@@ -16,6 +16,11 @@
 #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 ad73679302..3030bda1dd 100644
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
@@ -1,12 +1,13 @@
 #/** @file
-#  Component description file for DiskIo module.
+# 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
 #
-#  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.
 #
@@ -34,8 +35,8 @@
 #
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
-#  DRIVER_BINDING                =  gDiskIoDriverBinding
-#  COMPONENT_NAME                =  gDiskIoComponentName
+#  DRIVER_BINDING                =  gDiskIoDriverBinding                         
+#  COMPONENT_NAME                =  gDiskIoComponentName                         
 #
 
 ################################################################################
@@ -48,6 +49,8 @@
   ComponentName.c
   DiskIo.h
   diskio.c
+  CommonHeader.h
+  EntryPoint.c
 
 
 ################################################################################
@@ -62,18 +65,6 @@
 
 ################################################################################
 #
-# 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
 #                         this module.
 #
diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c
index 0cb49224ca..d5efd634cf 100644
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c
@@ -20,6 +20,11 @@
 
 **/
 
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
 #include "DiskIo.h"
 
 EFI_DRIVER_BINDING_PROTOCOL gDiskIoDriverBinding = {