5 files changed, 9 insertions, 12 deletions
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.c b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.c
index 4e90f4eaea..49d38eb45c 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.c
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.c
@@ -17,7 +17,7 @@
 
   A Processor's support for invariant TSC is indicated by CPUID.0x80000007.EDX[8].
 
-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2018, 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
@@ -32,7 +32,6 @@
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiLib.h>
 #include <Library/DebugLib.h>
-#include <Guid/TscFrequency.h>
 #include "TscTimerLibInternal.h"
 
 UINT64 mTscFrequency;
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.inf b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.inf
index a2ff9d05dd..1f77907470 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.inf
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.inf
@@ -12,7 +12,7 @@
 #  TSC reads are much more efficient and do not incur the overhead associated with a ring transition or
 #  access to a platform resource.
 #
-#  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2009 - 2018, 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
@@ -44,7 +44,6 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  PerformancePkg/PerformancePkg.dec
   BroxtonSiPkg/BroxtonSiPkg.dec
   BroxtonPlatformPkg/PlatformPkg.dec
 
@@ -61,6 +60,6 @@
   gEfiTscFrequencyGuid                          ## CONSUMES ## SystemTable
 
 [Pcd.common]
-  gPerformancePkgTokenSpaceGuid.PcdPerfPkgAcpiIoPortBaseAddress   ## SOMETIMES_CONSUMES
+  gPlatformModuleTokenSpaceGuid.PcdPerfPkgAcpiIoPortBaseAddress   ## SOMETIMES_CONSUMES
   gEfiBxtTokenSpaceGuid.PcdScAcpiIoPortBaseAddress
 
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.c b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.c
index caf1925748..397502bc92 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.c
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.c
@@ -17,7 +17,7 @@
 
   A Processor's support for invariant TSC is indicated by CPUID.0x80000007.EDX[8].
 
-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2018, 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
@@ -31,7 +31,6 @@
 
 #include <PiPei.h>
 #include <Library/HobLib.h>
-#include <Guid/TscFrequency.h>
 #include "TscTimerLibInternal.h"
 
 
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.inf b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.inf
index 0821983139..3b17cef70d 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.inf
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.inf
@@ -12,7 +12,7 @@
 #  TSC reads are much more efficient and do not incur the overhead associated with a ring transition or
 #  access to a platform resource.
 #
-#  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2009 - 2018, 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
@@ -43,7 +43,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  PerformancePkg/PerformancePkg.dec
+  BroxtonPlatformPkg/PlatformPkg.dec
   BroxtonSiPkg/BroxtonSiPkg.dec
 
 [LibraryClasses]
@@ -57,6 +57,6 @@
   gEfiTscFrequencyGuid                          ## PRODUCES ## HOB
 
 [Pcd.common]
-  gPerformancePkgTokenSpaceGuid.PcdPerfPkgAcpiIoPortBaseAddress     ## SOMETIMES_CONSUMES
+  gPlatformModuleTokenSpaceGuid.PcdPerfPkgAcpiIoPortBaseAddress     ## SOMETIMES_CONSUMES
   gEfiBxtTokenSpaceGuid.PcdScAcpiIoPortBaseAddress
 
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/TscTimerLibInternal.h b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/TscTimerLibInternal.h
index 99f6fcdee4..272c763ed6 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/TscTimerLibInternal.h
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/TscTimerLibInternal.h
@@ -1,7 +1,7 @@
 /** @file
   Internal header file for TscTimerLib instances.
 
-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2018, 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
@@ -16,7 +16,7 @@
 #ifndef _TSC_TIMER_LIB_INTERNAL_H_
 #define _TSC_TIMER_LIB_INTERNAL_H_
 
-#include <Ich/GenericIch.h>
+#include <GenericIch.h>
 #include <Library/TimerLib.h>
 #include <Library/BaseLib.h>
 #include <Library/IoLib.h>