diff --git a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.h b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.h
index a4d887f..c0170ad 100644
--- a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.h
+++ b/plat/hisilicon/hikey960/drivers/pwrc/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
 
 #include <hi3660.h>
 #include <hi3660_crg.h>
@@ -54,4 +54,4 @@
 void hisi_powerdn_cluster(unsigned int cluster, unsigned int core);
 unsigned int hisi_test_cpu_down(unsigned int cluster, unsigned int core);
 
-#endif /* __HISI_PWRC_H__ */
+#endif /* HISI_PWRC_H */
diff --git a/plat/hisilicon/hikey960/hikey960_def.h b/plat/hisilicon/hikey960/hikey960_def.h
index fc46d71..91d0af3 100644
--- a/plat/hisilicon/hikey960/hikey960_def.h
+++ b/plat/hisilicon/hikey960/hikey960_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HIKEY960_DEF_H__
-#define __HIKEY960_DEF_H__
+#ifndef HIKEY960_DEF_H
+#define HIKEY960_DEF_H
 
 #include <common_def.h>
 #include <tbbr_img_def.h>
@@ -53,4 +53,4 @@
 #define HIKEY960_UFS_DATA_BASE		0x10000000
 #define HIKEY960_UFS_DATA_SIZE		0x0A000000	/* 160MB */
 
-#endif /* __HIKEY960_DEF_H__ */
+#endif /* HIKEY960_DEF_H */
diff --git a/plat/hisilicon/hikey960/hikey960_private.h b/plat/hisilicon/hikey960/hikey960_private.h
index e2425fc..31d3a4a 100644
--- a/plat/hisilicon/hikey960/hikey960_private.h
+++ b/plat/hisilicon/hikey960/hikey960_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HIKEY960_PRIVATE_H__
-#define __HIKEY960_PRIVATE_H__
+#ifndef HIKEY960_PRIVATE_H
+#define HIKEY960_PRIVATE_H
 
 #include <bl_common.h>
 
@@ -38,4 +38,4 @@
 void clr_ex(void);
 void nop(void);
 
-#endif /* __HIKEY960_PRIVATE_H__ */
+#endif /* HIKEY960_PRIVATE_H */
diff --git a/plat/hisilicon/hikey960/include/hi3660.h b/plat/hisilicon/hikey960/include/hi3660.h
index 61b80b0..8ce531e 100644
--- a/plat/hisilicon/hikey960/include/hi3660.h
+++ b/plat/hisilicon/hikey960/include/hi3660.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __HI3660_H__
-#define __HI3660_H__
+#ifndef HI3660_H
+#define HI3660_H
 
 #include <hi3660_crg.h>
 #include <hi3660_hkadc.h>
@@ -366,4 +366,4 @@
 /* GPIO219: PD interrupt. pull up */
 #define IOCG_AO_043_REG			(IOCG_AO_REG_BASE + 0x030)
 
-#endif  /* __HI3660_H__ */
+#endif /* HI3660_H */
diff --git a/plat/hisilicon/hikey960/include/hi3660_crg.h b/plat/hisilicon/hikey960/include/hi3660_crg.h
index db1df9e..ec587aa 100644
--- a/plat/hisilicon/hikey960/include/hi3660_crg.h
+++ b/plat/hisilicon/hikey960/include/hi3660_crg.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __HI3660_CRG_H__
-#define __HI3660_CRG_H__
+#ifndef HI3660_CRG_H
+#define HI3660_CRG_H
 
 #define CRG_REG_BASE			0xFFF35000
 
@@ -176,4 +176,4 @@
 #define SC_DIV_AO_HISE_MASK		3
 #define SC_DIV_AO_HISE(x)		((x) & 0x3)
 
-#endif	/* __HI3660_CRG_H__ */
+#endif /* HI3660_CRG_H */
diff --git a/plat/hisilicon/hikey960/include/hi3660_hkadc.h b/plat/hisilicon/hikey960/include/hi3660_hkadc.h
index 6e67114..4d2de4a 100644
--- a/plat/hisilicon/hikey960/include/hi3660_hkadc.h
+++ b/plat/hisilicon/hikey960/include/hi3660_hkadc.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __HI3660_HKADC_H__
-#define __HI3660_HKADC_H__
+#ifndef HI3660_HKADC_H
+#define HI3660_HKADC_H
 
 #define HKADC_SSI_REG_BASE			0xE82B8000
 
@@ -58,4 +58,4 @@
 #define START_DELAY_TIMEOUT			2000
 #define HKADC_WR_NUM_VALUE			4
 
-#endif /* __HI3660_HKADC_H__ */
+#endif /* HI3660_HKADC_H */
diff --git a/plat/hisilicon/hikey960/include/hi3660_mem_map.h b/plat/hisilicon/hikey960/include/hi3660_mem_map.h
index db3efaf..cadc4a4 100644
--- a/plat/hisilicon/hikey960/include/hi3660_mem_map.h
+++ b/plat/hisilicon/hikey960/include/hi3660_mem_map.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI3660_MEM_MAP__
-#define __HI3660_MEM_MAP__
+#ifndef HI3660_MEM_MAP_H
+#define HI3660_MEM_MAP_H
 
 #define HISI_DATA_HEAD_BASE		(0x89C44400)
 
@@ -17,4 +17,4 @@
 #define HISI_DATA1_BASE			(0x89C93480)
 #define HISI_DATA1_SIZE			(0x00002D00)
 
-#endif /* __HI3660_MEM_MAP__ */
+#endif /* HI3660_MEM_MAP_H */
diff --git a/plat/hisilicon/hikey960/include/hisi_ipc.h b/plat/hisilicon/hikey960/include/hisi_ipc.h
index 9dda1a5..6a97968 100644
--- a/plat/hisilicon/hikey960/include/hisi_ipc.h
+++ b/plat/hisilicon/hikey960/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
 
 enum pm_mode {
 	PM_ON = 0,
@@ -21,4 +21,4 @@
 				unsigned int cmd_id);
 int hisi_ipc_init(void);
 
-#endif /* __HISI_IPC_H__ */
+#endif /* HISI_IPC_H */
diff --git a/plat/hisilicon/hikey960/include/plat_macros.S b/plat/hisilicon/hikey960/include/plat_macros.S
index 4a2b957..3b126f6 100644
--- a/plat/hisilicon/hikey960/include/plat_macros.S
+++ b/plat/hisilicon/hikey960/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 */