diff --git a/ArmPkg/Application/LinuxLoader/LinuxFdtLoader.c b/ArmPkg/Application/LinuxLoader/LinuxFdtLoader.c
index 2e222de51b..07d0ea7b41 100644
--- a/ArmPkg/Application/LinuxLoader/LinuxFdtLoader.c
+++ b/ArmPkg/Application/LinuxLoader/LinuxFdtLoader.c
@@ -57,7 +57,7 @@ UefiMain (
       return EFI_UNSUPPORTED;
     }
 
-    // Generate the File Path Node for the Linux Kernel & Device Tree blobl
+    // Generate the File Path Node for the Linux Kernel & Device Tree blob
     DevicePathKernel = FileDevicePath (LoadedImage->DeviceHandle, LINUX_KERNEL_NAME);
     DevicePathFdt    = FileDevicePath (LoadedImage->DeviceHandle, FDT_NAME);
 
diff --git a/ArmPlatformPkg/Bds/BdsHelper.c b/ArmPlatformPkg/Bds/BdsHelper.c
index bdfaafad2c..d306eea39b 100644
--- a/ArmPlatformPkg/Bds/BdsHelper.c
+++ b/ArmPlatformPkg/Bds/BdsHelper.c
@@ -181,7 +181,7 @@ GetHIInputBoolean (
 
   while(1) {
     Print (L"[y/n] ");
-    Status = GetHIInputStr (CmdBoolean,2);
+    Status = GetHIInputStr (CmdBoolean, 2);
     if (EFI_ERROR(Status)) {
       return Status;
     } else if ((CmdBoolean[0] == L'y') || (CmdBoolean[0] == L'Y')) {
diff --git a/ArmPlatformPkg/Bds/BdsInternal.h b/ArmPlatformPkg/Bds/BdsInternal.h
index fd49d9e499..e7a83e6926 100644
--- a/ArmPlatformPkg/Bds/BdsInternal.h
+++ b/ArmPlatformPkg/Bds/BdsInternal.h
@@ -88,9 +88,9 @@ typedef enum {
 } BDS_SUPPORTED_DEVICE_TYPE;
 
 typedef struct {
-  LIST_ENTRY                  Link;
-  CHAR16                      Description[BOOT_DEVICE_DESCRIPTION_MAX];
-  EFI_DEVICE_PATH_PROTOCOL*   DevicePathProtocol;
+  LIST_ENTRY                          Link;
+  CHAR16                              Description[BOOT_DEVICE_DESCRIPTION_MAX];
+  EFI_DEVICE_PATH_PROTOCOL*           DevicePathProtocol;
   struct _BDS_LOAD_OPTION_SUPPORT*    Support;
 } BDS_SUPPORTED_DEVICE;
 
diff --git a/ArmPlatformPkg/Sec/Exception.S b/ArmPlatformPkg/Sec/Exception.S
index bdcdeff741..14e1fa8c1d 100644
--- a/ArmPlatformPkg/Sec/Exception.S
+++ b/ArmPlatformPkg/Sec/Exception.S
@@ -12,8 +12,8 @@
 #
 
 #include <AsmMacroIoLib.h>
-#include <Base.h>
 #include <AutoGen.h>
+#include "SecInternal.h"
 
 .text
 .align 5