6 files changed, 18 insertions, 18 deletions
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
index cfc0c878a4..318020277b 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
@@ -8,8 +8,8 @@
 
 **/
 
-#ifndef __AARCH64_LIB_H__
-#define __AARCH64_LIB_H__
+#ifndef AARCH64_LIB_H_
+#define AARCH64_LIB_H_
 
 typedef VOID (*AARCH64_CACHE_OPERATION)(UINTN);
 
@@ -52,5 +52,5 @@ ArmReadIdAA64Mmfr2 (
   VOID
   );
 
-#endif // __AARCH64_LIB_H__
+#endif // AARCH64_LIB_H_
 
diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
index dcf6723b80..5a92ade2b3 100644
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
@@ -6,8 +6,8 @@
 
 **/
 
-#ifndef __ARM_V7_LIB_H__
-#define __ARM_V7_LIB_H__
+#ifndef ARM_V7_LIB_H_
+#define ARM_V7_LIB_H_
 
 #define ID_MMFR0_SHARELVL_SHIFT       12
 #define ID_MMFR0_SHARELVL_MASK       0xf
@@ -64,5 +64,5 @@ ArmReadIdPfr1 (
   VOID
   );
 
-#endif // __ARM_V7_LIB_H__
+#endif // ARM_V7_LIB_H_
 
diff --git a/ArmPkg/Library/ArmLib/ArmLibPrivate.h b/ArmPkg/Library/ArmLib/ArmLibPrivate.h
index 1818a1994d..5db83d620b 100644
--- a/ArmPkg/Library/ArmLib/ArmLibPrivate.h
+++ b/ArmPkg/Library/ArmLib/ArmLibPrivate.h
@@ -8,8 +8,8 @@
 
 **/
 
-#ifndef __ARM_LIB_PRIVATE_H__
-#define __ARM_LIB_PRIVATE_H__
+#ifndef ARM_LIB_PRIVATE_H_
+#define ARM_LIB_PRIVATE_H_
 
 #define CACHE_SIZE_4_KB             (3UL)
 #define CACHE_SIZE_8_KB             (4UL)
@@ -186,4 +186,4 @@ ReadCLIDR (
   VOID
   );
 
-#endif // __ARM_LIB_PRIVATE_H__
+#endif // ARM_LIB_PRIVATE_H_
diff --git a/ArmPkg/Library/OpteeLib/OpteeSmc.h b/ArmPkg/Library/OpteeLib/OpteeSmc.h
index 62319d718d..b760ec8f82 100644
--- a/ArmPkg/Library/OpteeLib/OpteeSmc.h
+++ b/ArmPkg/Library/OpteeLib/OpteeSmc.h
@@ -7,8 +7,8 @@
 
 **/
 
-#ifndef _OPTEE_SMC_H_
-#define _OPTEE_SMC_H_
+#ifndef OPTEE_SMC_H_
+#define OPTEE_SMC_H_
 
 /* Returned in Arg0 only from Trusted OS functions */
 #define OPTEE_SMC_RETURN_OK                     0x0
@@ -47,4 +47,4 @@ typedef struct {
   UINT8   Data4[8];
 } RFC4122_UUID;
 
-#endif
+#endif // OPTEE_SMC_H_
diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h
index 0bb3645ddc..a40a2ff5cb 100644
--- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h
+++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h
@@ -9,8 +9,8 @@
 
 **/
 
-#ifndef _PLATFORM_BM_H_
-#define _PLATFORM_BM_H_
+#ifndef PLATFORM_BM_H_
+#define PLATFORM_BM_H_
 
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
@@ -50,4 +50,4 @@ DisableQuietBoot (
   VOID
   );
 
-#endif // _PLATFORM_BM_H_
+#endif // PLATFORM_BM_H_
diff --git a/ArmPkg/Library/SemihostLib/SemihostPrivate.h b/ArmPkg/Library/SemihostLib/SemihostPrivate.h
index 30103b04b5..8864726116 100644
--- a/ArmPkg/Library/SemihostLib/SemihostPrivate.h
+++ b/ArmPkg/Library/SemihostLib/SemihostPrivate.h
@@ -7,8 +7,8 @@
 
 **/
 
-#ifndef __SEMIHOST_PRIVATE_H__
-#define __SEMIHOST_PRIVATE_H__
+#ifndef SEMIHOST_PRIVATE_H_
+#define SEMIHOST_PRIVATE_H_
 
 typedef struct {
   CHAR8   *FileName;
@@ -209,4 +209,4 @@ GccSemihostCall (
 
 #endif // __CC_ARM
 
-#endif //__SEMIHOST_PRIVATE_H__
+#endif // SEMIHOST_PRIVATE_H_