diff --git a/plat/renesas/rcar/include/plat.ld.S b/plat/renesas/rcar/include/plat.ld.S
index 90c132d..0461141 100644
--- a/plat/renesas/rcar/include/plat.ld.S
+++ b/plat/renesas/rcar/include/plat.ld.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __RCAR_PLAT_LD_S__
-#define __RCAR_PLAT_LD_S__
+#ifndef RCAR_PLAT_LD_S
+#define RCAR_PLAT_LD_S
 
 #include <platform_def.h>
 #include <xlat_tables_defs.h>
@@ -33,4 +33,4 @@
 
 }
 
-#endif /* __RCAR_PLAT_LD_S__ */
+#endif /* RCAR_PLAT_LD_S */
diff --git a/plat/renesas/rcar/include/platform_def.h b/plat/renesas/rcar/include/platform_def.h
index d38eebc..fa6e474 100644
--- a/plat/renesas/rcar/include/platform_def.h
+++ b/plat/renesas/rcar/include/platform_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PLATFORM_DEF_H__
-#define PLATFORM_DEF_H__
+#ifndef PLATFORM_DEF_H
+#define PLATFORM_DEF_H
 
 #include <arch.h>
 #ifndef __ASSEMBLY__
@@ -186,4 +186,4 @@
 #define PLAT_PCPU_DATA_SIZE	(2)
 #endif
 
-#endif
+#endif /* PLATFORM_DEF_H */
diff --git a/plat/renesas/rcar/include/rcar_def.h b/plat/renesas/rcar/include/rcar_def.h
index eb195b4..61b95a4 100644
--- a/plat/renesas/rcar/include/rcar_def.h
+++ b/plat/renesas/rcar/include/rcar_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef RCAR_DEF_H__
-#define RCAR_DEF_H__
+#ifndef RCAR_DEF_H
+#define RCAR_DEF_H
 
 #include <tbbr_img_def.h>
 #include <utils_def.h>
@@ -290,4 +290,4 @@
 #define	LOSSY_FMT2			LOSSY_FMT_YUV422INTLV
 #define	LOSSY_ENA_DIS2			LOSSY_DISABLE
 
-#endif
+#endif /* RCAR_DEF_H */
diff --git a/plat/renesas/rcar/include/rcar_private.h b/plat/renesas/rcar/include/rcar_private.h
index dd35826..e90fa08 100644
--- a/plat/renesas/rcar/include/rcar_private.h
+++ b/plat/renesas/rcar/include/rcar_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef RCAR_PRIVATE_H__
-#define RCAR_PRIVATE_H__
+#ifndef RCAR_PRIVATE_H
+#define RCAR_PRIVATE_H
 
 #include <bakery_lock.h>
 #include <bl_common.h>
@@ -98,4 +98,4 @@
 void mstpcr_write(uint32_t mstpcr, uint32_t mstpsr, uint32_t target_bit);
 void cpg_write(uintptr_t regadr, uint32_t regval);
 
-#endif
+#endif /* RCAR_PRIVATE_H */
diff --git a/plat/renesas/rcar/include/rcar_version.h b/plat/renesas/rcar/include/rcar_version.h
index 9a9ad9c..5ab8efc 100644
--- a/plat/renesas/rcar/include/rcar_version.h
+++ b/plat/renesas/rcar/include/rcar_version.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef	RCAR_VERSION_H__
-#define	RCAR_VERSION_H__
+#ifndef RCAR_VERSION_H
+#define RCAR_VERSION_H
 
 #include <arch_helpers.h>
 
@@ -14,4 +14,4 @@
 
 extern const uint8_t version_of_renesas[VERSION_OF_RENESAS_MAXLEN];
 
-#endif
+#endif /* RCAR_VERSION_H */
diff --git a/plat/renesas/rcar/include/registers/axi_registers.h b/plat/renesas/rcar/include/registers/axi_registers.h
index 1d8f41d..36cd58b 100644
--- a/plat/renesas/rcar/include/registers/axi_registers.h
+++ b/plat/renesas/rcar/include/registers/axi_registers.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef	AXI_REGISTER_H__
-#define	AXI_REGISTER_H__
+#ifndef AXI_REGISTERS_H
+#define AXI_REGISTERS_H
 
 /* AXI registers */
 
@@ -243,4 +243,4 @@
 /* EDC edc interrupt enable 1 */
 #define	EDC_EDCINTEN1	(EDC_BASE + 0x0044U)
 
-#endif
+#endif /* AXI_REGISTERS_H */
diff --git a/plat/renesas/rcar/include/registers/cpg_registers.h b/plat/renesas/rcar/include/registers/cpg_registers.h
index bd6e557..0d698d9 100644
--- a/plat/renesas/rcar/include/registers/cpg_registers.h
+++ b/plat/renesas/rcar/include/registers/cpg_registers.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef	CPG_REGISTER_H__
-#define	CPG_REGISTER_H__
+#ifndef CPG_REGISTERS_H
+#define CPG_REGISTERS_H
 
 /* CPG base address */
 #define	CPG_BASE	(0xE6150000U)
@@ -133,4 +133,4 @@
 /* System Module Stop Control Register 11 */
 #define	SMSTPCR11	(CPG_BASE + 0x099CU)
 
-#endif
+#endif /* CPG_REGISTERS_H */
diff --git a/plat/renesas/rcar/include/registers/lifec_registers.h b/plat/renesas/rcar/include/registers/lifec_registers.h
index b331be3..de78760 100644
--- a/plat/renesas/rcar/include/registers/lifec_registers.h
+++ b/plat/renesas/rcar/include/registers/lifec_registers.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef	LIFEC_REGISTER_H__
-#define	LIFEC_REGISTER_H__
+#ifndef LIFEC_REGISTERS_H
+#define LIFEC_REGISTERS_H
 
 #define	LIFEC_SEC_BASE	(0xE6110000U)
 
@@ -141,4 +141,4 @@
 #define	SAFE_READONLY14	(LIFEC_SAFE_BASE + 0x0210U)
 #define	SAFE_READONLY15	(LIFEC_SAFE_BASE + 0x0214U)
 
-#endif
+#endif /* LIFEC_REGISTERS_H */