diff --git a/plat/hisilicon/hikey/hikey_private.h b/plat/hisilicon/hikey/hikey_private.h
index e6d109a..ca1baa3 100644
--- a/plat/hisilicon/hikey/hikey_private.h
+++ b/plat/hisilicon/hikey/hikey_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HIKEY_PRIVATE_H__
-#define __HIKEY_PRIVATE_H__
+#ifndef HIKEY_PRIVATE_H
+#define HIKEY_PRIVATE_H
 
 #include <bl_common.h>
 
@@ -72,4 +72,4 @@
 
 void init_acpu_dvfs(void);
 
-#endif /* __HIKEY_PRIVATE_H__ */
+#endif /* HIKEY_PRIVATE_H */
diff --git a/plat/hisilicon/hikey/include/hi6220.h b/plat/hisilicon/hikey/include/hi6220.h
index fe7720a..f67ee5c 100644
--- a/plat/hisilicon/hikey/include/hi6220.h
+++ b/plat/hisilicon/hikey/include/hi6220.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6220_H__
-#define __HI6220_H__
+#ifndef HI6220_H
+#define HI6220_H
 
 #include <hi6220_regs_acpu.h>
 #include <hi6220_regs_ao.h>
@@ -74,4 +74,4 @@
 #define GPIO18_BASE				0xF702E000
 #define GPIO19_BASE				0xF702F000
 
-#endif	/* __HI6220_H__ */
+#endif /* HI6220_H */
diff --git a/plat/hisilicon/hikey/include/hi6220_regs_acpu.h b/plat/hisilicon/hikey/include/hi6220_regs_acpu.h
index dde9e65..a43db68 100644
--- a/plat/hisilicon/hikey/include/hi6220_regs_acpu.h
+++ b/plat/hisilicon/hikey/include/hi6220_regs_acpu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6220_REGS_ACPU_H__
-#define __HI6220_REGS_ACPU_H__
+#ifndef HI6220_REGS_ACPU_H
+#define HI6220_REGS_ACPU_H
 
 #define ACPU_CTRL_BASE				0xF6504000
 
@@ -297,4 +297,4 @@
 	 (0x1 << ACPU_SC_VD_CTRL_TUNE_EN_INT_SHIFT) |		\
 	 (0x1 << ACPU_SC_VD_CTRL_TUNE_EN_DIF_SHIFT))
 
-#endif /* __HI6220_REGS_ACPU_H__ */
+#endif /* HI6220_REGS_ACPU_H */
diff --git a/plat/hisilicon/hikey/include/hi6220_regs_ao.h b/plat/hisilicon/hikey/include/hi6220_regs_ao.h
index 79a5404..132f33c 100644
--- a/plat/hisilicon/hikey/include/hi6220_regs_ao.h
+++ b/plat/hisilicon/hikey/include/hi6220_regs_ao.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6220_AO_H__
-#define __HI6220_AO_H__
+#ifndef HI6220_REGS_AO_H
+#define HI6220_REGS_AO_H
 
 #define AO_CTRL_BASE				0xF7800000
 
@@ -331,4 +331,4 @@
 #define PCLK_TIMER1						(1 << 16)
 #define PCLK_TIMER0						(1 << 15)
 
-#endif /* __HI6220_AO_H__ */
+#endif /* HI6220_REGS_AO_H */
diff --git a/plat/hisilicon/hikey/include/hi6220_regs_peri.h b/plat/hisilicon/hikey/include/hi6220_regs_peri.h
index d2c0460..8711ae4 100644
--- a/plat/hisilicon/hikey/include/hi6220_regs_peri.h
+++ b/plat/hisilicon/hikey/include/hi6220_regs_peri.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6220_PERI_H__
-#define __HI6220_PERI_H__
+#ifndef HI6220_REGS_PERI_H
+#define HI6220_REGS_PERI_H
 
 #define PERI_BASE				0xF7030000
 
@@ -377,4 +377,4 @@
 #define PERI_RST8_DDRPACK_APB			(1 << 14)
 #define PERI_RST8_DDRT				(1 << 17)
 
-#endif /* __HI6220_PERI_H__ */
+#endif /* HI6220_REGS_PERI_H */
diff --git a/plat/hisilicon/hikey/include/hi6220_regs_pin.h b/plat/hisilicon/hikey/include/hi6220_regs_pin.h
index 7de4c3c..05620ea 100644
--- a/plat/hisilicon/hikey/include/hi6220_regs_pin.h
+++ b/plat/hisilicon/hikey/include/hi6220_regs_pin.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6220_PIN_H__
-#define __HI6220_PIN_H__
+#ifndef HI6220_REGS_PIN_H
+#define HI6220_REGS_PIN_H
 
 #define IOMG_BASE				0xF7010000
 
@@ -40,4 +40,4 @@
 #define IOCG_PULLDOWN				(1 << 1)
 #define IOCG_PULLUP				(1 << 0)
 
-#endif	/* __HI6220_PIN_H__ */
+#endif /* HI6220_REGS_PIN_H */
diff --git a/plat/hisilicon/hikey/include/hi6220_regs_pmctrl.h b/plat/hisilicon/hikey/include/hi6220_regs_pmctrl.h
index dc09b20..404405b 100644
--- a/plat/hisilicon/hikey/include/hi6220_regs_pmctrl.h
+++ b/plat/hisilicon/hikey/include/hi6220_regs_pmctrl.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6220_REGS_PMCTRL_H__
-#define __HI6220_REGS_PMCTRL_H__
+#ifndef HI6220_REGS_PMCTRL_H
+#define HI6220_REGS_PMCTRL_H
 
 #define PMCTRL_BASE				0xF7032000
 
@@ -98,4 +98,4 @@
 #define SOC_PMCTRL_ACPUSYSPLLCFG_acpu_syspll_clken_stat_START   (20)
 #define SOC_PMCTRL_ACPUSYSPLLCFG_acpu_syspll_clken_stat_END     (20)
 
-#endif /* __HI6220_REGS_PMCTRL_H__ */
+#endif /* HI6220_REGS_PMCTRL_H */
diff --git a/plat/hisilicon/hikey/include/hi6553.h b/plat/hisilicon/hikey/include/hi6553.h
index a80d36d..55ce91c 100644
--- a/plat/hisilicon/hikey/include/hi6553.h
+++ b/plat/hisilicon/hikey/include/hi6553.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6553_H__
-#define __HI6553_H__
+#ifndef HI6553_H
+#define HI6553_H
 
 #include <hi6220.h>
 #include <mmio.h>
@@ -78,4 +78,4 @@
 #define PMU_HI6552_V300				0x30
 #define PMU_HI6552_V310				0x31
 
-#endif	/* __HI6553_H__ */
+#endif /* HI6553_H */
diff --git a/plat/hisilicon/hikey/include/hikey_def.h b/plat/hisilicon/hikey/include/hikey_def.h
index deb375d..b9679f5 100644
--- a/plat/hisilicon/hikey/include/hikey_def.h
+++ b/plat/hisilicon/hikey/include/hikey_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HIKEY_DEF_H__
-#define __HIKEY_DEF_H__
+#ifndef HIKEY_DEF_H
+#define HIKEY_DEF_H
 
 /* Always assume DDR is 1GB size. */
 #define DDR_BASE			0x0
@@ -104,4 +104,4 @@
 #define IRQ_SEC_SGI_7				15
 #define IRQ_SEC_SGI_8				16
 
-#endif /* __HIKEY_DEF_H__ */
+#endif /* HIKEY_DEF_H */
diff --git a/plat/hisilicon/hikey/include/hikey_layout.h b/plat/hisilicon/hikey/include/hikey_layout.h
index acc7ad6..a87648e 100644
--- a/plat/hisilicon/hikey/include/hikey_layout.h
+++ b/plat/hisilicon/hikey/include/hikey_layout.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HIKEY_LAYOUT_H
-#define __HIKEY_LAYOUT_H
+#ifndef HIKEY_LAYOUT_H
+#define HIKEY_LAYOUT_H
 
 /*
  * Platform memory map related constants
@@ -119,4 +119,4 @@
 #endif /* SPD_none */
 #endif
 
-#endif /* !__HIKEY_LAYOUT_H */
+#endif /* HIKEY_LAYOUT_H */
diff --git a/plat/hisilicon/hikey/include/hisi_ipc.h b/plat/hisilicon/hikey/include/hisi_ipc.h
index b20742f..b0c0ae8 100644
--- a/plat/hisilicon/hikey/include/hisi_ipc.h
+++ b/plat/hisilicon/hikey/include/hisi_ipc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HISI_IPC_H__
-#define __HISI_IPC_H__
+#ifndef HISI_IPC_H
+#define HISI_IPC_H
 
 #define HISI_IPC_CORE_ACPU		0x0
 
@@ -43,4 +43,4 @@
 void hisi_ipc_psci_system_off(void);
 int hisi_ipc_init(void);
 
-#endif	/* __HISI_IPC_H__ */
+#endif /* HISI_IPC_H */
diff --git a/plat/hisilicon/hikey/include/hisi_mcu.h b/plat/hisilicon/hikey/include/hisi_mcu.h
index f5c6ed0..731c51a 100644
--- a/plat/hisilicon/hikey/include/hisi_mcu.h
+++ b/plat/hisilicon/hikey/include/hisi_mcu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef	__HISI_MCU_H__
-#define	__HISI_MCU_H__
+#ifndef HISI_MCU_H
+#define HISI_MCU_H
 
 #include <stdint.h>
 
@@ -13,4 +13,4 @@
 extern void hisi_mcu_start_run(void);
 extern int hisi_mcu_load_image(uintptr_t image_base, uint32_t image_size);
 
-#endif	/* __HISI_MCU_H__ */
+#endif /* HISI_MCU_H */
diff --git a/plat/hisilicon/hikey/include/hisi_pwrc.h b/plat/hisilicon/hikey/include/hisi_pwrc.h
index cffe70e..f1cc297 100644
--- a/plat/hisilicon/hikey/include/hisi_pwrc.h
+++ b/plat/hisilicon/hikey/include/hisi_pwrc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HISI_PWRC_H__
-#define __HISI_PWRC_H__
+#ifndef HISI_PWRC_H
+#define HISI_PWRC_H
 
 #ifndef __ASSEMBLY__
 
@@ -19,4 +19,4 @@
 
 #endif /*__ASSEMBLY__*/
 
-#endif /* __HISI_PWRC_H__ */
+#endif /* HISI_PWRC_H */
diff --git a/plat/hisilicon/hikey/include/hisi_sip_svc.h b/plat/hisilicon/hikey/include/hisi_sip_svc.h
index 662b6cc..a1fad7a 100644
--- a/plat/hisilicon/hikey/include/hisi_sip_svc.h
+++ b/plat/hisilicon/hikey/include/hisi_sip_svc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HISI_SIP_SVC_H__
-#define __HISI_SIP_SVC_H__
+#ifndef HISI_SIP_SVC_H
+#define HISI_SIP_SVC_H
 
 /* SMC function IDs for SiP Service queries */
 
@@ -18,4 +18,4 @@
 #define HISI_SIP_SVC_VERSION_MAJOR		0x0
 #define HISI_SIP_SVC_VERSION_MINOR		0x1
 
-#endif /* __ARM_SIP_SVC_H__ */
+#endif /* HISI_SIP_SVC_H */
diff --git a/plat/hisilicon/hikey/include/hisi_sram_map.h b/plat/hisilicon/hikey/include/hisi_sram_map.h
index ed90c7b..f93e418 100644
--- a/plat/hisilicon/hikey/include/hisi_sram_map.h
+++ b/plat/hisilicon/hikey/include/hisi_sram_map.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HISI_SRAM_MAP_H__
-#define __HISI_SRAM_MAP_H__
+#ifndef HISI_SRAM_MAP_H
+#define HISI_SRAM_MAP_H
 
 /*
  * SRAM Memory Region Layout
@@ -324,4 +324,4 @@
 
 #define PWRCTRL_AXI_RESERVED_ADDR		(ACPU_MASTER_CORE_STATE_ADDR + ACPU_MASTER_CORE_STATE_SIZE)
 
-#endif /* __HISI_SRAM_MAP_H__ */
+#endif /* HISI_SRAM_MAP_H */
diff --git a/plat/hisilicon/hikey/include/plat_macros.S b/plat/hisilicon/hikey/include/plat_macros.S
index fda0e39..de38bd5 100644
--- a/plat/hisilicon/hikey/include/plat_macros.S
+++ b/plat/hisilicon/hikey/include/plat_macros.S
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 #include <cci.h>
 #include <gicv2.h>
@@ -75,4 +75,4 @@
 	bl	str_in_crash_buf_print
 .endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */