diff --git a/EdkModulePkg/Core/Pei/PeiMain.h b/EdkModulePkg/Core/Pei/PeiMain.h
index 53c429f6e0..82121ac043 100644
--- a/EdkModulePkg/Core/Pei/PeiMain.h
+++ b/EdkModulePkg/Core/Pei/PeiMain.h
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation
+Copyright (c) 2006 - 2007, 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
@@ -347,7 +347,7 @@ Returns:
 --*/
 ;
 
-#ifdef EFI64
+#if   defined (MDE_CPU_IPF)
   //
   // In Ipf we should make special changes for the PHIT pointers to support
   // recovery boot in cache mode.
diff --git a/EdkModulePkg/Include/Library/EdkGenericBdsLib.h b/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
index 7ec0222620..dedffab2a7 100644
--- a/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
+++ b/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+Copyright (c) 2006 - 2007, 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        
@@ -305,7 +305,7 @@ BdsBootByDiskSignatureAndPartition (
 //
 // Notes: EFI 64 shadow all option rom
 //
-#ifdef EFI64
+#if   defined (MDE_CPU_IPF)
 #define EFI64_SHADOW_ALL_LEGACY_ROM() ShadowAllOptionRom ();
 VOID
 ShadowAllOptionRom();
@@ -316,7 +316,7 @@ ShadowAllOptionRom();
 //
 // BBS support macros and functions
 //
-#ifdef EFI32
+#if   defined (MDE_CPU_IA32)
 #define REFRESH_LEGACY_BOOT_OPTIONS \
         BdsDeleteAllInvalidLegacyBootOptions ();\
         BdsAddNonExistingLegacyBootOptions (); \
diff --git a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BBSsupport.h b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BBSsupport.h
index 572beb11ab..9a2007cb3e 100644
--- a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BBSsupport.h
+++ b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BBSsupport.h
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+Copyright (c) 2006 - 2007, 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        
@@ -26,7 +26,7 @@ Revision History
 
 #include "BootMaint/BootMaint.h"
 
-#ifdef EFI32
+#if   defined (MDE_CPU_IA32)
 #define REFRESH_LEGACY_BOOT_OPTIONS \
         BdsDeleteAllInvalidLegacyBootOptions ();\
         BdsAddNonExistingLegacyBootOptions (); \
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.h b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.h
index 37778f4421..663fd0a098 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.h
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.h
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+Copyright (c) 2006 - 2007, 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        
@@ -26,7 +26,7 @@ Revision History
 
 #include "Generic/BootMaint/BootMaint.h"
 
-#ifdef EFI32
+#if   defined (MDE_CPU_IA32)
 #define REFRESH_LEGACY_BOOT_OPTIONS \
         BdsDeleteAllInvalidLegacyBootOptions ();\
         BdsAddNonExistingLegacyBootOptions (); \
diff --git a/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h b/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
index 7ec0222620..aa3cfaea7a 100644
--- a/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
+++ b/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+Copyright (c) 2006 - 2007, 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        
@@ -305,7 +305,7 @@ BdsBootByDiskSignatureAndPartition (
 //
 // Notes: EFI 64 shadow all option rom
 //
-#ifdef EFI64
+#if   defined (MDE_CPU_IPF)
 #define EFI64_SHADOW_ALL_LEGACY_ROM() ShadowAllOptionRom ();
 VOID
 ShadowAllOptionRom();
@@ -316,7 +316,7 @@ ShadowAllOptionRom();
 //
 // BBS support macros and functions
 //
-#ifdef EFI32
+#if   defined (MDE_CPU_IA32)
 #define REFRESH_LEGACY_BOOT_OPTIONS \
         BdsDeleteAllInvalidLegacyBootOptions ();\
         BdsAddNonExistingLegacyBootOptions (); \