3 files changed, 4 insertions, 10 deletions
diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
index 91f7c7ecf9..916586f112 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
+++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
@@ -2,7 +2,7 @@
   This code produces the Data Hub protocol. It preloads the data hub
   with status information copied in from PEI HOBs.
   
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
 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        
@@ -139,7 +139,7 @@ DataHubLogData (
   for (Link = GetFirstNode(Head); Link != Head; Link = GetNextNode(Head, Link)) {
     FilterEntry = FILTER_ENTRY_FROM_LINK (Link);
     if (((FilterEntry->ClassFilter & DataRecordClass) != 0) &&
-        (CompareGuid (&FilterEntry->FilterDataRecordGuid, &gZeroGuid) || 
+        (IsZeroGuid (&FilterEntry->FilterDataRecordGuid) ||
          CompareGuid (&FilterEntry->FilterDataRecordGuid, DataRecordGuid))) {
       gBS->SignalEvent (FilterEntry->Event);
     }
diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h
index de2e3f34ff..7770c438da 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h
+++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h
@@ -2,7 +2,7 @@
   This code supports a the private implementation 
   of the Data Hub protocol
   
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
 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,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <Protocol/DataHub.h>
 
-#include <Guid/ZeroGuid.h>
-
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/UefiLib.h>
diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
index 834c3b3148..0b93f719bb 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
@@ -21,7 +21,7 @@
 #  drivers to be aware of all reporting formats.
 #  For more information, please ref http://www.intel.com/technology/framework/
 #  
-#  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -70,10 +70,6 @@
   DebugLib
 
 
-[Guids]
-  gZeroGuid                                     ## SOMETIMES_CONSUMES   ## GUID
-
-
 [Protocols]
   gEfiDataHubProtocolGuid                       ## PRODUCES