diff --git a/DuetPkg/DxeIpl/DxeIpl.inf b/DuetPkg/DxeIpl/DxeIpl.inf
index 826aee15b8..7c06dffa15 100644
--- a/DuetPkg/DxeIpl/DxeIpl.inf
+++ b/DuetPkg/DxeIpl/DxeIpl.inf
@@ -1,6 +1,6 @@
 #/*++
 # 
-# Copyright (c) 2006 - 2007, Intel Corporation                                                         
+# Copyright (c) 2006 - 2009, 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        
@@ -65,7 +65,7 @@
   Ia32/EnterDxeCore.c
   Ia32/Paging.c
   Ia32/VirtualMemory.h
-  
+
 #[BuildOptions.common]
   #MSFT:*_*_IA32_DLINK_FLAGS = /out:"$(BIN_DIR)\SecMain.exe" /base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib
   #MSFT:*_*_IA32_CC_FLAGS = /nologo /W4 /WX /Gy /c /D UNICODE /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
@@ -73,3 +73,6 @@
   #MSFT:*_*_IA32_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi
   #MSFT:*_*_IA32_ASMLINK_FLAGS       = /link /nologo /tiny  
   #GCC:*_UNIXGCC_IA32_CC_FLAGS                  = -O2 -falign-functions -falign-jumps -falign-loops -freorder-blocks -freorder-blocks-and-partition -falign-labels -fshort-wchar -fno-strict-aliasing -Wall  -Wno-missing-braces -c -include AutoGen.h
+
+[Depex]
+  TRUE
diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf b/DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
index 0b7827aa83..cf493cdbf8 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
@@ -1,6 +1,6 @@
 #/*++
 # 
-# Copyright (c) 2005, Intel Corporation                                                         
+# Copyright (c) 2005 - 2009, 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        
@@ -18,7 +18,7 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PciBusNoEnumerationDxe
   FILE_GUID                      = 35C0C168-2607-4e51-BB53-448E3ED1A87F
-  MODULE_TYPE                    = DXE_DRIVER
+  MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
index c85e4646c3..0addf7e39e 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
@@ -1,6 +1,6 @@
 #/*++
 # 
-# Copyright (c) 2005 - 2008, Intel Corporation                                                         
+# Copyright (c) 2005 - 2009, 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        
@@ -66,4 +66,7 @@
 
 [Guids]
   gEfiPciOptionRomTableGuid
-  gEfiPciExpressBaseAddressGuid
\ No newline at end of file
+  gEfiPciExpressBaseAddressGuid
+
+[Depex]
+  gEfiCpuIoProtocolGuid
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf
index 3ba2d99125..bfaba1d83a 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf
@@ -45,3 +45,6 @@
 
 [Protocols]
   gEfiIncompatiblePciDeviceSupportProtocolGuid    ## PRODUCEDS
+
+[Depex]
+  TRUE
diff --git a/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf b/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
index 1ecd7d3a7e..efe329911e 100644
--- a/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
+++ b/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
@@ -1,6 +1,6 @@
 #/*++
 # 
-# Copyright (c) 2005, Intel Corporation                                                         
+# Copyright (c) 2005 - 2009, 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        
@@ -21,7 +21,7 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = IsaAcpi
   FILE_GUID                      = 38A0EC22-FBE7-4911-8BC1-176E0D6C1DBD
-  MODULE_TYPE                    = DXE_DRIVER
+  MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x0002000A