diff --git a/include/services/arm_arch_svc.h b/include/services/arm_arch_svc.h
index 0d2f477..23c6f56 100644
--- a/include/services/arm_arch_svc.h
+++ b/include/services/arm_arch_svc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __ARM_ARCH_SVC_H__
-#define __ARM_ARCH_SVC_H__
+#ifndef ARM_ARCH_SVC_H
+#define ARM_ARCH_SVC_H
 
 #define SMCCC_VERSION			U(0x80000000)
 #define SMCCC_ARCH_FEATURES		U(0x80000001)
@@ -14,4 +14,4 @@
 
 #define SMCCC_ARCH_NOT_REQUIRED		-2
 
-#endif /* __ARM_ARCH_SVC_H__ */
+#endif /* ARM_ARCH_SVC_H */
diff --git a/include/services/mm_svc.h b/include/services/mm_svc.h
index 7a8a3eb..ed2b324 100644
--- a/include/services/mm_svc.h
+++ b/include/services/mm_svc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MM_SVC_H__
-#define __MM_SVC_H__
+#ifndef MM_SVC_H
+#define MM_SVC_H
 
 #include <utils_def.h>
 
@@ -28,4 +28,4 @@
 #define MM_COMMUNICATE_AARCH64		U(0xC4000041)
 #define MM_COMMUNICATE_AARCH32		U(0x84000041)
 
-#endif /* __MM_SVC_H__ */
+#endif /* MM_SVC_H */
diff --git a/include/services/secure_partition.h b/include/services/secure_partition.h
index 8b0adc8..d565e0c 100644
--- a/include/services/secure_partition.h
+++ b/include/services/secure_partition.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SECURE_PARTITION_H__
-#define __SECURE_PARTITION_H__
+#ifndef SECURE_PARTITION_H
+#define SECURE_PARTITION_H
 
 #include <stdint.h>
 #include <utils_def.h>
@@ -46,4 +46,4 @@
 	secure_partition_mp_info_t	*mp_info;
 } secure_partition_boot_info_t;
 
-#endif /* __SECURE_PARTITION_H__ */
+#endif /* SECURE_PARTITION_H */
diff --git a/include/services/spm_svc.h b/include/services/spm_svc.h
index 0200992..7a69b28 100644
--- a/include/services/spm_svc.h
+++ b/include/services/spm_svc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SPM_SVC_H__
-#define __SPM_SVC_H__
+#ifndef SPM_SVC_H
+#define SPM_SVC_H
 
 #include <utils_def.h>
 
@@ -79,4 +79,4 @@
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __SPM_SVC_H__ */
+#endif /* SPM_SVC_H */
diff --git a/include/services/std_svc.h b/include/services/std_svc.h
index 9fe70cc..b0614fb 100644
--- a/include/services/std_svc.h
+++ b/include/services/std_svc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STD_SVC_H__
-#define __STD_SVC_H__
+#ifndef STD_SVC_H
+#define STD_SVC_H
 
 /* SMC function IDs for Standard Service queries */
 
@@ -27,4 +27,4 @@
  */
 uintptr_t get_arm_std_svc_args(unsigned int svc_mask);
 
-#endif /* __STD_SVC_H__ */
+#endif /* STD_SVC_H */