diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
index 5fed85f1fb..54a27e501d 100644
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
@@ -2,16 +2,15 @@
 # Memory Status Code Library for UEFI drivers
 #
 # Lib to provide memory journal status code reporting Routines
-# Copyright (c) 2007, Intel Corporation.
 #
-#  All rights reserved.
-#  This software and associated documentation (if any) is furnished
-#  under a license and may only be used or copied in accordance
-#  with the terms of the license. Except as permitted by such
-#  license, no part of this software or documentation may be
-#  reproduced, stored in a retrieval system, or transmitted in any
-#  form or by any means without the express written consent of
-#  Intel Corporation.
+# Copyright (c) 2009, 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
+# http://opensource.org/licenses/bsd-license.php
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
 #**/
diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
index 46809eb77b..bfec5ee85e 100644
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
@@ -2,16 +2,14 @@
 # Memory Status Code Library for UEFI drivers
 #
 # Lib to provide memory journal status code reporting Routines
-# Copyright (c) 2007, Intel Corporation.
+# Copyright (c) 2009, 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
+# http://opensource.org/licenses/bsd-license.php
 #
-#  All rights reserved.
-#  This software and associated documentation (if any) is furnished
-#  under a license and may only be used or copied in accordance
-#  with the terms of the license. Except as permitted by such
-#  license, no part of this software or documentation may be
-#  reproduced, stored in a retrieval system, or transmitted in any
-#  form or by any means without the express written consent of
-#  Intel Corporation.
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
 #**/
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c
index 0a3d14a932..9c3c0da42d 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c
@@ -1,25 +1,17 @@
-/*++
-
-Copyright (c) 2009, Intel Corporation. All rights reserved. <BR> 
-This software and associated documentation (if any) is furnished
-under a license and may only be used or copied in accordance
-with the terms of the license. Except as permitted by such
-license, no part of this software or documentation may be
-reproduced, stored in a retrieval system, or transmitted in any
-form or by any means without the express written consent of
-Intel Corporation.
-
-
-Module Name:
-
-  MiscBaseBoardManufacturerFunction.c
-  
-Abstract: 
-
+/** @file
   BaseBoard manufacturer information boot time changes.
   SMBIOS type 2.
 
---*/
+  Copyright (c) 2009, 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
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
 
 #include "MiscSubClassDriver.h"
 /**
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c
index a5d123ad86..2cbd13af2a 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c
@@ -1,26 +1,18 @@
-/*++
- 
-Copyright (c) 2009, Intel Corporation. All rights reserved. <BR> 
-This software and associated documentation (if any) is furnished
-under a license and may only be used or copied in accordance
-with the terms of the license. Except as permitted by such
-license, no part of this software or documentation may be
-reproduced, stored in a retrieval system, or transmitted in any
-form or by any means without the express written consent of
-Intel Corporation.
-
-
-Module Name:
-
-  MiscBiosVendorFunction.c
-  
-Abstract: 
-
+/** @file
   BIOS vendor information boot time changes.
   Misc. subclass type 2.
   SMBIOS type 0.
 
---*/
+  Copyright (c) 2009, 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
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
 
 #include "MiscSubClassDriver.h"
 
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c
index 09bf4c8bfc..9c42ab51ec 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c
@@ -1,25 +1,17 @@
-/*++
-
-Copyright (c) 2009, Intel Corporation. All rights reserved. <BR> 
-This software and associated documentation (if any) is furnished
-under a license and may only be used or copied in accordance
-with the terms of the license. Except as permitted by such
-license, no part of this software or documentation may be
-reproduced, stored in a retrieval system, or transmitted in any
-form or by any means without the express written consent of
-Intel Corporation.
-
-
-Module Name:
-
-  MiscBootInformationFunction.c
-  
-Abstract: 
-
+/** @file
   boot information boot time changes.
   SMBIOS type 32.
 
---*/
+  Copyright (c) 2009, 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
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
 
 #include "MiscSubClassDriver.h"
 
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c
index 31a2e90a62..0483aaf14f 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c
@@ -1,25 +1,17 @@
-/*++
-
-Copyright (c) 2009, Intel Corporation. All rights reserved. <BR> 
-This software and associated documentation (if any) is furnished
-under a license and may only be used or copied in accordance
-with the terms of the license. Except as permitted by such
-license, no part of this software or documentation may be
-reproduced, stored in a retrieval system, or transmitted in any
-form or by any means without the express written consent of
-Intel Corporation.
-
-
-Module Name:
-
-  MiscChassisManufacturerFunction.c
-  
-Abstract: 
-
+/** @file
   Chassis manufacturer information boot time changes.
   SMBIOS type 3.
 
---*/
+  Copyright (c) 2009, 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
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
 
 #include "MiscSubClassDriver.h"
 
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c
index 405437634e..77141e1a9d 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c
@@ -1,25 +1,17 @@
-/*++
- 
-Copyright (c) 2009, Intel Corporation. All rights reserved. <BR> 
-This software and associated documentation (if any) is furnished
-under a license and may only be used or copied in accordance
-with the terms of the license. Except as permitted by such
-license, no part of this software or documentation may be
-reproduced, stored in a retrieval system, or transmitted in any
-form or by any means without the express written consent of
-Intel Corporation.
-
-
-Module Name:
-
-  MiscNumberOfInstallableLanguagesFunction.c
-  
-Abstract: 
-
+/** @file
   This driver parses the mSmbiosMiscDataTable structure and reports
   any generated data.
 
---*/
+  Copyright (c) 2009, 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
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
 
 #include "MiscSubClassDriver.h"
 /*++
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c
index 6abe9d2b7b..153a0a2a02 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c
@@ -1,25 +1,17 @@
-/*++
-
-Copyright (c) 2009, Intel Corporation. All rights reserved. <BR> 
-This software and associated documentation (if any) is furnished
-under a license and may only be used or copied in accordance
-with the terms of the license. Except as permitted by such
-license, no part of this software or documentation may be
-reproduced, stored in a retrieval system, or transmitted in any
-form or by any means without the express written consent of
-Intel Corporation.
-
-Module Name:
-
-  MiscOemStringFunction.c
-  
-Abstract: 
-
+/** @file
   boot information boot time changes.
   SMBIOS type 11.
 
---*/
+  Copyright (c) 2009, 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
+  http://opensource.org/licenses/bsd-license.php
 
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
 
 #include "MiscSubClassDriver.h"
 /**
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c
index ccfd5cfcf6..ba183aa23f 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c
@@ -1,25 +1,17 @@
-/*++
-
-Copyright (c) 2009, Intel Corporation. All rights reserved. <BR> 
-This software and associated documentation (if any) is furnished
-under a license and may only be used or copied in accordance
-with the terms of the license. Except as permitted by such
-license, no part of this software or documentation may be
-reproduced, stored in a retrieval system, or transmitted in any
-form or by any means without the express written consent of
-Intel Corporation.
-
-Module Name:
-
-  MiscResetCapabilitiesFunction.c
-  
-Abstract: 
-
+/** @file
   ResetCapabilities.
   SMBIOS type 23.
 
---*/
+  Copyright (c) 2009, 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
+  http://opensource.org/licenses/bsd-license.php
 
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
 
 #include "MiscSubClassDriver.h"
 /**
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c
index 512767f89e..5672ded83b 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c
@@ -1,24 +1,17 @@
-/*++
-
-Copyright (c) 2009, Intel Corporation. All rights reserved. <BR> 
-This software and associated documentation (if any) is furnished
-under a license and may only be used or copied in accordance
-with the terms of the license. Except as permitted by such
-license, no part of this software or documentation may be
-reproduced, stored in a retrieval system, or transmitted in any
-form or by any means without the express written consent of
-Intel Corporation.
-
-Module Name:
-
-  MiscResetCapabilitiesFunction.c
-  
-Abstract: 
-
+/** @file
   ResetCapabilities.
   SMBIOS type 23.
 
---*/
+  Copyright (c) 2009, 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
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
 
 #include "MiscSubClassDriver.h"
 /**
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c
index 8731b75070..4e6f52c6cc 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c
@@ -1,25 +1,17 @@
-/*++
- 
-Copyright (c) 2009, Intel Corporation. All rights reserved. <BR> 
-This software and associated documentation (if any) is furnished
-under a license and may only be used or copied in accordance
-with the terms of the license. Except as permitted by such
-license, no part of this software or documentation may be
-reproduced, stored in a retrieval system, or transmitted in any
-form or by any means without the express written consent of
-Intel Corporation.
-
-
-Module Name:
-
-  MiscSystemOptionStringFunction.c
-  
-Abstract: 
-
+/** @file
   BIOS system option string boot time changes.
   SMBIOS type 12.
 
---*/
+  Copyright (c) 2009, 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
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
 
 #include "MiscSubClassDriver.h"
 
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
index b3463fad4a..fc7b2b7d98 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
@@ -1,25 +1,17 @@
-/*++
-
-Copyright (c) 2009, Intel Corporation. All rights reserved. <BR> 
-This software and associated documentation (if any) is furnished
-under a license and may only be used or copied in accordance
-with the terms of the license. Except as permitted by such
-license, no part of this software or documentation may be
-reproduced, stored in a retrieval system, or transmitted in any
-form or by any means without the express written consent of
-Intel Corporation.
-
-
-Module Name:
-
-  MiscSystemSlotDesignatorFunction.c
-  
-Abstract: 
-
+/** @file
   BIOS system slot designator information boot time changes.
   SMBIOS type 9.
 
---*/
+  Copyright (c) 2009, 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
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
 
 #include "MiscSubClassDriver.h"
 /**