diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/BaseLib.h
index d08a2f0aac..25ee996775 100644
--- a/MdePkg/Include/Library/BaseLib.h
+++ b/MdePkg/Include/Library/BaseLib.h
@@ -129,17 +129,17 @@ typedef struct {
 #if defined (MDE_CPU_ARM)
 
 typedef struct {
-	UINT32		R3;  ///< Copy of R13
-	UINT32		R4;
-	UINT32		R5;
-	UINT32		R6;
-	UINT32		R7;
-	UINT32		R8;
-	UINT32		R9;
-	UINT32		R10;
-	UINT32		R11;
-	UINT32		R12;
-	UINT32		R14;
+  UINT32    R3;  ///< Copy of R13
+  UINT32    R4;
+  UINT32    R5;
+  UINT32    R6;
+  UINT32    R7;
+  UINT32    R8;
+  UINT32    R9;
+  UINT32    R10;
+  UINT32    R11;
+  UINT32    R12;
+  UINT32    R14;
 } BASE_LIBRARY_JUMP_BUFFER;
 
 #define BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT 4
diff --git a/MdePkg/Include/Protocol/HiiConfigRouting.h b/MdePkg/Include/Protocol/HiiConfigRouting.h
index 3cbca370f1..584e70fcec 100644
--- a/MdePkg/Include/Protocol/HiiConfigRouting.h
+++ b/MdePkg/Include/Protocol/HiiConfigRouting.h
@@ -258,7 +258,7 @@ EFI_STATUS
                                   was not found. Progress points to the
                                   'G' in "GUID" of the errant routing
                                   data. 
-  @retval EFI_DEVICE_ERROR 				Block not large enough. Progress undefined.
+  @retval EFI_DEVICE_ERROR        Block not large enough. Progress undefined.
 
   @retval EFI_INVALID_PARAMETER   Encountered non <BlockName>
                                   formatted string. Block is
diff --git a/MdePkg/Include/Protocol/Mtftp6.h b/MdePkg/Include/Protocol/Mtftp6.h
index 1595ef52be..efb987e860 100644
--- a/MdePkg/Include/Protocol/Mtftp6.h
+++ b/MdePkg/Include/Protocol/Mtftp6.h
@@ -511,7 +511,7 @@ typedef
 EFI_STATUS 
 (EFIAPI *EFI_MTFTP6_CONFIGURE)(
   IN EFI_MTFTP6_PROTOCOL      *This,
-  IN EFI_MTFTP6_CONFIG_DATA	  *MtftpConfigData OPTIONAL
+  IN EFI_MTFTP6_CONFIG_DATA   *MtftpConfigData OPTIONAL
 );
 
 /**
diff --git a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
index ae559d55ce..ef73b9d433 100644
--- a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
+++ b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
@@ -68,4 +68,4 @@
 
 [LibraryClasses.IPF]
   PalLib
-  BaseLib
\ No newline at end of file
+  BaseLib
diff --git a/MdePkg/Library/BaseLib/Arm/DisableInterrupts.S b/MdePkg/Library/BaseLib/Arm/DisableInterrupts.S
index f9f4a49575..35bf9d2603 100644
--- a/MdePkg/Library/BaseLib/Arm/DisableInterrupts.S
+++ b/MdePkg/Library/BaseLib/Arm/DisableInterrupts.S
@@ -30,6 +30,6 @@
 #
 ASM_PFX(DisableInterrupts):
     mrs  R0,CPSR
-    orr  R0,R0,#0x80		@Disable IRQ interrupts
+    orr  R0,R0,#0x80    @Disable IRQ interrupts
     msr  CPSR_c,R0
     bx   LR
diff --git a/MdePkg/Library/BaseLib/Arm/EnableInterrupts.S b/MdePkg/Library/BaseLib/Arm/EnableInterrupts.S
index debfb2da41..a79ac55a4a 100644
--- a/MdePkg/Library/BaseLib/Arm/EnableInterrupts.S
+++ b/MdePkg/Library/BaseLib/Arm/EnableInterrupts.S
@@ -31,6 +31,6 @@
 #
 ASM_PFX(EnableInterrupts):
     mrs  R0,CPSR
-    bic  R0,R0,#0x80		@Enable IRQ interrupts
+    bic  R0,R0,#0x80    @Enable IRQ interrupts
     msr  CPSR_c,R0
     bx   LR
diff --git a/MdePkg/Library/BaseLib/Arm/GetInterruptsState.S b/MdePkg/Library/BaseLib/Arm/GetInterruptsState.S
index f019eb6a29..9c37e05829 100644
--- a/MdePkg/Library/BaseLib/Arm/GetInterruptsState.S
+++ b/MdePkg/Library/BaseLib/Arm/GetInterruptsState.S
@@ -37,7 +37,7 @@
 #
 _GetInterruptState:
     mrs    R0, CPSR
-    tst    R0, #0x80	@Check if IRQ is enabled.
+    tst    R0, #0x80  @Check if IRQ is enabled.
     moveq  R0, #1
     movne  R0, #0
     bx     LR
diff --git a/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm b/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm
index 965a225191..3743291d13 100644
--- a/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm
+++ b/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm
@@ -12,10 +12,10 @@
 ;
 ;------------------------------------------------------------------------------
 
-	EXPORT	SetJump
-	EXPORT	InternalLongJump
+  EXPORT  SetJump
+  EXPORT  InternalLongJump
 
-	AREA	BaseLib, CODE, READONLY
+  AREA  BaseLib, CODE, READONLY
 
 ;/**
 ;  Saves the current CPU context that can be restored with a call to LongJump() and returns 0.;
diff --git a/MdePkg/Library/BaseLib/Arm/SwitchStack.asm b/MdePkg/Library/BaseLib/Arm/SwitchStack.asm
index 9baa4099b0..71e8ab3d7d 100644
--- a/MdePkg/Library/BaseLib/Arm/SwitchStack.asm
+++ b/MdePkg/Library/BaseLib/Arm/SwitchStack.asm
@@ -11,11 +11,11 @@
 ; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ;
 ;------------------------------------------------------------------------------
-	
+  
     EXPORT InternalSwitchStackAsm
             
     AREA   Switch_Stack, CODE, READONLY
-	
+  
 ;/**
 ;  This allows the caller to switch the stack and goes to the new entry point
 ;
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index 197e1dba00..83850f7fc1 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -548,7 +548,7 @@ PeCoffLoaderRelocateImage (
   if (ImageContext->RelocationsStripped) {
     // Applies additional environment specific actions to relocate fixups 
     // to a PE/COFF image if needed
-    PeCoffLoaderRelocateImageExtraAction (ImageContext); 	
+    PeCoffLoaderRelocateImageExtraAction (ImageContext);  
     return RETURN_SUCCESS;
   }
 
diff --git a/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf b/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
index 105a54482e..87ec6af91e 100644
--- a/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
+++ b/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
@@ -43,4 +43,4 @@
   PcdLib
 
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdUsbTransferTimeoutValue
\ No newline at end of file
+  gEfiMdePkgTokenSpaceGuid.PcdUsbTransferTimeoutValue