diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
index ab3395547c..74491b466c 100644
--- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
@@ -1,7 +1,7 @@
 /**@file
   Recovery Library. This library class defines a set of methods related do recovery.
 
-Copyright (c) 2006 - 2007 Intel Corporation
+Copyright (c) 2006 - 2008 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
@@ -41,6 +41,6 @@ PeiRecoverFirmware (
              );
   ASSERT_EFI_ERROR (Status);
 
-  return PeiRecovery->LoadRecoveryCapsule (GetPeiServicesTablePointer(), PeiRecovery);
+  return PeiRecovery->LoadRecoveryCapsule ((EFI_PEI_SERVICES  **) GetPeiServicesTablePointer(), PeiRecovery);
 }
 
diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index 44f733e7b3..f67adf9d3a 100644
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -1,7 +1,7 @@
 /** @file
   Report Status Code Library for PEI Phase.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2008, Intel Corporation<BR>
   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
@@ -68,7 +68,7 @@ InternalReportStatusCode (
   CONST EFI_PEI_SERVICES  **PeiServices;
   EFI_STATUS              Status;
 
-  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
+  PeiServices = GetPeiServicesTablePointer ();
   Status =  (*PeiServices)->ReportStatusCode (
                              PeiServices,
                              Type,
diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
index 44a870a687..1d7907ef7f 100644
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
+++ b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
@@ -1,7 +1,7 @@
 /**@file
   S3 Library. This library class defines a set of methods related do S3 mode
 
-Copyright (c) 2006 - 2007 Intel Corporation
+Copyright (c) 2006 - 2008 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
@@ -41,6 +41,6 @@ AcpiS3ResumeOs (
              );
   ASSERT_EFI_ERROR (Status);
 
-  return S3Resume->S3RestoreConfig (GetPeiServicesTablePointer()); 
+  return S3Resume->S3RestoreConfig ((EFI_PEI_SERVICES  **) GetPeiServicesTablePointer()); 
 }
 
diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
index 746e16979d..7d9eaf199d 100644
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
@@ -355,7 +355,7 @@ STATIC
 EFI_STATUS
 EFIAPI
 FindVariable (
-  IN EFI_PEI_SERVICES         **PeiServices,
+  IN        EFI_PEI_SERVICES   **PeiServices,
   IN CONST  CHAR16            *VariableName,
   IN CONST  EFI_GUID          *VendorGuid,
   OUT VARIABLE_POINTER_TRACK  *PtrTrack
@@ -581,7 +581,7 @@ PeiGetVariable2 (
 
 {
   return PeiGetVariable (
-           GetPeiServicesTablePointer (),
+           (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),
            (CHAR16*)VariableName,
            (EFI_GUID*)VariableGuid,
            Attributes,
@@ -703,7 +703,7 @@ PeiGetNextVariableName2 (
 
 {
   return PeiGetNextVariableName (
-           GetPeiServicesTablePointer (),
+           (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),
            VariableNameSize,
            VariableName,
            VariableGuid