diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
index 0e7a9d496e..2153b20896 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
@@ -21,8 +21,6 @@ Abstract:
 
 #include "CapsuleService.h"
 
-extern EFI_GUID gEfiCapsuleGuid;
-
 EFI_STATUS
 EFIAPI
 UpdateCapsule (
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.h b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.h
index c5ff6c79c4..c57fe5172e 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.h
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.h
@@ -1,13 +1,13 @@
 /*++
 
-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.             
+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:
 
@@ -24,12 +24,12 @@ Abstract:
 
 #include <Common/CapsuleName.h>
 
-
+extern EFI_GUID gEfiCapsuleGuid;
 
 EFI_STATUS
 EFIAPI
 UpdateCapsule(
-  IN UEFI_CAPSULE_HEADER     **CapsuleHeaderArray,
+  IN UEFI_CAPSULE_HEADER    **CapsuleHeaderArray,
   IN UINTN                   CapsuleCount,
   IN EFI_PHYSICAL_ADDRESS    ScatterGatherList OPTIONAL
   );