diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.c b/DuetPkg/DataHubGenDxe/DataHubGen.c
index 89169c2b24..5d1354a71d 100644
--- a/DuetPkg/DataHubGenDxe/DataHubGen.c
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.c
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2006 - 2007, Intel Corporation                                                         
+Copyright (c) 2006 - 2010, 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        
@@ -35,8 +35,7 @@ GetSmbiosTablesFromHob (
   //
   // Get Hob List
   //
-  GuidHob.Raw = GetHobList ();
-  GuidHob.Raw = GetNextGuidHob (&gEfiSmbiosTableGuid, GuidHob.Raw);
+  GuidHob.Raw = GetFirstGuidHob (&gEfiSmbiosTableGuid);
   if (GuidHob.Raw != NULL) {
     Table = GET_GUID_HOB_DATA (GuidHob.Guid);
     if (Table != NULL) {
diff --git a/DuetPkg/FSVariable/FSVariable.inf b/DuetPkg/FSVariable/FSVariable.inf
index a5c0c31e78..3fbce650c7 100644
--- a/DuetPkg/FSVariable/FSVariable.inf
+++ b/DuetPkg/FSVariable/FSVariable.inf
@@ -1,6 +1,6 @@
 #/*++
 #
-# Copyright (c) 2006 - 2007, Intel Corporation                                                         
+# Copyright (c) 2006 - 2010 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        
@@ -55,10 +55,10 @@
   UefiDriverEntryPoint
 
 [Guids]
-  gEfiHobListGuid
   gEfiFlashMapHobGuid
   gEfiVariableGuid
   gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid
+  
 [Protocols]
   gEfiVariableArchProtocolGuid
   gEfiVariableWriteArchProtocolGuid
@@ -70,5 +70,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize
+
 [Depex]
   TRUE
diff --git a/DuetPkg/FvbRuntimeService/DUETFwh.inf b/DuetPkg/FvbRuntimeService/DUETFwh.inf
index b00ea7b5f1..802b70b373 100644
--- a/DuetPkg/FvbRuntimeService/DUETFwh.inf
+++ b/DuetPkg/FvbRuntimeService/DUETFwh.inf
@@ -1,6 +1,6 @@
 #/*++
 #
-# Copyright (c) 2007, Intel Corporation                                                         
+# Copyright (c) 2007 - 2010, 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        
@@ -50,7 +50,6 @@
 
 [Guids]
   gEfiFlashMapHobGuid
-  gEfiHobListGuid
 
 [Protocols]
   gEfiSimpleFileSystemProtocolGuid
diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
index 3cbd082d26..00f735fc55 100644
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006 - 2008, Intel Corporation                                                         
+Copyright (c) 2006 - 2010, 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        
@@ -153,12 +153,8 @@ UpdateMemoryMap (
   UINTN                           Index;
   EFI_PHYSICAL_ADDRESS            Memory;
   EFI_GCD_MEMORY_SPACE_DESCRIPTOR Descriptor;
-  //
-  // Get Hob List
-  //
-  GuidHob.Raw = GetHobList();
   
-  GuidHob.Raw = GetNextGuidHob (&gEfiLdrMemoryDescriptorGuid, GuidHob.Raw);
+  GuidHob.Raw = GetFirstGuidHob (&gEfiLdrMemoryDescriptorGuid);
   if (GuidHob.Raw == NULL) {
     DEBUG ((EFI_D_ERROR, "Fail to get gEfiLdrMemoryDescriptorGuid from GUID HOB LIST!\n"));
     return;
diff --git a/DuetPkg/SmbiosGenDxe/SmbiosGen.c b/DuetPkg/SmbiosGenDxe/SmbiosGen.c
index b615757553..f3d52da92d 100644
--- a/DuetPkg/SmbiosGenDxe/SmbiosGen.c
+++ b/DuetPkg/SmbiosGenDxe/SmbiosGen.c
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2009, Intel Corporation                                                         
+Copyright (c) 2009 - 2010, 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        
@@ -30,11 +30,8 @@ GetSmbiosTablesFromHob (
 {
   EFI_PHYSICAL_ADDRESS       *Table;
   EFI_PEI_HOB_POINTERS        GuidHob;
-  //
-  // Get Hob List
-  //
-  GuidHob.Raw = GetHobList ();
-  GuidHob.Raw = GetNextGuidHob (&gEfiSmbiosTableGuid, GuidHob.Raw);
+
+  GuidHob.Raw = GetFirstGuidHob (&gEfiSmbiosTableGuid);
   if (GuidHob.Raw != NULL) {
     Table = GET_GUID_HOB_DATA (GuidHob.Guid);
     if (Table != NULL) {