66 files changed, 132 insertions, 132 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Include/Arm/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/Arm/EfiBind.h
index d983d85a8d..b2bf647433 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Arm/EfiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Arm/EfiBind.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2008, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Arm/EfiPeOptionalHeader.h b/EdkCompatibilityPkg/Foundation/Include/Arm/EfiPeOptionalHeader.h
index 66a23c1ec0..9b546ddced 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Arm/EfiPeOptionalHeader.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Arm/EfiPeOptionalHeader.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Arm/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Arm/TianoBind.h
index d48866bc4e..34cc500b60 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Arm/TianoBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Arm/TianoBind.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ebc/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/Ebc/EfiBind.h
index 930d589d0f..123c78e3fc 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ebc/EfiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ebc/EfiBind.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ebc/EfiPeOptionalHeader.h b/EdkCompatibilityPkg/Foundation/Include/Ebc/EfiPeOptionalHeader.h
index 0dd66c2789..3aa5912ea9 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ebc/EfiPeOptionalHeader.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ebc/EfiPeOptionalHeader.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h
index c1778824ec..fbe2b77b8e 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h b/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h
index 63191fef3d..ba27df61a9 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiCompNameSupport.h b/EdkCompatibilityPkg/Foundation/Include/EfiCompNameSupport.h
index 9379086ba4..88e076456f 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiCompNameSupport.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiCompNameSupport.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2008, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiDebug.h b/EdkCompatibilityPkg/Foundation/Include/EfiDebug.h
index d398ff532f..a1a1637e9a 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiDebug.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiDebug.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiDepex.h b/EdkCompatibilityPkg/Foundation/Include/EfiDepex.h
index 62a77848d1..ff559c297d 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiDepex.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiDepex.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiFlashMap.h b/EdkCompatibilityPkg/Foundation/Include/EfiFlashMap.h
index 9b0af35dd4..187a6659cb 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiFlashMap.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiFlashMap.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiPci.h b/EdkCompatibilityPkg/Foundation/Include/EfiPci.h
index c475cef82e..120b1d0b84 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiPci.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiPci.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h b/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h
index 55c743f7a7..8dd5f5deb5 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h b/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h
index 623069e969..95f84a02ca 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiSpec.h b/EdkCompatibilityPkg/Foundation/Include/EfiSpec.h
index 633c595db0..d64c2b2b56 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiSpec.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiSpec.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiStdArg.h b/EdkCompatibilityPkg/Foundation/Include/EfiStdArg.h
index 97100e95dc..9ff66e437d 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiStdArg.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiStdArg.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
index 212d1e002d..994cc2bb75 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiVariable.h b/EdkCompatibilityPkg/Foundation/Include/EfiVariable.h
index a463cac75a..b4ea9591bc 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiVariable.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiVariable.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiWorkingBlockHeader.h b/EdkCompatibilityPkg/Foundation/Include/EfiWorkingBlockHeader.h
index a67d041218..44f411b088 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiWorkingBlockHeader.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiWorkingBlockHeader.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h
index 12d7154d0b..58ff6e2ae6 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2008, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiPeOptionalHeader.h b/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiPeOptionalHeader.h
index 549d9f4fc4..71d7f5b5cc 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiPeOptionalHeader.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiPeOptionalHeader.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h
index 60699c1099..53428b19e2 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi.h
index 6a7246f72e..18f783ce5f 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi1_0.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi1_0.h
index 84c4147cc6..79653ee970 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi1_0.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi1_0.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi2_0.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi2_0.h
index 60c2e40e5c..727551591c 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi2_0.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi2_0.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi3_0.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi3_0.h
index cd359b6c1a..dc2be4cde0 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi3_0.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Acpi3_0.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/AcpiCommon.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/AcpiCommon.h
index 945e787788..0cab2e552b 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/AcpiCommon.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/AcpiCommon.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/AlertStandardFormatTable.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/AlertStandardFormatTable.h
index f750a63b40..43fc66d741 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/AlertStandardFormatTable.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/AlertStandardFormatTable.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/DMARemappingReportingTable.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/DMARemappingReportingTable.h
index 5adc20fc25..46f4bc0088 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/DMARemappingReportingTable.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/DMARemappingReportingTable.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/HighPrecisionEventTimerTable.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/HighPrecisionEventTimerTable.h
index ee23907633..a7a94b661c 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/HighPrecisionEventTimerTable.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/HighPrecisionEventTimerTable.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/IScsiBootFirmwareTable.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/IScsiBootFirmwareTable.h
index 8696e9c490..d214ff9521 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/IScsiBootFirmwareTable.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/IScsiBootFirmwareTable.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h
index ecaece1d1c..9d67677ee1 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
index 5bbc05957e..f142fbda4a 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/SdramSpd.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/SdramSpd.h
index f8ca8485d4..7599b4ff3d 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/SdramSpd.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/SdramSpd.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/ServerProcessorManagementInterfaceTable.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/ServerProcessorManagementInterfaceTable.h
index 2c2a925e60..ae697bc3c4 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/ServerProcessorManagementInterfaceTable.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/ServerProcessorManagementInterfaceTable.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Smbios.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Smbios.h
index 9c6564ca37..89b3015713 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Smbios.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Smbios.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h
index 2a2ed869fc..74065cdf04 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2005 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2005 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/WatchdogDescriptionTable.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/WatchdogDescriptionTable.h
index 8a23e7e07e..04383f4eb6 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/WatchdogDescriptionTable.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/WatchdogDescriptionTable.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/atapi.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/atapi.h
index 3fcc287a5a..ad3510cfd7 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/atapi.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/atapi.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci.h
index aa0668b9dc..012c5b6fef 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h
index f047e629bc..075729aab9 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci23.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci23.h
index c42991f38c..0957c86d25 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci23.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci23.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h
index 446cea4f69..0353f06f4a 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/scsi.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/scsi.h
index 70a6b23833..2c2025583b 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/scsi.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/scsi.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                  
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h
index 7ec33a1d36..ef8b7c13e5 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ipf/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/Ipf/EfiBind.h
index 6b53685040..95887ef423 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ipf/EfiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ipf/EfiBind.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ipf/EfiPeOptionalHeader.h b/EdkCompatibilityPkg/Foundation/Include/Ipf/EfiPeOptionalHeader.h
index 53de8aaa7e..3019badd59 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ipf/EfiPeOptionalHeader.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ipf/EfiPeOptionalHeader.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ipf/IpfDefines.h b/EdkCompatibilityPkg/Foundation/Include/Ipf/IpfDefines.h
index 0fe1407525..9535d58bca 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ipf/IpfDefines.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ipf/IpfDefines.h
@@ -2,8 +2,8 @@
 
 // TODO: fix comment to start with /*++
 //
-// Copyright (c) 2004, Intel Corporation
-// All rights reserved. This program and the accompanying materials
+// Copyright (c) 2004, 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
 // http://opensource.org/licenses/bsd-license.php
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ipf/IpfMacro.i b/EdkCompatibilityPkg/Foundation/Include/Ipf/IpfMacro.i
index 68c5f8c540..c6a5a68823 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ipf/IpfMacro.i
+++ b/EdkCompatibilityPkg/Foundation/Include/Ipf/IpfMacro.i
@@ -1,6 +1,6 @@
 //++
-// Copyright (c) 2004, Intel Corporation                                                         
-// All rights reserved. This program and the accompanying materials                          
+// Copyright (c) 2004, 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        
 // http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ipf/PalApi.h b/EdkCompatibilityPkg/Foundation/Include/Ipf/PalApi.h
index aaa6a64022..80306c8d1e 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ipf/PalApi.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ipf/PalApi.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ipf/SalApi.h b/EdkCompatibilityPkg/Foundation/Include/Ipf/SalApi.h
index 46b96f74dd..dfb0bc204f 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ipf/SalApi.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ipf/SalApi.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h
index de84156789..ab84a90e00 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Pei/Pei.h b/EdkCompatibilityPkg/Foundation/Include/Pei/Pei.h
index cef364b1bf..62b3b9a1ed 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Pei/Pei.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Pei/Pei.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2005, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2005, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Pei/PeiBind.h b/EdkCompatibilityPkg/Foundation/Include/Pei/PeiBind.h
index a3cdb7b776..8c6931eab5 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Pei/PeiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Pei/PeiBind.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Pei/PeiDebug.h b/EdkCompatibilityPkg/Foundation/Include/Pei/PeiDebug.h
index a957c2b521..6277922ed2 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Pei/PeiDebug.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Pei/PeiDebug.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Pei/PeiPerf.h b/EdkCompatibilityPkg/Foundation/Include/Pei/PeiPerf.h
index 5b86d838d4..58baa8abc2 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Pei/PeiPerf.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Pei/PeiPerf.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/Tiano.h b/EdkCompatibilityPkg/Foundation/Include/Tiano.h
index 55790c2eab..f26515251c 100644
--- a/EdkCompatibilityPkg/Foundation/Include/Tiano.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Tiano.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/TianoApi.h b/EdkCompatibilityPkg/Foundation/Include/TianoApi.h
index da1ca7c912..ecd46dca33 100644
--- a/EdkCompatibilityPkg/Foundation/Include/TianoApi.h
+++ b/EdkCompatibilityPkg/Foundation/Include/TianoApi.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/TianoCommon.h b/EdkCompatibilityPkg/Foundation/Include/TianoCommon.h
index c2a87c73dd..d8bf769fe1 100644
--- a/EdkCompatibilityPkg/Foundation/Include/TianoCommon.h
+++ b/EdkCompatibilityPkg/Foundation/Include/TianoCommon.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/TianoDevicePath.h b/EdkCompatibilityPkg/Foundation/Include/TianoDevicePath.h
index 445a075c13..4f7c53e434 100644
--- a/EdkCompatibilityPkg/Foundation/Include/TianoDevicePath.h
+++ b/EdkCompatibilityPkg/Foundation/Include/TianoDevicePath.h
@@ -1,7 +1,7 @@
 /*++
  
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/TianoError.h b/EdkCompatibilityPkg/Foundation/Include/TianoError.h
index 93cccf7ea9..2c2dc660e8 100644
--- a/EdkCompatibilityPkg/Foundation/Include/TianoError.h
+++ b/EdkCompatibilityPkg/Foundation/Include/TianoError.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/TianoHii.h b/EdkCompatibilityPkg/Foundation/Include/TianoHii.h
index a594fb1838..fd97e4215a 100644
--- a/EdkCompatibilityPkg/Foundation/Include/TianoHii.h
+++ b/EdkCompatibilityPkg/Foundation/Include/TianoHii.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2007, 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
 http://opensource.org/licenses/bsd-license.php
diff --git a/EdkCompatibilityPkg/Foundation/Include/TianoTypes.h b/EdkCompatibilityPkg/Foundation/Include/TianoTypes.h
index de52e4fde8..b1c0de7508 100644
--- a/EdkCompatibilityPkg/Foundation/Include/TianoTypes.h
+++ b/EdkCompatibilityPkg/Foundation/Include/TianoTypes.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
index 14eca7a301..9b7b0cf6cd 100644
--- a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2005 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2005 - 2008, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiPeOptionalHeader.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiPeOptionalHeader.h
index 03d1dc2957..d5df43cc55 100644
--- a/EdkCompatibilityPkg/Foundation/Include/X64/EfiPeOptionalHeader.h
+++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiPeOptionalHeader.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2005 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2005 - 2006, 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        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h
index 006755c519..bf33f579d1 100644
--- a/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2005, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2005, 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        
 http://opensource.org/licenses/bsd-license.php