diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
index 388b166e6e..c1a572f846 100644
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
@@ -13,8 +13,8 @@
 
 **/
 
-#ifndef _DISK_IO_H_
-#define _DISK_IO_H_
+#ifndef _DISK_IO_H
+#define _DISK_IO_H
 
 #include <Uefi.h>
 #include <Protocol/BlockIo.h>
diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h
index 469c948157..570d0194b5 100644
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h
@@ -15,6 +15,8 @@
 
 **/
 
+#ifndef _PARTITION_H 
+#define _PARTITION_H 
 
 #include <Uefi.h>
 #include <Protocol/BlockIo.h>
@@ -32,12 +34,6 @@
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DevicePathLib.h>
 
-//
-// Driver Binding Externs
-//
-extern EFI_DRIVER_BINDING_PROTOCOL gPartitionDriverBinding;
-extern EFI_COMPONENT_NAME_PROTOCOL gPartitionComponentName;
-
 #include <IndustryStandard/Mbr.h>
 #include <IndustryStandard/ElTorito.h>
 
@@ -192,3 +188,4 @@ EFI_STATUS
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath
   );
 
+#endif
diff --git a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h
index e94015d4e3..dedc14afdb 100644
--- a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h
+++ b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h
@@ -1,23 +1,16 @@
-/*++
-
-Copyright (c) 2006, 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.             
-
-Module Name:
-
-  SecurityStub.h
-
-Abstract:
-
+/** @file
   Some definitions for Security Architectural Protocol stub driver
 
---*/
+  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        
+  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.             
+
+**/
 
 #ifndef _SECURITY_STUB_ARCH_PROTOCOL_H
 #define _SECURITY_STUB_ARCH_PROTOCOL_H
@@ -41,15 +34,13 @@ SecurityStubAuthenticateState (
   IN EFI_SECURITY_ARCH_PROTOCOL          *This,
   IN UINT32                              AuthenticationStatus,
   IN  EFI_DEVICE_PATH_PROTOCOL           *File
-  )
-;
+  );
 
 EFI_STATUS
 EFIAPI
 SecurityStubInitialize (
   IN EFI_HANDLE        ImageHandle,
   IN EFI_SYSTEM_TABLE  *SystemTable
-  )
-;
+  );
 
 #endif