diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h
index 0a04edc672..868943a6d2 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h
@@ -1,4 +1,4 @@
-/*++
+/** @file
 
 Copyright (c) 2006 - 2007, Intel Corporation
 All rights reserved. This program and the accompanying materials
@@ -21,7 +21,7 @@ Abstract:
 
 Revision History
 
---*/
+**/
 
 #ifndef _EFI_PCI_LIB_H
 #define _EFI_PCI_LIB_H
diff --git a/IntelFrameworkModulePkg/Include/Guid/CustomDecompress.h b/IntelFrameworkModulePkg/Include/Guid/CustomDecompress.h
index 9d0c39459e..c03524e02b 100644
--- a/IntelFrameworkModulePkg/Include/Guid/CustomDecompress.h
+++ b/IntelFrameworkModulePkg/Include/Guid/CustomDecompress.h
@@ -1,4 +1,4 @@
-/*++
+/** @file
 
 Copyright (c) 2006 - 2007, Intel Corporation
 All rights reserved. This program and the accompanying materials
@@ -17,7 +17,7 @@ Abstract:
 
   Custom decompress Guid definitions
 
---*/
+**/
 
 #ifndef __EFI_CUSTOM_DECOMPRESS_GUID_H__
 #define __EFI_CUSTOM_DECOMPRESS_GUID_H__
diff --git a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg.c b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg.c
index 361f5be40b..2162b63557 100644
--- a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg.c
+++ b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg.c
@@ -1,4 +1,4 @@
-/*++
+/** @file
 
   Copyright (c) 2006 - 2007, Intel Corporation
   All rights reserved. This program and the accompanying materials
@@ -21,7 +21,7 @@ Abstract:
 
 Revision History
 
---*/
+**/
 
 #include "PciCfgInternal.h"
 
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
index 429e760a2f..82d253606d 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
@@ -1,4 +1,4 @@
-/*++
+/** @file
 
   Copyright (c) 2006, Intel Corporation
   All rights reserved. This program and the accompanying materials
@@ -9,7 +9,7 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
---*/
+**/
 
 #ifndef __DXE_STATUS_CODE_H__
 #define __DXE_STATUS_CODE_H__
diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
index 0b9fa29bdb..8535a3fd02 100644
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
@@ -1,4 +1,4 @@
-/*++
+/** @file
 
 Copyright (c) 2006 - 2008 Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
@@ -16,7 +16,7 @@ Abstract:
 
   Framework PEIM to provide the Variable functionality
 
---*/
+**/
 
 
 #include "Variable.h"
diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
index 0e37be5292..b5e8a35681 100644
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
@@ -1,4 +1,4 @@
-/*++
+/** @file
 
 Copyright (c) 2006 - 2007, Intel Corporation
 All rights reserved. This program and the accompanying materials
@@ -17,7 +17,7 @@ Abstract:
 
   Tiano PEIM to provide the variable functionality
 
---*/
+**/
 
 #ifndef _PEI_VARIABLE_H
 #define _PEI_VARIABLE_H
diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/VariableWorker.c b/IntelFrameworkModulePkg/Universal/VariablePei/VariableWorker.c
index 1a49ee8c98..6d620112ae 100644
--- a/IntelFrameworkModulePkg/Universal/VariablePei/VariableWorker.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/VariableWorker.c
@@ -1,4 +1,4 @@
-/*++
+/** @file
 
 Copyright (c) 2007, Intel Corporation
 All rights reserved. This program and the accompanying materials
@@ -17,7 +17,7 @@ Abstract:
 
   Framework PEIM to provide the Variable functionality
 
---*/
+**/
 
 #include <Variable.h>