diff --git a/bl1/bl1_private.h b/bl1/bl1_private.h
index 583b61f..ed81585 100644
--- a/bl1/bl1_private.h
+++ b/bl1/bl1_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BL1_PRIVATE_H__
-#define __BL1_PRIVATE_H__
+#ifndef BL1_PRIVATE_H
+#define BL1_PRIVATE_H
 
 #include <stdint.h>
 #include <utils_def.h>
@@ -35,4 +35,4 @@
 		void *cookie,
 		void *handle,
 		unsigned int flags);
-#endif /* __BL1_PRIVATE_H__ */
+#endif /* BL1_PRIVATE_H */
diff --git a/bl2/bl2_private.h b/bl2/bl2_private.h
index f93a179..7fd17bf 100644
--- a/bl2/bl2_private.h
+++ b/bl2/bl2_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BL2_PRIVATE_H__
-#define __BL2_PRIVATE_H__
+#ifndef BL2_PRIVATE_H
+#define BL2_PRIVATE_H
 
 #if BL2_IN_XIP_MEM
 /*******************************************************************************
@@ -33,4 +33,4 @@
 struct entry_point_info *bl2_load_images(void);
 void bl2_run_next_image(const struct entry_point_info *bl_ep_info);
 
-#endif /* __BL2_PRIVATE_H__ */
+#endif /* BL2_PRIVATE_H */
diff --git a/bl32/sp_min/sp_min_private.h b/bl32/sp_min/sp_min_private.h
index 1836af9..6b5d792 100644
--- a/bl32/sp_min/sp_min_private.h
+++ b/bl32/sp_min/sp_min_private.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SP_MIN_H__
-#define __SP_MIN_H__
+#ifndef SP_MIN_PRIVATE_H
+#define SP_MIN_PRIVATE_H
 
 void sp_min_warm_entrypoint(void);
 void sp_min_main(void);
 void sp_min_warm_boot(void);
 void sp_min_fiq(void);
 
-#endif /* __SP_MIN_H__ */
+#endif /* SP_MIN_PRIVATE_H */
diff --git a/bl32/tsp/tsp_private.h b/bl32/tsp/tsp_private.h
index dd65a5f..b697fa4 100644
--- a/bl32/tsp/tsp_private.h
+++ b/bl32/tsp/tsp_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TSP_PRIVATE_H__
-#define __TSP_PRIVATE_H__
+#ifndef TSP_PRIVATE_H
+#define TSP_PRIVATE_H
 
 /* Definitions to help the assembler access the SMC/ERET args structure */
 #define TSP_ARGS_SIZE		0x40
@@ -149,5 +149,4 @@
 uint64_t tsp_main(void);
 #endif /* __ASSEMBLY__ */
 
-#endif /* __TSP_PRIVATE_H__ */
-
+#endif /* TSP_PRIVATE_H */
diff --git a/drivers/arm/ccn/ccn_private.h b/drivers/arm/ccn/ccn_private.h
index c17c274..8a936d9 100644
--- a/drivers/arm/ccn/ccn_private.h
+++ b/drivers/arm/ccn/ccn_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CCN_PRIVATE_H__
-#define __CCN_PRIVATE_H__
+#ifndef CCN_PRIVATE_H
+#define CCN_PRIVATE_H
 
 /*
  * A CCN implementation can have a maximum of 64 Request nodes with node IDs
@@ -230,4 +230,4 @@
 #define CCN_GET_HN_NODEID_MAP(periphbase, mn_hn_id_reg_offset)		\
 	ccn_reg_read(periphbase, MN_REGION_ID, mn_hn_id_reg_offset)
 
-#endif /* __CCN_PRIVATE_H__ */
+#endif /* CCN_PRIVATE_H */
diff --git a/drivers/arm/gic/common/gic_common_private.h b/drivers/arm/gic/common/gic_common_private.h
index fa34e47..9d9e8c7 100644
--- a/drivers/arm/gic/common/gic_common_private.h
+++ b/drivers/arm/gic/common/gic_common_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef GIC_COMMON_PRIVATE_H_
-#define GIC_COMMON_PRIVATE_H_
+#ifndef GIC_COMMON_PRIVATE_H
+#define GIC_COMMON_PRIVATE_H
 
 #include <gic_common.h>
 #include <mmio.h>
@@ -85,4 +85,4 @@
 void gicd_set_ipriorityr(uintptr_t base, unsigned int id, unsigned int pri);
 void gicd_set_icfgr(uintptr_t base, unsigned int id, unsigned int cfg);
 
-#endif /* GIC_COMMON_PRIVATE_H_ */
+#endif /* GIC_COMMON_PRIVATE_H */
diff --git a/drivers/arm/gic/v2/gicv2_private.h b/drivers/arm/gic/v2/gicv2_private.h
index 1eb6d9d..ccfad78 100644
--- a/drivers/arm/gic/v2/gicv2_private.h
+++ b/drivers/arm/gic/v2/gicv2_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GICV2_PRIVATE_H__
-#define __GICV2_PRIVATE_H__
+#ifndef GICV2_PRIVATE_H
+#define GICV2_PRIVATE_H
 
 #include <gicv2.h>
 #include <mmio.h>
@@ -146,4 +146,4 @@
 	mmio_write_32(base + GICC_DIR, val);
 }
 
-#endif /* __GICV2_PRIVATE_H__ */
+#endif /* GICV2_PRIVATE_H */
diff --git a/drivers/arm/gic/v3/gicv3_private.h b/drivers/arm/gic/v3/gicv3_private.h
index 85231ad..188e711 100644
--- a/drivers/arm/gic/v3/gicv3_private.h
+++ b/drivers/arm/gic/v3/gicv3_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GICV3_PRIVATE_H__
-#define __GICV3_PRIVATE_H__
+#ifndef GICV3_PRIVATE_H
+#define GICV3_PRIVATE_H
 
 #include <assert.h>
 #include <gic_common.h>
@@ -387,4 +387,4 @@
 }
 
 
-#endif /* __GICV3_PRIVATE_H__ */
+#endif /* GICV3_PRIVATE_H */
diff --git a/drivers/imx/timer/imx_gpt.h b/drivers/imx/timer/imx_gpt.h
index 6416c3c..2432633 100644
--- a/drivers/imx/timer/imx_gpt.h
+++ b/drivers/imx/timer/imx_gpt.h
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_GPT_H__
-#define __IMX_GPT_H__
+#ifndef IMX_GPT_H
+#define IMX_GPT_H
 
 #include <stdint.h>
 
 void imx_gpt_ops_init(uintptr_t reg_base);
 
-#endif /* __IMX_GPT_H__ */
+#endif /* IMX_GPT_H */
diff --git a/drivers/imx/uart/imx_uart.h b/drivers/imx/uart/imx_uart.h
index de42125..c3edbc7 100644
--- a/drivers/imx/uart/imx_uart.h
+++ b/drivers/imx/uart/imx_uart.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_CONSOLE_H__
-#define __IMX_CONSOLE_H__
+#ifndef IMX_UART_H
+#define IMX_UART_H
 
 #define IMX_UART_RXD_OFFSET	0x00
 #define IMX_UART_RXD_CHARRDY	BIT(15)
@@ -150,4 +150,4 @@
 #define IMX_UART_TS_RXFULL	BIT(3)
 #define IMX_UART_TS_SOFTRST	BIT(0)
 
-#endif /* __IMX_UART_H__ */
+#endif /* IMX_UART_H */
diff --git a/drivers/imx/usdhc/imx_usdhc.h b/drivers/imx/usdhc/imx_usdhc.h
index 6214cc1..9ff3298 100644
--- a/drivers/imx/usdhc/imx_usdhc.h
+++ b/drivers/imx/usdhc/imx_usdhc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_USDHC_H__
-#define	__IMX_USDHC_H__
+#ifndef IMX_USDHC_H
+#define IMX_USDHC_H
 
 #include <mmc.h>
 
@@ -134,4 +134,4 @@
 #define mmio_clrbits32(addr, clear)		mmio_write_32(addr, mmio_read_32(addr) & ~(clear))
 #define mmio_setbits32(addr, set)		mmio_write_32(addr, mmio_read_32(addr) | (set))
 
-#endif  /* __IMX_USDHC_H__ */
+#endif /* IMX_USDHC_H */
diff --git a/drivers/marvell/comphy.h b/drivers/marvell/comphy.h
index 788b1b6..fab564e 100644
--- a/drivers/marvell/comphy.h
+++ b/drivers/marvell/comphy.h
@@ -7,8 +7,8 @@
 
 /* Driver for COMPHY unit that is part or Marvell A8K SoCs */
 
-#ifndef _COMPHY_H_
-#define _COMPHY_H_
+#ifndef COMPHY_H
+#define COMPHY_H
 
 /* COMPHY registers */
 #define COMMON_PHY_CFG1_REG			0x0
@@ -469,5 +469,4 @@
 #define HPIPE_GLOBAL_PM_RXDLOZ_WAIT_MASK	\
 			(0xFF << HPIPE_GLOBAL_PM_RXDLOZ_WAIT_OFFSET)
 
-#endif /* _COMPHY_H_ */
-
+#endif /* COMPHY_H */
diff --git a/drivers/marvell/comphy/comphy-cp110.h b/drivers/marvell/comphy/comphy-cp110.h
index 1d7aec8..6eb7fd0 100644
--- a/drivers/marvell/comphy/comphy-cp110.h
+++ b/drivers/marvell/comphy/comphy-cp110.h
@@ -7,8 +7,8 @@
 
 /* Marvell CP110 SoC COMPHY unit driver */
 
-#ifndef _PHY_COMPHY_CP110_H
-#define _PHY_COMPHY_CP110_H
+#ifndef COMPHY_CP110_H
+#define COMPHY_CP110_H
 
 #define SD_ADDR(base, lane)			(base + 0x1000 * lane)
 #define HPIPE_ADDR(base, lane)			(SD_ADDR(base, lane) + 0x800)
@@ -862,5 +862,4 @@
 /* General defines */
 #define PLL_LOCK_TIMEOUT			15000
 
-#endif /* _PHY_COMPHY_CP110_H */
-
+#endif /* COMPHY_CP110_H */
diff --git a/drivers/marvell/comphy/phy-comphy-3700.h b/drivers/marvell/comphy/phy-comphy-3700.h
index 714a41c..1628e36 100644
--- a/drivers/marvell/comphy/phy-comphy-3700.h
+++ b/drivers/marvell/comphy/phy-comphy-3700.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef _PHY_COMPHY_3700_H
-#define _PHY_COMPHY_3700_H
+#ifndef PHY_COMPHY_3700_H
+#define PHY_COMPHY_3700_H
 
 #define PLL_SET_DELAY_US			600
 #define COMPHY_PLL_TIMEOUT			1000
@@ -255,4 +255,4 @@
 int mvebu_3700_comphy_is_pll_locked(uint8_t comphy_index, uint32_t comphy_mode);
 int mvebu_3700_comphy_power_off(uint8_t comphy_index, uint32_t comphy_mode);
 int mvebu_3700_comphy_power_on(uint8_t comphy_index, uint32_t comphy_mode);
-#endif /* _PHY_COMPHY_3700_H */
+#endif /* PHY_COMPHY_3700_H */
diff --git a/drivers/marvell/comphy/phy-comphy-common.h b/drivers/marvell/comphy/phy-comphy-common.h
index ba1a83c..78c7a38 100644
--- a/drivers/marvell/comphy/phy-comphy-common.h
+++ b/drivers/marvell/comphy/phy-comphy-common.h
@@ -7,8 +7,8 @@
 
 /* Marvell CP110 ana A3700 common */
 
-#ifndef _PHY_COMPHY_COMMON_H
-#define _PHY_COMPHY_COMMON_H
+#ifndef PHY_COMPHY_COMMON_H
+#define PHY_COMPHY_COMMON_H
 
 /* #define DEBUG_COMPHY */
 #ifdef DEBUG_COMPHY
@@ -153,4 +153,4 @@
 	debug("new val 0x%x\n", mmio_read_16(addr));
 }
 
-#endif /* _PHY_COMPHY_COMMON_H */
+#endif /* PHY_COMPHY_COMMON_H */
diff --git a/drivers/marvell/comphy/phy-default-porting-layer.h b/drivers/marvell/comphy/phy-default-porting-layer.h
index 39cd181..b3ad7eb 100644
--- a/drivers/marvell/comphy/phy-default-porting-layer.h
+++ b/drivers/marvell/comphy/phy-default-porting-layer.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __PHY_DEFAULT_PORTING_LAYER_H
-#define __PHY_DEFAULT_PORTING_LAYER_H
+#ifndef PHY_DEFAULT_PORTING_LAYER_H
+#define PHY_DEFAULT_PORTING_LAYER_H
 
 
 #define MAX_LANE_NR		6
@@ -48,4 +48,4 @@
 		.valid = 0x1
 	},
 };
-#endif /* __PHY_DEFAULT_PORTING_LAYER_H */
+#endif /* PHY_DEFAULT_PORTING_LAYER_H */
diff --git a/drivers/marvell/mc_trustzone/mc_trustzone.h b/drivers/marvell/mc_trustzone/mc_trustzone.h
index 8a06923..d36dcb5 100644
--- a/drivers/marvell/mc_trustzone/mc_trustzone.h
+++ b/drivers/marvell/mc_trustzone/mc_trustzone.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef _MC_TRUSTZONE_H
-#define _MC_TRUSTZONE_H
+#ifndef MC_TRUSTZONE_H
+#define MC_TRUSTZONE_H
 
 #include <addr_map.h>
 
@@ -24,4 +24,4 @@
 
 void tz_enable_win(int ap_index, const struct addr_map_win *win, int win_id);
 
-#endif /* _MC_TRUSTZONE_H */
+#endif /* MC_TRUSTZONE_H */
diff --git a/drivers/marvell/uart/a3700_console.h b/drivers/marvell/uart/a3700_console.h
index 1831360..de7c4fc 100644
--- a/drivers/marvell/uart/a3700_console.h
+++ b/drivers/marvell/uart/a3700_console.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __A3700_CONSOLE_H__
-#define __A3700_CONSOLE_H__
+#ifndef A3700_CONSOLE_H
+#define A3700_CONSOLE_H
 
 /* MVEBU UART Registers */
 #define UART_RX_REG		0x00
@@ -52,4 +52,4 @@
 #define UART_CTRL_TXFIFO_RESET	(1 << 15)
 #define UARTLSR_TXFIFOEMPTY	(1 << 6)
 
-#endif	/* __A3700_CONSOLE_H__ */
+#endif /* A3700_CONSOLE_H */
diff --git a/drivers/renesas/rcar/avs/avs_driver.h b/drivers/renesas/rcar/avs/avs_driver.h
index e868928..aa773b6 100644
--- a/drivers/renesas/rcar/avs/avs_driver.h
+++ b/drivers/renesas/rcar/avs/avs_driver.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef AVS_DRIVER_H__
-#define AVS_DRIVER_H__
+#ifndef AVS_DRIVER_H
+#define AVS_DRIVER_H
 
 /* AVS Setting. 1:enable / 0:disable */
 #ifndef AVS_SETTING_ENABLE
@@ -17,4 +17,4 @@
 void rcar_avs_setting(void);
 void rcar_avs_end(void);
 
-#endif /* AVS_DRIVER_H__ */
+#endif /* AVS_DRIVER_H */
diff --git a/drivers/renesas/rcar/board/board.h b/drivers/renesas/rcar/board/board.h
index 15d80b9..7bb2a06 100644
--- a/drivers/renesas/rcar/board/board.h
+++ b/drivers/renesas/rcar/board/board.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #define BOARD_SALVATOR_X		(0x00)
 #define BOARD_KRIEK			(0x01)
@@ -32,4 +32,4 @@
 
 int32_t rcar_get_board_type(uint32_t *type, uint32_t *rev);
 
-#endif
+#endif /* BOARD_H */
diff --git a/drivers/renesas/rcar/console/rcar_printf.h b/drivers/renesas/rcar/console/rcar_printf.h
index dd7a61b..bcb00c3 100644
--- a/drivers/renesas/rcar/console/rcar_printf.h
+++ b/drivers/renesas/rcar/console/rcar_printf.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef	RCAR_PRINTF_H__
-#define	RCAR_PRINTF_H__
+#ifndef RCAR_PRINTF_H
+#define RCAR_PRINTF_H
 
 #include <string.h>
 
@@ -16,4 +16,4 @@
 extern uint64_t rcar_stack_generic_timer[5];
 #endif
 
-#endif
+#endif /* RCAR_PRINTF_H */
diff --git a/drivers/renesas/rcar/delay/micro_delay.h b/drivers/renesas/rcar/delay/micro_delay.h
index f598394..458959f 100644
--- a/drivers/renesas/rcar/delay/micro_delay.h
+++ b/drivers/renesas/rcar/delay/micro_delay.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef MICRO_DELAY_H__
-#define MICRO_DELAY_H__
+#ifndef MICRO_DELAY_H
+#define MICRO_DELAY_H
 
 #define TMU3_MEASUREMENT	(0)
 
@@ -23,4 +23,4 @@
 
 #endif
 
-#endif
+#endif /* MICRO_DELAY_H */
diff --git a/drivers/renesas/rcar/emmc/emmc_config.h b/drivers/renesas/rcar/emmc/emmc_config.h
index 16dcea1..686ccb9 100644
--- a/drivers/renesas/rcar/emmc/emmc_config.h
+++ b/drivers/renesas/rcar/emmc/emmc_config.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __EMMC_CONFIG_H__
-#define __EMMC_CONFIG_H__
+#ifndef EMMC_CONFIG_H
+#define EMMC_CONFIG_H
 
 /* ************************ HEADER (INCLUDE) SECTION *********************** */
 
@@ -36,5 +36,5 @@
 
 /* ********************************* CODE ********************************** */
 
-#endif /* #ifndef __EMMC_CONFIG_H__ */
+#endif /* EMMC_CONFIG_H */
 /* ******************************** END ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_def.h b/drivers/renesas/rcar/emmc/emmc_def.h
index 2944515..178c795 100644
--- a/drivers/renesas/rcar/emmc/emmc_def.h
+++ b/drivers/renesas/rcar/emmc/emmc_def.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __EMMC_DEF_H__
-#define __EMMC_DEF_H__
+#ifndef EMMC_DEF_H
+#define EMMC_DEF_H
 
 #include "emmc_std.h"
 
@@ -74,5 +74,5 @@
 
 /* ********************************* CODE ********************************** */
 
-#endif /* #define __EMMC_DEF_H__ */
+#endif /* EMMC_DEF_H */
 /* ******************************** END ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_hal.h b/drivers/renesas/rcar/emmc/emmc_hal.h
index 633446c..f0b7e9d 100644
--- a/drivers/renesas/rcar/emmc/emmc_hal.h
+++ b/drivers/renesas/rcar/emmc/emmc_hal.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __EMMC_HAL_H__
-#define __EMMC_HAL_H__
+#ifndef EMMC_HAL_H
+#define EMMC_HAL_H
 /* ************************ HEADER (INCLUDE) SECTION *********************** */
 #include <stdint.h>
 /* ***************** MACROS, CONSTANTS, COMPILATION FLAGS ****************** */
@@ -313,6 +313,6 @@
 
 /* ********************************* CODE ********************************** */
 
-#endif /* __EMMC_HAL_H__ */
+#endif /* EMMC_HAL_H */
 
 /* ******************************** END ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_registers.h b/drivers/renesas/rcar/emmc/emmc_registers.h
index a670ab7..55ff33d 100644
--- a/drivers/renesas/rcar/emmc/emmc_registers.h
+++ b/drivers/renesas/rcar/emmc/emmc_registers.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __EMMC_REGISTERS_H__
-#define __EMMC_REGISTERS_H__
+#ifndef EMMC_REGISTERS_H
+#define EMMC_REGISTERS_H
 
 /* ************************ HEADER (INCLUDE) SECTION *********************** */
 
@@ -256,5 +256,5 @@
 
 /* ********************************* CODE ********************************** */
 
-#endif /* __EMMC_REGISTERS_H__ */
+#endif /* EMMC_REGISTERS_H */
 /* ******************************** END ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_std.h b/drivers/renesas/rcar/emmc/emmc_std.h
index f4ce198..99cb6b9 100644
--- a/drivers/renesas/rcar/emmc/emmc_std.h
+++ b/drivers/renesas/rcar/emmc/emmc_std.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __EMMC_STD_H__
-#define __EMMC_STD_H__
+#ifndef EMMC_STD_H
+#define EMMC_STD_H
 
 #include "emmc_hal.h"
 
@@ -471,4 +471,4 @@
 /* ********************************* CODE ********************************** */
 
 /* ******************************** END ************************************ */
-#endif /* __EMMC_STD_H__ */
+#endif /* EMMC_STD_H */
diff --git a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h b/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h
index 3c4a9a5..2dec58f 100644
--- a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h
+++ b/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IIC_DVFS_H__
-#define IIC_DVFS_H__
+#ifndef IIC_DVFS_H
+#define IIC_DVFS_H
 
 /* PMIC slave */
 #define PMIC			(0x30)
@@ -20,4 +20,4 @@
 int32_t rcar_iic_dvfs_receive(uint8_t slave, uint8_t reg, uint8_t *data);
 int32_t rcar_iic_dvfs_send(uint8_t slave, uint8_t regr, uint8_t data);
 
-#endif
+#endif /* IIC_DVFS_H */
diff --git a/drivers/renesas/rcar/io/io_common.h b/drivers/renesas/rcar/io/io_common.h
index c5729b8..6eb7777 100644
--- a/drivers/renesas/rcar/io/io_common.h
+++ b/drivers/renesas/rcar/io/io_common.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IO_COMMON_H__
-#define IO_COMMON_H__
+#ifndef IO_COMMON_H
+#define IO_COMMON_H
 
 typedef struct io_drv_spec {
 	size_t offset;
@@ -13,4 +13,4 @@
 	uint32_t partition;
 } io_drv_spec_t;
 
-#endif
+#endif /* IO_COMMON_H */
diff --git a/drivers/renesas/rcar/io/io_emmcdrv.h b/drivers/renesas/rcar/io/io_emmcdrv.h
index 82c6c51..95070f2 100644
--- a/drivers/renesas/rcar/io/io_emmcdrv.h
+++ b/drivers/renesas/rcar/io/io_emmcdrv.h
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IO_EMMCDRV_H__
-#define IO_EMMCDRV_H__
+#ifndef IO_EMMCDRV_H
+#define IO_EMMCDRV_H
 
 struct io_dev_connector;
 int32_t rcar_register_io_dev_emmcdrv(const io_dev_connector_t **connector);
 
-#endif
+#endif /* IO_EMMCDRV_H */
diff --git a/drivers/renesas/rcar/io/io_memdrv.h b/drivers/renesas/rcar/io/io_memdrv.h
index 41727d3..90e6812 100644
--- a/drivers/renesas/rcar/io/io_memdrv.h
+++ b/drivers/renesas/rcar/io/io_memdrv.h
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IO_MEMDRV_H__
-#define IO_MEMDRV_H__
+#ifndef IO_MEMDRV_H
+#define IO_MEMDRV_H
 
 struct io_dev_connector;
 int32_t rcar_register_io_dev_memdrv(const io_dev_connector_t **connector);
 
-#endif
+#endif /* IO_MEMDRV_H */
diff --git a/drivers/renesas/rcar/io/io_private.h b/drivers/renesas/rcar/io/io_private.h
index d0e66c0..207523a 100644
--- a/drivers/renesas/rcar/io/io_private.h
+++ b/drivers/renesas/rcar/io/io_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IO_PRIVATE_H_
-#define IO_PRIVATE_H_
+#ifndef IO_PRIVATE_H
+#define IO_PRIVATE_H
 
 /*
  * Return codes reported by 'io_*' APIs
@@ -17,4 +17,4 @@
 #define IO_NOT_SUPPORTED	(-0x82)
 #define IO_RESOURCES_EXHAUSTED	(-0x83)
 
-#endif
+#endif /* IO_PRIVATE_H */
diff --git a/drivers/renesas/rcar/io/io_rcar.h b/drivers/renesas/rcar/io/io_rcar.h
index 2420902..c26a617 100644
--- a/drivers/renesas/rcar/io/io_rcar.h
+++ b/drivers/renesas/rcar/io/io_rcar.h
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IO_RCAR_H__
-#define IO_RCAR_H__
+#ifndef IO_RCAR_H
+#define IO_RCAR_H
 
 int32_t rcar_register_io_dev(const io_dev_connector_t **dev_con);
 int32_t rcar_get_certificate(const int32_t name, uint32_t *cert);
 void rcar_read_certificate(uint64_t cert, uint32_t *size, uintptr_t *dest);
 
-#endif
+#endif /* IO_RCAR_H */
diff --git a/drivers/renesas/rcar/pwrc/pwrc.h b/drivers/renesas/rcar/pwrc/pwrc.h
index 166886e..3cdac69 100644
--- a/drivers/renesas/rcar/pwrc/pwrc.h
+++ b/drivers/renesas/rcar/pwrc/pwrc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef RCAR_PWRC_H__
-#define RCAR_PWRC_H__
+#ifndef PWRC_H
+#define PWRC_H
 
 #define PPOFFR_OFF		0x0
 #define PPONR_OFF		0x4
@@ -74,4 +74,4 @@
 
 #endif
 
-#endif
+#endif /* PWRC_H */
diff --git a/drivers/renesas/rcar/rom/rom_api.h b/drivers/renesas/rcar/rom/rom_api.h
index 85105ef..1d5b03d 100644
--- a/drivers/renesas/rcar/rom/rom_api.h
+++ b/drivers/renesas/rcar/rom/rom_api.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef ROM_API_H__
-#define ROM_API_H__
+#ifndef ROM_API_H
+#define ROM_API_H
 
 #include <stdint.h>
 
@@ -28,4 +28,4 @@
 				  rom_read_flash_f f);
 uint32_t rcar_rom_get_lcs(uint32_t *lcs);
 
-#endif
+#endif /* ROM_API_H */
diff --git a/drivers/renesas/rcar/rpc/rpc_registers.h b/drivers/renesas/rcar/rpc/rpc_registers.h
index 326519d..79aea85 100644
--- a/drivers/renesas/rcar/rpc/rpc_registers.h
+++ b/drivers/renesas/rcar/rpc/rpc_registers.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef RPC_REGISTER_H__
-#define RPC_REGISTER_H__
+#ifndef RPC_REGISTERS_H
+#define RPC_REGISTERS_H
 
 #define RPC_BASE	(0xEE200000U)
 #define RPC_CMNCR	(RPC_BASE + 0x0000U)
@@ -22,4 +22,4 @@
 #define RPC_PHYCNT	(RPC_BASE + 0x007CU)
 #define RPC_PHYINT	(RPC_BASE + 0x0088U)
 
-#endif
+#endif /* RPC_REGISTERS_H */
diff --git a/drivers/staging/renesas/rcar/ddr/boot_init_dram.h b/drivers/staging/renesas/rcar/ddr/boot_init_dram.h
index 7ec2930..4b0a9eb 100644
--- a/drivers/staging/renesas/rcar/ddr/boot_init_dram.h
+++ b/drivers/staging/renesas/rcar/ddr/boot_init_dram.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef	__BOOT_INIT_DRAM_
-#define	__BOOT_INIT_DRAM_
+#ifndef BOOT_INIT_DRAM_H
+#define BOOT_INIT_DRAM_H
 
 extern int32_t rcar_dram_init(void);
 
@@ -15,4 +15,4 @@
 #define INITDRAM_ERR_O (0xfffffffe)
 #define INITDRAM_ERR_T (0xfffffff0)
 
-#endif
+#endif /* BOOT_INIT_DRAM_H */
diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef_e3.h b/drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef_e3.h
index 80e3eec..8606f76 100644
--- a/drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef_e3.h
+++ b/drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef_e3.h
@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-
-#ifndef BOOT_INIT_DRAM_REGDEF_E3_H_
-#define BOOT_INIT_DRAM_REGDEF_E3_H_
+#ifndef BOOT_INIT_DRAM_REGDEF_E3_H
+#define BOOT_INIT_DRAM_REGDEF_E3_H
 
 #ifdef __cplusplus
 extern "C" {
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 #define				BIT0						0x00000001U
 #define				BIT11						0x00000800U
@@ -111,5 +110,6 @@
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
-#endif				/* BOOT_INIT_DRAM_REGDEF_E3_H_ */
+#endif /* __cplusplus */
+
+#endif /* BOOT_INIT_DRAM_REGDEF_E3_H */
diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h
index 115765b..47fe07b 100644
--- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h
+++ b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#pragma once
-#include <stdint.h>
+#ifndef DDR_INIT_E3_H
+#define DDR_INIT_E3_H
 
-#ifndef	__DDR_INIT_E3_
-#define	__DDR_INIT_E3_
+#include <stdint.h>
 
 #define RCAR_E3_DDR_VERSION    "rev.0.09"
 
@@ -31,4 +30,4 @@
 #define INITDRAM_ERR_O (0xfffffffe)
 #define INITDRAM_ERR_T (0xfffffff0)
 
-#endif /* __DDR_INIT_E3_ */
+#endif /* DDR_INIT_E3_H */
diff --git a/drivers/staging/renesas/rcar/ddr/dram_sub_func.h b/drivers/staging/renesas/rcar/ddr/dram_sub_func.h
index e083bfb..7e88f42 100644
--- a/drivers/staging/renesas/rcar/ddr/dram_sub_func.h
+++ b/drivers/staging/renesas/rcar/ddr/dram_sub_func.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef DRAM_SUB_FUNC_H_
-#define DRAM_SUB_FUNC_H_
+#ifndef DRAM_SUB_FUNC_H
+#define DRAM_SUB_FUNC_H
 
 #define DRAM_UPDATE_STATUS_ERR	(-1)
 #define DRAM_BOOT_STATUS_COLD	(0)
@@ -14,4 +14,4 @@
 int32_t rcar_dram_update_boot_status(uint32_t status);
 void rcar_dram_get_boot_status(uint32_t * status);
 
-#endif
+#endif /* DRAM_SUB_FUNC_H */
diff --git a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h b/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h
index 041a778..647a937 100644
--- a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h
+++ b/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PFC_INIT_E3_H__
-#define PFC_INIT_E3_H__
+#ifndef PFC_INIT_E3_H
+#define PFC_INIT_E3_H
 
 void pfc_init_e3(void);
 
-#endif /* PFC_INIT_E3_H__ */
+#endif /* PFC_INIT_E3_H */
diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h
index 844c1b9..2478e1c 100644
--- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h
+++ b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PFC_INIT_H3_V1_H__
-#define PFC_INIT_H3_V1_H__
+#ifndef PFC_INIT_H3_V1_H
+#define PFC_INIT_H3_V1_H
 
 void pfc_init_h3_v1(void);
 
-#endif /* PFC_INIT_H3_V1_H__ */
+#endif /* PFC_INIT_H3_V1_H */
diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h
index 3f691f8..b02f93e 100644
--- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h
+++ b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PFC_INIT_H3_V2_H__
-#define PFC_INIT_H3_V2_H__
+#ifndef PFC_INIT_H3_V2_H
+#define PFC_INIT_H3_V2_H
 
 void pfc_init_h3_v2(void);
 
-#endif /* PFC_INIT_H3_V2_H__ */
+#endif /* PFC_INIT_H3_V2_H */
diff --git a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h b/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h
index c6ee693..70885de 100644
--- a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h
+++ b/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PFC_INIT_M3_H__
-#define PFC_INIT_M3_H__
+#ifndef PFC_INIT_M3_H
+#define PFC_INIT_M3_H
 
 void pfc_init_m3(void);
 
-#endif /* PFC_INIT_M3_H__ */
+#endif /* PFC_INIT_M3_H */
diff --git a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h b/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h
index 9e08e58..3e6f879 100644
--- a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h
+++ b/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PFC_INIT_M3N_H__
-#define PFC_INIT_M3N_H__
+#ifndef PFC_INIT_M3N_H
+#define PFC_INIT_M3N_H
 
 void pfc_init_m3n(void);
 
-#endif /* PFC_INIT_M3N_H__ */
+#endif /* PFC_INIT_M3N_H */
diff --git a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.h b/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.h
index ab82e96..2c1d8c5 100644
--- a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.h
+++ b/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_E3_V10__
-#define QOS_INIT_H_E3_V10__
+#ifndef QOS_INIT_E3_V10_H
+#define QOS_INIT_E3_V10_H
 
 void qos_init_e3_v10(void);
 
-#endif /* QOS_INIT_H_E3_V10__ */
+#endif /* QOS_INIT_E3_V10_H */
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.h b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.h
index e55f774..f96182a 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.h
+++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_H3_V10__
-#define QOS_INIT_H_H3_V10__
+#ifndef QOS_INIT_H3_V10_H
+#define QOS_INIT_H3_V10_H
 
 void qos_init_h3_v10(void);
 
-#endif /* QOS_INIT_H_H3_V10__ */
+#endif /* QOS_INIT_H3_V10_H */
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.h b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.h
index 759e58b..3faeb4f 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.h
+++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_H3_V11__
-#define QOS_INIT_H_H3_V11__
+#ifndef QOS_INIT_H3_V11_H
+#define QOS_INIT_H3_V11_H
 
 void qos_init_h3_v11(void);
 
-#endif /* QOS_INIT_H_H3_V11__ */
+#endif /* QOS_INIT_H3_V11_H */
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.h b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.h
index 59c1bdb..9b7619e 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.h
+++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_H3_V20__
-#define QOS_INIT_H_H3_V20__
+#ifndef QOS_INIT_H3_V20_H
+#define QOS_INIT_H3_V20_H
 
 void qos_init_h3_v20(void);
 
-#endif /* QOS_INIT_H_H3_V20__ */
+#endif /* QOS_INIT_H3_V20_H */
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.h b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.h
index 5441f55..d33b43c 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.h
+++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_H3_V30__
-#define QOS_INIT_H_H3_V30__
+#ifndef QOS_INIT_H3_V30_H
+#define QOS_INIT_H3_V30_H
 
 void qos_init_h3_v30(void);
 
-#endif /* QOS_INIT_H_H3_V20__ */
+#endif /* QOS_INIT_H3_V30_H */
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.h b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.h
index 73fe694..46f3440 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.h
+++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_H3N_V30__
-#define QOS_INIT_H_H3N_V30__
+#ifndef QOS_INIT_H3N_V30_H
+#define QOS_INIT_H3N_V30_H
 
 void qos_init_h3n_v30(void);
 
-#endif /* QOS_INIT_H_H3N_V30__ */
+#endif /* QOS_INIT_H3N_V30_H */
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.h b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.h
index 8371075..01ef46c 100644
--- a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.h
+++ b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_M3_V10__
-#define QOS_INIT_H_M3_V10__
+#ifndef QOS_INIT_M3_V10_H
+#define QOS_INIT_M3_V10_H
 
 void qos_init_m3_v10(void);
 
-#endif /* QOS_INIT_H_M3_V10__ */
+#endif /* QOS_INIT_M3_V10_H */
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.h b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.h
index 6e3bc57..1552fb6 100644
--- a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.h
+++ b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_M3_V11__
-#define QOS_INIT_H_M3_V11__
+#ifndef QOS_INIT_M3_V11_H
+#define QOS_INIT_M3_V11_H
 
 void qos_init_m3_v11(void);
 
-#endif /* QOS_INIT_H_M3_V11__ */
+#endif /* QOS_INIT_M3_V11_H */
diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.h b/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.h
index ae7d2e2..0cd0c85 100644
--- a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.h
+++ b/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_M3N_V10__
-#define QOS_INIT_H_M3N_V10__
+#ifndef QOS_INIT_M3N_V10_H
+#define QOS_INIT_M3N_V10_H
 
 void qos_init_m3n_v10(void);
 
-#endif /* QOS_INIT_H_M3N_V10__ */
+#endif /* QOS_INIT_M3N_V10_H */
diff --git a/drivers/staging/renesas/rcar/qos/qos_common.h b/drivers/staging/renesas/rcar/qos/qos_common.h
index a5963f3..0174d5b 100644
--- a/drivers/staging/renesas/rcar/qos/qos_common.h
+++ b/drivers/staging/renesas/rcar/qos/qos_common.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_COMMON_H_
-#define QOS_COMMON_H_
+#ifndef QOS_COMMON_H
+#define QOS_COMMON_H
 
 #define RCAR_REF_DEFAULT		(0U)
 
@@ -110,4 +110,4 @@
 extern uint32_t qos_init_ddr_ch;
 extern uint8_t qos_init_ddr_phyvalid;
 
-#endif /* QOS_COMMON_H_ */
+#endif /* QOS_COMMON_H */
diff --git a/drivers/staging/renesas/rcar/qos/qos_init.h b/drivers/staging/renesas/rcar/qos/qos_init.h
index d2f3ec8..1b64992 100644
--- a/drivers/staging/renesas/rcar/qos/qos_init.h
+++ b/drivers/staging/renesas/rcar/qos/qos_init.h
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_
-#define QOS_INIT_H_
+#ifndef QOS_INIT_H
+#define QOS_INIT_H
 
 extern void rcar_qos_init(void);
 extern uint8_t get_boardcnf_phyvalid(void);
 
-#endif /* QOS_INIT_H_ */
+#endif /* QOS_INIT_H */
diff --git a/drivers/staging/renesas/rcar/qos/qos_reg.h b/drivers/staging/renesas/rcar/qos/qos_reg.h
index 1bf70b2..759816f 100644
--- a/drivers/staging/renesas/rcar/qos/qos_reg.h
+++ b/drivers/staging/renesas/rcar/qos/qos_reg.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_REG_H_
-#define QOS_REG_H_
+#ifndef QOS_REG_H
+#define QOS_REG_H
 
 #define	RCAR_QOS_NONE				(3U)
 #define	RCAR_QOS_TYPE_DEFAULT		(0U)
@@ -118,4 +118,4 @@
 #define	QOSWT_WTSET0				(QOS_BASE0 + 0x8038U)
 #define	QOSWT_WTSET1				(QOS_BASE0 + 0x803CU)
 
-#endif /* QOS_REG_H_ */
+#endif /* QOS_REG_H */
diff --git a/include/bl1/bl1.h b/include/bl1/bl1.h
index dd03de0..39b8d1e 100644
--- a/include/bl1/bl1.h
+++ b/include/bl1/bl1.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BL1_FWU_H__
-#define __BL1_FWU_H__
+#ifndef BL1_H
+#define BL1_H
 
 #include <bl_common.h>
 
@@ -97,4 +97,4 @@
 			meminfo_t *bl2_mem_layout);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BL1_FWU_H__ */
+#endif /* BL1_H */
diff --git a/include/bl1/tbbr/tbbr_img_desc.h b/include/bl1/tbbr/tbbr_img_desc.h
index 4063f8a..bb36eb5 100644
--- a/include/bl1/tbbr/tbbr_img_desc.h
+++ b/include/bl1/tbbr/tbbr_img_desc.h
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TBBR_IMG_DESC_H__
-#define __TBBR_IMG_DESC_H__
+#ifndef TBBR_IMG_DESC_H
+#define TBBR_IMG_DESC_H
 
 #include <bl_common.h>
 
 extern image_desc_t bl1_tbbr_image_descs[];
 
-#endif /* __TBBR_IMG_DESC_H__ */
+#endif /* TBBR_IMG_DESC_H */
diff --git a/include/bl2/bl2.h b/include/bl2/bl2.h
index 89ff06e..8ec080c 100644
--- a/include/bl2/bl2.h
+++ b/include/bl2/bl2.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef BL2_H__
-#define BL2_H__
+#ifndef BL2_H
+#define BL2_H
 
 void bl2_main(void);
 
-#endif /* BL2_H__ */
+#endif /* BL2_H */
diff --git a/include/bl2u/bl2u.h b/include/bl2u/bl2u.h
index 7017b3a..387eaf8 100644
--- a/include/bl2u/bl2u.h
+++ b/include/bl2u/bl2u.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef BL2_H__
-#define BL2_H__
+#ifndef BL2U_H
+#define BL2U_H
 
 void bl2u_main(void);
 
-#endif /* BL2_H__ */
+#endif /* BL2U_H */
diff --git a/include/bl31/bl31.h b/include/bl31/bl31.h
index 7c35922..08c555d 100644
--- a/include/bl31/bl31.h
+++ b/include/bl31/bl31.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BL31_H__
-#define __BL31_H__
+#ifndef BL31_H
+#define BL31_H
 
 #include <stdint.h>
 
@@ -21,4 +21,4 @@
 void bl31_main(void);
 void bl31_lib_init(void);
 
-#endif /* __BL31_H__ */
+#endif /* BL31_H */
diff --git a/include/bl31/ea_handle.h b/include/bl31/ea_handle.h
index 060c9b7..68f012c 100644
--- a/include/bl31/ea_handle.h
+++ b/include/bl31/ea_handle.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __EA_HANDLE_H__
-#define __EA_HANDLE_H__
+#ifndef EA_HANDLE_H
+#define EA_HANDLE_H
 
 /* Constants indicating the reason for an External Abort */
 
@@ -21,4 +21,4 @@
 /* RAS event signalled as peripheral interrupt */
 #define ERROR_INTERRUPT		3
 
-#endif /* __EA_HANDLE_H__ */
+#endif /* EA_HANDLE_H */
diff --git a/include/bl31/interrupt_mgmt.h b/include/bl31/interrupt_mgmt.h
index 0cdbda0..6a49fb6 100644
--- a/include/bl31/interrupt_mgmt.h
+++ b/include/bl31/interrupt_mgmt.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __INTERRUPT_MGMT_H__
-#define __INTERRUPT_MGMT_H__
+#ifndef INTERRUPT_MGMT_H
+#define INTERRUPT_MGMT_H
 
 #include <arch.h>
 #include <utils_def.h>
@@ -144,4 +144,4 @@
 int enable_intr_rm_local(uint32_t type, uint32_t security_state);
 
 #endif /*__ASSEMBLY__*/
-#endif /* __INTERRUPT_MGMT_H__ */
+#endif /* INTERRUPT_MGMT_H */
diff --git a/include/bl32/payloads/tlk.h b/include/bl32/payloads/tlk.h
index 941b6cc..0234cbe 100644
--- a/include/bl32/payloads/tlk.h
+++ b/include/bl32/payloads/tlk.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TLK_H__
-#define __TLK_H__
+#ifndef TLK_H
+#define TLK_H
 
 #include <utils_def.h>
 
@@ -63,4 +63,4 @@
 #define TOS_UID			0xbf00ff01 /* Implementation UID */
 #define TOS_CALL_VERSION	0xbf00ff03 /* Trusted OS Call Version */
 
-#endif /* __TLK_H__ */
+#endif /* TLK_H */
diff --git a/include/bl32/sp_min/platform_sp_min.h b/include/bl32/sp_min/platform_sp_min.h
index 2d71a47..feb4ec3 100644
--- a/include/bl32/sp_min/platform_sp_min.h
+++ b/include/bl32/sp_min/platform_sp_min.h
@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLATFORM_SP_MIN_H__
-#define __PLATFORM_SP_MIN_H__
+#ifndef PLATFORM_SP_MIN_H
+#define PLATFORM_SP_MIN_H
+
+#include <stdint.h>
 
 /*******************************************************************************
  * Mandatory SP_MIN functions
@@ -20,4 +22,4 @@
 /* Platforms that enable SP_MIN_WITH_SECURE_FIQ shall implement this api */
 void sp_min_plat_fiq_handler(uint32_t id);
 
-#endif /* __PLATFORM_SP_MIN_H__ */
+#endif /* PLATFORM_SP_MIN_H */
diff --git a/include/bl32/tsp/platform_tsp.h b/include/bl32/tsp/platform_tsp.h
index a5a0223..fe8a2c9 100644
--- a/include/bl32/tsp/platform_tsp.h
+++ b/include/bl32/tsp/platform_tsp.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLATFORM_TSP_H__
-
+#ifndef PLATFORM_TSP_H
+#define PLATFORM_TSP_H
 
 /*******************************************************************************
  * Mandatory TSP functions (only if platform contains a TSP)
@@ -14,7 +14,4 @@
 void tsp_plat_arch_setup(void);
 void tsp_platform_setup(void);
 
-
-#define __PLATFORM_H__
-
-#endif
+#endif /* PLATFORM_TSP_H */
diff --git a/include/bl32/tsp/tsp.h b/include/bl32/tsp/tsp.h
index 43bba8f..ed4792e 100644
--- a/include/bl32/tsp/tsp.h
+++ b/include/bl32/tsp/tsp.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TSP_H__
-#define __TSP_H__
+#ifndef TSP_H
+#define TSP_H
 
 /*
  * SMC function IDs that TSP uses to signal various forms of completions
@@ -107,4 +107,4 @@
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __TSP_H__ */
+#endif /* TSP_H */
diff --git a/include/common/aarch32/asm_macros.S b/include/common/aarch32/asm_macros.S
index f7d0595..c54f75c 100644
--- a/include/common/aarch32/asm_macros.S
+++ b/include/common/aarch32/asm_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ASM_MACROS_S__
-#define __ASM_MACROS_S__
+#ifndef ASM_MACROS_S
+#define ASM_MACROS_S
 
 #include <arch.h>
 #include <asm_macros_common.S>
@@ -189,4 +189,4 @@
 		.endif
 	.endm
 
-#endif /* __ASM_MACROS_S__ */
+#endif /* ASM_MACROS_S */
diff --git a/include/common/aarch32/assert_macros.S b/include/common/aarch32/assert_macros.S
index c958810..ab3a2eb 100644
--- a/include/common/aarch32/assert_macros.S
+++ b/include/common/aarch32/assert_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ASSERT_MACROS_S__
-#define __ASSERT_MACROS_S__
+#ifndef ASSERT_MACROS_S
+#define ASSERT_MACROS_S
 
 	/*
 	 * Assembler macro to enable asm_assert. We assume that the stack is
@@ -23,4 +23,4 @@
 	b	asm_assert;\
 300:
 
-#endif /* __ASSERT_MACROS_S__ */
+#endif /* ASSERT_MACROS_S */
diff --git a/include/common/aarch32/console_macros.S b/include/common/aarch32/console_macros.S
index 7c30688..ba6e7d0 100644
--- a/include/common/aarch32/console_macros.S
+++ b/include/common/aarch32/console_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __CONSOLE_MACROS_S__
-#define __CONSOLE_MACROS_S__
+#ifndef CONSOLE_MACROS_S
+#define CONSOLE_MACROS_S
 
 #include <console.h>
 
@@ -81,4 +81,4 @@
 	b	console_register
 	.endm
 #endif /* USE_FINISH_CONSOLE_REG_2 */
-#endif /* __CONSOLE_MACROS_S__ */
+#endif /* CONSOLE_MACROS_S */
diff --git a/include/common/aarch32/el3_common_macros.S b/include/common/aarch32/el3_common_macros.S
index 5db8854..9b18ba3 100644
--- a/include/common/aarch32/el3_common_macros.S
+++ b/include/common/aarch32/el3_common_macros.S
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __EL3_COMMON_MACROS_S__
-#define __EL3_COMMON_MACROS_S__
+#ifndef EL3_COMMON_MACROS_S
+#define EL3_COMMON_MACROS_S
 
 #include <arch.h>
 #include <asm_macros.S>
@@ -313,4 +313,4 @@
 #endif
 	.endm
 
-#endif /* __EL3_COMMON_MACROS_S__ */
+#endif /* EL3_COMMON_MACROS_S */
diff --git a/include/common/aarch64/asm_macros.S b/include/common/aarch64/asm_macros.S
index 91416e4..dea3021 100644
--- a/include/common/aarch64/asm_macros.S
+++ b/include/common/aarch64/asm_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ASM_MACROS_S__
-#define __ASM_MACROS_S__
+#ifndef ASM_MACROS_S
+#define ASM_MACROS_S
 
 #include <arch.h>
 #include <asm_macros_common.S>
@@ -192,4 +192,4 @@
 	.endm
 #endif
 
-#endif /* __ASM_MACROS_S__ */
+#endif /* ASM_MACROS_S */
diff --git a/include/common/aarch64/assert_macros.S b/include/common/aarch64/assert_macros.S
index 4567c69..06371c4 100644
--- a/include/common/aarch64/assert_macros.S
+++ b/include/common/aarch64/assert_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ASSERT_MACROS_S__
-#define __ASSERT_MACROS_S__
+#ifndef ASSERT_MACROS_S
+#define ASSERT_MACROS_S
 
 	/*
 	 * Assembler macro to enable asm_assert. Use this macro wherever
@@ -26,4 +26,4 @@
 	b	asm_assert ;\
 300:
 
-#endif /* __ASSERT_MACROS_S__ */
+#endif /* ASSERT_MACROS_S */
diff --git a/include/common/aarch64/console_macros.S b/include/common/aarch64/console_macros.S
index b285ecc..5c88d4f 100644
--- a/include/common/aarch64/console_macros.S
+++ b/include/common/aarch64/console_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __CONSOLE_MACROS_S__
-#define __CONSOLE_MACROS_S__
+#ifndef CONSOLE_MACROS_S
+#define CONSOLE_MACROS_S
 
 #include <console.h>
 
@@ -84,4 +84,5 @@
 	b	console_register
 	.endm
 #endif /* USE_FINISH_CONSOLE_REG_2 */
-#endif /* __CONSOLE_MACROS_S__ */
+
+#endif /* CONSOLE_MACROS_S */
diff --git a/include/common/aarch64/el3_common_macros.S b/include/common/aarch64/el3_common_macros.S
index 4902583..adfb54e 100644
--- a/include/common/aarch64/el3_common_macros.S
+++ b/include/common/aarch64/el3_common_macros.S
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __EL3_COMMON_MACROS_S__
-#define __EL3_COMMON_MACROS_S__
+#ifndef EL3_COMMON_MACROS_S
+#define EL3_COMMON_MACROS_S
 
 #include <arch.h>
 #include <asm_macros.S>
@@ -341,4 +341,4 @@
 #endif
 	.endm
 
-#endif /* __EL3_COMMON_MACROS_S__ */
+#endif /* EL3_COMMON_MACROS_S */
diff --git a/include/common/asm_macros_common.S b/include/common/asm_macros_common.S
index 081addc..09742af 100644
--- a/include/common/asm_macros_common.S
+++ b/include/common/asm_macros_common.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ASM_MACROS_COMMON_S__
-#define __ASM_MACROS_COMMON_S__
+#ifndef ASM_MACROS_COMMON_S
+#define ASM_MACROS_COMMON_S
 
 	/*
 	 * This macro is used to create a function label and place the
@@ -104,4 +104,4 @@
 	.endm
 
 
-#endif /* __ASM_MACROS_COMMON_S__ */
+#endif /* ASM_MACROS_COMMON_S */
diff --git a/include/common/bl_common.h b/include/common/bl_common.h
index 6a79dc3..56c89fc 100644
--- a/include/common/bl_common.h
+++ b/include/common/bl_common.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BL_COMMON_H__
-#define __BL_COMMON_H__
+#ifndef BL_COMMON_H
+#define BL_COMMON_H
 
 #include <ep_info.h>
 #include <param_header.h>
@@ -201,4 +201,4 @@
 
 #endif /*__ASSEMBLY__*/
 
-#endif /* __BL_COMMON_H__ */
+#endif /* BL_COMMON_H */
diff --git a/include/common/desc_image_load.h b/include/common/desc_image_load.h
index 1ed2b15..6254895 100644
--- a/include/common/desc_image_load.h
+++ b/include/common/desc_image_load.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __DESC_IMAGE_LOAD_H__
-#define __DESC_IMAGE_LOAD_H__
+#ifndef DESC_IMAGE_LOAD_H
+#define DESC_IMAGE_LOAD_H
 
 #include <bl_common.h>
 
@@ -37,4 +37,4 @@
 bl_params_t *get_next_bl_params_from_mem_params_desc(void);
 void populate_next_bl_params_config(bl_params_t *bl2_to_next_bl_params);
 
-#endif /* __DESC_IMAGE_LOAD_H__ */
+#endif /* DESC_IMAGE_LOAD_H */
diff --git a/include/common/ep_info.h b/include/common/ep_info.h
index db2355a..0f67687 100644
--- a/include/common/ep_info.h
+++ b/include/common/ep_info.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __EP_INFO_H__
-#define __EP_INFO_H__
+#ifndef EP_INFO_H
+#define EP_INFO_H
 
 #include <param_header.h>
 #include <utils_def.h>
@@ -132,5 +132,4 @@
 
 #endif /*__ASSEMBLY__*/
 
-#endif /* __EP_INFO_H__ */
-
+#endif /* EP_INFO_H */
diff --git a/include/common/fdt_wrappers.h b/include/common/fdt_wrappers.h
index c8d753f..79d001d 100644
--- a/include/common/fdt_wrappers.h
+++ b/include/common/fdt_wrappers.h
@@ -6,8 +6,8 @@
 
 /* Helper functions to offer easier navigation of Device Tree Blob */
 
-#ifndef __FDT_WRAPPERS__
-#define __FDT_WRAPPERS__
+#ifndef FDT_WRAPPERS_H
+#define FDT_WRAPPERS_H
 
 /* Number of cells, given total length in bytes. Each cell is 4 bytes long */
 #define NCELLS(len) ((len) / 4U)
@@ -21,4 +21,4 @@
 int fdtw_write_inplace_cells(void *dtb, int node, const char *prop,
 		unsigned int cells, void *value);
 
-#endif /* __FDT_WRAPPERS__ */
+#endif /* FDT_WRAPPERS_H */
diff --git a/include/common/image_decompress.h b/include/common/image_decompress.h
index aed8df3..bb35c3b 100644
--- a/include/common/image_decompress.h
+++ b/include/common/image_decompress.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMAGE_DECOMPRESS_H__
-#define __IMAGE_DECOMPRESS_H__
+#ifndef IMAGE_DECOMPRESS_H
+#define IMAGE_DECOMPRESS_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -21,4 +21,4 @@
 void image_decompress_prepare(struct image_info *info);
 int image_decompress(struct image_info *info);
 
-#endif /* __IMAGE_DECOMPRESS_H___ */
+#endif /* IMAGE_DECOMPRESS_H */
diff --git a/include/common/interrupt_props.h b/include/common/interrupt_props.h
index 4ac698d..6c6a853 100644
--- a/include/common/interrupt_props.h
+++ b/include/common/interrupt_props.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __INTERRUPT_PROPS_H__
-#define __INTERRUPT_PROPS_H__
+#ifndef INTERRUPT_PROPS_H
+#define INTERRUPT_PROPS_H
 
 #ifndef __ASSEMBLY__
 
@@ -26,4 +26,4 @@
 } interrupt_prop_t;
 
 #endif /* __ASSEMBLY__ */
-#endif /* __INTERRUPT_PROPS_H__ */
+#endif /* INTERRUPT_PROPS_H */
diff --git a/include/common/param_header.h b/include/common/param_header.h
index ec4ee4e..e9717cb 100644
--- a/include/common/param_header.h
+++ b/include/common/param_header.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PARAM_HEADER_H__
-#define __PARAM_HEADER_H__
+#ifndef PARAM_HEADER_H
+#define PARAM_HEADER_H
 
 #include <stdbool.h>
 #include <utils_def.h>
@@ -54,5 +54,4 @@
 
 #endif /*__ASSEMBLY__*/
 
-#endif /* __PARAM_HEADER_H__ */
-
+#endif /* PARAM_HEADER_H */
diff --git a/include/common/romlib.h b/include/common/romlib.h
index 81a6f5c..7f53c47 100644
--- a/include/common/romlib.h
+++ b/include/common/romlib.h
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef ROMLIB_H_
+#ifndef ROMLIB_H
+#define ROMLIB_H
 
 #define ROMLIB_MAJOR   0
 #define ROMLIB_MINOR   1
@@ -12,4 +13,4 @@
 
 int rom_lib_init(int version);
 
-#endif
+#endif /* ROMLIB_H */
diff --git a/include/common/tbbr/cot_def.h b/include/common/tbbr/cot_def.h
index 4a2a8ef..33350a0 100644
--- a/include/common/tbbr/cot_def.h
+++ b/include/common/tbbr/cot_def.h
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __COT_DEF_H__
-#define __COT_DEF_H__
+#ifndef COT_DEF_H
+#define COT_DEF_H
 
 /* TBBR CoT definitions */
 
 #define COT_MAX_VERIFIED_PARAMS		4
 
-#endif /* __COT_DEF_H__ */
+#endif /* COT_DEF_H */
diff --git a/include/common/tbbr/tbbr_img_def.h b/include/common/tbbr/tbbr_img_def.h
index 96bfb53..bd8f5dc 100644
--- a/include/common/tbbr/tbbr_img_def.h
+++ b/include/common/tbbr/tbbr_img_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TBBR_IMG_DEF_H__
-#define __TBBR_IMG_DEF_H__
+#ifndef TBBR_IMG_DEF_H
+#define TBBR_IMG_DEF_H
 
 #include <utils_def.h>
 
@@ -86,4 +86,4 @@
 /* Define size of the array */
 #define MAX_NUMBER_IDS			U(30)
 
-#endif /* __TBBR_IMG_DEF_H__ */
+#endif /* TBBR_IMG_DEF_H */
diff --git a/include/drivers/allwinner/sunxi_rsb.h b/include/drivers/allwinner/sunxi_rsb.h
index 5a69d35..3d003ce 100644
--- a/include/drivers/allwinner/sunxi_rsb.h
+++ b/include/drivers/allwinner/sunxi_rsb.h
@@ -17,4 +17,4 @@
 int rsb_read(uint8_t rt_addr, uint8_t reg_addr);
 int rsb_write(uint8_t rt_addr, uint8_t reg_addr, uint8_t value);
 
-#endif
+#endif /* SUNXI_RSB_H */
diff --git a/include/drivers/arm/arm_gicv3_common.h b/include/drivers/arm/arm_gicv3_common.h
index 8970e3f..b88b59f 100644
--- a/include/drivers/arm/arm_gicv3_common.h
+++ b/include/drivers/arm/arm_gicv3_common.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ARM_GICV3_COMMON_H__
-#define __ARM_GICV3_COMMON_H__
+#ifndef ARM_GICV3_COMMON_H
+#define ARM_GICV3_COMMON_H
 
 /*******************************************************************************
  * GIC500/GIC600 Re-distributor interface registers & constants
@@ -17,4 +17,4 @@
 #define WAKER_SL_BIT		(1U << WAKER_SL_SHIFT)
 #define WAKER_QSC_BIT		(1U << WAKER_QSC_SHIFT)
 
-#endif /* __ARM_GICV3_COMMON_H__ */
+#endif /* ARM_GICV3_COMMON_H */
diff --git a/include/drivers/arm/cci.h b/include/drivers/arm/cci.h
index 41a3de2..24b76da 100644
--- a/include/drivers/arm/cci.h
+++ b/include/drivers/arm/cci.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CCI_H__
-#define __CCI_H__
+#ifndef CCI_H
+#define CCI_H
 
 #include <utils_def.h>
 
@@ -122,4 +122,4 @@
 void cci_disable_snoop_dvm_reqs(unsigned int master_id);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CCI_H__ */
+#endif /* CCI_H */
diff --git a/include/drivers/arm/ccn.h b/include/drivers/arm/ccn.h
index d740867..eba974d 100644
--- a/include/drivers/arm/ccn.h
+++ b/include/drivers/arm/ccn.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CCN_H__
-#define __CCN_H__
+#ifndef CCN_H
+#define CCN_H
 
 /*
  * This macro defines the maximum number of master interfaces that reside on
@@ -93,4 +93,4 @@
 int ccn_get_part0_id(uintptr_t periphbase);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CCN_H__ */
+#endif /* CCN_H */
diff --git a/include/drivers/arm/gic_common.h b/include/drivers/arm/gic_common.h
index 0ef1148..2f5334f 100644
--- a/include/drivers/arm/gic_common.h
+++ b/include/drivers/arm/gic_common.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GIC_COMMON_H__
-#define __GIC_COMMON_H__
+#ifndef GIC_COMMON_H
+#define GIC_COMMON_H
 
 #include <utils_def.h>
 
@@ -100,4 +100,4 @@
 	(GIC_HIGHEST_NS_PRIORITY << 16)	|	\
 	(GIC_HIGHEST_NS_PRIORITY << 24))
 
-#endif /* __GIC_COMMON_H__ */
+#endif /* GIC_COMMON_H */
diff --git a/include/drivers/arm/gicv2.h b/include/drivers/arm/gicv2.h
index c80f80b..705077c 100644
--- a/include/drivers/arm/gicv2.h
+++ b/include/drivers/arm/gicv2.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GICV2_H__
-#define __GICV2_H__
+#ifndef GICV2_H
+#define GICV2_H
 
 #include <gic_common.h>
 
@@ -184,4 +184,4 @@
 void gicv2_interrupt_set_cfg(unsigned int id, unsigned int cfg);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __GICV2_H__ */
+#endif /* GICV2_H */
diff --git a/include/drivers/arm/gicv3.h b/include/drivers/arm/gicv3.h
index 9c291eb..c26f297 100644
--- a/include/drivers/arm/gicv3.h
+++ b/include/drivers/arm/gicv3.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GICV3_H__
-#define __GICV3_H__
+#ifndef GICV3_H
+#define GICV3_H
 
 /*******************************************************************************
  * GICv3 miscellaneous definitions
@@ -405,4 +405,4 @@
 unsigned int gicv3_set_pmr(unsigned int mask);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __GICV3_H__ */
+#endif /* GICV3_H */
diff --git a/include/drivers/arm/nic_400.h b/include/drivers/arm/nic_400.h
index 740f184..bb74982 100644
--- a/include/drivers/arm/nic_400.h
+++ b/include/drivers/arm/nic_400.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __NIC_400_H__
-#define __NIC_400_H__
+#ifndef NIC_400_H
+#define NIC_400_H
 
 /*
  * Address of slave 'n' security setting in the NIC-400 address region
@@ -13,4 +13,4 @@
  */
 #define NIC400_ADDR_CTRL_SECURITY_REG(n)	(0x8 + (n) * 4)
 
-#endif /* __NIC_400_H__ */
+#endif /* NIC_400_H */
diff --git a/include/drivers/arm/pl011.h b/include/drivers/arm/pl011.h
index 137764d..6216a61 100644
--- a/include/drivers/arm/pl011.h
+++ b/include/drivers/arm/pl011.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PL011_H__
-#define __PL011_H__
+#ifndef PL011_H
+#define PL011_H
 
 #include <console.h>
 
@@ -103,4 +103,4 @@
 
 #endif /*__ASSEMBLY__*/
 
-#endif	/* __PL011_H__ */
+#endif /* PL011_H */
diff --git a/include/drivers/arm/pl061_gpio.h b/include/drivers/arm/pl061_gpio.h
index 971a23d..6c4a9f5 100644
--- a/include/drivers/arm/pl061_gpio.h
+++ b/include/drivers/arm/pl061_gpio.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PL061_GPIO_H__
-#define __PL061_GPIO_H__
+#ifndef PL061_GPIO_H
+#define PL061_GPIO_H
 
 #include <gpio.h>
 
 void pl061_gpio_register(uintptr_t base_addr, int gpio_dev);
 void pl061_gpio_init(void);
 
-#endif	/* __PL061_GPIO_H__ */
+#endif /* PL061_GPIO_H */
diff --git a/include/drivers/arm/smmu_v3.h b/include/drivers/arm/smmu_v3.h
index e3912e3..1b7ffb8 100644
--- a/include/drivers/arm/smmu_v3.h
+++ b/include/drivers/arm/smmu_v3.h
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SMMU_V3_H__
-#define __SMMU_V3_H__
+#ifndef SMMU_V3_H
+#define SMMU_V3_H
 
-#include <utils_def.h>
 #include <stdint.h>
+#include <utils_def.h>
 
 /* SMMUv3 register offsets from device base */
 #define SMMU_S_IDR1	U(0x8004)
@@ -24,4 +24,4 @@
 
 int smmuv3_init(uintptr_t smmu_base);
 
-#endif /* __SMMU_V3_H__ */
+#endif /* SMMU_V3_H */
diff --git a/include/drivers/arm/sp804_delay_timer.h b/include/drivers/arm/sp804_delay_timer.h
index 0cf168b..8eb8715 100644
--- a/include/drivers/arm/sp804_delay_timer.h
+++ b/include/drivers/arm/sp804_delay_timer.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SP804_DELAY_TIMER_H__
-#define __SP804_DELAY_TIMER_H__
+#ifndef SP804_DELAY_TIMER_H
+#define SP804_DELAY_TIMER_H
 
 #include <delay_timer.h>
 #include <stdint.h>
@@ -25,4 +25,4 @@
 		sp804_timer_ops_init((base_addr), &sp804_timer_ops);	\
 	} while (0)
 
-#endif /* __SP804_DELAY_TIMER_H__ */
+#endif /* SP804_DELAY_TIMER_H */
diff --git a/include/drivers/auth/auth_common.h b/include/drivers/auth/auth_common.h
index 058375f..e6859fd 100644
--- a/include/drivers/auth/auth_common.h
+++ b/include/drivers/auth/auth_common.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __AUTH_COMMON_H__
-#define __AUTH_COMMON_H__
+#ifndef AUTH_COMMON_H
+#define AUTH_COMMON_H
 
 /*
  * Authentication framework common types
@@ -117,4 +117,4 @@
 		.len = (unsigned int)_len \
 	}
 
-#endif /* __AUTH_COMMON_H__ */
+#endif /* AUTH_COMMON_H */
diff --git a/include/drivers/auth/auth_mod.h b/include/drivers/auth/auth_mod.h
index bb3b8f9..19bc2f1 100644
--- a/include/drivers/auth/auth_mod.h
+++ b/include/drivers/auth/auth_mod.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __AUTH_MOD_H__
-#define __AUTH_MOD_H__
+#ifndef AUTH_MOD_H
+#define AUTH_MOD_H
 
 #if TRUSTED_BOARD_BOOT
 
@@ -49,4 +49,4 @@
 
 #endif /* TRUSTED_BOARD_BOOT */
 
-#endif /* __AUTH_MOD_H__ */
+#endif /* AUTH_MOD_H */
diff --git a/include/drivers/auth/crypto_mod.h b/include/drivers/auth/crypto_mod.h
index f9b44d1..3a42105 100644
--- a/include/drivers/auth/crypto_mod.h
+++ b/include/drivers/auth/crypto_mod.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CRYPTO_MOD_H__
-#define __CRYPTO_MOD_H__
+#ifndef CRYPTO_MOD_H
+#define CRYPTO_MOD_H
 
 /* Return values */
 enum crypto_ret_value {
@@ -59,4 +59,4 @@
 
 extern const crypto_lib_desc_t crypto_lib_desc;
 
-#endif /* __CRYPTO_MOD_H__ */
+#endif /* CRYPTO_MOD_H */
diff --git a/include/drivers/auth/img_parser_mod.h b/include/drivers/auth/img_parser_mod.h
index eaf3e6e..4379693 100644
--- a/include/drivers/auth/img_parser_mod.h
+++ b/include/drivers/auth/img_parser_mod.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMG_PARSER_MOD_H__
-#define __IMG_PARSER_MOD_H__
+#ifndef IMG_PARSER_MOD_H
+#define IMG_PARSER_MOD_H
 
 #include <auth_common.h>
 
@@ -61,4 +61,4 @@
 		.get_auth_param = _get_param \
 	}
 
-#endif /* __IMG_PARSER_MOD_H__ */
+#endif /* IMG_PARSER_MOD_H */
diff --git a/include/drivers/auth/mbedtls/mbedtls_common.h b/include/drivers/auth/mbedtls/mbedtls_common.h
index 5d3e198..a9c2352 100644
--- a/include/drivers/auth/mbedtls/mbedtls_common.h
+++ b/include/drivers/auth/mbedtls/mbedtls_common.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MBEDTLS_COMMON_H__
-#define __MBEDTLS_COMMON_H__
+#ifndef MBEDTLS_COMMON_H
+#define MBEDTLS_COMMON_H
 
 void mbedtls_init(void);
 
-#endif /* __MBEDTLS_COMMON_H__ */
+#endif /* MBEDTLS_COMMON_H */
diff --git a/include/drivers/auth/mbedtls/mbedtls_config.h b/include/drivers/auth/mbedtls/mbedtls_config.h
index cc57b77..d143d73 100644
--- a/include/drivers/auth/mbedtls/mbedtls_config.h
+++ b/include/drivers/auth/mbedtls/mbedtls_config.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __MBEDTLS_CONFIG_H__
-#define __MBEDTLS_CONFIG_H__
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
 
 /*
  * Key algorithms currently supported on mbed TLS libraries
@@ -104,4 +104,4 @@
 #define TF_MBEDTLS_HEAP_SIZE		U(7168)
 #endif
 
-#endif /* __MBEDTLS_CONFIG_H__ */
+#endif /* MBEDTLS_CONFIG_H */
diff --git a/include/drivers/cadence/cdns_uart.h b/include/drivers/cadence/cdns_uart.h
index 51de8e3..f92d9fb 100644
--- a/include/drivers/cadence/cdns_uart.h
+++ b/include/drivers/cadence/cdns_uart.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CADENCE_UART_H__
-#define __CADENCE_UART_H__
+#ifndef CDNS_UART_H
+#define CDNS_UART_H
 
 #include <console.h>
 
@@ -47,4 +47,4 @@
 
 #endif /*__ASSEMBLY__*/
 
-#endif
+#endif /* CDNS_UART_H */
diff --git a/include/drivers/cfi/v2m_flash.h b/include/drivers/cfi/v2m_flash.h
index 5763b36..6beec50 100644
--- a/include/drivers/cfi/v2m_flash.h
+++ b/include/drivers/cfi/v2m_flash.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __NORFLASH_H_
-#define __NORFLASH_H_
+#ifndef V2M_FLASH_H
+#define V2M_FLASH_H
 
 #include <stdint.h>
 
@@ -42,5 +42,4 @@
 int nor_unlock(uintptr_t base_addr);
 int nor_erase(uintptr_t base_addr);
 
-#endif /* __NORFLASH_H_ */
-
+#endif /* V2M_FLASH_H*/
diff --git a/include/drivers/console.h b/include/drivers/console.h
index 1f041b9..2375466 100644
--- a/include/drivers/console.h
+++ b/include/drivers/console.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CONSOLE_H__
-#define __CONSOLE_H__
+#ifndef CONSOLE_H
+#define CONSOLE_H
 
 #include <utils_def.h>
 
@@ -80,5 +80,4 @@
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __CONSOLE_H__ */
-
+#endif /* CONSOLE_H */
diff --git a/include/drivers/console_assertions.h b/include/drivers/console_assertions.h
index cedce86..559bb50 100644
--- a/include/drivers/console_assertions.h
+++ b/include/drivers/console_assertions.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CONSOLE_ASSERTIONS_H__
-#define __CONSOLE_ASSERTIONS_H__
+#ifndef CONSOLE_ASSERTIONS_H
+#define CONSOLE_ASSERTIONS_H
 
 #include <cassert.h>
 
@@ -26,5 +26,4 @@
 CASSERT(CONSOLE_T_DRVDATA == sizeof(console_t),
 	assert_console_t_drvdata_offset_mismatch);
 
-#endif /* __CONSOLE_ASSERTIONS_H__ */
-
+#endif /* CONSOLE_ASSERTIONS_H */
diff --git a/include/drivers/coreboot/cbmem_console.h b/include/drivers/coreboot/cbmem_console.h
index 4fca36f..7fe7a72 100644
--- a/include/drivers/coreboot/cbmem_console.h
+++ b/include/drivers/coreboot/cbmem_console.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CBMEM_CONSOLE_H__
-#define __CBMEM_CONSOLE_H__
+#ifndef CBMEM_CONSOLE_H
+#define CBMEM_CONSOLE_H
 
 #include <console.h>
 
@@ -24,4 +24,4 @@
 
 #endif /* __ASSEMBLER__ */
 
-#endif /* __CBMEM_CONSOLE_H__ */
+#endif /* CBMEM_CONSOLE_H */
diff --git a/include/drivers/delay_timer.h b/include/drivers/delay_timer.h
index b28f619..684f1c3 100644
--- a/include/drivers/delay_timer.h
+++ b/include/drivers/delay_timer.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __DELAY_TIMER_H__
-#define __DELAY_TIMER_H__
+#ifndef DELAY_TIMER_H
+#define DELAY_TIMER_H
 
 #include <stdint.h>
 
@@ -27,5 +27,4 @@
 void udelay(uint32_t usec);
 void timer_init(const timer_ops_t *ops_ptr);
 
-
-#endif /* __DELAY_TIMER_H__ */
+#endif /* DELAY_TIMER_H */
diff --git a/include/drivers/dw_ufs.h b/include/drivers/dw_ufs.h
index a9774cf..13e53f1 100644
--- a/include/drivers/dw_ufs.h
+++ b/include/drivers/dw_ufs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __DW_UFS_H__
-#define __DW_UFS_H__
+#ifndef DW_UFS_H
+#define DW_UFS_H
 
 #include <stdint.h>
 
@@ -107,4 +107,4 @@
 
 int dw_ufs_init(dw_ufs_params_t *params);
 
-#endif /* __DW_UFS_H__ */
+#endif /* DW_UFS_H */
diff --git a/include/drivers/generic_delay_timer.h b/include/drivers/generic_delay_timer.h
index 1c53a72..adba10f 100644
--- a/include/drivers/generic_delay_timer.h
+++ b/include/drivers/generic_delay_timer.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GENERIC_DELAY_TIMER_H__
-#define __GENERIC_DELAY_TIMER_H__
+#ifndef GENERIC_DELAY_TIMER_H
+#define GENERIC_DELAY_TIMER_H
 
 #include <stdint.h>
 
@@ -13,4 +13,4 @@
 
 void generic_delay_timer_init(void);
 
-#endif /* __GENERIC_DELAY_TIMER_H__ */
+#endif /* GENERIC_DELAY_TIMER_H */
diff --git a/include/drivers/gpio.h b/include/drivers/gpio.h
index 5722051..bef62f7 100644
--- a/include/drivers/gpio.h
+++ b/include/drivers/gpio.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GPIO_H__
-#define __GPIO_H__
+#ifndef GPIO_H
+#define GPIO_H
 
 #define GPIO_DIR_OUT		0
 #define GPIO_DIR_IN		1
@@ -34,4 +34,4 @@
 int gpio_get_pull(int gpio);
 void gpio_init(const gpio_ops_t *ops);
 
-#endif	/* __GPIO_H__ */
+#endif /* GPIO_H */
diff --git a/include/drivers/io/io_block.h b/include/drivers/io/io_block.h
index 4f3ab39..d6d32f9 100644
--- a/include/drivers/io/io_block.h
+++ b/include/drivers/io/io_block.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IO_BLOCK_H__
-#define __IO_BLOCK_H__
+#ifndef IO_BLOCK_H
+#define IO_BLOCK_H
 
 #include <io_storage.h>
 
@@ -25,4 +25,4 @@
 
 int register_io_dev_block(const struct io_dev_connector **dev_con);
 
-#endif /* __IO_BLOCK_H__ */
+#endif /* IO_BLOCK_H */
diff --git a/include/drivers/io/io_driver.h b/include/drivers/io/io_driver.h
index 8306407..587f137 100644
--- a/include/drivers/io/io_driver.h
+++ b/include/drivers/io/io_driver.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IO_DRIVER_H__
-#define __IO_DRIVER_H__
+#ifndef IO_DRIVER_H
+#define IO_DRIVER_H
 
 #include <io_storage.h>
 #include <stdint.h>
@@ -56,4 +56,4 @@
 /* Register an IO device */
 int io_register_device(const io_dev_info_t *dev_info);
 
-#endif  /* __IO_DRIVER_H__ */
+#endif /* IO_DRIVER_H */
diff --git a/include/drivers/io/io_dummy.h b/include/drivers/io/io_dummy.h
index abe77ec..edfc699 100644
--- a/include/drivers/io/io_dummy.h
+++ b/include/drivers/io/io_dummy.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IO_DUMMY_H__
-#define __IO_DUMMY_H__
+#ifndef IO_DUMMY_H
+#define IO_DUMMY_H
 
 int register_io_dev_dummy(const struct io_dev_connector **dev_con);
 
-#endif /* __IO_DUMMY_H__ */
+#endif /* IO_DUMMY_H */
diff --git a/include/drivers/io/io_fip.h b/include/drivers/io/io_fip.h
index 1131cc7..e0b5746 100644
--- a/include/drivers/io/io_fip.h
+++ b/include/drivers/io/io_fip.h
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IO_FIP_H__
-#define __IO_FIP_H__
+#ifndef IO_FIP_H
+#define IO_FIP_H
 
 struct io_dev_connector;
 
 int register_io_dev_fip(const struct io_dev_connector **dev_con);
 
-#endif /* __IO_FIP_H__ */
+#endif /* IO_FIP_H */
diff --git a/include/drivers/io/io_memmap.h b/include/drivers/io/io_memmap.h
index 70e4e55..87e3466 100644
--- a/include/drivers/io/io_memmap.h
+++ b/include/drivers/io/io_memmap.h
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IO_MEMMAP_H__
-#define __IO_MEMMAP_H__
+#ifndef IO_MEMMAP_H
+#define IO_MEMMAP_H
 
 struct io_dev_connector;
 
 int register_io_dev_memmap(const struct io_dev_connector **dev_con);
 
-#endif /* __IO_MEMMAP_H__ */
+#endif /* IO_MEMMAP_H */
diff --git a/include/drivers/io/io_semihosting.h b/include/drivers/io/io_semihosting.h
index a917f5a..e90ea5c 100644
--- a/include/drivers/io/io_semihosting.h
+++ b/include/drivers/io/io_semihosting.h
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IO_SH_H__
-#define __IO_SH_H__
+#ifndef IO_SEMIHOSTING_H
+#define IO_SEMIHOSTING_H
 
 struct io_dev_connector;
 
 int register_io_dev_sh(const struct io_dev_connector **dev_con);
 
-#endif /* __IO_SH_H__ */
+#endif /* IO_SEMIHOSTING_H */
diff --git a/include/drivers/io/io_storage.h b/include/drivers/io/io_storage.h
index 02308e3..c496d48 100644
--- a/include/drivers/io/io_storage.h
+++ b/include/drivers/io/io_storage.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IO_H__
-#define __IO_H__
+#ifndef IO_STORAGE_H
+#define IO_STORAGE_H
 
 #include <errno.h>
 #include <stdint.h>
@@ -101,4 +101,4 @@
 int io_close(uintptr_t handle);
 
 
-#endif /* __IO_H__ */
+#endif /* IO_STORAGE_H */
diff --git a/include/drivers/marvell/addr_map.h b/include/drivers/marvell/addr_map.h
index 6b957a1..0d219f2 100644
--- a/include/drivers/marvell/addr_map.h
+++ b/include/drivers/marvell/addr_map.h
@@ -7,8 +7,8 @@
 
 /* Address map types for Marvell address translation unit drivers */
 
-#ifndef _ADDR_MAP_H_
-#define _ADDR_MAP_H_
+#ifndef ADDR_MAP_H
+#define ADDR_MAP_H
 
 #include <stdint.h>
 
@@ -18,4 +18,4 @@
 	uint32_t target_id;
 };
 
-#endif /* _ADDR_MAP_H_ */
+#endif /* ADDR_MAP_H */
diff --git a/include/drivers/marvell/amb_adec.h b/include/drivers/marvell/amb_adec.h
index 087864a..a92db5b 100644
--- a/include/drivers/marvell/amb_adec.h
+++ b/include/drivers/marvell/amb_adec.h
@@ -7,8 +7,8 @@
 
 /* AXI to M-Bridge decoding unit driver for Marvell Armada 8K and 8K+ SoCs */
 
-#ifndef _AMB_ADEC_H_
-#define _AMB_ADEC_H_
+#ifndef AMB_ADEC_H
+#define AMB_ADEC_H
 
 #include <stdint.h>
 
@@ -33,4 +33,4 @@
 
 int init_amb_adec(uintptr_t base);
 
-#endif /* _AMB_ADEC_H_ */
+#endif /* AMB_ADEC_H */
diff --git a/include/drivers/marvell/aro.h b/include/drivers/marvell/aro.h
index 37e211f..c16f625 100644
--- a/include/drivers/marvell/aro.h
+++ b/include/drivers/marvell/aro.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  * https://spdx.org/licenses
  */
-#ifndef _ARO_H_
-#define _ARO_H_
+#ifndef ARO_H
+#define ARO_H
 
 enum hws_freq {
 	CPU_FREQ_2000,
@@ -44,4 +44,4 @@
 
 int init_aro(void);
 
-#endif /* _ARO_H_ */
+#endif /* ARO_H */
diff --git a/include/drivers/marvell/cache_llc.h b/include/drivers/marvell/cache_llc.h
index 9e41793..1aa4c88 100644
--- a/include/drivers/marvell/cache_llc.h
+++ b/include/drivers/marvell/cache_llc.h
@@ -9,8 +9,8 @@
  * for Marvell SoCs in AP806, AP807, and AP810
  */
 
-#ifndef _CACHE_LLC_H_
-#define _CACHE_LLC_H_
+#ifndef CACHE_LLC_H
+#define CACHE_LLC_H
 
 #define LLC_CTRL(ap)			(MVEBU_LLC_BASE(ap) + 0x100)
 #define LLC_SYNC(ap)			(MVEBU_LLC_BASE(ap) + 0x700)
@@ -38,5 +38,4 @@
 void llc_runtime_enable(int ap_index);
 #endif
 
-#endif /* _CACHE_LLC_H_ */
-
+#endif /* CACHE_LLC_H */
diff --git a/include/drivers/marvell/ccu.h b/include/drivers/marvell/ccu.h
index ff30a76..2757765 100644
--- a/include/drivers/marvell/ccu.h
+++ b/include/drivers/marvell/ccu.h
@@ -7,8 +7,8 @@
 
 /* CCU unit device driver for Marvell AP807, AP807 and AP810 SoCs */
 
-#ifndef _CCU_H_
-#define _CCU_H_
+#ifndef CCU_H
+#define CCU_H
 
 #ifndef __ASSEMBLY__
 #include <addr_map.h>
@@ -48,4 +48,4 @@
 void ccu_restore_win_all(int ap_id);
 #endif
 
-#endif /* _CCU_H_ */
+#endif /* CCU_H */
diff --git a/include/drivers/marvell/gwin.h b/include/drivers/marvell/gwin.h
index 5dc9f24..6b7f175 100644
--- a/include/drivers/marvell/gwin.h
+++ b/include/drivers/marvell/gwin.h
@@ -7,8 +7,8 @@
 
 /* GWIN unit device driver for Marvell AP810 SoC */
 
-#ifndef _GWIN_H_
-#define _GWIN_H_
+#ifndef GWIN_H
+#define GWIN_H
 
 #include <addr_map.h>
 
@@ -16,4 +16,4 @@
 void gwin_temp_win_insert(int ap_index, struct addr_map_win *win, int size);
 void gwin_temp_win_remove(int ap_index, struct addr_map_win *win, int size);
 
-#endif /* _GWIN_H_ */
+#endif /* GWIN_H */
diff --git a/include/drivers/marvell/i2c.h b/include/drivers/marvell/i2c.h
index bd14385..06c5114 100644
--- a/include/drivers/marvell/i2c.h
+++ b/include/drivers/marvell/i2c.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef _I2C_H_
-#define _I2C_H_
+#ifndef I2C_H
+#define I2C_H
 
 
 void i2c_init(void);
@@ -16,4 +16,5 @@
 
 int i2c_write(uint8_t chip,
 	      unsigned int addr, int alen, uint8_t *buffer, int len);
-#endif
+
+#endif /* I2C_H */
diff --git a/include/drivers/marvell/io_win.h b/include/drivers/marvell/io_win.h
index 4102a11..45e8666 100644
--- a/include/drivers/marvell/io_win.h
+++ b/include/drivers/marvell/io_win.h
@@ -7,8 +7,8 @@
 
 /* IO Window unit device driver for Marvell AP807, AP807 and AP810 SoCs */
 
-#ifndef _IO_WIN_H_
-#define _IO_WIN_H_
+#ifndef IO_WIN_H
+#define IO_WIN_H
 
 #include <addr_map.h>
 
@@ -18,4 +18,4 @@
 void iow_save_win_all(int ap_id);
 void iow_restore_win_all(int ap_id);
 
-#endif /* _IO_WIN_H_ */
+#endif /* IO_WIN_H */
diff --git a/include/drivers/marvell/iob.h b/include/drivers/marvell/iob.h
index 9848c0a..ccbdf96 100644
--- a/include/drivers/marvell/iob.h
+++ b/include/drivers/marvell/iob.h
@@ -7,8 +7,8 @@
 
 /* IOW unit device driver for Marvell CP110 and CP115 SoCs */
 
-#ifndef _IOB_H_
-#define _IOB_H_
+#ifndef IOB_H
+#define IOB_H
 
 #include <addr_map.h>
 
@@ -28,4 +28,4 @@
 void iob_cfg_space_update(int ap_idx, int cp_idx,
 			  uintptr_t base, uintptr_t new_base);
 
-#endif /* _IOB_H_ */
+#endif /* IOB_H */
diff --git a/include/drivers/marvell/mci.h b/include/drivers/marvell/mci.h
index 789b3b9..8ef0234 100644
--- a/include/drivers/marvell/mci.h
+++ b/include/drivers/marvell/mci.h
@@ -7,12 +7,12 @@
 
 /* MCI bus driver for Marvell ARMADA 8K and 8K+ SoCs */
 
-#ifndef _MCI_H_
-#define _MCI_H_
+#ifndef MCI_H
+#define MCI_H
 
 int mci_initialize(int mci_index);
 void mci_turn_link_down(void);
 void mci_turn_link_on(void);
 int mci_get_link_status(void);
 
-#endif /* _MCI_H_ */
+#endif /* MCI_H */
diff --git a/include/drivers/marvell/mochi/ap_setup.h b/include/drivers/marvell/mochi/ap_setup.h
index 41f2bac..eff4473 100644
--- a/include/drivers/marvell/mochi/ap_setup.h
+++ b/include/drivers/marvell/mochi/ap_setup.h
@@ -7,11 +7,11 @@
 
 /* AP8xx Marvell SoC driver */
 
-#ifndef __AP_SETUP_H__
-#define __AP_SETUP_H__
+#ifndef AP_SETUP_H
+#define AP_SETUP_H
 
 void ap_init(void);
 void ap_ble_init(void);
 int ap_get_count(void);
 
-#endif /* __AP_SETUP_H__ */
+#endif /* AP_SETUP_H */
diff --git a/include/drivers/marvell/mochi/cp110_setup.h b/include/drivers/marvell/mochi/cp110_setup.h
index 839efe1..18d9f18 100644
--- a/include/drivers/marvell/mochi/cp110_setup.h
+++ b/include/drivers/marvell/mochi/cp110_setup.h
@@ -7,8 +7,8 @@
 
 /* CP110 Marvell SoC driver */
 
-#ifndef __CP110_SETUP_H__
-#define __CP110_SETUP_H__
+#ifndef CP110_SETUP_H
+#define CP110_SETUP_H
 
 #include <mmio.h>
 #include <mvebu_def.h>
@@ -51,4 +51,4 @@
 void cp110_init(uintptr_t cp110_base, uint32_t stream_id);
 void cp110_ble_init(uintptr_t cp110_base);
 
-#endif /* __CP110_SETUP_H__ */
+#endif /* CP110_SETUP_H */
diff --git a/include/drivers/marvell/thermal.h b/include/drivers/marvell/thermal.h
index 191f97b..48376a7 100644
--- a/include/drivers/marvell/thermal.h
+++ b/include/drivers/marvell/thermal.h
@@ -7,8 +7,8 @@
 
 /* Driver for thermal unit located in Marvell ARMADA 8K and compatible SoCs */
 
-#ifndef _THERMAL_H
-#define _THERMAL_H
+#ifndef THERMAL_H
+#define THERMAL_H
 
 struct tsen_config {
 	/* thermal temperature parameters */
@@ -28,4 +28,4 @@
 int marvell_thermal_read(struct tsen_config *tsen_cfg, int *temp);
 struct tsen_config *marvell_thermal_config_get(void);
 
-#endif /* _THERMAL_H */
+#endif /* THERMAL_H */
diff --git a/include/drivers/mentor/mi2cv.h b/include/drivers/mentor/mi2cv.h
index 6b03ed7..85b733b 100644
--- a/include/drivers/mentor/mi2cv.h
+++ b/include/drivers/mentor/mi2cv.h
@@ -8,8 +8,8 @@
 
 /* This driver provides support for Mentor Graphics MI2CV IP core */
 
-#ifndef _MI2CV_H_
-#define _MI2CV_H_
+#ifndef MI2CV_H
+#define MI2CV_H
 
 #include <stdint.h>
 
@@ -36,4 +36,5 @@
 
 int i2c_write(uint8_t chip,
 	      unsigned int addr, int alen, uint8_t *buffer, int len);
-#endif
+
+#endif /* MI2CV_H */
diff --git a/include/drivers/mmc.h b/include/drivers/mmc.h
index 9900630..a62928b 100644
--- a/include/drivers/mmc.h
+++ b/include/drivers/mmc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MMC_H__
-#define __MMC_H__
+#ifndef MMC_H
+#define MMC_H
 
 #include <stdint.h>
 #include <utils_def.h>
@@ -232,4 +232,4 @@
 	     unsigned int width, unsigned int flags,
 	     struct mmc_device_info *device_info);
 
-#endif	/* __MMC_H__ */
+#endif /* MMC_H */
diff --git a/include/drivers/partition/gpt.h b/include/drivers/partition/gpt.h
index 7a22d9e2..7984e4d 100644
--- a/include/drivers/partition/gpt.h
+++ b/include/drivers/partition/gpt.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GPT_H__
-#define __GPT_H__
+#ifndef GPT_H
+#define GPT_H
 
 #include <partition.h>
 
@@ -48,4 +48,4 @@
 
 int parse_gpt_entry(gpt_entry_t *gpt_entry, partition_entry_t *entry);
 
-#endif	/* __GPT_H__ */
+#endif /* GPT_H */
diff --git a/include/drivers/partition/mbr.h b/include/drivers/partition/mbr.h
index 1cacb78..1452c02 100644
--- a/include/drivers/partition/mbr.h
+++ b/include/drivers/partition/mbr.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MBR_H__
-#define __MBR_H__
+#ifndef MBR_H
+#define MBR_H
 
 #define MBR_OFFSET			0
 
@@ -26,4 +26,4 @@
 	unsigned int		sector_nums;
 } mbr_entry_t;
 
-#endif	/* __MBR_H__ */
+#endif /* MBR_H */
diff --git a/include/drivers/partition/partition.h b/include/drivers/partition/partition.h
index 047c7dd..2aeaace 100644
--- a/include/drivers/partition/partition.h
+++ b/include/drivers/partition/partition.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PARTITION_H__
-#define __PARTITION_H__
+#ifndef PARTITION_H
+#define PARTITION_H
 
 #include <cassert.h>
 #include <stdint.h>
@@ -36,4 +36,4 @@
 const partition_entry_list_t *get_partition_entry_list(void);
 void partition_init(unsigned int image_id);
 
-#endif	/* __PARTITION_H__ */
+#endif /* PARTITION_H */
diff --git a/include/drivers/st/stm32_gpio.h b/include/drivers/st/stm32_gpio.h
index 7a5ccd3..938922b 100644
--- a/include/drivers/st/stm32_gpio.h
+++ b/include/drivers/st/stm32_gpio.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_GPIO_H__
-#define __PLAT_GPIO_H__
+#ifndef STM32_GPIO_H
+#define STM32_GPIO_H
 
 #include <utils_def.h>
 
@@ -98,4 +98,4 @@
 	      uint32_t pull, uint32_t alternate);
 #endif /*__ASSEMBLY__*/
 
-#endif /*__PLAT_GPIO_H__*/
+#endif /* STM32_GPIO_H */
diff --git a/include/drivers/st/stm32_i2c.h b/include/drivers/st/stm32_i2c.h
index 29b9d34..4760c00 100644
--- a/include/drivers/st/stm32_i2c.h
+++ b/include/drivers/st/stm32_i2c.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_I2C_H
-#define __STM32MP1_I2C_H
+#ifndef STM32_I2C_H
+#define STM32_I2C_H
 
 #include <stdint.h>
 #include <utils_def.h>
@@ -297,4 +297,4 @@
 int stm32_i2c_config_analog_filter(struct i2c_handle_s *hi2c,
 				   uint32_t analog_filter);
 
-#endif /* __STM32MP1_I2C_H */
+#endif /* STM32_I2C_H */
diff --git a/include/drivers/st/stm32mp1_clk.h b/include/drivers/st/stm32mp1_clk.h
index 85a1eb8..c895517 100644
--- a/include/drivers/st/stm32mp1_clk.h
+++ b/include/drivers/st/stm32mp1_clk.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_CLK_H__
-#define __STM32MP1_CLK_H__
+#ifndef STM32MP1_CLK_H
+#define STM32MP1_CLK_H
 
 #include <arch_helpers.h>
 #include <stdbool.h>
@@ -27,4 +27,4 @@
 	return base - (uint32_t)(~read_cntpct_el0());
 }
 
-#endif /* __STM32MP1_CLK_H__ */
+#endif /* STM32MP1_CLK_H */
diff --git a/include/drivers/st/stm32mp1_clkfunc.h b/include/drivers/st/stm32mp1_clkfunc.h
index 635a9cd..b11ccf8 100644
--- a/include/drivers/st/stm32mp1_clkfunc.h
+++ b/include/drivers/st/stm32mp1_clkfunc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_CLKFUNC_H__
-#define __STM32MP1_CLKFUNC_H__
+#ifndef STM32MP1_CLKFUNC_H
+#define STM32MP1_CLKFUNC_H
 
 #include <stdbool.h>
 
@@ -39,4 +39,4 @@
 uintptr_t fdt_get_stgen_base(void);
 int fdt_get_clock_id(int node);
 
-#endif /* __STM32MP1_CLKFUNC_H__ */
+#endif /* STM32MP1_CLKFUNC_H */
diff --git a/include/drivers/st/stm32mp1_ddr.h b/include/drivers/st/stm32mp1_ddr.h
index 0765664..363e302 100644
--- a/include/drivers/st/stm32mp1_ddr.h
+++ b/include/drivers/st/stm32mp1_ddr.h
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
  */
 
-#ifndef _STM32MP1_DDR_H
-#define _STM32MP1_DDR_H
+#ifndef STM32MP1_DDR_H
+#define STM32MP1_DDR_H
 
 #include <stdbool.h>
+#include <stdint.h>
 
 #define DT_DDR_COMPAT	"st,stm32mp1-ddr"
 
@@ -170,4 +171,4 @@
 int stm32mp1_ddr_clk_enable(struct ddr_info *priv, uint16_t mem_speed);
 void stm32mp1_ddr_init(struct ddr_info *priv,
 		       struct stm32mp1_ddr_config *config);
-#endif /* _STM32MP1_DDR_H */
+#endif /* STM32MP1_DDR_H */
diff --git a/include/drivers/st/stm32mp1_ddr_helpers.h b/include/drivers/st/stm32mp1_ddr_helpers.h
index 298a080..38f2415 100644
--- a/include/drivers/st/stm32mp1_ddr_helpers.h
+++ b/include/drivers/st/stm32mp1_ddr_helpers.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_DDR_HELPERS_H__
-#define __STM32MP1_DDR_HELPERS_H__
+#ifndef STM32MP1_DDR_HELPERS_H
+#define STM32MP1_DDR_HELPERS_H
 
 void ddr_enable_clock(void);
 
-#endif /* __STM32MP1_DDR_HELPERS_H__ */
+#endif /* STM32MP1_DDR_HELPERS_H */
diff --git a/include/drivers/st/stm32mp1_ddr_regs.h b/include/drivers/st/stm32mp1_ddr_regs.h
index 64ad965..9598d9b 100644
--- a/include/drivers/st/stm32mp1_ddr_regs.h
+++ b/include/drivers/st/stm32mp1_ddr_regs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
  */
 
-#ifndef _RAM_STM32MP1_DDR_REGS_H
-#define _RAM_STM32MP1_DDR_REGS_H
+#ifndef STM32MP1_DDR_REGS_H
+#define STM32MP1_DDR_REGS_H
 
 #include <utils_def.h>
 
@@ -410,4 +410,4 @@
 
 void ddr_enable_clock(void);
 
-#endif /* _RAM_STM32MP1_DDR_REGS_H */
+#endif /* STM32MP1_DDR_REGS_H */
diff --git a/include/drivers/st/stm32mp1_pmic.h b/include/drivers/st/stm32mp1_pmic.h
index 5d94b40..cc80b25 100644
--- a/include/drivers/st/stm32mp1_pmic.h
+++ b/include/drivers/st/stm32mp1_pmic.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_PMIC_H__
-#define __STM32MP1_PMIC_H__
+#ifndef STM32MP1_PMIC_H
+#define STM32MP1_PMIC_H
 
 #include <stdbool.h>
 
@@ -15,4 +15,4 @@
 void initialize_pmic(void);
 int pmic_ddr_power_init(enum ddr_type ddr_type);
 
-#endif /* __STM32MP1_PMIC_H__ */
+#endif /* STM32MP1_PMIC_H */
diff --git a/include/drivers/st/stm32mp1_pwr.h b/include/drivers/st/stm32mp1_pwr.h
index e567042..b34536e 100644
--- a/include/drivers/st/stm32mp1_pwr.h
+++ b/include/drivers/st/stm32mp1_pwr.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_PWR_H__
-#define __STM32MP1_PWR_H__
+#ifndef STM32MP1_PWR_H
+#define STM32MP1_PWR_H
 
 #include <utils_def.h>
 
@@ -29,4 +29,4 @@
 #define PWR_MPUCR_CSTDBYDIS	BIT(3)
 #define PWR_MPUCR_CSSF		BIT(9)
 
-#endif /* __STM32MP1_PWR_H__ */
+#endif /* STM32MP1_PWR_H */
diff --git a/include/drivers/st/stm32mp1_ram.h b/include/drivers/st/stm32mp1_ram.h
index af96177..38360e7 100644
--- a/include/drivers/st/stm32mp1_ram.h
+++ b/include/drivers/st/stm32mp1_ram.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _STM32MP1_RAM_H
-#define _STM32MP1_RAM_H
+#ifndef STM32MP1_RAM_H
+#define STM32MP1_RAM_H
 
 int stm32mp1_ddr_probe(void);
 
-#endif /* _STM32MP1_RAM_H */
+#endif /* STM32MP1_RAM_H */
diff --git a/include/drivers/st/stm32mp1_rcc.h b/include/drivers/st/stm32mp1_rcc.h
index e28ca97..87f4d7f 100644
--- a/include/drivers/st/stm32mp1_rcc.h
+++ b/include/drivers/st/stm32mp1_rcc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_RCC_H__
-#define __STM32MP1_RCC_H__
+#ifndef STM32MP1_RCC_H
+#define STM32MP1_RCC_H
 
 #include <utils_def.h>
 
@@ -365,4 +365,4 @@
 /* Values of RCC_MP_AHB4ENSETR register */
 #define RCC_MP_AHB4ENSETR_GPIOGEN	BIT(6)
 
-#endif /* __STM32MP1_RCC_H__ */
+#endif /* STM32MP1_RCC_H */
diff --git a/include/drivers/st/stm32mp1_reset.h b/include/drivers/st/stm32mp1_reset.h
index 76ee09d..cd488cc 100644
--- a/include/drivers/st/stm32mp1_reset.h
+++ b/include/drivers/st/stm32mp1_reset.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_RESET_H__
-#define __STM32MP1_RESET_H__
+#ifndef STM32MP1_RESET_H
+#define STM32MP1_RESET_H
 
 #include <stdint.h>
 
 void stm32mp1_reset_assert(uint32_t reset_id);
 void stm32mp1_reset_deassert(uint32_t reset_id);
 
-#endif /* __STM32MP1_RESET_H__ */
+#endif /* STM32MP1_RESET_H */
diff --git a/include/drivers/st/stpmu1.h b/include/drivers/st/stpmu1.h
index 1b93ab2..4bbcebb 100644
--- a/include/drivers/st/stpmu1.h
+++ b/include/drivers/st/stpmu1.h
@@ -4,9 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-
-#ifndef __STPMU1_H__
-#define __STPMU1_H__
+#ifndef STPMU1_H
+#define STPMU1_H
 
 #include <stm32_i2c.h>
 #include <utils_def.h>
@@ -138,4 +137,4 @@
 int stpmu1_regulator_voltage_set(const char *name, uint16_t millivolts);
 void stpmu1_bind_i2c(struct i2c_handle_s *i2c_handle, uint16_t i2c_addr);
 
-#endif /* __STPMU1_H__ */
+#endif /* STPMU1_H */
diff --git a/include/drivers/synopsys/dw_mmc.h b/include/drivers/synopsys/dw_mmc.h
index 1ec8d1d..533a876 100644
--- a/include/drivers/synopsys/dw_mmc.h
+++ b/include/drivers/synopsys/dw_mmc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __DW_MMC_H__
-#define __DW_MMC_H__
+#ifndef DW_MMC_H
+#define DW_MMC_H
 
 #include <mmc.h>
 
@@ -20,4 +20,4 @@
 
 void dw_mmc_init(dw_mmc_params_t *params, struct mmc_device_info *info);
 
-#endif	/* __DW_MMC_H__ */
+#endif /* DW_MMC_H */
diff --git a/include/drivers/ti/uart/uart_16550.h b/include/drivers/ti/uart/uart_16550.h
index 9ee2a33..ad80c57 100644
--- a/include/drivers/ti/uart/uart_16550.h
+++ b/include/drivers/ti/uart/uart_16550.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __UART_16550_H__
-#define __UART_16550_H__
+#ifndef UART_16550_H
+#define UART_16550_H
 
 #include <console.h>
 
@@ -93,4 +93,4 @@
 
 #endif /*__ASSEMBLY__*/
 
-#endif	/* __UART_16550_H__ */
+#endif /* UART_16550_H */
diff --git a/include/drivers/ufs.h b/include/drivers/ufs.h
index 88dedc5..414649b 100644
--- a/include/drivers/ufs.h
+++ b/include/drivers/ufs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __UFS_H__
-#define __UFS_H__
+#ifndef UFS_H
+#define UFS_H
 
 #include <utils_def.h>
 
@@ -545,4 +545,4 @@
 size_t ufs_write_blocks(int lun, int lba, const uintptr_t buf, size_t size);
 int ufs_init(const ufs_ops_t *ops, ufs_params_t *params);
 
-#endif /* __UFS_H__ */
+#endif /* UFS_H */
diff --git a/include/lib/aarch32/arch.h b/include/lib/aarch32/arch.h
index 3536d20..38e01bd 100644
--- a/include/lib/aarch32/arch.h
+++ b/include/lib/aarch32/arch.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __ARCH_H__
-#define __ARCH_H__
+#ifndef ARCH_H
+#define ARCH_H
 
 #include <utils_def.h>
 
@@ -630,4 +630,4 @@
 #define AMEVTYPER1E	p15, 0, c13, c15, 6
 #define AMEVTYPER1F	p15, 0, c13, c15, 7
 
-#endif /* __ARCH_H__ */
+#endif /* ARCH_H */
diff --git a/include/lib/aarch32/smccc_helpers.h b/include/lib/aarch32/smccc_helpers.h
index 5eeb204..67952ec 100644
--- a/include/lib/aarch32/smccc_helpers.h
+++ b/include/lib/aarch32/smccc_helpers.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SMCCC_HELPERS_H__
-#define __SMCCC_HELPERS_H__
+#ifndef SMCCC_HELPERS_H
+#define SMCCC_HELPERS_H
 
 #include <smccc.h>
 
@@ -156,4 +156,4 @@
 
 #endif /*__ASSEMBLY__*/
 
-#endif /* __SMCCC_HELPERS_H__ */
+#endif /* SMCCC_HELPERS_H */
diff --git a/include/lib/aarch32/smccc_macros.S b/include/lib/aarch32/smccc_macros.S
index fdb65e8..1fe6c64 100644
--- a/include/lib/aarch32/smccc_macros.S
+++ b/include/lib/aarch32/smccc_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __SMCCC_MACROS_S__
-#define __SMCCC_MACROS_S__
+#ifndef SMCCC_MACROS_S
+#define SMCCC_MACROS_S
 
 #include <arch.h>
 
@@ -196,4 +196,4 @@
 	eret
 	.endm
 
-#endif /* __SMCCC_MACROS_S__ */
+#endif /* SMCCC_MACROS_S */
diff --git a/include/lib/aarch64/setjmp.h b/include/lib/aarch64/setjmp.h
index c65810d..bbfe1df 100644
--- a/include/lib/aarch64/setjmp.h
+++ b/include/lib/aarch64/setjmp.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __JMP_H__
-#define __JMP_H__
+#ifndef SETJMP_H
+#define SETJMP_H
 
 #define JMP_CTX_X19	0x0
 #define JMP_CTX_X21	0x10
@@ -56,4 +56,4 @@
 void longjmp(struct jmpbuf *buf);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __JMP_H__ */
+#endif /* SETJMP_H */
diff --git a/include/lib/aarch64/smccc_helpers.h b/include/lib/aarch64/smccc_helpers.h
index c76faf5..efab18b 100644
--- a/include/lib/aarch64/smccc_helpers.h
+++ b/include/lib/aarch64/smccc_helpers.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SMCCC_HELPERS_H__
-#define __SMCCC_HELPERS_H__
+#ifndef SMCCC_HELPERS_H
+#define SMCCC_HELPERS_H
 
 #include <smccc.h>
 
@@ -82,4 +82,4 @@
 
 #endif /*__ASSEMBLY__*/
 
-#endif /* __SMCCC_HELPERS_H__ */
+#endif /* SMCCC_HELPERS_H */
diff --git a/include/lib/cassert.h b/include/lib/cassert.h
index 3119e1f..bbfdfdb 100644
--- a/include/lib/cassert.h
+++ b/include/lib/cassert.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CASSERT_H__
-#define __CASSERT_H__
+#ifndef CASSERT_H
+#define CASSERT_H
 
 #include <cdefs.h>
 
@@ -20,4 +20,4 @@
 #define CASSERT(cond, msg)	\
 	typedef char msg[(cond) ? 1 : -1] __unused
 
-#endif /* __CASSERT_H__ */
+#endif /* CASSERT_H */
diff --git a/include/lib/coreboot.h b/include/lib/coreboot.h
index f8fbd93..88212c3 100644
--- a/include/lib/coreboot.h
+++ b/include/lib/coreboot.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __COREBOOT_H__
-#define __COREBOOT_H__
+#ifndef COREBOOT_H
+#define COREBOOT_H
 
 #include <stdint.h>
 
@@ -21,4 +21,4 @@
 
 void coreboot_table_setup(void *base);
 
-#endif /* __COREBOOT_H__ */
+#endif /* COREBOOT_H */
diff --git a/include/lib/cpus/aarch32/aem_generic.h b/include/lib/cpus/aarch32/aem_generic.h
index f5476df..5fbdf53 100644
--- a/include/lib/cpus/aarch32/aem_generic.h
+++ b/include/lib/cpus/aarch32/aem_generic.h
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __AEM_GENERIC_H__
-#define __AEM_GENERIC_H__
+#ifndef AEM_GENERIC_H
+#define AEM_GENERIC_H
 
 /* BASE AEM midr for revision 0 */
 #define BASE_AEM_MIDR 0x410FD0F0
 
-#endif /* __AEM_GENERIC_H__ */
+#endif /* AEM_GENERIC_H */
diff --git a/include/lib/cpus/aarch32/cortex_a12.h b/include/lib/cpus/aarch32/cortex_a12.h
index 3068a41..3aa7278 100644
--- a/include/lib/cpus/aarch32/cortex_a12.h
+++ b/include/lib/cpus/aarch32/cortex_a12.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A12_H__
-#define __CORTEX_A12_H__
+#ifndef CORTEX_A12_H
+#define CORTEX_A12_H
 
 /*******************************************************************************
  * Cortex-A12 midr with version/revision set to 0
@@ -17,4 +17,4 @@
  ******************************************************************************/
 #define CORTEX_A12_ACTLR_SMP_BIT	(1 << 6)
 
-#endif /* __CORTEX_A12_H__ */
+#endif /* CORTEX_A12_H */
diff --git a/include/lib/cpus/aarch32/cortex_a15.h b/include/lib/cpus/aarch32/cortex_a15.h
index 0f01a43..ca842f6 100644
--- a/include/lib/cpus/aarch32/cortex_a15.h
+++ b/include/lib/cpus/aarch32/cortex_a15.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A15_H__
-#define __CORTEX_A15_H__
+#ifndef CORTEX_A15_H
+#define CORTEX_A15_H
 
 /*******************************************************************************
  * Cortex-A15 midr with version/revision set to 0
@@ -18,4 +18,4 @@
 #define CORTEX_A15_ACTLR_INV_BTB_BIT	(1 << 0)
 #define CORTEX_A15_ACTLR_SMP_BIT	(1 << 6)
 
-#endif /* __CORTEX_A15_H__ */
+#endif /* CORTEX_A15_H */
diff --git a/include/lib/cpus/aarch32/cortex_a17.h b/include/lib/cpus/aarch32/cortex_a17.h
index d2ca91c..b5a4a90 100644
--- a/include/lib/cpus/aarch32/cortex_a17.h
+++ b/include/lib/cpus/aarch32/cortex_a17.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A17_H__
-#define __CORTEX_A17_H__
+#ifndef CORTEX_A17_H
+#define CORTEX_A17_H
 
 /*******************************************************************************
  * Cortex-A17 midr with version/revision set to 0
@@ -17,4 +17,4 @@
  ******************************************************************************/
 #define CORTEX_A17_ACTLR_SMP_BIT	(1 << 6)
 
-#endif /* __CORTEX_A17_H__ */
+#endif /* CORTEX_A17_H */
diff --git a/include/lib/cpus/aarch32/cortex_a32.h b/include/lib/cpus/aarch32/cortex_a32.h
index 4d6826a..36322d2 100644
--- a/include/lib/cpus/aarch32/cortex_a32.h
+++ b/include/lib/cpus/aarch32/cortex_a32.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A32_H__
-#define __CORTEX_A32_H__
+#ifndef CORTEX_A32_H
+#define CORTEX_A32_H
 
 /* Cortex-A32 Main ID register for revision 0 */
 #define CORTEX_A32_MIDR				0x410FD010
@@ -17,4 +17,4 @@
 #define CORTEX_A32_CPUECTLR_EL1			p15, 1, c15
 #define CORTEX_A32_CPUECTLR_SMPEN_BIT		(1 << 6)
 
-#endif /* __CORTEX_A32_H__ */
+#endif /* CORTEX_A32_H */
diff --git a/include/lib/cpus/aarch32/cortex_a5.h b/include/lib/cpus/aarch32/cortex_a5.h
index 0a0b7ff..3e58f25 100644
--- a/include/lib/cpus/aarch32/cortex_a5.h
+++ b/include/lib/cpus/aarch32/cortex_a5.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A5_H__
-#define __CORTEX_A5_H__
+#ifndef CORTEX_A5_H
+#define CORTEX_A5_H
 
 /*******************************************************************************
  * Cortex-A8 midr with version/revision set to 0
@@ -17,4 +17,4 @@
  ******************************************************************************/
 #define CORTEX_A5_ACTLR_SMP_BIT		(1 << 6)
 
-#endif /* __CORTEX_A5_H__ */
+#endif /* CORTEX_A5_H */
diff --git a/include/lib/cpus/aarch32/cortex_a53.h b/include/lib/cpus/aarch32/cortex_a53.h
index a7a681f..a2d7ec0 100644
--- a/include/lib/cpus/aarch32/cortex_a53.h
+++ b/include/lib/cpus/aarch32/cortex_a53.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A53_H__
-#define __CORTEX_A53_H__
+#ifndef CORTEX_A53_H
+#define CORTEX_A53_H
 
 /* Cortex-A53 midr for revision 0 */
 #define CORTEX_A53_MIDR 0x410FD030
@@ -67,4 +67,4 @@
  ******************************************************************************/
 #define CORTEX_A53_L2MERRSR			p15, 3, c15
 
-#endif /* __CORTEX_A53_H__ */
+#endif /* CORTEX_A53_H */
diff --git a/include/lib/cpus/aarch32/cortex_a57.h b/include/lib/cpus/aarch32/cortex_a57.h
index 3f0fb04..6f60c11 100644
--- a/include/lib/cpus/aarch32/cortex_a57.h
+++ b/include/lib/cpus/aarch32/cortex_a57.h
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A57_H__
-#define __CORTEX_A57_H__
+#ifndef CORTEX_A57_H
+#define CORTEX_A57_H
+
 #include <utils_def.h>
 
 /* Cortex-A57 midr for revision 0 */
@@ -79,4 +80,4 @@
  ******************************************************************************/
 #define CORTEX_A57_L2MERRSR			p15, 3, c15
 
-#endif /* __CORTEX_A57_H__ */
+#endif /* CORTEX_A57_H */
diff --git a/include/lib/cpus/aarch32/cortex_a7.h b/include/lib/cpus/aarch32/cortex_a7.h
index 61b0d00..03fc118 100644
--- a/include/lib/cpus/aarch32/cortex_a7.h
+++ b/include/lib/cpus/aarch32/cortex_a7.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A7_H__
-#define __CORTEX_A7_H__
+#ifndef CORTEX_A7_H
+#define CORTEX_A7_H
 
 /*******************************************************************************
  * Cortex-A7 midr with version/revision set to 0
@@ -17,4 +17,4 @@
  ******************************************************************************/
 #define CORTEX_A7_ACTLR_SMP_BIT		(1 << 6)
 
-#endif /* __CORTEX_A7_H__ */
+#endif /* CORTEX_A7_H */
diff --git a/include/lib/cpus/aarch32/cortex_a72.h b/include/lib/cpus/aarch32/cortex_a72.h
index 1a3c014..f45865a 100644
--- a/include/lib/cpus/aarch32/cortex_a72.h
+++ b/include/lib/cpus/aarch32/cortex_a72.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A72_H__
-#define __CORTEX_A72_H__
+#ifndef CORTEX_A72_H
+#define CORTEX_A72_H
 #include <utils_def.h>
 
 /* Cortex-A72 midr for revision 0 */
@@ -54,4 +54,4 @@
  ******************************************************************************/
 #define CORTEX_A72_L2MERRSR				p15, 3, c15
 
-#endif /* __CORTEX_A72_H__ */
+#endif /* CORTEX_A72_H */
diff --git a/include/lib/cpus/aarch32/cortex_a9.h b/include/lib/cpus/aarch32/cortex_a9.h
index be85f9b..a9e86ef 100644
--- a/include/lib/cpus/aarch32/cortex_a9.h
+++ b/include/lib/cpus/aarch32/cortex_a9.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A9_H__
-#define __CORTEX_A9_H__
+#ifndef CORTEX_A9_H
+#define CORTEX_A9_H
 
 /*******************************************************************************
  * Cortex-A9 midr with version/revision set to 0
@@ -28,4 +28,4 @@
 DEFINE_COPROCR_RW_FUNCS(pcr, PCR)
 #endif
 
-#endif /* __CORTEX_A9_H__ */
+#endif /* CORTEX_A9_H */
diff --git a/include/lib/cpus/aarch32/cpu_macros.S b/include/lib/cpus/aarch32/cpu_macros.S
index aa728b2..1c0da0f 100644
--- a/include/lib/cpus/aarch32/cpu_macros.S
+++ b/include/lib/cpus/aarch32/cpu_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __CPU_MACROS_S__
-#define __CPU_MACROS_S__
+#ifndef CPU_MACROS_S
+#define CPU_MACROS_S
 
 #include <arch.h>
 #include <errata_report.h>
@@ -227,4 +227,4 @@
 	beq	\_label
 	.endm
 
-#endif /* __CPU_MACROS_S__ */
+#endif /* CPU_MACROS_S */
diff --git a/include/lib/cpus/aarch64/aem_generic.h b/include/lib/cpus/aarch64/aem_generic.h
index ddb235f..1edef84 100644
--- a/include/lib/cpus/aarch64/aem_generic.h
+++ b/include/lib/cpus/aarch64/aem_generic.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __AEM_GENERIC_H__
-#define __AEM_GENERIC_H__
+#ifndef AEM_GENERIC_H
+#define AEM_GENERIC_H
 
 /* BASE AEM midr for revision 0 */
 #define BASE_AEM_MIDR 0x410FD0F0
@@ -13,5 +13,4 @@
 /* Foundation AEM midr for revision 0 */
 #define FOUNDATION_AEM_MIDR  0x410FD000
 
-
-#endif /* __AEM_GENERIC_H__ */
+#endif /* AEM_GENERIC_H */
diff --git a/include/lib/cpus/aarch64/cortex_a35.h b/include/lib/cpus/aarch64/cortex_a35.h
index ad0fedc..2363198 100644
--- a/include/lib/cpus/aarch64/cortex_a35.h
+++ b/include/lib/cpus/aarch64/cortex_a35.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A35_H__
-#define __CORTEX_A35_H__
+#ifndef CORTEX_A35_H
+#define CORTEX_A35_H
 
 /* Cortex-A35 Main ID register for revision 0 */
 #define CORTEX_A35_MIDR				0x410FD040
@@ -17,4 +17,4 @@
 #define CORTEX_A35_CPUECTLR_EL1			S3_1_C15_C2_1
 #define CORTEX_A35_CPUECTLR_SMPEN_BIT		(1 << 6)
 
-#endif /* __CORTEX_A35_H__ */
+#endif /* CORTEX_A35_H */
diff --git a/include/lib/cpus/aarch64/cortex_a53.h b/include/lib/cpus/aarch64/cortex_a53.h
index 9aa118b..4b7d238 100644
--- a/include/lib/cpus/aarch64/cortex_a53.h
+++ b/include/lib/cpus/aarch64/cortex_a53.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A53_H__
-#define __CORTEX_A53_H__
+#ifndef CORTEX_A53_H
+#define CORTEX_A53_H
 
 /* Cortex-A53 midr for revision 0 */
 #define CORTEX_A53_MIDR			U(0x410FD030)
@@ -71,4 +71,4 @@
  ******************************************************************************/
 #define CORTEX_A53_L2MERRSR_EL1				S3_1_C15_C2_3
 
-#endif /* __CORTEX_A53_H__ */
+#endif /* CORTEX_A53_H */
diff --git a/include/lib/cpus/aarch64/cortex_a55.h b/include/lib/cpus/aarch64/cortex_a55.h
index 293f2b2..763b7cb 100644
--- a/include/lib/cpus/aarch64/cortex_a55.h
+++ b/include/lib/cpus/aarch64/cortex_a55.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A55_H__
-#define __CORTEX_A55_H__
+#ifndef CORTEX_A55_H
+#define CORTEX_A55_H
 
 /* Cortex-A55 MIDR for revision 0 */
 #define CORTEX_A55_MIDR		0x410fd050
@@ -19,4 +19,4 @@
 /* Definitions of register field mask in CORTEX_A55_CPUPWRCTLR_EL1 */
 #define CORTEX_A55_CORE_PWRDN_EN_MASK	0x1
 
-#endif /* __CORTEX_A55_H__ */
+#endif /* CORTEX_A55_H */
diff --git a/include/lib/cpus/aarch64/cortex_a57.h b/include/lib/cpus/aarch64/cortex_a57.h
index 97d074e..71d07db 100644
--- a/include/lib/cpus/aarch64/cortex_a57.h
+++ b/include/lib/cpus/aarch64/cortex_a57.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A57_H__
-#define __CORTEX_A57_H__
+#ifndef CORTEX_A57_H
+#define CORTEX_A57_H
 #include <utils_def.h>
 
 /* Cortex-A57 midr for revision 0 */
@@ -81,4 +81,4 @@
  ******************************************************************************/
 #define CORTEX_A57_L2MERRSR_EL1			S3_1_C15_C2_3
 
-#endif /* __CORTEX_A57_H__ */
+#endif /* CORTEX_A57_H */
diff --git a/include/lib/cpus/aarch64/cortex_a72.h b/include/lib/cpus/aarch64/cortex_a72.h
index 5b9e06d..4eafc11 100644
--- a/include/lib/cpus/aarch64/cortex_a72.h
+++ b/include/lib/cpus/aarch64/cortex_a72.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A72_H__
-#define __CORTEX_A72_H__
+#ifndef CORTEX_A72_H
+#define CORTEX_A72_H
 #include <utils_def.h>
 
 /* Cortex-A72 midr for revision 0 */
@@ -61,4 +61,4 @@
  ******************************************************************************/
 #define CORTEX_A72_L2MERRSR_EL1				S3_1_C15_C2_3
 
-#endif /* __CORTEX_A72_H__ */
+#endif /* CORTEX_A72_H */
diff --git a/include/lib/cpus/aarch64/cortex_a73.h b/include/lib/cpus/aarch64/cortex_a73.h
index 4db0cae..77ea205 100644
--- a/include/lib/cpus/aarch64/cortex_a73.h
+++ b/include/lib/cpus/aarch64/cortex_a73.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A73_H__
-#define __CORTEX_A73_H__
+#ifndef CORTEX_A73_H
+#define CORTEX_A73_H
 
 /* Cortex-A73 midr for revision 0 */
 #define CORTEX_A73_MIDR	0x410FD090
@@ -29,4 +29,4 @@
 
 #define CORTEX_A73_IMP_DEF_REG1_DISABLE_LOAD_PASS_STORE	(1 << 3)
 
-#endif /* __CORTEX_A73_H__ */
+#endif /* CORTEX_A73_H */
diff --git a/include/lib/cpus/aarch64/cortex_a76.h b/include/lib/cpus/aarch64/cortex_a76.h
index 1cb7747..4dea64b 100644
--- a/include/lib/cpus/aarch64/cortex_a76.h
+++ b/include/lib/cpus/aarch64/cortex_a76.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_A76_H__
-#define __CORTEX_A76_H__
+#ifndef CORTEX_A76_H
+#define CORTEX_A76_H
 
 /* Cortex-A76 MIDR for revision 0 */
 #define CORTEX_A76_MIDR		0x410fd0b0
@@ -26,4 +26,4 @@
 /* Definitions of register field mask in CORTEX_A76_CPUPWRCTLR_EL1 */
 #define CORTEX_A76_CORE_PWRDN_EN_MASK	0x1
 
-#endif /* __CORTEX_A76_H__ */
+#endif /* CORTEX_A76_H */
diff --git a/include/lib/cpus/aarch64/cortex_deimos.h b/include/lib/cpus/aarch64/cortex_deimos.h
index 3c36567..694fb15 100644
--- a/include/lib/cpus/aarch64/cortex_deimos.h
+++ b/include/lib/cpus/aarch64/cortex_deimos.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_DEIMOS_H__
-#define __CORTEX_DEIMOS_H__
+#ifndef CORTEX_DEIMOS_H
+#define CORTEX_DEIMOS_H
 
 #define CORTEX_DEIMOS_MIDR					U(0x410FD0D0)
 
@@ -20,4 +20,4 @@
 #define CORTEX_DEIMOS_CPUPWRCTLR_EL1				S3_0_C15_C2_7
 #define CORTEX_DEIMOS_CPUPWRCTLR_EL1_CORE_PWRDN_BIT		(U(1) << 0)
 
-#endif /* __CORTEX_DEIMOS_H__ */
+#endif /* CORTEX_DEIMOS_H */
diff --git a/include/lib/cpus/aarch64/cortex_helios.h b/include/lib/cpus/aarch64/cortex_helios.h
index 1098a12..571ea9d 100644
--- a/include/lib/cpus/aarch64/cortex_helios.h
+++ b/include/lib/cpus/aarch64/cortex_helios.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CORTEX_HELIOS_H__
-#define __CORTEX_HELIOS_H__
+#ifndef CORTEX_HELIOS_H
+#define CORTEX_HELIOS_H
 
 #define CORTEX_HELIOS_MIDR		U(0x410FD060)
 
@@ -26,4 +26,4 @@
 #define CORTEX_HELIOS_CPUPWRCTLR_EL1				S3_0_C15_C2_7
 #define CORTEX_HELIOS_CPUPWRCTLR_EL1_CORE_PWRDN_BIT		(U(1) << 0)
 
-#endif /* __CORTEX_HELIOS_H__ */
+#endif /* CORTEX_HELIOS_H */
diff --git a/include/lib/cpus/aarch64/cpu_macros.S b/include/lib/cpus/aarch64/cpu_macros.S
index 14616ac..2875700 100644
--- a/include/lib/cpus/aarch64/cpu_macros.S
+++ b/include/lib/cpus/aarch64/cpu_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __CPU_MACROS_S__
-#define __CPU_MACROS_S__
+#ifndef CPU_MACROS_S
+#define CPU_MACROS_S
 
 #include <arch.h>
 #include <errata_report.h>
@@ -255,8 +255,6 @@
 	.endm
 #endif
 
-#endif /* __CPU_MACROS_S__ */
-
 	/*
 	 * This macro is used on some CPUs to detect if they are vulnerable
 	 * to CVE-2017-5715.
@@ -285,3 +283,5 @@
 	cmp	w0, #((\_cpu_midr >> MIDR_PN_SHIFT) & MIDR_PN_MASK)
 	b.eq	\_label
 	.endm
+
+#endif /* CPU_MACROS_S */
diff --git a/include/lib/cpus/aarch64/denver.h b/include/lib/cpus/aarch64/denver.h
index 712a4a4..81c076a 100644
--- a/include/lib/cpus/aarch64/denver.h
+++ b/include/lib/cpus/aarch64/denver.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __DENVER_H__
-#define __DENVER_H__
+#ifndef DENVER_H
+#define DENVER_H
 
 /* MIDR values for Denver */
 #define DENVER_MIDR_PN0			U(0x4E0F0000)
@@ -39,6 +39,6 @@
 /* Disable Dynamic Code Optimisation */
 void denver_disable_dco(void);
 
-#endif
+#endif /* __ASSEMBLY__ */
 
-#endif /* __DENVER_H__ */
+#endif /* DENVER_H */
diff --git a/include/lib/el3_runtime/pubsub.h b/include/lib/el3_runtime/pubsub.h
index 2c8a196..930952f 100644
--- a/include/lib/el3_runtime/pubsub.h
+++ b/include/lib/el3_runtime/pubsub.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PUBSUB_H__
-#define __PUBSUB_H__
+#ifndef PUBSUB_H
+#define PUBSUB_H
 
 #define __pubsub_start_sym(event)	__pubsub_##event##_start
 #define __pubsub_end_sym(event)		__pubsub_##event##_end
@@ -84,4 +84,4 @@
 typedef void* (*pubsub_cb_t)(const void *arg);
 
 #endif	/* __LINKER__ */
-#endif	/* __PUBSUB_H__ */
+#endif /* PUBSUB_H */
diff --git a/include/lib/extensions/ras.h b/include/lib/extensions/ras.h
index 400de59..62fd63f 100644
--- a/include/lib/extensions/ras.h
+++ b/include/lib/extensions/ras.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef RAS_COMMON
-#define RAS_COMMON
+#ifndef RAS_H
+#define RAS_H
 
 #define ERR_HANDLER_VERSION	1U
 
@@ -196,4 +196,5 @@
 void ras_init(void);
 
 #endif /* __ASSEMBLY__ */
-#endif /* RAS_COMMON */
+
+#endif /* RAS_H */
diff --git a/include/lib/libc/aarch32/endian_.h b/include/lib/libc/aarch32/endian_.h
index 83a26b7..0cf2c75 100644
--- a/include/lib/libc/aarch32/endian_.h
+++ b/include/lib/libc/aarch32/endian_.h
@@ -36,8 +36,8 @@
  * All rights reserved.
  */
 
-#ifndef AARCH32_ENDIAN_H
-#define AARCH32_ENDIAN_H
+#ifndef ENDIAN__H
+#define ENDIAN__H
 
 #include <stdint.h>
 
@@ -143,4 +143,4 @@
 #define __bswap32(x)	__bswap32_var(x)
 
 #endif /* __OPTIMIZE__ */
-#endif /* AARCH32_ENDIAN_H */
+#endif /* ENDIAN__H */
diff --git a/include/lib/libc/aarch32/stddef_.h b/include/lib/libc/aarch32/stddef_.h
index 928481c..1babfad 100644
--- a/include/lib/libc/aarch32/stddef_.h
+++ b/include/lib/libc/aarch32/stddef_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDDEF__H
+#define STDDEF__H
+
 #ifndef SIZET_
 typedef unsigned int size_t;
 #define SIZET_
@@ -13,3 +16,5 @@
 typedef long ptrdiff_t;
 #define _PTRDIFF_T
 #endif
+
+#endif /* STDDEF__H */
diff --git a/include/lib/libc/aarch32/stdio_.h b/include/lib/libc/aarch32/stdio_.h
index 98304bc..50d3cc2 100644
--- a/include/lib/libc/aarch32/stdio_.h
+++ b/include/lib/libc/aarch32/stdio_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDIO__H
+#define STDIO__H
+
 #ifndef SIZET_
 typedef unsigned int size_t;
 #define SIZET_
@@ -13,3 +16,5 @@
 typedef int ssize_t;
 #define SSIZET_
 #endif
+
+#endif /* STDIO__H */
diff --git a/include/lib/libc/aarch32/stdlib_.h b/include/lib/libc/aarch32/stdlib_.h
index af96d01..9c07857 100644
--- a/include/lib/libc/aarch32/stdlib_.h
+++ b/include/lib/libc/aarch32/stdlib_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDLIB__H
+#define STDLIB__H
+
 #ifndef SIZET_
 typedef unsigned int size_t;
 #define SIZET_
@@ -11,3 +14,5 @@
 
 #define EXIT_FAILURE 1
 #define EXIT_SUCCESS 0
+
+#endif /* STDLIB__H */
diff --git a/include/lib/libc/aarch32/string_.h b/include/lib/libc/aarch32/string_.h
index b3ad602..4e139b0 100644
--- a/include/lib/libc/aarch32/string_.h
+++ b/include/lib/libc/aarch32/string_.h
@@ -4,7 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STRING__H
+#define STRING__H
+
 #ifndef SIZET_
 typedef unsigned int size_t;
 #define SIZET_
 #endif
+
+#endif /* STRING__H */
diff --git a/include/lib/libc/aarch32/time_.h b/include/lib/libc/aarch32/time_.h
index 4fc629d..a9169c2 100644
--- a/include/lib/libc/aarch32/time_.h
+++ b/include/lib/libc/aarch32/time_.h
@@ -4,9 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef TIME__H
+#define TIME__H
+
 #ifndef SIZET_
 typedef unsigned int size_t;
 #define SIZET_
 #endif
 
 typedef long int time_t;
+
+#endif /* TIME__H */
diff --git a/include/lib/libc/aarch64/endian_.h b/include/lib/libc/aarch64/endian_.h
index c60b475..7c79fd4 100644
--- a/include/lib/libc/aarch64/endian_.h
+++ b/include/lib/libc/aarch64/endian_.h
@@ -36,8 +36,8 @@
  * All rights reserved.
  */
 
-#ifndef AARCH64_ENDIAN_H
-#define AARCH64_ENDIAN_H
+#ifndef ENDIAN__H
+#define ENDIAN__H
 
 #include <stdint.h>
 
@@ -125,4 +125,4 @@
 #define	__bswap32(x)	__bswap32_var(x)
 
 #endif /* __OPTIMIZE__ */
-#endif /* AARCH64_ENDIAN_H */
+#endif /* ENDIAN__H */
diff --git a/include/lib/libc/aarch64/stddef_.h b/include/lib/libc/aarch64/stddef_.h
index 3e5883e..b7d8209 100644
--- a/include/lib/libc/aarch64/stddef_.h
+++ b/include/lib/libc/aarch64/stddef_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDDEF__H
+#define STDDEF__H
+
 #ifndef SIZET_
 typedef unsigned long size_t;
 #define SIZET_
@@ -13,3 +16,5 @@
 typedef long ptrdiff_t;
 #define _PTRDIFF_T
 #endif
+
+#endif /* STDDEF__H */
diff --git a/include/lib/libc/aarch64/stdio_.h b/include/lib/libc/aarch64/stdio_.h
index ad0b200..09b0172 100644
--- a/include/lib/libc/aarch64/stdio_.h
+++ b/include/lib/libc/aarch64/stdio_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDIO__H
+#define STDIO__H
+
 #ifndef SIZET_
 typedef unsigned long size_t;
 #define SIZET_
@@ -13,3 +16,5 @@
 typedef long ssize_t;
 #define SSIZET_
 #endif
+
+#endif /* STDIO__H */
diff --git a/include/lib/libc/aarch64/stdlib_.h b/include/lib/libc/aarch64/stdlib_.h
index 3612c99..81a39d1 100644
--- a/include/lib/libc/aarch64/stdlib_.h
+++ b/include/lib/libc/aarch64/stdlib_.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STDLIB__H
+#define STDLIB__H
+
 #ifndef SIZET_
 typedef unsigned long size_t;
 #define SIZET_
@@ -11,3 +14,5 @@
 
 #define EXIT_FAILURE 1
 #define EXIT_SUCCESS 0
+
+#endif /* STDLIB__H */
diff --git a/include/lib/libc/aarch64/string_.h b/include/lib/libc/aarch64/string_.h
index a88a751..71c51a6 100644
--- a/include/lib/libc/aarch64/string_.h
+++ b/include/lib/libc/aarch64/string_.h
@@ -4,7 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef STRING__H
+#define STRING__H
+
 #ifndef SIZET_
 typedef unsigned long size_t;
 #define SIZET_
 #endif
+
+#endif /* STRING__H */
diff --git a/include/lib/libc/aarch64/time_.h b/include/lib/libc/aarch64/time_.h
index cbc34e7..68ab1b8 100644
--- a/include/lib/libc/aarch64/time_.h
+++ b/include/lib/libc/aarch64/time_.h
@@ -4,9 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifndef TIME__H
+#define TIME__H
+
 #ifndef SIZET_
 typedef unsigned long size_t;
 #define SIZET_
 #endif
 
 typedef long int time_t;
+
+#endif /* TIME__H */
diff --git a/include/lib/libc/endian.h b/include/lib/libc/endian.h
index 2cc4c5f..4100f57 100644
--- a/include/lib/libc/endian.h
+++ b/include/lib/libc/endian.h
@@ -188,4 +188,4 @@
 	le32enc(p + 4, (uint32_t)(u >> 32));
 }
 
-#endif /* SYS_ENDIAN_H */
+#endif /* ENDIAN_H */
diff --git a/include/lib/mmio.h b/include/lib/mmio.h
index 38fdf0f..3242a7c 100644
--- a/include/lib/mmio.h
+++ b/include/lib/mmio.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MMIO_H__
-#define __MMIO_H__
+#ifndef MMIO_H
+#define MMIO_H
 
 #include <stdint.h>
 
@@ -73,4 +73,4 @@
 	mmio_write_32(addr, (mmio_read_32(addr) & ~clear) | set);
 }
 
-#endif /* __MMIO_H__ */
+#endif /* MMIO_H */
diff --git a/include/lib/optee_utils.h b/include/lib/optee_utils.h
index 3d35b19..b13c450 100644
--- a/include/lib/optee_utils.h
+++ b/include/lib/optee_utils.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __OPTEE_UTILS_H__
-#define __OPTEE_UTILS_H__
+#ifndef OPTEE_UTILS_H
+#define OPTEE_UTILS_H
 
 #include <bl_common.h>
 
@@ -12,4 +12,4 @@
 	image_info_t *pager_image_info,
 	image_info_t *paged_image_info);
 
-#endif /* __OPTEE_UTILS_H__ */
+#endif /* OPTEE_UTILS_H */
diff --git a/include/lib/pmf/pmf_asm_macros.S b/include/lib/pmf/pmf_asm_macros.S
index 5e19e62..5f3e6b7 100644
--- a/include/lib/pmf/pmf_asm_macros.S
+++ b/include/lib/pmf/pmf_asm_macros.S
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PMF_ASM_MACROS_S__
-#define __PMF_ASM_MACROS_S__
+#ifndef PMF_ASM_MACROS_S
+#define PMF_ASM_MACROS_S
 
 #define PMF_TS_SIZE	8
 
@@ -27,4 +27,4 @@
 	add	x0, x0, x1
 	.endm
 
-#endif /* __PMF_ASM_MACROS_S__ */
+#endif /* PMF_ASM_MACROS_S */
diff --git a/include/lib/runtime_instr.h b/include/lib/runtime_instr.h
index ed564e2..cb64839 100644
--- a/include/lib/runtime_instr.h
+++ b/include/lib/runtime_instr.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __RUNTIME_INSTR_H__
-#define __RUNTIME_INSTR_H__
+#ifndef RUNTIME_INSTR_H
+#define RUNTIME_INSTR_H
 
 #include <utils_def.h>
 
@@ -22,4 +22,4 @@
 PMF_DECLARE_GET_TIMESTAMP(rt_instr_svc)
 #endif /* __ASSEMBLY__ */
 
-#endif /* __RUNTIME_INSTR_H__ */
+#endif /* RUNTIME_INSTR_H */
diff --git a/include/lib/semihosting.h b/include/lib/semihosting.h
index eb7c4c3..006c7b7 100644
--- a/include/lib/semihosting.h
+++ b/include/lib/semihosting.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SEMIHOSTING_H__
-#define __SEMIHOSTING_H__
+#ifndef SEMIHOSTING_H
+#define SEMIHOSTING_H
 
 #include <stdint.h>
 #include <stdio.h> /* For ssize_t */
@@ -55,4 +55,4 @@
 void semihosting_write_string(char *string);
 char semihosting_read_char(void);
 
-#endif /* __SEMIHOSTING_H__ */
+#endif /* SEMIHOSTING_H */
diff --git a/include/lib/smccc.h b/include/lib/smccc.h
index b3dad10..6ee8aa0 100644
--- a/include/lib/smccc.h
+++ b/include/lib/smccc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SMCCC_H__
-#define __SMCCC_H__
+#ifndef SMCCC_H
+#define SMCCC_H
 
 #include <utils_def.h>
 
@@ -101,4 +101,4 @@
 			      (_uuid).node[4], (_uuid).node[5]))
 
 #endif /*__ASSEMBLY__*/
-#endif /* __SMCCC_H__ */
+#endif /* SMCCC_H */
diff --git a/include/lib/smccc_v1.h b/include/lib/smccc_v1.h
index 98ef021..2b8bd8b 100644
--- a/include/lib/smccc_v1.h
+++ b/include/lib/smccc_v1.h
@@ -7,7 +7,7 @@
 #ifndef SMCCC_V1_H
 #define SMCCC_V1_H
 
-#ifndef __SMCCC_H__
+#ifndef SMCCC_H
 #error "This file must only be included from smccc.h"
 #endif
 
diff --git a/include/lib/smccc_v2.h b/include/lib/smccc_v2.h
index 628c160..22bf458 100644
--- a/include/lib/smccc_v2.h
+++ b/include/lib/smccc_v2.h
@@ -7,7 +7,7 @@
 #ifndef SMCCC_V2_H
 #define SMCCC_V2_H
 
-#ifndef __SMCCC_H__
+#ifndef SMCCC_H
 #error "This file must only be included from smccc.h"
 #endif
 
diff --git a/include/lib/utils.h b/include/lib/utils.h
index f324a99..b6ab26e 100644
--- a/include/lib/utils.h
+++ b/include/lib/utils.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __UTILS_H__
-#define __UTILS_H__
+#ifndef UTILS_H
+#define UTILS_H
 
 /*
  * C code should be put in this part of the header to avoid breaking ASM files
@@ -92,4 +92,4 @@
 
 #endif /* !(defined(__LINKER__) || defined(__ASSEMBLY__)) */
 
-#endif /* __UTILS_H__ */
+#endif /* UTILS_H */
diff --git a/include/lib/xlat_tables/xlat_tables_defs.h b/include/lib/xlat_tables/xlat_tables_defs.h
index d260c3e..09baae9 100644
--- a/include/lib/xlat_tables/xlat_tables_defs.h
+++ b/include/lib/xlat_tables/xlat_tables_defs.h
@@ -170,4 +170,4 @@
 #define XN_SHIFT			54
 #define UXN_SHIFT			XN_SHIFT
 
-#endif /* __XLAT_TABLES_DEFS_H__ */
+#endif /* XLAT_TABLES_DEFS_H */
diff --git a/include/lib/zlib/tf_gunzip.h b/include/lib/zlib/tf_gunzip.h
index 46d20eb..741ba50 100644
--- a/include/lib/zlib/tf_gunzip.h
+++ b/include/lib/zlib/tf_gunzip.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TF_GUNZIP_H__
-#define __TF_GUNZIP_H__
+#ifndef TF_GUNZIP_H
+#define TF_GUNZIP_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -13,4 +13,4 @@
 int gunzip(uintptr_t *in_buf, size_t in_len, uintptr_t *out_buf,
 	   size_t out_len, uintptr_t work_buf, size_t work_len);
 
-#endif /* __TF_GUNZIP_H___ */
+#endif /* TF_GUNZIP_H */
diff --git a/include/plat/arm/board/common/board_css_def.h b/include/plat/arm/board/common/board_css_def.h
index 1a80e16..29211be 100644
--- a/include/plat/arm/board/common/board_css_def.h
+++ b/include/plat/arm/board/common/board_css_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BOARD_CSS_DEF_H__
-#define __BOARD_CSS_DEF_H__
+#ifndef BOARD_CSS_DEF_H
+#define BOARD_CSS_DEF_H
 
 #include <common_def.h>
 #include <soc_css_def.h>
@@ -73,5 +73,4 @@
 #define PLAT_ARM_TSP_UART_BASE			V2M_IOFPGA_UART0_BASE
 #define PLAT_ARM_TSP_UART_CLK_IN_HZ		V2M_IOFPGA_UART0_CLK_IN_HZ
 
-#endif /* __BOARD_CSS_DEF_H__ */
-
+#endif /* BOARD_CSS_DEF_H */
diff --git a/include/plat/arm/common/aarch64/arm_macros.S b/include/plat/arm/common/aarch64/arm_macros.S
index 7953d7e..c2ba7db 100644
--- a/include/plat/arm/common/aarch64/arm_macros.S
+++ b/include/plat/arm/common/aarch64/arm_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ARM_MACROS_S__
-#define __ARM_MACROS_S__
+#ifndef ARM_MACROS_S
+#define ARM_MACROS_S
 
 #include <gic_common.h>
 #include <gicv2.h>
@@ -91,4 +91,4 @@
 exit_print_gic_regs:
 	.endm
 
-#endif /* __ARM_MACROS_S__ */
+#endif /* ARM_MACROS_S */
diff --git a/include/plat/arm/common/aarch64/cci_macros.S b/include/plat/arm/common/aarch64/cci_macros.S
index 52e060d..069dc85 100644
--- a/include/plat/arm/common/aarch64/cci_macros.S
+++ b/include/plat/arm/common/aarch64/cci_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __CCI_MACROS_S__
-#define __CCI_MACROS_S__
+#ifndef CCI_MACROS_S
+#define CCI_MACROS_S
 
 #include <cci.h>
 #include <platform_def.h>
@@ -34,4 +34,4 @@
 	bl	str_in_crash_buf_print
 	.endm
 
-#endif /* __CCI_MACROS_S__ */
+#endif /* CCI_MACROS_S */
diff --git a/include/plat/arm/common/arm_config.h b/include/plat/arm/common/arm_config.h
index 44610bd..4dda350 100644
--- a/include/plat/arm/common/arm_config.h
+++ b/include/plat/arm/common/arm_config.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ARM_CONFIG_H__
-#define __ARM_CONFIG_H__
+#ifndef ARM_CONFIG_H
+#define ARM_CONFIG_H
 
 #include <stdint.h>
 #include <utils_def.h>
@@ -39,4 +39,4 @@
 }
 
 
-#endif /* __ARM_CONFIG_H__ */
+#endif /* ARM_CONFIG_H */
diff --git a/include/plat/arm/common/arm_spm_def.h b/include/plat/arm/common/arm_spm_def.h
index 6aa8ce8..69aae4a 100644
--- a/include/plat/arm/common/arm_spm_def.h
+++ b/include/plat/arm/common/arm_spm_def.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ARM_SPM_DEF_H__
-#define __ARM_SPM_DEF_H__
+#ifndef ARM_SPM_DEF_H
+#define ARM_SPM_DEF_H
 
 #include <arm_def.h>
 #include <utils_def.h>
@@ -100,4 +100,4 @@
 #define PLAT_SPM_COOKIE_0		ULL(0)
 #define PLAT_SPM_COOKIE_1		ULL(0)
 
-#endif /* __ARM_SPM_DEF_H__ */
+#endif /* ARM_SPM_DEF_H */
diff --git a/include/plat/arm/css/common/aarch64/css_macros.S b/include/plat/arm/css/common/aarch64/css_macros.S
index b669ef6..85a7044 100644
--- a/include/plat/arm/css/common/aarch64/css_macros.S
+++ b/include/plat/arm/css/common/aarch64/css_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __CSS_MACROS_S__
-#define __CSS_MACROS_S__
+#ifndef CSS_MACROS_S
+#define CSS_MACROS_S
 
 #include <arm_macros.S>
 #include <platform_def.h>
@@ -22,5 +22,4 @@
 	arm_print_gic_regs
 	.endm
 
-
-#endif /* __CSS_MACROS_S__ */
+#endif /* CSS_MACROS_S */
diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h
index 3853319..4a7d314 100644
--- a/include/plat/arm/css/common/css_def.h
+++ b/include/plat/arm/css/common/css_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_DEF_H__
-#define __CSS_DEF_H__
+#ifndef CSS_DEF_H
+#define CSS_DEF_H
 
 #include <arm_def.h>
 #include <gic_common.h>
@@ -200,4 +200,4 @@
 #define CSS_CPU_PWR_STATE_OFF		0
 #define CSS_CPU_PWR_STATE(state, n)	(((state) >> (n)) & 1)
 
-#endif /* __CSS_DEF_H__ */
+#endif /* CSS_DEF_H */
diff --git a/include/plat/arm/css/common/css_pm.h b/include/plat/arm/css/common/css_pm.h
index a243671..eeb72de 100644
--- a/include/plat/arm/css/common/css_pm.h
+++ b/include/plat/arm/css/common/css_pm.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_PM_H__
-#define __CSS_PM_H__
+#ifndef CSS_PM_H
+#define CSS_PM_H
 
 #include <cdefs.h>
 #include <psci.h>
@@ -45,4 +45,4 @@
  */
 extern const uint32_t plat_css_core_pos_to_scmi_dmn_id_map[];
 
-#endif /* __CSS_PM_H__ */
+#endif /* CSS_PM_H */
diff --git a/include/plat/arm/soc/common/soc_css.h b/include/plat/arm/soc/common/soc_css.h
index 897bf2e..469928d 100644
--- a/include/plat/arm/soc/common/soc_css.h
+++ b/include/plat/arm/soc/common/soc_css.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SOC_CSS_H__
-#define __SOC_CSS_H__
+#ifndef SOC_CSS_H
+#define SOC_CSS_H
 
 /*
  * Utility functions for ARM CSS SoCs
@@ -19,5 +19,4 @@
 	soc_css_init_pcie();
 }
 
-
-#endif /* __SOC_CSS_H__ */
+#endif /* SOC_CSS_H */
diff --git a/include/plat/arm/soc/common/soc_css_def.h b/include/plat/arm/soc/common/soc_css_def.h
index 3206f4e..263313a 100644
--- a/include/plat/arm/soc/common/soc_css_def.h
+++ b/include/plat/arm/soc/common/soc_css_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SOC_CSS_DEF_H__
-#define __SOC_CSS_DEF_H__
+#ifndef SOC_CSS_DEF_H
+#define SOC_CSS_DEF_H
 
 #include <common_def.h>
 #include <utils_def.h>
@@ -84,4 +84,4 @@
 #define PLAT_ARM_SCP_TZC_DRAM1_SIZE	ULL(0x00200000)
 #endif
 
-#endif /* __SOC_CSS_DEF_H__ */
+#endif /* SOC_CSS_DEF_H */
diff --git a/include/plat/common/common_def.h b/include/plat/common/common_def.h
index 5d76d6e..66074ac 100644
--- a/include/plat/common/common_def.h
+++ b/include/plat/common/common_def.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __COMMON_DEF_H__
-#define __COMMON_DEF_H__
+#ifndef COMMON_DEF_H
+#define COMMON_DEF_H
 
 #include <bl_common.h>
 #include <platform_def.h>
@@ -83,4 +83,5 @@
 #define BL2_CODE_END		round_up(BL2_ROM_END, PAGE_SIZE)
 #endif /* BL2_IN_XIP_MEM */
 #endif /* SEPARATE_CODE_AND_RODATA */
-#endif /* __COMMON_DEF_H__ */
+
+#endif /* COMMON_DEF_H */
diff --git a/include/plat/marvell/a3700/common/armada_common.h b/include/plat/marvell/a3700/common/armada_common.h
index 9fc4634..fdcc02a 100644
--- a/include/plat/marvell/a3700/common/armada_common.h
+++ b/include/plat/marvell/a3700/common/armada_common.h
@@ -5,12 +5,12 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __ARMADA_COMMON_H__
-#define __ARMADA_COMMON_H__
+#ifndef ARMADA_COMMON_H
+#define ARMADA_COMMON_H
 
 #include <io_addr_dec.h>
 #include <stdint.h>
 
 int marvell_get_io_dec_win_conf(struct dec_win_config **win, uint32_t *size);
 
-#endif /* __ARMADA_COMMON_H__ */
+#endif /* ARMADA_COMMON_H */
diff --git a/include/plat/marvell/a3700/common/board_marvell_def.h b/include/plat/marvell/a3700/common/board_marvell_def.h
index 49a1a5c..1782596 100644
--- a/include/plat/marvell/a3700/common/board_marvell_def.h
+++ b/include/plat/marvell/a3700/common/board_marvell_def.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __BOARD_MARVELL_DEF_H__
-#define __BOARD_MARVELL_DEF_H__
+#ifndef BOARD_MARVELL_DEF_H
+#define BOARD_MARVELL_DEF_H
 
 /*
  * Required platform porting definitions common to all ARM
@@ -73,5 +73,4 @@
 
 #define PLAT_MARVELL_TRUSTED_SRAM_SIZE	0x80000	/* 512 KB */
 
-
-#endif /* __BOARD_MARVELL_DEF_H__ */
+#endif /* BOARD_MARVELL_DEF_H */
diff --git a/include/plat/marvell/a3700/common/marvell_def.h b/include/plat/marvell/a3700/common/marvell_def.h
index 6c3a524..3c105fc 100644
--- a/include/plat/marvell/a3700/common/marvell_def.h
+++ b/include/plat/marvell/a3700/common/marvell_def.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MARVELL_DEF_H__
-#define __MARVELL_DEF_H__
+#ifndef MARVELL_DEF_H
+#define MARVELL_DEF_H
 
 #include <arch.h>
 #include <common_def.h>
@@ -174,4 +174,4 @@
 					 MARVELL_BL_RAM_SIZE)
 
 
-#endif /* __MARVELL_DEF_H__ */
+#endif /* MARVELL_DEF_H */
diff --git a/include/plat/marvell/a3700/common/plat_marvell.h b/include/plat/marvell/a3700/common/plat_marvell.h
index f733d04..8c289e9 100644
--- a/include/plat/marvell/a3700/common/plat_marvell.h
+++ b/include/plat/marvell/a3700/common/plat_marvell.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __PLAT_MARVELL_H__
-#define __PLAT_MARVELL_H__
+#ifndef PLAT_MARVELL_H
+#define PLAT_MARVELL_H
 
 #include <bl_common.h>
 #include <cassert.h>
@@ -93,4 +93,4 @@
 
 const mmap_region_t *plat_marvell_get_mmap(void);
 
-#endif /* __PLAT_MARVELL_H__ */
+#endif /* PLAT_MARVELL_H */
diff --git a/include/plat/marvell/a8k/common/armada_common.h b/include/plat/marvell/a8k/common/armada_common.h
index c1e37f5..64d9adf 100644
--- a/include/plat/marvell/a8k/common/armada_common.h
+++ b/include/plat/marvell/a8k/common/armada_common.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __ARMADA_COMMON_H__
-#define __ARMADA_COMMON_H__
+#ifndef ARMADA_COMMON_H
+#define ARMADA_COMMON_H
 
 #include <amb_adec.h>
 #include <io_win.h>
@@ -125,4 +125,4 @@
 int marvell_get_ccu_memory_map(int ap_idx, struct addr_map_win **win,
 			       uint32_t *size);
 
-#endif /* __A8K_COMMON_H__ */
+#endif /* ARMADA_COMMON_H */
diff --git a/include/plat/marvell/a8k/common/board_marvell_def.h b/include/plat/marvell/a8k/common/board_marvell_def.h
index e67543e..0da56e7 100644
--- a/include/plat/marvell/a8k/common/board_marvell_def.h
+++ b/include/plat/marvell/a8k/common/board_marvell_def.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __BOARD_MARVELL_DEF_H__
-#define __BOARD_MARVELL_DEF_H__
+#ifndef BOARD_MARVELL_DEF_H
+#define BOARD_MARVELL_DEF_H
 
 /*
  * Required platform porting definitions common to all ARM
@@ -74,4 +74,4 @@
 #define PLAT_MARVELL_TRUSTED_SRAM_SIZE	0x80000	/* 512 KB */
 
 
-#endif /* __BOARD_MARVELL_DEF_H__ */
+#endif /* BOARD_MARVELL_DEF_H */
diff --git a/include/plat/marvell/a8k/common/marvell_def.h b/include/plat/marvell/a8k/common/marvell_def.h
index 9429753..c67b3cd 100644
--- a/include/plat/marvell/a8k/common/marvell_def.h
+++ b/include/plat/marvell/a8k/common/marvell_def.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MARVELL_DEF_H__
-#define __MARVELL_DEF_H__
+#ifndef MARVELL_DEF_H
+#define MARVELL_DEF_H
 
 #include <arch.h>
 #include <common_def.h>
@@ -178,4 +178,4 @@
 					 MARVELL_BL_RAM_SIZE)
 
 
-#endif /* __MARVELL_DEF_H__ */
+#endif /* MARVELL_DEF_H */
diff --git a/include/plat/marvell/a8k/common/plat_marvell.h b/include/plat/marvell/a8k/common/plat_marvell.h
index 2aecd3f..f062491 100644
--- a/include/plat/marvell/a8k/common/plat_marvell.h
+++ b/include/plat/marvell/a8k/common/plat_marvell.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __PLAT_MARVELL_H__
-#define __PLAT_MARVELL_H__
+#ifndef PLAT_MARVELL_H
+#define PLAT_MARVELL_H
 
 #include <cassert.h>
 #include <cpu_data.h>
@@ -127,4 +127,4 @@
 int plat_marvell_early_cpu_powerdown(void);
 int bl2_plat_handle_scp_bl2(image_info_t *scp_bl2_image_info);
 
-#endif /* __PLAT_MARVELL_H__ */
+#endif /* PLAT_MARVELL_H */
diff --git a/include/plat/marvell/a8k/common/plat_pm_trace.h b/include/plat/marvell/a8k/common/plat_pm_trace.h
index 0878959..a954914 100644
--- a/include/plat/marvell/a8k/common/plat_pm_trace.h
+++ b/include/plat/marvell/a8k/common/plat_pm_trace.h
@@ -5,9 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __PLAT_PM_TRACE_H
-#define __PLAT_PM_TRACE_H
-
+#ifndef PLAT_PM_TRACE_H
+#define PLAT_PM_TRACE_H
 
 /*
  * PM Trace is for Debug purpose only!!!
@@ -97,4 +96,4 @@
  */
 void pm_trace_add(unsigned int trace, unsigned int core);
 
-#endif /* __PLAT_PM_TRACE_H */
+#endif /* PLAT_PM_TRACE_H */
diff --git a/include/plat/marvell/common/aarch64/cci_macros.S b/include/plat/marvell/common/aarch64/cci_macros.S
index d6080cf..96b364e 100644
--- a/include/plat/marvell/common/aarch64/cci_macros.S
+++ b/include/plat/marvell/common/aarch64/cci_macros.S
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __CCI_MACROS_S__
-#define __CCI_MACROS_S__
+#ifndef CCI_MACROS_S
+#define CCI_MACROS_S
 
 #include <cci.h>
 #include <platform_def.h>
@@ -36,4 +36,4 @@
 	bl	str_in_crash_buf_print
 	.endm
 
-#endif /* __CCI_MACROS_S__ */
+#endif /* CCI_MACROS_S */
diff --git a/include/plat/marvell/common/aarch64/marvell_macros.S b/include/plat/marvell/common/aarch64/marvell_macros.S
index faf1070..c2a8bd0 100644
--- a/include/plat/marvell/common/aarch64/marvell_macros.S
+++ b/include/plat/marvell/common/aarch64/marvell_macros.S
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MARVELL_MACROS_S__
-#define __MARVELL_MACROS_S__
+#ifndef MARVELL_MACROS_S
+#define MARVELL_MACROS_S
 
 #include <cci.h>
 #include <gic_common.h>
@@ -131,4 +131,4 @@
 	.endm
 
 
-#endif /* __MARVELL_MACROS_S__ */
+#endif /* MARVELL_MACROS_S */
diff --git a/include/plat/marvell/common/marvell_plat_priv.h b/include/plat/marvell/common/marvell_plat_priv.h
index c1dad0e..6f0b588 100644
--- a/include/plat/marvell/common/marvell_plat_priv.h
+++ b/include/plat/marvell/common/marvell_plat_priv.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MARVELL_PLAT_PRIV_H__
-#define __MARVELL_PLAT_PRIV_H__
+#ifndef MARVELL_PLAT_PRIV_H
+#define MARVELL_PLAT_PRIV_H
 
 #include <utils.h>
 
@@ -31,4 +31,4 @@
 void plat_marvell_gic_irq_pcpu_save(void);
 void plat_marvell_gic_irq_pcpu_restore(void);
 
-#endif /* __MARVELL_PLAT_PRIV_H__ */
+#endif /* MARVELL_PLAT_PRIV_H */
diff --git a/include/plat/marvell/common/marvell_pm.h b/include/plat/marvell/common/marvell_pm.h
index 2817a46..8f16607 100644
--- a/include/plat/marvell/common/marvell_pm.h
+++ b/include/plat/marvell/common/marvell_pm.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef _MARVELL_PM_H_
-#define _MARVELL_PM_H_
+#ifndef MARVELL_PM_H
+#define MARVELL_PM_H
 
 #define MVEBU_MAILBOX_MAGIC_NUM		PLAT_MARVELL_MAILBOX_MAGIC_NUM
 #define MVEBU_MAILBOX_SUSPEND_STATE	0xb007de7c
@@ -23,4 +23,4 @@
 /* BLE execution start counter value */
 #define	MBOX_IDX_START_CNT		4
 
-#endif /* _MARVELL_PM_H_ */
+#endif /* MARVELL_PM_H */
diff --git a/include/plat/marvell/common/mvebu.h b/include/plat/marvell/common/mvebu.h
index a7d6c3f..35a0200 100644
--- a/include/plat/marvell/common/mvebu.h
+++ b/include/plat/marvell/common/mvebu.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef _MVEBU_H_
-#define _MVEBU_H_
+#ifndef MVEBU_H
+#define MVEBU_H
 
 /* Use this functions only when printf is allowed */
 #define debug_enter()	VERBOSE("----> Enter %s\n", __func__)
@@ -36,4 +36,4 @@
 #define _1GB_				(_1MB_ * 1024ULL)
 #define _2GB_				(2 * _1GB_)
 
-#endif	/* MVEBU_H */
+#endif /* MVEBU_H */
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 */
diff --git a/include/tools_share/firmware_image_package.h b/include/tools_share/firmware_image_package.h
index b1ce56a..9f586b0 100644
--- a/include/tools_share/firmware_image_package.h
+++ b/include/tools_share/firmware_image_package.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __FIRMWARE_IMAGE_PACKAGE_H__
-#define __FIRMWARE_IMAGE_PACKAGE_H__
+#ifndef FIRMWARE_IMAGE_PACKAGE_H
+#define FIRMWARE_IMAGE_PACKAGE_H
 
 #include <stdint.h>
 #include <uuid.h>
@@ -88,4 +88,4 @@
 	uint64_t	flags;
 } fip_toc_entry_t;
 
-#endif /* __FIRMWARE_IMAGE_PACKAGE_H__ */
+#endif /* FIRMWARE_IMAGE_PACKAGE_H */
diff --git a/include/tools_share/tbbr_oid.h b/include/tools_share/tbbr_oid.h
index b0b95e4..6bccfdd 100644
--- a/include/tools_share/tbbr_oid.h
+++ b/include/tools_share/tbbr_oid.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TBBR_OID_H__
-#define __TBBR_OID_H__
+#ifndef TBBR_OID_H
+#define TBBR_OID_H
 
 /*
  * The following is a list of OID values defined and reserved by ARM, which
@@ -145,4 +145,4 @@
 /* NonTrustedFirmwareConfigHash - NT_FW_CONFIG */
 #define NON_TRUSTED_FW_CONFIG_HASH_OID		"1.3.6.1.4.1.4128.2100.1202"
 
-#endif /* __TBBR_OID_H__ */
+#endif /* TBBR_OID_H */
diff --git a/include/tools_share/uuid.h b/include/tools_share/uuid.h
index f3ac4af..7d00432 100644
--- a/include/tools_share/uuid.h
+++ b/include/tools_share/uuid.h
@@ -31,8 +31,8 @@
  * All rights reserved.
  */
 
-#ifndef _SYS_UUID_H_
-#define _SYS_UUID_H_
+#ifndef UUID_H
+#define UUID_H
 
 /* Length of a node address (an IEEE 802 address). */
 #define	_UUID_NODE_LEN		6
@@ -59,4 +59,4 @@
 /* XXX namespace pollution? */
 typedef struct uuid uuid_t;
 
-#endif /* _SYS_UUID_H_ */
+#endif /* UUID_H */
diff --git a/plat/allwinner/common/include/mentor_i2c_plat.h b/plat/allwinner/common/include/mentor_i2c_plat.h
index f547f9a..d03f2d1 100644
--- a/plat/allwinner/common/include/mentor_i2c_plat.h
+++ b/plat/allwinner/common/include/mentor_i2c_plat.h
@@ -6,8 +6,8 @@
  */
 /* This driver provides I2C support for Allwinner sunXi SoCs */
 
-#ifndef SUNXI_I2C_H
-#define SUNXI_I2C_H
+#ifndef MENTOR_I2C_PLAT_H
+#define MENTOR_I2C_PLAT_H
 
 #define CONFIG_SYS_TCLK			24000000
 #define CONFIG_SYS_I2C_SPEED		100000
@@ -25,4 +25,4 @@
 	uint32_t soft_reset;
 };
 
-#endif
+#endif /* MENTOR_I2C_PLAT_H */
diff --git a/plat/allwinner/common/include/plat_macros.S b/plat/allwinner/common/include/plat_macros.S
index 6ee4597..77f183d 100644
--- a/plat/allwinner/common/include/plat_macros.S
+++ b/plat/allwinner/common/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 <arm_macros.S>
 #include <sunxi_mmap.h>
@@ -24,4 +24,4 @@
 	arm_print_gic_regs
 	.endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/allwinner/common/include/sunxi_def.h b/plat/allwinner/common/include/sunxi_def.h
index da87b23..73c4453 100644
--- a/plat/allwinner/common/include/sunxi_def.h
+++ b/plat/allwinner/common/include/sunxi_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SUNXI_DEF_H__
-#define __SUNXI_DEF_H__
+#ifndef SUNXI_DEF_H
+#define SUNXI_DEF_H
 
 /* Clock configuration */
 #define SUNXI_OSC24M_CLK_IN_HZ		24000000
@@ -18,4 +18,4 @@
 #define SUNXI_SOC_H5			0x1718
 #define SUNXI_SOC_H6			0x1728
 
-#endif /* __SUNXI_DEF_H__ */
+#endif /* SUNXI_DEF_H */
diff --git a/plat/allwinner/sun50i_a64/include/sunxi_cpucfg.h b/plat/allwinner/sun50i_a64/include/sunxi_cpucfg.h
index 049c2ad..c3eeadb 100644
--- a/plat/allwinner/sun50i_a64/include/sunxi_cpucfg.h
+++ b/plat/allwinner/sun50i_a64/include/sunxi_cpucfg.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SUNXI_CPUCFG_H__
-#define __SUNXI_CPUCFG_H__
+#ifndef SUNXI_CPUCFG_H
+#define SUNXI_CPUCFG_H
 
 #include <sunxi_mmap.h>
 
@@ -33,4 +33,4 @@
 #define SUNXI_R_CPUCFG_SS_ENTRY_REG	(SUNXI_R_CPUCFG_BASE + 0x01a8)
 #define SUNXI_R_CPUCFG_HP_FLAG_REG	(SUNXI_R_CPUCFG_BASE + 0x01ac)
 
-#endif /* __SUNXI_CPUCFG_H__ */
+#endif /* SUNXI_CPUCFG_H */
diff --git a/plat/allwinner/sun50i_a64/include/sunxi_mmap.h b/plat/allwinner/sun50i_a64/include/sunxi_mmap.h
index 28b1dd3..db44091 100644
--- a/plat/allwinner/sun50i_a64/include/sunxi_mmap.h
+++ b/plat/allwinner/sun50i_a64/include/sunxi_mmap.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SUNXI_MMAP_H__
-#define __SUNXI_MMAP_H__
+#ifndef SUNXI_MMAP_H
+#define SUNXI_MMAP_H
 
 /* Memory regions */
 #define SUNXI_ROM_BASE			0x00000000
@@ -71,4 +71,4 @@
 #define SUNXI_R_RSB_BASE		0x01f03400
 #define SUNXI_R_PWM_BASE		0x01f03800
 
-#endif /* __SUNXI_MMAP_H__ */
+#endif /* SUNXI_MMAP_H */
diff --git a/plat/allwinner/sun50i_h6/include/sunxi_cpucfg.h b/plat/allwinner/sun50i_h6/include/sunxi_cpucfg.h
index e061b89..556fb97 100644
--- a/plat/allwinner/sun50i_h6/include/sunxi_cpucfg.h
+++ b/plat/allwinner/sun50i_h6/include/sunxi_cpucfg.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SUNXI_CPUCFG_H__
-#define __SUNXI_CPUCFG_H__
+#ifndef SUNXI_CPUCFG_H
+#define SUNXI_CPUCFG_H
 
 #include <sunxi_mmap.h>
 
@@ -24,4 +24,4 @@
 #define SUNXI_CPU_POWER_CLAMP_REG(c, n)	(SUNXI_R_CPUCFG_BASE + 0x0050 + \
 					(c) * 0x10 + (n) * 4)
 
-#endif /* __SUNXI_CPUCFG_H__ */
+#endif /* SUNXI_CPUCFG_H */
diff --git a/plat/allwinner/sun50i_h6/include/sunxi_mmap.h b/plat/allwinner/sun50i_h6/include/sunxi_mmap.h
index ff1eb61..f36491a 100644
--- a/plat/allwinner/sun50i_h6/include/sunxi_mmap.h
+++ b/plat/allwinner/sun50i_h6/include/sunxi_mmap.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SUNXI_MMAP_H__
-#define __SUNXI_MMAP_H__
+#ifndef SUNXI_MMAP_H
+#define SUNXI_MMAP_H
 
 /* Memory regions */
 #define SUNXI_ROM_BASE			0x00000000
@@ -58,4 +58,4 @@
 #define SUNXI_R_UART_BASE		0x07080000
 #define SUNXI_R_PIO_BASE		0x07022000
 
-#endif /* __SUNXI_MMAP_H__ */
+#endif /* SUNXI_MMAP_H */
diff --git a/plat/arm/board/fvp/fvp_private.h b/plat/arm/board/fvp/fvp_private.h
index 16f10a2..e7dea99 100644
--- a/plat/arm/board/fvp/fvp_private.h
+++ b/plat/arm/board/fvp/fvp_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __FVP_PRIVATE_H__
-#define __FVP_PRIVATE_H__
+#ifndef FVP_PRIVATE_H
+#define FVP_PRIVATE_H
 
 #include <plat_arm.h>
 
@@ -21,4 +21,4 @@
 void tsp_early_platform_setup(void);
 
 
-#endif /* __FVP_PRIVATE_H__ */
+#endif /* FVP_PRIVATE_H */
diff --git a/plat/arm/board/fvp/include/plat.ld.S b/plat/arm/board/fvp/include/plat.ld.S
index f2a3ea6..ad2d46c 100644
--- a/plat/arm/board/fvp/include/plat.ld.S
+++ b/plat/arm/board/fvp/include/plat.ld.S
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __PLAT_LD_S__
-#define __PLAT_LD_S__
+#ifndef PLAT_LD_S
+#define PLAT_LD_S
 
 #include <arm_tzc_dram.ld.S>
 #include <arm_reclaim_init.ld.S>
 
-#endif /* __PLAT_LD_S__ */
+#endif /* PLAT_LD_S */
diff --git a/plat/arm/board/fvp/include/plat_macros.S b/plat/arm/board/fvp/include/plat_macros.S
index 4dcde2d..6be8b09 100644
--- a/plat/arm/board/fvp/include/plat_macros.S
+++ b/plat/arm/board/fvp/include/plat_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 #include <arm_macros.S>
 #include <v2m_def.h>
@@ -40,4 +40,4 @@
 	arm_print_gic_regs
 	.endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/arm/board/juno/include/plat_macros.S b/plat/arm/board/juno/include/plat_macros.S
index 0dd96c4..ec94a4f 100644
--- a/plat/arm/board/juno/include/plat_macros.S
+++ b/plat/arm/board/juno/include/plat_macros.S
@@ -3,8 +3,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_macros.S>
 #include <css_macros.S>
@@ -21,4 +21,4 @@
 	print_cci_regs
 	.endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/arm/board/juno/juno_decl.h b/plat/arm/board/juno/juno_decl.h
index 8a3b373..cd87c3b 100644
--- a/plat/arm/board/juno/juno_decl.h
+++ b/plat/arm/board/juno/juno_decl.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __JUNO_DECL_H__
-#define __JUNO_DECL_H__
+#ifndef JUNO_DECL_H
+#define JUNO_DECL_H
 
 int juno_getentropy(void *buf, size_t len);
 
-#endif /* __JUNO_DECL_H__ */
+#endif /* JUNO_DECL_H */
diff --git a/plat/arm/board/juno/juno_tzmp1_def.h b/plat/arm/board/juno/juno_tzmp1_def.h
index 7055f76..5d0978c 100644
--- a/plat/arm/board/juno/juno_tzmp1_def.h
+++ b/plat/arm/board/juno/juno_tzmp1_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __JUNO_TZMP1_DEF_H__
-#define __JUNO_TZMP1_DEF_H__
+#ifndef JUNO_TZMP1_DEF_H
+#define JUNO_TZMP1_DEF_H
 
 #include <plat_arm.h>
 
@@ -82,4 +82,4 @@
 /* config to PROTCTRL register */
 #define V550_PROTCTRL_CONFIG		0xa8700000
 
-#endif /* __JUNO_TZMP1_DEF_H__ */
+#endif /* JUNO_TZMP1_DEF_H */
diff --git a/plat/arm/board/n1sdp/include/plat_macros.S b/plat/arm/board/n1sdp/include/plat_macros.S
index fe9a66c..521bcc3 100644
--- a/plat/arm/board/n1sdp/include/plat_macros.S
+++ b/plat/arm/board/n1sdp/include/plat_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 #include <css_macros.S>
 
@@ -20,4 +20,5 @@
  */
 	.macro plat_crash_print_regs
 	.endm
-#endif /* __PLAT_MACROS_S__ */
+
+#endif /* PLAT_MACROS_S */
diff --git a/plat/arm/board/n1sdp/include/platform_def.h b/plat/arm/board/n1sdp/include/platform_def.h
index d26f559..3e48397 100644
--- a/plat/arm/board/n1sdp/include/platform_def.h
+++ b/plat/arm/board/n1sdp/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 <arm_def.h>
 #include <board_css_def.h>
@@ -68,4 +68,5 @@
 
 /* Platform ID address */
 #define SSC_VERSION				(SSC_REG_BASE + SSC_VERSION_OFFSET)
-#endif /* __PLATFORM_DEF_H__ */
+
+#endif /* PLATFORM_DEF_H */
diff --git a/plat/arm/board/sgm775/include/platform_def.h b/plat/arm/board/sgm775/include/platform_def.h
index babe093..8a3431b 100644
--- a/plat/arm/board/sgm775/include/platform_def.h
+++ b/plat/arm/board/sgm775/include/platform_def.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLATFORM_DEF_H__
-#define __PLATFORM_DEF_H__
+#ifndef PLATFORM_DEF_H
+#define PLATFORM_DEF_H
 
 #include <sgm_base_platform_def.h>
 
 #define PLAT_MAX_CPUS_PER_CLUSTER	8
 #define PLAT_MAX_PE_PER_CPU		1
 
-#endif /* __PLATFORM_DEF_H__ */
+#endif /* PLATFORM_DEF_H */
diff --git a/plat/arm/css/drivers/mhu/css_mhu.h b/plat/arm/css/drivers/mhu/css_mhu.h
index 0fb00c7..ff04ae4 100644
--- a/plat/arm/css/drivers/mhu/css_mhu.h
+++ b/plat/arm/css/drivers/mhu/css_mhu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_MHU_H__
-#define __CSS_MHU_H__
+#ifndef CSS_MHU_H
+#define CSS_MHU_H
 
 #include <stdint.h>
 
@@ -16,4 +16,4 @@
 
 void mhu_secure_init(void);
 
-#endif	/* __CSS_MHU_H__ */
+#endif /* CSS_MHU_H */
diff --git a/plat/arm/css/drivers/scmi/scmi.h b/plat/arm/css/drivers/scmi/scmi.h
index 7f89229..e1358bf 100644
--- a/plat/arm/css/drivers/scmi/scmi.h
+++ b/plat/arm/css/drivers/scmi/scmi.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_SCMI_H__
-#define __CSS_SCMI_H__
+#ifndef SCMI_H
+#define SCMI_H
 
 #include <bakery_lock.h>
 #include <stddef.h>
@@ -162,4 +162,4 @@
 /* API to get the platform specific SCMI channel information. */
 scmi_channel_plat_info_t *plat_css_get_scmi_info();
 
-#endif	/* __CSS_SCMI_H__ */
+#endif /* SCMI_H */
diff --git a/plat/arm/css/drivers/scmi/scmi_private.h b/plat/arm/css/drivers/scmi/scmi_private.h
index 39bc8cc..a4f4179 100644
--- a/plat/arm/css/drivers/scmi/scmi_private.h
+++ b/plat/arm/css/drivers/scmi/scmi_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_SCMI_PRIVATE_H__
-#define __CSS_SCMI_PRIVATE_H__
+#ifndef SCMI_PRIVATE_H
+#define SCMI_PRIVATE_H
 
 /*
  * SCMI power domain management protocol message and response lengths. It is
@@ -150,4 +150,4 @@
 	assert(ch->info && ch->info->scmi_mbx_mem);
 }
 
-#endif	/* __CSS_SCMI_PRIVATE_H__ */
+#endif /* SCMI_PRIVATE_H */
diff --git a/plat/arm/css/drivers/scp/css_scp.h b/plat/arm/css/drivers/scp/css_scp.h
index 44dfbca..84c1487 100644
--- a/plat/arm/css/drivers/scp/css_scp.h
+++ b/plat/arm/css/drivers/scp/css_scp.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_SCP_H__
-#define __CSS_SCP_H__
+#ifndef CSS_SCP_H
+#define CSS_SCP_H
 
 #include <cassert.h>
 #include <platform_def.h>
@@ -47,4 +47,4 @@
 CASSERT(SCP_BL2U_BASE >= ARM_TB_FW_CONFIG_LIMIT, assert_scp_bl2u_overflow);
 #endif
 
-#endif	/* __CSS_SCP_H__ */
+#endif /* CSS_SCP_H */
diff --git a/plat/arm/css/drivers/scpi/css_scpi.h b/plat/arm/css/drivers/scpi/css_scpi.h
index 2a7e624..68fc60a 100644
--- a/plat/arm/css/drivers/scpi/css_scpi.h
+++ b/plat/arm/css/drivers/scpi/css_scpi.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_SCPI_H__
-#define __CSS_SCPI_H__
+#ifndef CSS_SCPI_H
+#define CSS_SCPI_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -106,5 +106,4 @@
 		unsigned int *cluster_state_p);
 uint32_t scpi_sys_power_state(scpi_system_state_t system_state);
 
-
-#endif	/* __CSS_SCPI_H__ */
+#endif /* CSS_SCPI_H */
diff --git a/plat/arm/css/drivers/sds/sds.h b/plat/arm/css/drivers/sds/sds.h
index 4aef0df..114ae92 100644
--- a/plat/arm/css/drivers/sds/sds.h
+++ b/plat/arm/css/drivers/sds/sds.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SDS_H__
-#define __SDS_H__
+#ifndef SDS_H
+#define SDS_H
 
 /* SDS Structure Identifier defines */
 /* AP CPU INFO defines */
@@ -86,4 +86,5 @@
 int sds_struct_write(uint32_t structure_id, unsigned int fld_off, void *data,
 		size_t size, sds_access_mode_t mode);
 #endif /*__ASSEMBLY__ */
-#endif /* __SDS_H__ */
+
+#endif /* SDS_H */
diff --git a/plat/arm/css/drivers/sds/sds_private.h b/plat/arm/css/drivers/sds/sds_private.h
index 43b97f6..2101dd0 100644
--- a/plat/arm/css/drivers/sds/sds_private.h
+++ b/plat/arm/css/drivers/sds/sds_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SDS_PRIVATE_H__
-#define __SDS_PRIVATE_H__
+#ifndef SDS_PRIVATE_H
+#define SDS_PRIVATE_H
 
 /* SDS Header defines */
 #define SDS_HEADER_ID_SHIFT			0
@@ -96,4 +96,5 @@
 #define GET_SDS_REGION_SIZE(region)		((((region_desc_t *)(region))->reg[1]))
 
 #endif /* __ASSEMBLY__ */
-#endif /* __SDS_PRIVATE_H__ */
+
+#endif /* SDS_PRIVATE_H */
diff --git a/plat/arm/css/sgi/include/plat_macros.S b/plat/arm/css/sgi/include/plat_macros.S
index fe9a66c..521bcc3 100644
--- a/plat/arm/css/sgi/include/plat_macros.S
+++ b/plat/arm/css/sgi/include/plat_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 #include <css_macros.S>
 
@@ -20,4 +20,5 @@
  */
 	.macro plat_crash_print_regs
 	.endm
-#endif /* __PLAT_MACROS_S__ */
+
+#endif /* PLAT_MACROS_S */
diff --git a/plat/arm/css/sgi/include/sgi_ras.h b/plat/arm/css/sgi/include/sgi_ras.h
index b307b9c..a449eae 100644
--- a/plat/arm/css/sgi/include/sgi_ras.h
+++ b/plat/arm/css/sgi/include/sgi_ras.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SGI_RAS__
-#define __SGI_RAS__
+#ifndef SGI_RAS_H
+#define SGI_RAS_H
 
 /*
  * Mapping the RAS interrupt with SDEI event number and the event
@@ -19,4 +19,4 @@
 
 int sgi_ras_intr_handler_setup(void);
 
-#endif /* __SGI_RAS__ */
+#endif /* SGI_RAS_H */
diff --git a/plat/arm/css/sgm/include/plat_macros.S b/plat/arm/css/sgm/include/plat_macros.S
index d877ef8..715ded2 100644
--- a/plat/arm/css/sgm/include/plat_macros.S
+++ b/plat/arm/css/sgm/include/plat_macros.S
@@ -3,8 +3,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_macros.S>
 #include <css_macros.S>
@@ -21,4 +21,4 @@
 print_cci_regs
 .endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/arm/css/sgm/include/sgm_base_platform_def.h b/plat/arm/css/sgm/include/sgm_base_platform_def.h
index eaba619..a9795a4 100644
--- a/plat/arm/css/sgm/include/sgm_base_platform_def.h
+++ b/plat/arm/css/sgm/include/sgm_base_platform_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SGM_BASE_PLATFORM_DEF_H__
-#define __SGM_BASE_PLATFORM_DEF_H__
+#ifndef SGM_BASE_PLATFORM_DEF_H
+#define SGM_BASE_PLATFORM_DEF_H
 
 #include <arm_def.h>
 #include <board_css_def.h>
@@ -239,4 +239,4 @@
  */
 #define PLAT_ARM_MEM_PROT_ADDR		(V2M_FLASH0_BASE + \
 					 V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE)
-#endif /* __SGM_BASE_PLATFORM_DEF_H__ */
+#endif /* SGM_BASE_PLATFORM_DEF_H */
diff --git a/plat/arm/css/sgm/include/sgm_plat_config.h b/plat/arm/css/sgm/include/sgm_plat_config.h
index 75abeff..79e6b5c 100644
--- a/plat/arm/css/sgm/include/sgm_plat_config.h
+++ b/plat/arm/css/sgm/include/sgm_plat_config.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SGM_PLAT_CONFIG_H__
-#define __SGM_PLAT_CONFIG_H__
+#ifndef SGM_PLAT_CONFIG_H
+#define SGM_PLAT_CONFIG_H
 
 #include <ccn.h>
 #include <gicv3.h>
@@ -39,4 +39,5 @@
 
 void plat_config_init(void);
 css_plat_config_t *get_plat_config(void);
-#endif /* __SGM_PLAT_CONFIG_H__ */
+
+#endif /* SGM_PLAT_CONFIG_H */
diff --git a/plat/arm/css/sgm/include/sgm_variant.h b/plat/arm/css/sgm/include/sgm_variant.h
index a0a91b0..859ddb5 100644
--- a/plat/arm/css/sgm/include/sgm_variant.h
+++ b/plat/arm/css/sgm/include/sgm_variant.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SGM_VARIANT_H__
-#define __SGM_VARIANT_H__
+#ifndef SGM_VARIANT_H
+#define SGM_VARIANT_H
 
 /* SSC_VERSION values for sgm */
 #define SGM775_SSC_VER_PART_NUM		0x0790
@@ -14,4 +14,4 @@
 #define SGM_DMC_SIZE			0x40000
 #define SGM775_DMC_COUNT		4
 
-#endif /* __SGM_VARIANT_H__ */
+#endif /* SGM_VARIANT_H */
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 */
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 */
diff --git a/plat/hisilicon/poplar/include/hi3798cv200.h b/plat/hisilicon/poplar/include/hi3798cv200.h
index 254b357..ddb4396 100644
--- a/plat/hisilicon/poplar/include/hi3798cv200.h
+++ b/plat/hisilicon/poplar/include/hi3798cv200.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI3798cv200_H__
-#define __HI3798cv200_H__
+#ifndef HI3798CV200_H
+#define HI3798CV200_H
 
 #include <utils_def.h>
 
@@ -102,4 +102,4 @@
 #define HISI_TZPC_BASE			(0xF8A80000)
 #define HISI_TZPC_SEC_ATTR_CTRL		(HISI_TZPC_BASE + 0x10)
 
-#endif	/* __HI3798cv200_H__ */
+#endif /* HI3798CV200_H */
diff --git a/plat/hisilicon/poplar/include/plat_private.h b/plat/hisilicon/poplar/include/plat_private.h
index 63b7d76..3aeccc4 100644
--- a/plat/hisilicon/poplar/include/plat_private.h
+++ b/plat/hisilicon/poplar/include/plat_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_PRIVATE_H__
-#define __PLAT_PRIVATE_H__
+#ifndef PLAT_PRIVATE_H
+#define PLAT_PRIVATE_H
 
 #include <bl_common.h>
 #include "hi3798cv200.h"
@@ -33,4 +33,4 @@
 void poplar_gic_cpuif_enable(void);
 void poplar_gic_pcpu_init(void);
 
-#endif /* __PLAT_PRIVATE_H__ */
+#endif /* PLAT_PRIVATE_H */
diff --git a/plat/hisilicon/poplar/include/poplar_layout.h b/plat/hisilicon/poplar/include/poplar_layout.h
index 9fb5a94..03047f9 100644
--- a/plat/hisilicon/poplar/include/poplar_layout.h
+++ b/plat/hisilicon/poplar/include/poplar_layout.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __POPLAR_LAYOUT_H
-#define __POPLAR_LAYOUT_H
+#ifndef POPLAR_LAYOUT_H
+#define POPLAR_LAYOUT_H
 
 /*
  * Boot memory layout definitions for the HiSilicon Poplar board
@@ -129,4 +129,4 @@
 #define BL31_BASE			(LLOADER_TEXT_BASE + BL31_OFFSET)
 #define BL31_LIMIT			(BL31_BASE + BL31_SIZE)
 
-#endif /* !__POPLAR_LAYOUT_H */
+#endif /* POPLAR_LAYOUT_H */
diff --git a/plat/imx/common/include/imx8_iomux.h b/plat/imx/common/include/imx8_iomux.h
index 7a7f549..0e93d98 100644
--- a/plat/imx/common/include/imx8_iomux.h
+++ b/plat/imx/common/include/imx8_iomux.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX8_IOMUX_H__
-#define __IMX8_IOMUX_H__
+#ifndef IMX8_IOMUX_H
+#define IMX8_IOMUX_H
 
 #define PADRING_IFMUX_EN_SHIFT		31
 #define PADRING_IFMUX_EN_MASK		(1 << PADRING_IFMUX_EN_SHIFT)
@@ -22,4 +22,4 @@
 #define PADRING_DSE_SHIFT		0
 #define PADRING_DSE_MASK		(0x7 << PADRING_DSE_SHIFT)
 
-#endif	/* __IMX8_IOMUX_H__ */
+#endif /* IMX8_IOMUX_H */
diff --git a/plat/imx/common/include/imx8_lpuart.h b/plat/imx/common/include/imx8_lpuart.h
index 33f955d..8e1184f 100644
--- a/plat/imx/common/include/imx8_lpuart.h
+++ b/plat/imx/common/include/imx8_lpuart.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_LPUART_H__
-#define __IMX_LPUART_H__
+#ifndef IMX8_LPUART_H
+#define IMX8_LPUART_H
 
 #include <console.h>
 
@@ -63,4 +63,4 @@
 			   console_lpuart_t *console);
 #endif /*__ASSEMBLY__*/
 
-#endif  /* __IMX_LPUART_H__*/
+#endif /* IMX8_LPUART_H */
diff --git a/plat/imx/common/include/imx8qm_pads.h b/plat/imx/common/include/imx8qm_pads.h
index 6107bd9..a5c1d2c 100644
--- a/plat/imx/common/include/imx8qm_pads.h
+++ b/plat/imx/common/include/imx8qm_pads.h
@@ -8,8 +8,8 @@
  * Header file used to configure SoC pad list.
  */
 
-#ifndef SC_PADS_H
-#define SC_PADS_H
+#ifndef IMX8QM_PADS_H
+#define IMX8QM_PADS_H
 
 /* Includes */
 
@@ -290,4 +290,4 @@
 #define SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETA    268	/*  */
 /*@}*/
 
-#endif				/* SC_PADS_H */
+#endif /* IMX8QM_PADS_H */
diff --git a/plat/imx/common/include/imx8qx_pads.h b/plat/imx/common/include/imx8qx_pads.h
index 0e153bb..5445aa1 100644
--- a/plat/imx/common/include/imx8qx_pads.h
+++ b/plat/imx/common/include/imx8qx_pads.h
@@ -8,8 +8,8 @@
  * Header file used to configure SoC pad list.
  */
 
-#ifndef SC_PADS_H
-#define SC_PADS_H
+#ifndef IMX8QX_PADS_H
+#define IMX8QX_PADS_H
 
 /* Includes */
 
@@ -195,4 +195,4 @@
 #define SC_P_COMP_CTL_GPIO_1V8_3V3_QSPI0B        173	/*  */
 /*@}*/
 
-#endif				/* SC_PADS_H */
+#endif /* IMX8QX_PADS_H */
diff --git a/plat/imx/common/include/imx_aips.h b/plat/imx/common/include/imx_aips.h
index 3c33553..1d41fe0 100644
--- a/plat/imx/common/include/imx_aips.h
+++ b/plat/imx/common/include/imx_aips.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_AIPS_H__
-#define __IMX_AIPS_H__
+#ifndef IMX_AIPS_H
+#define IMX_AIPS_H
 
 #include <stdint.h>
 
@@ -19,4 +19,4 @@
 
 void imx_aips_init(void);
 
-#endif /* __IMX_AIPS_H__ */
+#endif /* IMX_AIPS_H */
diff --git a/plat/imx/common/include/imx_caam.h b/plat/imx/common/include/imx_caam.h
index 2e1f41a..335bd0f 100644
--- a/plat/imx/common/include/imx_caam.h
+++ b/plat/imx/common/include/imx_caam.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_CAAM_H__
-#define __IMX_CAAM_H__
+#ifndef IMX_CAAM_H
+#define IMX_CAAM_H
 
 #include <stdint.h>
 #include <arch.h>
@@ -66,4 +66,4 @@
 /* Declare CAAM API */
 void imx_caam_init(void);
 
-#endif /* __IMX_CAAM_H__ */
+#endif /* IMX_CAAM_H */
diff --git a/plat/imx/common/include/imx_clock.h b/plat/imx/common/include/imx_clock.h
index 8558638..ce245ad 100644
--- a/plat/imx/common/include/imx_clock.h
+++ b/plat/imx/common/include/imx_clock.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_CLOCK_H__
-#define __IMX_CLOCK_H__
+#ifndef IMX_CLOCK_H
+#define IMX_CLOCK_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -999,4 +999,4 @@
 void imx_clock_disable_usb(unsigned int usb_id);
 void imx_clock_set_usb_clk_root_bits(uint32_t usb_clk_root_en_bits);
 
-#endif /* __IMX_CLOCK_H__ */
+#endif /* IMX_CLOCK_H */
diff --git a/plat/imx/common/include/imx_csu.h b/plat/imx/common/include/imx_csu.h
index 9bf9373..879d10b 100644
--- a/plat/imx/common/include/imx_csu.h
+++ b/plat/imx/common/include/imx_csu.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_CSU_H__
-#define __IMX_CSU_H__
+#ifndef IMX_CSU_H
+#define IMX_CSU_H
 
 #include <arch.h>
 
@@ -41,4 +41,4 @@
 			      CSU_CSL_SUR_S2)
 void imx_csu_init(void);
 
-#endif /* __IMX_CSU_H__ */
+#endif /* IMX_CSU_H */
diff --git a/plat/imx/common/include/imx_hab.h b/plat/imx/common/include/imx_hab.h
index e3d266c..22c0742 100644
--- a/plat/imx/common/include/imx_hab.h
+++ b/plat/imx/common/include/imx_hab.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_HAB_H__
-#define __IMX_HAB_H__
+#ifndef IMX_HAB_H
+#define IMX_HAB_H
 
 #include <imx_hab_arch.h>
 #include <imx_regs.h>
@@ -30,4 +30,4 @@
 #define HAB_ROM_VECTOR_TABLE_REPORT_STATUS	(HAB_ROM_VECTOR_BASE + 0x24)
 #define HAB_ROM_VECTOR_TABLE_FAILSAFE		(HAB_ROM_VECTOR_BASE + 0x28)
 
-#endif /* __IMX_HAB_H__ */
+#endif /* IMX_HAB_H */
diff --git a/plat/imx/common/include/imx_io_mux.h b/plat/imx/common/include/imx_io_mux.h
index 44284f6..9b30421 100644
--- a/plat/imx/common/include/imx_io_mux.h
+++ b/plat/imx/common/include/imx_io_mux.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_IO_MUX_H__
-#define __IMX_IO_MUX_H__
+#ifndef IMX_IO_MUX_H
+#define IMX_IO_MUX_H
 
 #include <stdint.h>
 
@@ -606,4 +606,4 @@
 void imx_io_muxc_set_pad_alt_function(uint32_t pad_mux_offset, uint32_t alt_function);
 void imx_io_muxc_set_pad_features(uint32_t pad_feature_offset, uint32_t pad_features);
 
-#endif /* __IMX_IO_MUX_H__ */
+#endif /* IMX_IO_MUX_H */
diff --git a/plat/imx/common/include/imx_snvs.h b/plat/imx/common/include/imx_snvs.h
index 081ae8c..0aed1e1 100644
--- a/plat/imx/common/include/imx_snvs.h
+++ b/plat/imx/common/include/imx_snvs.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_SNVS_H__
-#define __IMX_SNVS_H__
+#ifndef IMX_SNVS_H
+#define IMX_SNVS_H
 
 #include <stdint.h>
 #include <arch.h>
@@ -79,4 +79,4 @@
 
 void imx_snvs_init(void);
 
-#endif /* __IMX_SNVS_H__ */
+#endif /* IMX_SNVS_H */
diff --git a/plat/imx/common/include/imx_wdog.h b/plat/imx/common/include/imx_wdog.h
index 8033e62..7b3037d 100644
--- a/plat/imx/common/include/imx_wdog.h
+++ b/plat/imx/common/include/imx_wdog.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_WDOG_H__
-#define __IMX_WDOG_H__
+#ifndef IMX_WDOG_H
+#define IMX_WDOG_H
 
 #include <arch.h>
 #include <stdint.h>
@@ -58,4 +58,4 @@
 /* External facing API */
 void imx_wdog_init(void);
 
-#endif /* __IMX_WDOG_H__ */
+#endif /* IMX_WDOG_H */
diff --git a/plat/imx/common/include/plat_imx8.h b/plat/imx/common/include/plat_imx8.h
index a333bfb..03799c4 100644
--- a/plat/imx/common/include/plat_imx8.h
+++ b/plat/imx/common/include/plat_imx8.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_IMX8_H__
-#define __PLAT_IMX8_H__
+#ifndef PLAT_IMX8_H
+#define PLAT_IMX8_H
 
 #include <gicv3.h>
 #include <psci.h>
@@ -23,4 +23,5 @@
 int imx_validate_power_state(unsigned int power_state,
 			psci_power_state_t *req_state);
 void imx_get_sys_suspend_power_state(psci_power_state_t *req_state);
-#endif /*__PLAT_IMX8_H__ */
+
+#endif /* PLAT_IMX8_H */
diff --git a/plat/imx/common/include/sci/sci.h b/plat/imx/common/include/sci/sci.h
index 3dd17ce..f0a2502 100644
--- a/plat/imx/common/include/sci/sci.h
+++ b/plat/imx/common/include/sci/sci.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _SC_SCI_H
-#define _SC_SCI_H
+#ifndef SCI_H
+#define SCI_H
 
 /* Defines */
 
@@ -16,4 +16,4 @@
 #include <sci/svc/pm/sci_pm_api.h>
 #include <sci/svc/rm/sci_rm_api.h>
 
-#endif /* _SC_SCI_H */
+#endif /* SCI_H */
diff --git a/plat/imx/common/include/sci/sci_ipc.h b/plat/imx/common/include/sci/sci_ipc.h
index c169a79..1167ea3 100644
--- a/plat/imx/common/include/sci/sci_ipc.h
+++ b/plat/imx/common/include/sci/sci_ipc.h
@@ -8,8 +8,8 @@
  * Header file for the IPC implementation.
  */
 
-#ifndef SC_IPC_H
-#define SC_IPC_H
+#ifndef SCI_IPC_H
+#define SCI_IPC_H
 
 /* Includes */
 
@@ -64,4 +64,4 @@
 
 sc_ipc_t ipc_handle;
 
-#endif				/* SC_IPC_H */
+#endif /* SCI_IPC_H */
diff --git a/plat/imx/common/include/sci/sci_rpc.h b/plat/imx/common/include/sci/sci_rpc.h
index 052f361..1771bae 100644
--- a/plat/imx/common/include/sci/sci_rpc.h
+++ b/plat/imx/common/include/sci/sci_rpc.h
@@ -8,8 +8,8 @@
  * Header file for the RPC implementation.
  */
 
-#ifndef SC_RPC_H
-#define SC_RPC_H
+#ifndef SCI_RPC_H
+#define SCI_RPC_H
 
 /* Includes */
 
@@ -124,4 +124,4 @@
  */
 void sc_rpc_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg);
 
-#endif				/* SC_RPC_H */
+#endif /* SCI_RPC_H */
diff --git a/plat/imx/common/include/sci/sci_scfw.h b/plat/imx/common/include/sci/sci_scfw.h
index 781c69e..a169f88 100644
--- a/plat/imx/common/include/sci/sci_scfw.h
+++ b/plat/imx/common/include/sci/sci_scfw.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _SC_SCFW_H
-#define _SC_SCFW_H
+#ifndef SCI_SCFW_H
+#define SCI_SCFW_H
 
 /* Includes */
 
@@ -33,5 +33,4 @@
 typedef uint64_t sc_ipc_id_t;
 
 
-#endif /* _SC_SCFW_H */
-
+#endif /* SCI_SCFW_H */
diff --git a/plat/imx/common/include/sci/sci_types.h b/plat/imx/common/include/sci/sci_types.h
index 3ee5276..6ade01c 100644
--- a/plat/imx/common/include/sci/sci_types.h
+++ b/plat/imx/common/include/sci/sci_types.h
@@ -8,8 +8,8 @@
  * Header file containing types used across multiple service APIs.
  */
 
-#ifndef SC_TYPES_H
-#define SC_TYPES_H
+#ifndef SCI_TYPES_H
+#define SCI_TYPES_H
 
 /* Includes */
 
@@ -846,4 +846,4 @@
 typedef __UINT64_TYPE__ uint64_t;
 #endif
 
-#endif				/* SC_TYPES_H */
+#endif /* SCI_TYPES_H */
diff --git a/plat/imx/common/include/sci/svc/pad/sci_pad_api.h b/plat/imx/common/include/sci/svc/pad/sci_pad_api.h
index 0955678..dc23eed 100644
--- a/plat/imx/common/include/sci/svc/pad/sci_pad_api.h
+++ b/plat/imx/common/include/sci/svc/pad/sci_pad_api.h
@@ -52,8 +52,8 @@
  * @{
  */
 
-#ifndef SC_PAD_API_H
-#define SC_PAD_API_H
+#ifndef SCI_PAD_API_H
+#define SCI_PAD_API_H
 
 /* Includes */
 
@@ -567,6 +567,6 @@
 
 /* @} */
 
-#endif				/* SC_PAD_API_H */
+#endif /* SCI_PAD_API_H */
 
 /**@}*/
diff --git a/plat/imx/common/include/sci/svc/pm/sci_pm_api.h b/plat/imx/common/include/sci/svc/pm/sci_pm_api.h
index 5c3c382..76ca5c4 100644
--- a/plat/imx/common/include/sci/svc/pm/sci_pm_api.h
+++ b/plat/imx/common/include/sci/svc/pm/sci_pm_api.h
@@ -16,8 +16,8 @@
  * @{
  */
 
-#ifndef SC_PM_API_H
-#define SC_PM_API_H
+#ifndef SCI_PM_API_H
+#define SCI_PM_API_H
 
 /* Includes */
 
@@ -679,6 +679,6 @@
 
 /* @} */
 
-#endif				/* SC_PM_API_H */
+#endif /* SCI_PM_API_H */
 
 /**@}*/
diff --git a/plat/imx/common/include/sci/svc/rm/sci_rm_api.h b/plat/imx/common/include/sci/svc/rm/sci_rm_api.h
index 012d919..df1bc40 100644
--- a/plat/imx/common/include/sci/svc/rm/sci_rm_api.h
+++ b/plat/imx/common/include/sci/svc/rm/sci_rm_api.h
@@ -18,8 +18,8 @@
  * @{
  */
 
-#ifndef SC_RM_API_H
-#define SC_RM_API_H
+#ifndef SCI_RM_API_H
+#define SCI_RM_API_H
 
 /* Includes */
 
@@ -752,6 +752,6 @@
 
 /* @} */
 
-#endif				/* SC_RM_API_H */
+#endif /* SCI_RM_API_H */
 
 /**@}*/
diff --git a/plat/imx/common/sci/svc/pad/sci_pad_rpc.h b/plat/imx/common/sci/svc/pad/sci_pad_rpc.h
index 686e6e9..8e9c4bb 100644
--- a/plat/imx/common/sci/svc/pad/sci_pad_rpc.h
+++ b/plat/imx/common/sci/svc/pad/sci_pad_rpc.h
@@ -11,8 +11,8 @@
  * @{
  */
 
-#ifndef SC_PAD_RPC_H
-#define SC_PAD_RPC_H
+#ifndef SCI_PAD_RPC_H
+#define SCI_PAD_RPC_H
 
 /* Includes */
 
@@ -61,6 +61,6 @@
  */
 void pad_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg);
 
-#endif				/* SC_PAD_RPC_H */
+#endif /* SCI_PAD_RPC_H */
 
 /**@}*/
diff --git a/plat/imx/common/sci/svc/pm/sci_pm_rpc.h b/plat/imx/common/sci/svc/pm/sci_pm_rpc.h
index 19ab6e4..8bad3c7 100644
--- a/plat/imx/common/sci/svc/pm/sci_pm_rpc.h
+++ b/plat/imx/common/sci/svc/pm/sci_pm_rpc.h
@@ -11,8 +11,8 @@
  * @{
  */
 
-#ifndef SC_PM_RPC_H
-#define SC_PM_RPC_H
+#ifndef SCI_PM_RPC_H
+#define SCI_PM_RPC_H
 
 /* Includes */
 
@@ -66,6 +66,6 @@
  */
 void pm_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg);
 
-#endif				/* SC_PM_RPC_H */
+#endif /* SCI_PM_RPC_H */
 
 /**@}*/
diff --git a/plat/imx/common/sci/svc/rm/sci_rm_rpc.h b/plat/imx/common/sci/svc/rm/sci_rm_rpc.h
index e3de450..45d05f9 100644
--- a/plat/imx/common/sci/svc/rm/sci_rm_rpc.h
+++ b/plat/imx/common/sci/svc/rm/sci_rm_rpc.h
@@ -11,8 +11,8 @@
  * @{
  */
 
-#ifndef SC_RM_RPC_H
-#define SC_RM_RPC_H
+#ifndef SCI_RM_RPC_H
+#define SCI_RM_RPC_H
 
 /* Includes */
 
@@ -76,6 +76,6 @@
  */
 void rm_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg);
 
-#endif				/* SC_RM_RPC_H */
+#endif /* SCI_RM_RPC_H */
 
 /**@}*/
diff --git a/plat/imx/imx7/include/imx_hab_arch.h b/plat/imx/imx7/include/imx_hab_arch.h
index 338a027..2a34c6a 100644
--- a/plat/imx/imx7/include/imx_hab_arch.h
+++ b/plat/imx/imx7/include/imx_hab_arch.h
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_HAB_ARCH_H__
-#define __IMX_HAB_ARCH_H__
+#ifndef IMX_HAB_ARCH_H
+#define IMX_HAB_ARCH_H
 
 /* Define the offset the High Assurance Boot callback table is at */
 #define HAB_CALLBACK_OFFSET	0x100
 
-#endif /* __IMX_HAB_ARCH_H__ */
+#endif /* IMX_HAB_ARCH_H */
diff --git a/plat/imx/imx7/include/imx_regs.h b/plat/imx/imx7/include/imx_regs.h
index aa345cf..3c7e20f 100644
--- a/plat/imx/imx7/include/imx_regs.h
+++ b/plat/imx/imx7/include/imx_regs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_REGS_H__
-#define __IMX_REGS_H__
+#ifndef IMX_REGS_H
+#define IMX_REGS_H
 
 /* Define the processor memory map */
 
@@ -105,4 +105,4 @@
 /* Define the maximum number of WDOG blocks on this SoC */
 #define MXC_MAX_WDOG_NUM		0x04
 
-#endif /* __IMX_REGS_H__ */
+#endif /* IMX_REGS_H */
diff --git a/plat/imx/imx7/warp7/include/platform_def.h b/plat/imx/imx7/warp7/include/platform_def.h
index 27429c7..d0148f4 100644
--- a/plat/imx/imx7/warp7/include/platform_def.h
+++ b/plat/imx/imx7/warp7/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>
 #include <common_def.h>
@@ -214,4 +214,4 @@
  */
 #define SYS_COUNTER_FREQ_IN_TICKS	8000000		/* 8 MHz */
 
-#endif /* __PLATFORM_DEF_H__ */
+#endif /* PLATFORM_DEF_H */
diff --git a/plat/imx/imx7/warp7/warp7_private.h b/plat/imx/imx7/warp7/warp7_private.h
index c93acac..cb6d900 100644
--- a/plat/imx/imx7/warp7/warp7_private.h
+++ b/plat/imx/imx7/warp7/warp7_private.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __WARP7_PRIVATE_H__
-#define __WARP7_PRIVATE_H__
+#ifndef WARP7_PRIVATE_H
+#define WARP7_PRIVATE_H
 
 /*******************************************************************************
  * Function and variable prototypes
  ******************************************************************************/
 void plat_warp7_io_setup(void);
 
-#endif /*__WARP7_PRIVATE_H__ */
+#endif /* WARP7_PRIVATE_H */
diff --git a/plat/layerscape/board/ls1043/include/ns_access.h b/plat/layerscape/board/ls1043/include/ns_access.h
index 6ed7bc0..833a5df 100644
--- a/plat/layerscape/board/ls1043/include/ns_access.h
+++ b/plat/layerscape/board/ls1043/include/ns_access.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __FSL_NS_ACCESS_H_
-#define __FSL_NS_ACCESS_H_
+#ifndef NS_ACCESS_H
+#define NS_ACCESS_H
 
 #include "fsl_csu.h"
 
@@ -171,4 +171,4 @@
 	 {CSU_CSLX_DSCR, CSU_ALL_RW},
 };
 
-#endif
+#endif /* NS_ACCESS_H */
diff --git a/plat/layerscape/board/ls1043/include/plat_macros.S b/plat/layerscape/board/ls1043/include/plat_macros.S
index 8163dc1..1ae43ef 100644
--- a/plat/layerscape/board/ls1043/include/plat_macros.S
+++ b/plat/layerscape/board/ls1043/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
 
 	/* ---------------------------------------------
 	 * The below required platform porting macro
@@ -18,4 +18,4 @@
 	.macro plat_crash_print_regs
 	.endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/layerscape/board/ls1043/include/soc_tzasc.h b/plat/layerscape/board/ls1043/include/soc_tzasc.h
index 0039f2d..b2483d9 100644
--- a/plat/layerscape/board/ls1043/include/soc_tzasc.h
+++ b/plat/layerscape/board/ls1043/include/soc_tzasc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _SOC_TZASC_H_
-#define _SOC_TZASC_H_
+#ifndef SOC_TZASC_H
+#define SOC_TZASC_H
 
 #include "tzc380.h"
 
@@ -90,4 +90,4 @@
 	{}
 };
 
-#endif /* _SOC_TZASC_H_ */
+#endif /* SOC_TZASC_H */
diff --git a/plat/layerscape/common/include/fsl_csu.h b/plat/layerscape/common/include/fsl_csu.h
index 680911e..5cc88b1 100644
--- a/plat/layerscape/common/include/fsl_csu.h
+++ b/plat/layerscape/common/include/fsl_csu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __FSL_CSU_H__
-#define __FSL_CSU_H__
+#ifndef FSL_CSU_H
+#define FSL_CSU_H
 
 enum csu_cslx_access {
 	CSU_NS_SUP_R = 0x08,
@@ -30,4 +30,4 @@
 
 void enable_layerscape_ns_access(void);
 
-#endif
+#endif /* FSL_CSU_H */
diff --git a/plat/layerscape/common/include/ls_16550.h b/plat/layerscape/common/include/ls_16550.h
index 8daafbb..94694ee 100644
--- a/plat/layerscape/common/include/ls_16550.h
+++ b/plat/layerscape/common/include/ls_16550.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __LS_16550_H__
-#define __LS_16550_H__
+#ifndef LS_16550_H
+#define LS_16550_H
 
 #include <console.h>
 
@@ -83,4 +83,4 @@
 
 #endif /*__ASSEMBLY__*/
 
-#endif	/* __LS_16550_H__ */
+#endif /* LS_16550_H */
diff --git a/plat/layerscape/common/include/plat_ls.h b/plat/layerscape/common/include/plat_ls.h
index 05b9c05..49526ca 100644
--- a/plat/layerscape/common/include/plat_ls.h
+++ b/plat/layerscape/common/include/plat_ls.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_LS_H__
-#define __PLAT_LS_H__
+#ifndef PLAT_LS_H
+#define PLAT_LS_H
 
 #include <cpu_data.h>
 #include <stdint.h>
@@ -58,4 +58,4 @@
 /* others */
 unsigned int plat_ls_get_cluster_core_count(u_register_t mpidr);
 
-#endif /* __PLAT_LS_H__ */
+#endif /* PLAT_LS_H */
diff --git a/plat/layerscape/common/include/soc.h b/plat/layerscape/common/include/soc.h
index 72c10cf..76c3418 100644
--- a/plat/layerscape/common/include/soc.h
+++ b/plat/layerscape/common/include/soc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __LAYERSCAPE_SOC_H__
-#define __LAYERSCAPE_SOC_H__
+#ifndef SOC_H
+#define SOC_H
 
 #include <stdint.h>
 
@@ -15,4 +15,4 @@
 
 void get_gic_offset(uint32_t *gicc_base, uint32_t *gicd_base);
 
-#endif /* __LAYERSCAPE_SOC_H__ */
+#endif /* SOC_H */
diff --git a/plat/layerscape/common/include/tzc380.h b/plat/layerscape/common/include/tzc380.h
index 788c0ed..88063a9 100644
--- a/plat/layerscape/common/include/tzc380.h
+++ b/plat/layerscape/common/include/tzc380.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TZC380_H__
-#define __TZC380_H__
+#ifndef TZC380_H
+#define TZC380_H
 
 struct tzc380_reg {
 	unsigned int secure;
@@ -16,4 +16,4 @@
 	unsigned int sub_mask;
 };
 
-#endif /* __TZC380_H__ */
+#endif /* TZC380_H */
diff --git a/plat/layerscape/common/tsp/platform_tsp.h b/plat/layerscape/common/tsp/platform_tsp.h
index b1c96cb..260f66a 100644
--- a/plat/layerscape/common/tsp/platform_tsp.h
+++ b/plat/layerscape/common/tsp/platform_tsp.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLATFORM_TSP_H__
-#define __PLATFORM_TSP_H__
+#ifndef PLATFORM_TSP_H
+#define PLATFORM_TSP_H
 
 /*******************************************************************************
  * Mandatory TSP functions (only if platform contains a TSP)
@@ -14,4 +14,4 @@
 void tsp_plat_arch_setup(void);
 void tsp_platform_setup(void);
 
-#endif /* __PLATFORM_TSP_H__ */
+#endif /* PLATFORM_TSP_H */
diff --git a/plat/marvell/a3700/a3700/mvebu_def.h b/plat/marvell/a3700/a3700/mvebu_def.h
index c58f06b..dad1085 100644
--- a/plat/marvell/a3700/a3700/mvebu_def.h
+++ b/plat/marvell/a3700/a3700/mvebu_def.h
@@ -5,9 +5,9 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MVEBU_DEF_H__
-#define __MVEBU_DEF_H__
+#ifndef MVEBU_DEF_H
+#define MVEBU_DEF_H
 
 #include <a3700_plat_def.h>
 
-#endif /* __MVEBU_DEF_H__ */
+#endif /* MVEBU_DEF_H */
diff --git a/plat/marvell/a3700/common/include/a3700_plat_def.h b/plat/marvell/a3700/common/include/a3700_plat_def.h
index 6ae57b3..c7f40ad 100644
--- a/plat/marvell/a3700/common/include/a3700_plat_def.h
+++ b/plat/marvell/a3700/common/include/a3700_plat_def.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __A3700_PLAT_DEF_H__
-#define __A3700_PLAT_DEF_H__
+#ifndef A3700_PLAT_DEF_H
+#define A3700_PLAT_DEF_H
 
 #include <marvell_def.h>
 
@@ -119,4 +119,4 @@
  */
 #define MVEBU_COMPHY_REG_BASE			(MVEBU_REGS_BASE + 0x18300)
 
-#endif /* __A3700_PLAT_DEF_H__ */
+#endif /* A3700_PLAT_DEF_H */
diff --git a/plat/marvell/a3700/common/include/a3700_pm.h b/plat/marvell/a3700/common/include/a3700_pm.h
index bd8792a..cc6cf43 100644
--- a/plat/marvell/a3700/common/include/a3700_pm.h
+++ b/plat/marvell/a3700/common/include/a3700_pm.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __A3700_PM_H__
-#define __A3700_PM_H__
+#ifndef A3700_PM_H
+#define A3700_PM_H
 
 #include <stdint.h>
 
@@ -48,5 +48,4 @@
 
 struct pm_wake_up_src_config *mv_wake_up_src_config_get(void);
 
-
-#endif /* __A3700_PM_H__ */
+#endif /* A3700_PM_H */
diff --git a/plat/marvell/a3700/common/include/ddr_info.h b/plat/marvell/a3700/common/include/ddr_info.h
index 1a9230d..254f78c 100644
--- a/plat/marvell/a3700/common/include/ddr_info.h
+++ b/plat/marvell/a3700/common/include/ddr_info.h
@@ -5,10 +5,10 @@
  * https://spdx.org/licenses
  */
 
-#ifndef _DDR_INFO_H_
-#define _DDR_INFO_H_
+#ifndef DDR_INFO_H
+#define DDR_INFO_H
 
 #define DRAM_MAX_IFACE			1
 #define DRAM_CH0_MMAP_LOW_OFFSET	0x200
 
-#endif /* _DDR_INFO_H_ */
+#endif /* DDR_INFO_H */
diff --git a/plat/marvell/a3700/common/include/dram_win.h b/plat/marvell/a3700/common/include/dram_win.h
index 7ff20be..6f345f9 100644
--- a/plat/marvell/a3700/common/include/dram_win.h
+++ b/plat/marvell/a3700/common/include/dram_win.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef _DRAM_WIN_H_
-#define _DRAM_WIN_H_
+#ifndef DRAM_WIN_H
+#define DRAM_WIN_H
 
 #include <bl_common.h>
 #include <io_addr_dec.h>
@@ -14,5 +14,4 @@
 void dram_win_map_build(struct dram_win_map *win_map);
 void cpu_wins_init(void);
 
-#endif /* _DRAM_WIN_H_ */
-
+#endif /* DRAM_WIN_H */
diff --git a/plat/marvell/a3700/common/include/io_addr_dec.h b/plat/marvell/a3700/common/include/io_addr_dec.h
index 79f6f2c..42ef30b 100644
--- a/plat/marvell/a3700/common/include/io_addr_dec.h
+++ b/plat/marvell/a3700/common/include/io_addr_dec.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef _IO_ADDR_DEC_H_
-#define _IO_ADDR_DEC_H_
+#ifndef IO_ADDR_DEC_H
+#define IO_ADDR_DEC_H
 
 #include <stdint.h>
 
@@ -63,5 +63,4 @@
 		     struct dec_win_config *io_dec_config,
 		     uint32_t io_unit_num);
 
-#endif /* _IO_ADDR_DEC_H_ */
-
+#endif /* IO_ADDR_DEC_H */
diff --git a/plat/marvell/a3700/common/include/plat_macros.S b/plat/marvell/a3700/common/include/plat_macros.S
index b52d1cf..f689b4f 100644
--- a/plat/marvell/a3700/common/include/plat_macros.S
+++ b/plat/marvell/a3700/common/include/plat_macros.S
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 #include <marvell_macros.S>
 
@@ -23,4 +23,4 @@
 	print_cci_regs
 .endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/marvell/a3700/common/include/platform_def.h b/plat/marvell/a3700/common/include/platform_def.h
index 7c72cc5..ca2553c 100644
--- a/plat/marvell/a3700/common/include/platform_def.h
+++ b/plat/marvell/a3700/common/include/platform_def.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __PLATFORM_DEF_H__
-#define __PLATFORM_DEF_H__
+#ifndef PLATFORM_DEF_H
+#define PLATFORM_DEF_H
 
 #include <board_marvell_def.h>
 #include <mvebu_def.h>
@@ -228,4 +228,4 @@
 #define BL32_LIMIT		TRUSTED_DRAM_SIZE
 #endif
 
-#endif /* __PLATFORM_DEF_H__ */
+#endif /* PLATFORM_DEF_H */
diff --git a/plat/marvell/a8k/a70x0/mvebu_def.h b/plat/marvell/a8k/a70x0/mvebu_def.h
index a7c5abb..72bca12 100644
--- a/plat/marvell/a8k/a70x0/mvebu_def.h
+++ b/plat/marvell/a8k/a70x0/mvebu_def.h
@@ -5,11 +5,11 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MVEBU_DEF_H__
-#define __MVEBU_DEF_H__
+#ifndef MVEBU_DEF_H
+#define MVEBU_DEF_H
 
 #include <a8k_plat_def.h>
 
 #define CP_COUNT		1	/* A70x0 has single CP0 */
 
-#endif /* __MVEBU_DEF_H__ */
+#endif /* MVEBU_DEF_H */
diff --git a/plat/marvell/a8k/a70x0_amc/mvebu_def.h b/plat/marvell/a8k/a70x0_amc/mvebu_def.h
index 5c66552..cedf323 100644
--- a/plat/marvell/a8k/a70x0_amc/mvebu_def.h
+++ b/plat/marvell/a8k/a70x0_amc/mvebu_def.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MVEBU_DEF_H__
-#define __MVEBU_DEF_H__
+#ifndef MVEBU_DEF_H
+#define MVEBU_DEF_H
 
 #include <a8k_plat_def.h>
 
@@ -28,4 +28,4 @@
 #endif
 
 
-#endif /* __MVEBU_DEF_H__ */
+#endif /* MVEBU_DEF_H */
diff --git a/plat/marvell/a8k/a80x0/board/phy-porting-layer.h b/plat/marvell/a8k/a80x0/board/phy-porting-layer.h
index da391eb..38497fb 100644
--- a/plat/marvell/a8k/a80x0/board/phy-porting-layer.h
+++ b/plat/marvell/a8k/a80x0/board/phy-porting-layer.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __PHY_PORTING_LAYER_H
-#define __PHY_PORTING_LAYER_H
+#ifndef PHY_PORTING_LAYER_H
+#define PHY_PORTING_LAYER_H
 
 #define MAX_LANE_NR		6
 
@@ -164,4 +164,4 @@
 		},
 	},
 };
-#endif /* __PHY_PORTING_LAYER_H */
+#endif /* PHY_PORTING_LAYER_H */
diff --git a/plat/marvell/a8k/a80x0/mvebu_def.h b/plat/marvell/a8k/a80x0/mvebu_def.h
index 5bff12c..3fa119a 100644
--- a/plat/marvell/a8k/a80x0/mvebu_def.h
+++ b/plat/marvell/a8k/a80x0/mvebu_def.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MVEBU_DEF_H__
-#define __MVEBU_DEF_H__
+#ifndef MVEBU_DEF_H
+#define MVEBU_DEF_H
 
 #include <a8k_plat_def.h>
 
@@ -14,4 +14,4 @@
 #define I2C_SPD_ADDR		0x53	/* Access SPD data */
 #define I2C_SPD_P0_ADDR		0x36	/* Select SPD data page 0 */
 
-#endif /* __MVEBU_DEF_H__ */
+#endif /* MVEBU_DEF_H */
diff --git a/plat/marvell/a8k/a80x0_mcbin/mvebu_def.h b/plat/marvell/a8k/a80x0_mcbin/mvebu_def.h
index 5bff12c..3fa119a 100644
--- a/plat/marvell/a8k/a80x0_mcbin/mvebu_def.h
+++ b/plat/marvell/a8k/a80x0_mcbin/mvebu_def.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MVEBU_DEF_H__
-#define __MVEBU_DEF_H__
+#ifndef MVEBU_DEF_H
+#define MVEBU_DEF_H
 
 #include <a8k_plat_def.h>
 
@@ -14,4 +14,4 @@
 #define I2C_SPD_ADDR		0x53	/* Access SPD data */
 #define I2C_SPD_P0_ADDR		0x36	/* Select SPD data page 0 */
 
-#endif /* __MVEBU_DEF_H__ */
+#endif /* MVEBU_DEF_H */
diff --git a/plat/marvell/a8k/common/include/a8k_plat_def.h b/plat/marvell/a8k/common/include/a8k_plat_def.h
index 55ad002..7ed56e0 100644
--- a/plat/marvell/a8k/common/include/a8k_plat_def.h
+++ b/plat/marvell/a8k/common/include/a8k_plat_def.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __A8K_PLAT_DEF_H__
-#define __A8K_PLAT_DEF_H__
+#ifndef A8K_PLAT_DEF_H
+#define A8K_PLAT_DEF_H
 
 #include <marvell_def.h>
 
@@ -191,4 +191,4 @@
 };
 #endif /* __ASSEMBLER__ */
 
-#endif /* __A8K_PLAT_DEF_H__ */
+#endif /* A8K_PLAT_DEF_H */
diff --git a/plat/marvell/a8k/common/include/mentor_i2c_plat.h b/plat/marvell/a8k/common/include/mentor_i2c_plat.h
index 8829a92..e03c448 100644
--- a/plat/marvell/a8k/common/include/mentor_i2c_plat.h
+++ b/plat/marvell/a8k/common/include/mentor_i2c_plat.h
@@ -6,8 +6,8 @@
  */
 /* This driver provides I2C support for Marvell A8K and compatible SoCs */
 
-#ifndef A8K_I2C_H
-#define A8K_I2C_H
+#ifndef MENTOR_I2C_PLAT_H
+#define MENTOR_I2C_PLAT_H
 
 #define CONFIG_SYS_TCLK			250000000
 #define CONFIG_SYS_I2C_SPEED		100000
@@ -30,4 +30,4 @@
 	uint32_t unstuck;
 };
 
-#endif
+#endif /* MENTOR_I2C_PLAT_H */
diff --git a/plat/marvell/a8k/common/include/plat_macros.S b/plat/marvell/a8k/common/include/plat_macros.S
index 2a6ccf2..8faccf0 100644
--- a/plat/marvell/a8k/common/include/plat_macros.S
+++ b/plat/marvell/a8k/common/include/plat_macros.S
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 #include <marvell_macros.S>
 
@@ -17,4 +17,4 @@
 .macro plat_crash_print_regs
 .endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/marvell/a8k/common/include/platform_def.h b/plat/marvell/a8k/common/include/platform_def.h
index ed7bb63..4c3e7a9 100644
--- a/plat/marvell/a8k/common/include/platform_def.h
+++ b/plat/marvell/a8k/common/include/platform_def.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __PLATFORM_DEF_H__
-#define __PLATFORM_DEF_H__
+#ifndef PLATFORM_DEF_H
+#define PLATFORM_DEF_H
 
 #include <board_marvell_def.h>
 #include <gic_common.h>
@@ -198,4 +198,4 @@
 
 #define MVEBU_PMU_IRQ_WA
 
-#endif /* __PLATFORM_DEF_H__ */
+#endif /* PLATFORM_DEF_H */
diff --git a/plat/marvell/a8k/common/mss/mss_pm_ipc.h b/plat/marvell/a8k/common/mss/mss_pm_ipc.h
index 0f69457..1dfa9fa 100644
--- a/plat/marvell/a8k/common/mss/mss_pm_ipc.h
+++ b/plat/marvell/a8k/common/mss/mss_pm_ipc.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MSS_PM_IPC_H
-#define __MSS_PM_IPC_H
+#ifndef MSS_PM_IPC_H
+#define MSS_PM_IPC_H
 
 #include <mss_ipc_drv.h>
 
@@ -32,4 +32,4 @@
 int mss_pm_ipc_msg_trigger(void);
 
 
-#endif /* __MSS_PM_IPC_H */
+#endif /* MSS_PM_IPC_H */
diff --git a/plat/marvell/common/mss/mss_ipc_drv.h b/plat/marvell/common/mss/mss_ipc_drv.h
index 28eb907..7bb15d3 100644
--- a/plat/marvell/common/mss/mss_ipc_drv.h
+++ b/plat/marvell/common/mss/mss_ipc_drv.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __PM_IPC_DRV_H
-#define __PM_IPC_DRV_H
+#ifndef MSS_IPC_DRV_H
+#define MSS_IPC_DRV_H
 
 #include <psci.h>
 
@@ -117,4 +117,4 @@
 int mv_pm_ipc_msg_tx(unsigned int channel_id, unsigned int msg_id,
 			unsigned int cluster_power_state);
 
-#endif /* __PM_IPC_DRV_H */
+#endif /* MSS_IPC_DRV_H */
diff --git a/plat/marvell/common/mss/mss_mem.h b/plat/marvell/common/mss/mss_mem.h
index efff59e..5d68ac7 100644
--- a/plat/marvell/common/mss/mss_mem.h
+++ b/plat/marvell/common/mss/mss_mem.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MSS_PM_MEM_H
-#define __MSS_PM_MEM_H
+#ifndef MSS_MEM_H
+#define MSS_MEM_H
 
 /* MSS SRAM Memory base */
 #define MSS_SRAM_PM_CONTROL_BASE		(MVEBU_REGS_BASE + 0x520000)
@@ -57,4 +57,4 @@
 	unsigned int ctrl_blk_size;
 };
 
-#endif /* __MSS_PM_MEM_H */
+#endif /* MSS_MEM_H */
diff --git a/plat/marvell/common/mss/mss_scp_bl2_format.h b/plat/marvell/common/mss/mss_scp_bl2_format.h
index c04df72..7cf8d32 100644
--- a/plat/marvell/common/mss/mss_scp_bl2_format.h
+++ b/plat/marvell/common/mss/mss_scp_bl2_format.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MSS_SCP_BL2_FORMAT_H
-#define __MSS_SCP_BL2_FORMAT_H
+#ifndef MSS_SCP_BL2_FORMAT_H
+#define MSS_SCP_BL2_FORMAT_H
 
 #define MAX_NR_OF_FILES	5
 #define FILE_MAGIC	0xddd01ff
@@ -41,4 +41,4 @@
 				 */
 } img_header_t;
 
-#endif /* __MSS_SCP_BL2_FORMAT_H */
+#endif /* MSS_SCP_BL2_FORMAT_H */
diff --git a/plat/marvell/common/mss/mss_scp_bootloader.h b/plat/marvell/common/mss/mss_scp_bootloader.h
index 67c387a..4950d24 100644
--- a/plat/marvell/common/mss/mss_scp_bootloader.h
+++ b/plat/marvell/common/mss/mss_scp_bootloader.h
@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MSS_SCP_BOOTLOADER_H__
-#define __MSS_SCP_BOOTLOADER_H__
+#ifndef MSS_SCP_BOOTLOADER_H
+#define MSS_SCP_BOOTLOADER_H
 
 int scp_bootloader_transfer(void *image, unsigned int image_size);
 uintptr_t bl2_plat_get_cp_mss_regs(int ap_idx, int cp_idx);
@@ -16,4 +16,4 @@
 void bl2_plat_configure_mss_windows(uintptr_t mss_regs);
 int bl2_plat_mss_check_image_ready(void);
 
-#endif /* __MSS_SCP_BOOTLOADER_H__ */
+#endif /* MSS_SCP_BOOTLOADER_H */
diff --git a/plat/mediatek/common/custom/oem_svc.h b/plat/mediatek/common/custom/oem_svc.h
index 636bb87..76f7c24 100644
--- a/plat/mediatek/common/custom/oem_svc.h
+++ b/plat/mediatek/common/custom/oem_svc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __OEM_SVC_H__
-#define __OEM_SVC_H__
+#ifndef OEM_SVC_H
+#define OEM_SVC_H
 
 /*******************************************************************************
  * Defines for runtime services func ids
@@ -41,4 +41,4 @@
 #define OEM_SVC_E_NOT_SUPPORTED		-1
 #define OEM_SVC_E_INVALID_PARAMS	-2
 
-#endif /* __OEM_SVC_H__ */
+#endif /* OEM_SVC_H */
diff --git a/plat/mediatek/common/drivers/uart/uart8250.h b/plat/mediatek/common/drivers/uart/uart8250.h
index 8204d3f..da7c7a1 100644
--- a/plat/mediatek/common/drivers/uart/uart8250.h
+++ b/plat/mediatek/common/drivers/uart/uart8250.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __UART8250_H__
-#define __UART8250_H__
+#ifndef UART8250_H
+#define UART8250_H
 
 /* UART register */
 #define UART_RBR		0x00	/* Receive buffer register */
@@ -35,4 +35,4 @@
 #define UART_LSR_DR		0x01	/* Data ready */
 #define UART_LSR_THRE		0x20	/* Xmit holding register empty */
 
-#endif	/* __UART8250_H__ */
+#endif /* UART8250_H */
diff --git a/plat/mediatek/common/mtk_plat_common.h b/plat/mediatek/common/mtk_plat_common.h
index 923cf69..ff8e8c0 100644
--- a/plat/mediatek/common/mtk_plat_common.h
+++ b/plat/mediatek/common/mtk_plat_common.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __MTK_PLAT_COMMON_H__
-#define __MTK_PLAT_COMMON_H__
+#ifndef MTK_PLAT_COMMON_H
+#define MTK_PLAT_COMMON_H
 
 #include <bl_common.h>
 #include <param_header.h>
@@ -74,4 +74,4 @@
 uint64_t get_kernel_info_r2(void);
 
 extern struct atf_arg_t gteearg;
-#endif
+#endif /* MTK_PLAT_COMMON_H */
diff --git a/plat/mediatek/common/mtk_sip_svc.h b/plat/mediatek/common/mtk_sip_svc.h
index 1572ba7..cd4096e 100644
--- a/plat/mediatek/common/mtk_sip_svc.h
+++ b/plat/mediatek/common/mtk_sip_svc.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __PLAT_SIP_SVC_H__
-#define __PLAT_SIP_SVC_H__
+#ifndef MTK_SIP_SVC_H
+#define MTK_SIP_SVC_H
 
 #include <stdint.h>
 
@@ -50,4 +50,4 @@
  */
 uint64_t mt_sip_set_authorized_sreg(uint32_t sreg, uint32_t val);
 
-#endif /* __PLAT_SIP_SVC_H__ */
+#endif /* MTK_SIP_SVC_H */
diff --git a/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.h b/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.h
index 99b78a7..84df081 100644
--- a/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.h
+++ b/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MT_CPUXGPT_H__
-#define __MT_CPUXGPT_H__
+#ifndef MT_CPUXGPT_H
+#define MT_CPUXGPT_H
 
 /* REG */
 #define INDEX_CTL_REG       0x000
@@ -25,4 +25,4 @@
 void sched_clock_init(uint64_t normal_base, uint64_t atf_base);
 uint64_t sched_clock(void);
 
-#endif /* __MT_CPUXGPT_H__ */
+#endif /* MT_CPUXGPT_H */
diff --git a/plat/mediatek/mt6795/include/mcucfg.h b/plat/mediatek/mt6795/include/mcucfg.h
index eff8d34..7f6a786 100644
--- a/plat/mediatek/mt6795/include/mcucfg.h
+++ b/plat/mediatek/mt6795/include/mcucfg.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MCUCFG_H__
-#define __MCUCFG_H__
+#ifndef MCUCFG_H
+#define MCUCFG_H
 
 #include <platform_def.h>
 #include <stdint.h>
@@ -151,4 +151,4 @@
 	MP1_L2RSTDISABLE = 1 << MP1_L2RSTDISABLE_SHIFT
 };
 
-#endif  /* __MCUCFG_H__ */
+#endif  /* MCUCFG_H */
diff --git a/plat/mediatek/mt6795/include/plat_private.h b/plat/mediatek/mt6795/include/plat_private.h
index 9c6c1f0..10baa23 100644
--- a/plat/mediatek/mt6795/include/plat_private.h
+++ b/plat/mediatek/mt6795/include/plat_private.h
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_PRIVATE_H__
-#define __PLAT_PRIVATE_H__
+#ifndef PLAT_PRIVATE_H
+#define PLAT_PRIVATE_H
+
 #include <stdint.h>
 #include <xlat_tables.h>
 
@@ -33,4 +34,4 @@
 void plat_mt_gic_cpuif_disable(void);
 void plat_mt_gic_pcpu_init(void);
 
-#endif /* __PLAT_PRIVATE_H__ */
+#endif /* PLAT_PRIVATE_H */
diff --git a/plat/mediatek/mt6795/include/plat_sip_calls.h b/plat/mediatek/mt6795/include/plat_sip_calls.h
index b328195..b9a1363 100644
--- a/plat/mediatek/mt6795/include/plat_sip_calls.h
+++ b/plat/mediatek/mt6795/include/plat_sip_calls.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_SIP_CALLS_H__
-#define __PLAT_SIP_CALLS_H__
+#ifndef PLAT_SIP_CALLS_H
+#define PLAT_SIP_CALLS_H
 
 /*******************************************************************************
  * Plat SiP function constants
  ******************************************************************************/
 #define MTK_PLAT_SIP_NUM_CALLS	0
 
-#endif /* __PLAT_SIP_CALLS_H__ */
+#endif /* PLAT_SIP_CALLS_H */
diff --git a/plat/mediatek/mt6795/include/power_tracer.h b/plat/mediatek/mt6795/include/power_tracer.h
index 5eb77e4..8c98dbd 100644
--- a/plat/mediatek/mt6795/include/power_tracer.h
+++ b/plat/mediatek/mt6795/include/power_tracer.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __POWER_TRACER_H__
-#define __POWER_TRACER_H__
+#ifndef POWER_TRACER_H
+#define POWER_TRACER_H
 
 #define CPU_UP		0
 #define CPU_DOWN	1
@@ -16,4 +16,4 @@
 
 void trace_power_flow(unsigned long mpidr, unsigned char mode);
 
-#endif
+#endif /* POWER_TRACER_H */
diff --git a/plat/mediatek/mt6795/include/scu.h b/plat/mediatek/mt6795/include/scu.h
index 3c78692..625418a 100644
--- a/plat/mediatek/mt6795/include/scu.h
+++ b/plat/mediatek/mt6795/include/scu.h
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SCU_H__
-#define __SCU_H__
+#ifndef SCU_H
+#define SCU_H
 
 void disable_scu(unsigned long mpidr);
 void enable_scu(unsigned long mpidr);
 
-#endif
+#endif /* SCU_H */
diff --git a/plat/mediatek/mt6795/include/spm.h b/plat/mediatek/mt6795/include/spm.h
index 5e31276..5227e1d 100644
--- a/plat/mediatek/mt6795/include/spm.h
+++ b/plat/mediatek/mt6795/include/spm.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SPM_H__
-#define __SPM_H__
+#ifndef SPM_H
+#define SPM_H
 
 #define SPM_POWERON_CONFIG_SET			(SPM_BASE + 0x000)
 #define SPM_POWER_ON_VAL0			(SPM_BASE + 0x010)
@@ -195,4 +195,4 @@
 #define WAKE_SRC_ALL_MD32	(1 << 28)
 #define WAKE_SRC_CPU_IRQ	(1 << 29)
 
-#endif /* __SPM_H__ */
+#endif /* SPM_H */
diff --git a/plat/mediatek/mt8173/drivers/crypt/crypt.h b/plat/mediatek/mt8173/drivers/crypt/crypt.h
index 3bbc168..1a691a6 100644
--- a/plat/mediatek/mt8173/drivers/crypt/crypt.h
+++ b/plat/mediatek/mt8173/drivers/crypt/crypt.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __CRYPT_H__
-#define __CRYPT_H__
+#ifndef CRYPT_H
+#define CRYPT_H
 
 #include <stdint.h>
 
@@ -13,4 +13,4 @@
 uint64_t crypt_set_hdcp_key_num(uint32_t num);
 uint64_t crypt_clear_hdcp_key(void);
 
-#endif /* __CRYPT_H__ */
+#endif /* CRYPT_H */
diff --git a/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.h b/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.h
index 6e14e3d..1e58027 100644
--- a/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.h
+++ b/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __MTCMOS_H__
-#define __MTCMOS_H__
+#ifndef MTCMOS_H
+#define MTCMOS_H
 
 /*
  * This function will turn off all the little core's power except cpu 0. The
@@ -15,4 +15,4 @@
 void mtcmos_little_cpu_off(void);
 uint32_t mtcmos_non_cpu_ctrl(uint32_t on, uint32_t mtcmos_num);
 
-#endif /* __MTCMOS_H__ */
+#endif /* MTCMOS_H */
diff --git a/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.h b/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.h
index 01f1b25..0f09771 100644
--- a/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.h
+++ b/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PMIC_WRAP_INIT_H__
-#define __PMIC_WRAP_INIT_H__
+#ifndef PMIC_WRAP_INIT_H
+#define PMIC_WRAP_INIT_H
 
 /* external API */
 int32_t pwrap_read(uint32_t adr, uint32_t *rdata);
@@ -164,4 +164,4 @@
 	E_PWR_SWITCH_DIO              = 32
 };
 
-#endif /* __PMIC_WRAP_INIT_H__ */
+#endif /* PMIC_WRAP_INIT_H */
diff --git a/plat/mediatek/mt8173/drivers/rtc/rtc.h b/plat/mediatek/mt8173/drivers/rtc/rtc.h
index d4f8a56..9c4ca49 100644
--- a/plat/mediatek/mt8173/drivers/rtc/rtc.h
+++ b/plat/mediatek/mt8173/drivers/rtc/rtc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_DRIVER_RTC_H__
-#define __PLAT_DRIVER_RTC_H__
+#ifndef RTC_H
+#define RTC_H
 
 /* RTC registers */
 enum {
@@ -51,4 +51,4 @@
 
 void rtc_bbpu_power_down(void);
 
-#endif /* __PLAT_DRIVER_RTC_H__ */
+#endif /* RTC_H */
diff --git a/plat/mediatek/mt8173/drivers/spm/spm.h b/plat/mediatek/mt8173/drivers/spm/spm.h
index abbee2f..403303a 100644
--- a/plat/mediatek/mt8173/drivers/spm/spm.h
+++ b/plat/mediatek/mt8173/drivers/spm/spm.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __SPM_H__
-#define __SPM_H__
+#ifndef SPM_H
+#define SPM_H
 
 #define SPM_POWERON_CONFIG_SET			(SPM_BASE + 0x000)
 #define SPM_POWER_ON_VAL0			(SPM_BASE + 0x010)
@@ -333,4 +333,4 @@
 void spm_lock_release(void);
 void spm_boot_init(void);
 
-#endif /* __SPM_H__ */
+#endif /* SPM_H */
diff --git a/plat/mediatek/mt8173/drivers/spm/spm_hotplug.h b/plat/mediatek/mt8173/drivers/spm/spm_hotplug.h
index 8ebf5c4..00849a2 100644
--- a/plat/mediatek/mt8173/drivers/spm/spm_hotplug.h
+++ b/plat/mediatek/mt8173/drivers/spm/spm_hotplug.h
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __SPM_HOTPLUG_H__
-#define __SPM_HOTPLUG_H__
+#ifndef SPM_HOTPLUG_H
+#define SPM_HOTPLUG_H
 
 void spm_clear_hotplug(void);
 void spm_hotplug_off(unsigned long mpidr);
 void spm_hotplug_on(unsigned long mpidr);
 
-#endif /* __SPM_HOTPLUG_H__ */
+#endif /* SPM_HOTPLUG_H */
diff --git a/plat/mediatek/mt8173/drivers/spm/spm_mcdi.h b/plat/mediatek/mt8173/drivers/spm/spm_mcdi.h
index e29f565..7f3f96e 100644
--- a/plat/mediatek/mt8173/drivers/spm/spm_mcdi.h
+++ b/plat/mediatek/mt8173/drivers/spm/spm_mcdi.h
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __SPM_MCDI_H__
-#define __SPM_MCDI_H__
+#ifndef SPM_MCDI_H
+#define SPM_MCDI_H
 
 void spm_mcdi_wakeup_all_cores(void);
 void spm_mcdi_prepare_for_mtcmos(void);
 void spm_mcdi_prepare_for_off_state(unsigned long mpidr, unsigned int afflvl);
 void spm_mcdi_finish_for_on_state(unsigned long mpidr, unsigned int afflvl);
 
-#endif /* __SPM_MCDI_H__ */
+#endif /* SPM_MCDI_H */
diff --git a/plat/mediatek/mt8173/drivers/spm/spm_suspend.h b/plat/mediatek/mt8173/drivers/spm/spm_suspend.h
index 4041cfe..b00faa9 100644
--- a/plat/mediatek/mt8173/drivers/spm/spm_suspend.h
+++ b/plat/mediatek/mt8173/drivers/spm/spm_suspend.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __SPM_SUSPEND_H__
-#define __SPM_SUSPEND_H__
+#ifndef SPM_SUSPEND_H
+#define SPM_SUSPEND_H
 
 /* cpu dormant return code */
 #define CPU_DORMANT_RESET        0
@@ -13,4 +13,4 @@
 void spm_system_suspend(void);
 void spm_system_suspend_finish(void);
 
-#endif /* __SPM_SUSPEND_H__*/
+#endif /* SPM_SUSPEND_H*/
diff --git a/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.h b/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.h
index 0364bba..8c0fe83 100644
--- a/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.h
+++ b/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MT_CPUXGPT_H__
-#define __MT_CPUXGPT_H__
+#ifndef MT_CPUXGPT_H
+#define MT_CPUXGPT_H
 
 /* REG */
 #define INDEX_CNT_L_INIT    0x008
@@ -13,4 +13,4 @@
 
 void generic_timer_backup(void);
 
-#endif /* __MT_CPUXGPT_H__ */
+#endif /* MT_CPUXGPT_H */
diff --git a/plat/mediatek/mt8173/include/mcucfg.h b/plat/mediatek/mt8173/include/mcucfg.h
index 355c276..49d7c3e 100644
--- a/plat/mediatek/mt8173/include/mcucfg.h
+++ b/plat/mediatek/mt8173/include/mcucfg.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __MCUCFG_H__
-#define __MCUCFG_H__
+#ifndef MCUCFG_H
+#define MCUCFG_H
 
 #include <mt8173_def.h>
 #include <stdint.h>
@@ -216,4 +216,4 @@
 			  ACLK_EMI_DYNAMIC_CG_EN | ACLK_INFRA_DYNAMIC_CG_EN,
 };
 
-#endif  /* __MCUCFG_H__ */
+#endif /* MCUCFG_H */
diff --git a/plat/mediatek/mt8173/include/mt8173_def.h b/plat/mediatek/mt8173/include/mt8173_def.h
index 3289de4..58962f0 100644
--- a/plat/mediatek/mt8173/include/mt8173_def.h
+++ b/plat/mediatek/mt8173/include/mt8173_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MT8173_DEF_H__
-#define __MT8173_DEF_H__
+#ifndef MT8173_DEF_H
+#define MT8173_DEF_H
 
 #if RESET_TO_BL31
 #error "MT8173 is incompatible with RESET_TO_BL31!"
@@ -149,4 +149,4 @@
 		mtk_make_pwrstate_lvl1(lvl1_state, lvl0_state, pwr_lvl, type))
 
 
-#endif /* __MT8173_DEF_H__ */
+#endif /* MT8173_DEF_H */
diff --git a/plat/mediatek/mt8173/include/plat_private.h b/plat/mediatek/mt8173/include/plat_private.h
index 87ffbfc..cd92d34 100644
--- a/plat/mediatek/mt8173/include/plat_private.h
+++ b/plat/mediatek/mt8173/include/plat_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_PRIVATE_H__
-#define __PLAT_PRIVATE_H__
+#ifndef PLAT_PRIVATE_H
+#define PLAT_PRIVATE_H
 
 /*******************************************************************************
  * Function and variable prototypes
@@ -24,4 +24,4 @@
 /* Declarations for plat_topology.c */
 int mt_setup_topology(void);
 
-#endif /* __PLAT_PRIVATE_H__ */
+#endif /* PLAT_PRIVATE_H */
diff --git a/plat/mediatek/mt8173/include/plat_sip_calls.h b/plat/mediatek/mt8173/include/plat_sip_calls.h
index 2593709..88202cc 100644
--- a/plat/mediatek/mt8173/include/plat_sip_calls.h
+++ b/plat/mediatek/mt8173/include/plat_sip_calls.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_SIP_CALLS_H__
-#define __PLAT_SIP_CALLS_H__
+#ifndef PLAT_SIP_CALLS_H
+#define PLAT_SIP_CALLS_H
 
 /*******************************************************************************
  * Plat SiP function constants
@@ -19,4 +19,4 @@
 #define MTK_SIP_CLR_HDCP_KEY			0x82000406
 #define MTK_SIP_SET_HDCP_KEY_EX			0x82000407
 
-#endif /* __PLAT_SIP_CALLS_H__ */
+#endif /* PLAT_SIP_CALLS_H */
diff --git a/plat/mediatek/mt8173/include/power_tracer.h b/plat/mediatek/mt8173/include/power_tracer.h
index e8c0552..195366d 100644
--- a/plat/mediatek/mt8173/include/power_tracer.h
+++ b/plat/mediatek/mt8173/include/power_tracer.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __POWER_TRACER_H__
-#define __POWER_TRACER_H__
+#ifndef POWER_TRACER_H
+#define POWER_TRACER_H
 
 #define CPU_UP		0
 #define CPU_DOWN	1
@@ -16,4 +16,4 @@
 
 void trace_power_flow(unsigned long mpidr, unsigned char mode);
 
-#endif
+#endif /* POWER_TRACER_H */
diff --git a/plat/mediatek/mt8173/include/scu.h b/plat/mediatek/mt8173/include/scu.h
index 2ce4b23..b1e9424 100644
--- a/plat/mediatek/mt8173/include/scu.h
+++ b/plat/mediatek/mt8173/include/scu.h
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SCU_H__
-#define __SCU_H__
+#ifndef SCU_H
+#define SCU_H
 
 void disable_scu(unsigned long mpidr);
 void enable_scu(unsigned long mpidr);
 
-#endif
+#endif /* SCU_H */
diff --git a/plat/nvidia/tegra/include/drivers/flowctrl.h b/plat/nvidia/tegra/include/drivers/flowctrl.h
index 2e3bcf0..d604c97 100644
--- a/plat/nvidia/tegra/include/drivers/flowctrl.h
+++ b/plat/nvidia/tegra/include/drivers/flowctrl.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __FLOWCTRL_H__
-#define __FLOWCTRL_H__
+#ifndef FLOWCTRL_H
+#define FLOWCTRL_H
 
 #include <mmio.h>
 #include <tegra_def.h>
@@ -58,4 +58,4 @@
 void tegra_fc_lock_active_cluster(void);
 void tegra_fc_reset_bpmp(void);
 
-#endif /* __FLOWCTRL_H__ */
+#endif /* FLOWCTRL_H */
diff --git a/plat/nvidia/tegra/include/drivers/mce.h b/plat/nvidia/tegra/include/drivers/mce.h
index c7867a5..8140870 100644
--- a/plat/nvidia/tegra/include/drivers/mce.h
+++ b/plat/nvidia/tegra/include/drivers/mce.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MCE_H__
-#define __MCE_H__
+#ifndef MCE_H
+#define MCE_H
 
 #include <mmio.h>
 #include <tegra_def.h>
@@ -73,4 +73,4 @@
 void mce_update_cstate_info(const mce_cstate_info_t *cstate);
 void mce_verify_firmware_version(void);
 
-#endif /* __MCE_H__ */
+#endif /* MCE_H */
diff --git a/plat/nvidia/tegra/include/drivers/memctrl.h b/plat/nvidia/tegra/include/drivers/memctrl.h
index 8413299..17427cb 100644
--- a/plat/nvidia/tegra/include/drivers/memctrl.h
+++ b/plat/nvidia/tegra/include/drivers/memctrl.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MEMCTRL_H__
-#define __MEMCTRL_H__
+#ifndef MEMCTRL_H
+#define MEMCTRL_H
 
 void tegra_memctrl_setup(void);
 void tegra_memctrl_restore_settings(void);
@@ -14,4 +14,4 @@
 void tegra_memctrl_videomem_setup(uint64_t phys_base, uint32_t size_in_bytes);
 void tegra_memctrl_disable_ahb_redirection(void);
 
-#endif /* __MEMCTRL_H__ */
+#endif /* MEMCTRL_H */
diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v1.h b/plat/nvidia/tegra/include/drivers/memctrl_v1.h
index 78ee2e7..2553a1f 100644
--- a/plat/nvidia/tegra/include/drivers/memctrl_v1.h
+++ b/plat/nvidia/tegra/include/drivers/memctrl_v1.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MEMCTRLV1_H__
-#define __MEMCTRLV1_H__
+#ifndef MEMCTRL_V1_H
+#define MEMCTRL_V1_H
 
 #include <mmio.h>
 #include <tegra_def.h>
@@ -53,4 +53,4 @@
 	mmio_write_32(TEGRA_MC_BASE + off, val);
 }
 
-#endif /* __MEMCTRLV1_H__ */
+#endif /* MEMCTRL_V1_H */
diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v2.h b/plat/nvidia/tegra/include/drivers/memctrl_v2.h
index b72653e..9ae4302 100644
--- a/plat/nvidia/tegra/include/drivers/memctrl_v2.h
+++ b/plat/nvidia/tegra/include/drivers/memctrl_v2.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MEMCTRLV2_H__
-#define __MEMCTRLV2_H__
+#ifndef MEMCTRL_V2_H
+#define MEMCTRL_V2_H
 
 #include <tegra_def.h>
 
@@ -475,4 +475,4 @@
 
 #endif /* __ASSMEBLY__ */
 
-#endif /* __MEMCTRLV2_H__ */
+#endif /* MEMCTRL_V2_H */
diff --git a/plat/nvidia/tegra/include/drivers/pmc.h b/plat/nvidia/tegra/include/drivers/pmc.h
index ea9392b..14c9225 100644
--- a/plat/nvidia/tegra/include/drivers/pmc.h
+++ b/plat/nvidia/tegra/include/drivers/pmc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PMC_H__
-#define __PMC_H__
+#ifndef PMC_H
+#define PMC_H
 
 #include <mmio.h>
 #include <tegra_def.h>
@@ -40,4 +40,4 @@
 void tegra_pmc_cpu_on(int32_t cpu);
 __dead2 void tegra_pmc_system_reset(void);
 
-#endif /* __PMC_H__ */
+#endif /* PMC_H */
diff --git a/plat/nvidia/tegra/include/drivers/smmu.h b/plat/nvidia/tegra/include/drivers/smmu.h
index 86e911a..974aa35 100644
--- a/plat/nvidia/tegra/include/drivers/smmu.h
+++ b/plat/nvidia/tegra/include/drivers/smmu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SMMU_H
-#define __SMMU_H
+#ifndef SMMU_H
+#define SMMU_H
 
 #include <memctrl_v2.h>
 #include <mmio.h>
@@ -705,4 +705,4 @@
 void tegra_smmu_save_context(uint64_t smmu_ctx_addr);
 smmu_regs_t *plat_get_smmu_ctx(void);
 
-#endif /*__SMMU_H */
+#endif /* SMMU_H */
diff --git a/plat/nvidia/tegra/include/plat_macros.S b/plat/nvidia/tegra/include/plat_macros.S
index caf1148..14e7d8a 100644
--- a/plat/nvidia/tegra/include/plat_macros.S
+++ b/plat/nvidia/tegra/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 <tegra_def.h>
 
@@ -57,4 +57,4 @@
 1:
 .endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/nvidia/tegra/include/platform_def.h b/plat/nvidia/tegra/include/platform_def.h
index 4894442..6a507d4 100644
--- a/plat/nvidia/tegra/include/platform_def.h
+++ b/plat/nvidia/tegra/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>
 #include <common_def.h>
@@ -65,4 +65,4 @@
 #define CACHE_WRITEBACK_SHIFT		6
 #define CACHE_WRITEBACK_GRANULE		(U(1) << CACHE_WRITEBACK_SHIFT)
 
-#endif /* __PLATFORM_DEF_H__ */
+#endif /* PLATFORM_DEF_H */
diff --git a/plat/nvidia/tegra/include/t132/tegra_def.h b/plat/nvidia/tegra/include/t132/tegra_def.h
index ae00fb5..277f91b 100644
--- a/plat/nvidia/tegra/include/t132/tegra_def.h
+++ b/plat/nvidia/tegra/include/t132/tegra_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TEGRA_DEF_H__
-#define __TEGRA_DEF_H__
+#ifndef TEGRA_DEF_H
+#define TEGRA_DEF_H
 
 #include <utils_def.h>
 
@@ -99,4 +99,4 @@
 #define TEGRA_TZRAM_BASE		U(0x7C010000)
 #define TEGRA_TZRAM_SIZE		U(0x10000)
 
-#endif /* __TEGRA_DEF_H__ */
+#endif /* TEGRA_DEF_H */
diff --git a/plat/nvidia/tegra/include/t186/tegra_def.h b/plat/nvidia/tegra/include/t186/tegra_def.h
index d033147..79aff59 100644
--- a/plat/nvidia/tegra/include/t186/tegra_def.h
+++ b/plat/nvidia/tegra/include/t186/tegra_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TEGRA_DEF_H__
-#define __TEGRA_DEF_H__
+#ifndef TEGRA_DEF_H
+#define TEGRA_DEF_H
 
 #include <utils_def.h>
 
@@ -247,4 +247,4 @@
 #define TEGRA_TZRAM_BASE		U(0x30000000)
 #define TEGRA_TZRAM_SIZE		U(0x40000)
 
-#endif /* __TEGRA_DEF_H__ */
+#endif /* TEGRA_DEF_H */
diff --git a/plat/nvidia/tegra/include/t210/tegra_def.h b/plat/nvidia/tegra/include/t210/tegra_def.h
index 454c666..5d86224 100644
--- a/plat/nvidia/tegra/include/t210/tegra_def.h
+++ b/plat/nvidia/tegra/include/t210/tegra_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TEGRA_DEF_H__
-#define __TEGRA_DEF_H__
+#ifndef TEGRA_DEF_H
+#define TEGRA_DEF_H
 
 #include <utils_def.h>
 
@@ -124,4 +124,4 @@
 #define TEGRA_TZRAM_BASE		U(0x7C010000)
 #define TEGRA_TZRAM_SIZE		U(0x10000)
 
-#endif /* __TEGRA_DEF_H__ */
+#endif /* TEGRA_DEF_H */
diff --git a/plat/nvidia/tegra/include/tegra_platform.h b/plat/nvidia/tegra/include/tegra_platform.h
index db79fbe..63a0e01 100644
--- a/plat/nvidia/tegra/include/tegra_platform.h
+++ b/plat/nvidia/tegra/include/tegra_platform.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TEGRA_PLATFORM_H__
-#define __TEGRA_PLATFORM_H__
+#ifndef TEGRA_PLATFORM_H
+#define TEGRA_PLATFORM_H
 
 #include <cdefs.h>
 
@@ -31,4 +31,4 @@
 uint8_t tegra_platform_is_emulation(void);
 uint8_t tegra_platform_is_fpga(void);
 
-#endif /* __TEGRA_PLATFORM_H__ */
+#endif /* TEGRA_PLATFORM_H */
diff --git a/plat/nvidia/tegra/include/tegra_private.h b/plat/nvidia/tegra/include/tegra_private.h
index b6f2df7..c4c277e 100644
--- a/plat/nvidia/tegra/include/tegra_private.h
+++ b/plat/nvidia/tegra/include/tegra_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TEGRA_PRIVATE_H__
-#define __TEGRA_PRIVATE_H__
+#ifndef TEGRA_PRIVATE_H
+#define TEGRA_PRIVATE_H
 
 #include <arch.h>
 #include <platform_def.h>
@@ -112,4 +112,4 @@
 void tegra_secure_entrypoint(void);
 void tegra186_cpu_reset_handler(void);
 
-#endif /* __TEGRA_PRIVATE_H__ */
+#endif /* TEGRA_PRIVATE_H */
diff --git a/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h b/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h
index 26197e9..27baab6 100644
--- a/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h
+++ b/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MCE_PRIVATE_H__
-#define __MCE_PRIVATE_H__
+#ifndef MCE_PRIVATE_H
+#define MCE_PRIVATE_H
 
 #include <mmio.h>
 #include <tegra_def.h>
@@ -258,4 +258,4 @@
 extern void nvg_set_request_data(uint64_t req, uint64_t data);
 extern void nvg_set_request(uint64_t req);
 extern uint64_t nvg_get_result(void);
-#endif /* __MCE_PRIVATE_H__ */
+#endif /* MCE_PRIVATE_H */
diff --git a/plat/nvidia/tegra/soc/t186/drivers/include/t18x_ari.h b/plat/nvidia/tegra/soc/t186/drivers/include/t18x_ari.h
index 8c6f30c..ecfb3f4 100644
--- a/plat/nvidia/tegra/soc/t186/drivers/include/t18x_ari.h
+++ b/plat/nvidia/tegra/soc/t186/drivers/include/t18x_ari.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef T18X_TEGRA_ARI_H
-#define T18X_TEGRA_ARI_H
+#ifndef T18X_ARI_H
+#define T18X_ARI_H
 
 /*
  * ----------------------------------------------------------------------------
@@ -434,4 +434,4 @@
 	TEGRA_NVG_CHANNEL_LAST_INDEX,
 } tegra_nvg_channel_id_t;
 
-#endif /* T18X_TEGRA_ARI_H */
+#endif /* T18X_ARI_H */
diff --git a/plat/qemu/include/plat_macros.S b/plat/qemu/include/plat_macros.S
index 93cded2..b6cdb07 100644
--- a/plat/qemu/include/plat_macros.S
+++ b/plat/qemu/include/plat_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 #include <arm_macros.S>
 #include <platform_def.h>
@@ -23,4 +23,4 @@
 	arm_print_gic_regs
 	.endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/qemu/qemu_private.h b/plat/qemu/qemu_private.h
index 88b93da..ab2bf1b 100644
--- a/plat/qemu/qemu_private.h
+++ b/plat/qemu/qemu_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __QEMU_PRIVATE_H
-#define __QEMU_PRIVATE_H
+#ifndef QEMU_PRIVATE_H
+#define QEMU_PRIVATE_H
 
 #include <stdint.h>
 
@@ -35,4 +35,4 @@
 
 void qemu_console_init(void);
 
-#endif /*__QEMU_PRIVATE_H*/
+#endif /* QEMU_PRIVATE_H */
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 */
diff --git a/plat/rockchip/common/drivers/parameter/ddr_parameter.h b/plat/rockchip/common/drivers/parameter/ddr_parameter.h
index f8e3be9..69c4e18 100644
--- a/plat/rockchip/common/drivers/parameter/ddr_parameter.h
+++ b/plat/rockchip/common/drivers/parameter/ddr_parameter.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PARAMETER_H__
-#define __PARAMETER_H__
+#ifndef DDR_PARAMETER_H
+#define DDR_PARAMETER_H
 
 #include <arch_helpers.h>
 #include <console.h>
@@ -38,4 +38,4 @@
 
 struct param_ddr_usage ddr_region_usage_parse(uint64_t addr, uint64_t max_mb);
 
-#endif /* __PARAMETER_H__ */
+#endif /* DDR_PARAMETER_H */
diff --git a/plat/rockchip/common/drivers/pmu/pmu_com.h b/plat/rockchip/common/drivers/pmu/pmu_com.h
index 75e924d..4b4b00f 100644
--- a/plat/rockchip/common/drivers/pmu/pmu_com.h
+++ b/plat/rockchip/common/drivers/pmu/pmu_com.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PMU_COM_H__
-#define __PMU_COM_H__
+#ifndef PMU_COM_H
+#define PMU_COM_H
 
 #ifndef CHECK_CPU_WFIE_BASE
 #define CHECK_CPU_WFIE_BASE (PMU_BASE + PMU_CORE_PWR_ST)
@@ -108,4 +108,4 @@
 	return 0;
 }
 
-#endif /* __PMU_COM_H__ */
+#endif /* PMU_COM_H */
diff --git a/plat/rockchip/common/include/plat_macros.S b/plat/rockchip/common/include/plat_macros.S
index 6b3cb6a..9ee4e83 100644
--- a/plat/rockchip/common/include/plat_macros.S
+++ b/plat/rockchip/common/include/plat_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ROCKCHIP_PLAT_MACROS_S__
-#define __ROCKCHIP_PLAT_MACROS_S__
+#ifndef ROCKCHIP_PLAT_MACROS_S
+#define ROCKCHIP_PLAT_MACROS_S
 
 #include <cci.h>
 #include <gic_common.h>
@@ -115,4 +115,4 @@
 #endif
 	.endm
 
-#endif /* __ROCKCHIP_PLAT_MACROS_S__ */
+#endif /* ROCKCHIP_PLAT_MACROS_S */
diff --git a/plat/rockchip/common/include/plat_params.h b/plat/rockchip/common/include/plat_params.h
index 7109907..1ec02f5 100644
--- a/plat/rockchip/common/include/plat_params.h
+++ b/plat/rockchip/common/include/plat_params.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_PARAMS_H__
-#define __PLAT_PARAMS_H__
+#ifndef PLAT_PARAMS_H
+#define PLAT_PARAMS_H
 
 #include <stdint.h>
 
@@ -95,4 +95,4 @@
 	uint64_t value;
 };
 
-#endif /* __PLAT_PARAMS_H__ */
+#endif /* PLAT_PARAMS_H */
diff --git a/plat/rockchip/common/include/plat_private.h b/plat/rockchip/common/include/plat_private.h
index e1e4f33..955ca64 100644
--- a/plat/rockchip/common/include/plat_private.h
+++ b/plat/rockchip/common/include/plat_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_PRIVATE_H__
-#define __PLAT_PRIVATE_H__
+#ifndef PLAT_PRIVATE_H
+#define PLAT_PRIVATE_H
 
 #ifndef __ASSEMBLY__
 #include <mmio.h>
@@ -143,4 +143,4 @@
 #define PMU_CPU_AUTO_PWRDN	0xf0
 #define PMU_CLST_RET	0xa5
 
-#endif /* __PLAT_PRIVATE_H__ */
+#endif /* PLAT_PRIVATE_H */
diff --git a/plat/rockchip/common/include/rockchip_sip_svc.h b/plat/rockchip/common/include/rockchip_sip_svc.h
index 8125ab0..340d653 100644
--- a/plat/rockchip/common/include/rockchip_sip_svc.h
+++ b/plat/rockchip/common/include/rockchip_sip_svc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __ROCKCHIP_SIP_SVC_H__
-#define __ROCKCHIP_SIP_SVC_H__
+#ifndef ROCKCHIP_SIP_SVC_H
+#define ROCKCHIP_SIP_SVC_H
 
 /* SMC function IDs for SiP Service queries */
 #define SIP_SVC_CALL_COUNT		0x8200ff00
@@ -24,4 +24,4 @@
 	RK_SIP_E_INVALID_PARAM = -1
 };
 
-#endif
+#endif /* ROCKCHIP_SIP_SVC_H */
diff --git a/plat/rockchip/rk3328/drivers/pmu/pmu.h b/plat/rockchip/rk3328/drivers/pmu/pmu.h
index 9d2819a..d98f53c 100644
--- a/plat/rockchip/rk3328/drivers/pmu/pmu.h
+++ b/plat/rockchip/rk3328/drivers/pmu/pmu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PMU_H__
-#define __PMU_H__
+#ifndef PMU_H
+#define PMU_H
 
 #include <soc.h>
 
@@ -128,4 +128,4 @@
 #define UART_INT_DISABLE	0x00
 #define UART_FIFO_RESET		0x07
 
-#endif /* __PMU_H__ */
+#endif /* PMU_H */
diff --git a/plat/rockchip/rk3328/drivers/soc/soc.h b/plat/rockchip/rk3328/drivers/soc/soc.h
index 2c04ae2..a1f35b2 100644
--- a/plat/rockchip/rk3328/drivers/soc/soc.h
+++ b/plat/rockchip/rk3328/drivers/soc/soc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SOC_H__
-#define __SOC_H__
+#ifndef SOC_H
+#define SOC_H
 
 /******************************* stimer ***************************************/
 #define TIMER_LOADE_COUNT0	0x00
@@ -110,4 +110,4 @@
 #define GPIO2_D2_GPIO_MODE	0x30
 #define GRF_GPIO2D_IOMUX	0x34
 
-#endif /* __SOC_H__ */
+#endif /* SOC_H */
diff --git a/plat/rockchip/rk3328/include/plat.ld.S b/plat/rockchip/rk3328/include/plat.ld.S
index b3559b2..e9bb3a2 100644
--- a/plat/rockchip/rk3328/include/plat.ld.S
+++ b/plat/rockchip/rk3328/include/plat.ld.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ROCKCHIP_PLAT_LD_S__
-#define __ROCKCHIP_PLAT_LD_S__
+#ifndef ROCKCHIP_PLAT_LD_S
+#define ROCKCHIP_PLAT_LD_S
 
 MEMORY {
     PMUSRAM (rwx): ORIGIN = PMUSRAM_BASE, LENGTH = PMUSRAM_RSIZE
@@ -34,4 +34,4 @@
 	} >PMUSRAM
 }
 
-#endif /* __ROCKCHIP_PLAT_LD_S__ */
+#endif /* ROCKCHIP_PLAT_LD_S */
diff --git a/plat/rockchip/rk3328/rk3328_def.h b/plat/rockchip/rk3328/rk3328_def.h
index 035fcb6..4704a72 100644
--- a/plat/rockchip/rk3328/rk3328_def.h
+++ b/plat/rockchip/rk3328/rk3328_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_DEF_H__
-#define __PLAT_DEF_H__
+#ifndef RK3328_DEF_H
+#define RK3328_DEF_H
 
 #define MAJOR_VERSION		(1)
 #define MINOR_VERSION		(2)
@@ -145,4 +145,4 @@
 #define SHARE_MEM_PAGE_NUM      15
 #define SHARE_MEM_SIZE          SIZE_K(SHARE_MEM_PAGE_NUM * 4)
 
-#endif /* __PLAT_DEF_H__ */
+#endif /* RK3328_DEF_H */
diff --git a/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.h b/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.h
index 057d961..15912b5 100644
--- a/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.h
+++ b/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __DDR_RK3368_H__
-#define __DDR_RK3368_H__
+#ifndef DDR_RK3368_H
+#define DDR_RK3368_H
 
 #define DDR_PCTL_SCFG		0x0
 #define DDR_PCTL_SCTL		0x4
@@ -244,4 +244,4 @@
 uint32_t *ddr_get_resume_code_base(void);
 void ddr_reg_save(uint32_t pllpdstat, uint64_t base_addr);
 
-#endif
+#endif /* DDR_RK3368_H */
diff --git a/plat/rockchip/rk3368/drivers/pmu/pmu.h b/plat/rockchip/rk3368/drivers/pmu/pmu.h
index 4c02107..b4d4807 100644
--- a/plat/rockchip/rk3368/drivers/pmu/pmu.h
+++ b/plat/rockchip/rk3368/drivers/pmu/pmu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PMU_H__
-#define __PMU_H__
+#ifndef PMU_H
+#define PMU_H
 
 /* Allocate sp reginon in pmusram */
 #define PSRAM_SP_SIZE		0x80
@@ -204,4 +204,4 @@
 
 #define MAX_WAIT_CONUT 1000
 
-#endif /* __PMU_H__ */
+#endif /* PMU_H */
diff --git a/plat/rockchip/rk3368/drivers/soc/soc.h b/plat/rockchip/rk3368/drivers/soc/soc.h
index 38d7332..5f24e93 100644
--- a/plat/rockchip/rk3368/drivers/soc/soc.h
+++ b/plat/rockchip/rk3368/drivers/soc/soc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SOC_H__
-#define __SOC_H__
+#ifndef SOC_H
+#define SOC_H
 
 enum plls_id {
 	ABPLL_ID = 0,
@@ -138,4 +138,4 @@
 void soc_sleep_config(void);
 void pm_plls_resume(void);
 
-#endif /* __SOC_H__ */
+#endif /* SOC_H */
diff --git a/plat/rockchip/rk3368/include/plat.ld.S b/plat/rockchip/rk3368/include/plat.ld.S
index b3559b2..e9bb3a2 100644
--- a/plat/rockchip/rk3368/include/plat.ld.S
+++ b/plat/rockchip/rk3368/include/plat.ld.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ROCKCHIP_PLAT_LD_S__
-#define __ROCKCHIP_PLAT_LD_S__
+#ifndef ROCKCHIP_PLAT_LD_S
+#define ROCKCHIP_PLAT_LD_S
 
 MEMORY {
     PMUSRAM (rwx): ORIGIN = PMUSRAM_BASE, LENGTH = PMUSRAM_RSIZE
@@ -34,4 +34,4 @@
 	} >PMUSRAM
 }
 
-#endif /* __ROCKCHIP_PLAT_LD_S__ */
+#endif /* ROCKCHIP_PLAT_LD_S */
diff --git a/plat/rockchip/rk3368/include/plat_sip_calls.h b/plat/rockchip/rk3368/include/plat_sip_calls.h
index ead187e..66c4868 100644
--- a/plat/rockchip/rk3368/include/plat_sip_calls.h
+++ b/plat/rockchip/rk3368/include/plat_sip_calls.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_SIP_CALLS_H__
-#define __PLAT_SIP_CALLS_H__
+#ifndef PLAT_SIP_CALLS_H
+#define PLAT_SIP_CALLS_H
 
 #define RK_PLAT_SIP_NUM_CALLS	0
 
-#endif /* __PLAT_SIP_CALLS_H__ */
+#endif /* PLAT_SIP_CALLS_H */
diff --git a/plat/rockchip/rk3368/rk3368_def.h b/plat/rockchip/rk3368/rk3368_def.h
index 9ebe3be..a7be7c3 100644
--- a/plat/rockchip/rk3368/rk3368_def.h
+++ b/plat/rockchip/rk3368/rk3368_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_DEF_H__
-#define __PLAT_DEF_H__
+#ifndef RK3368_DEF_H
+#define RK3368_DEF_H
 
 /* Special value used to verify platform parameters from BL2 to BL3-1 */
 #define RK_BL31_PLAT_PARAM_VAL	0x0f1e2d3c4b5a6978ULL
@@ -104,4 +104,4 @@
 	INTR_PROP_DESC(RK_IRQ_SEC_PHY_TIMER, GIC_HIGHEST_SEC_PRIORITY,	\
 		       GICV2_INTR_GROUP1, GIC_INTR_CFG_LEVEL)
 
-#endif /* __PLAT_DEF_H__ */
+#endif /* RK3368_DEF_H */
diff --git a/plat/rockchip/rk3399/drivers/dp/cdn_dp.h b/plat/rockchip/rk3399/drivers/dp/cdn_dp.h
index 3b9a108..c5cbae2 100644
--- a/plat/rockchip/rk3399/drivers/dp/cdn_dp.h
+++ b/plat/rockchip/rk3399/drivers/dp/cdn_dp.h
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SOC_ROCKCHIP_RK3399_DP_H__
-#define __SOC_ROCKCHIP_RK3399_DP_H__
+#ifndef CDN_DP_H
+#define CDN_DP_H
+
 #include <plat_private.h>
 
 enum {
@@ -44,4 +45,5 @@
 			   uint64_t x4,
 			   uint64_t x5,
 			   uint64_t x6);
-#endif
+
+#endif /* CDN_DP_H */
diff --git a/plat/rockchip/rk3399/drivers/dram/dfs.h b/plat/rockchip/rk3399/drivers/dram/dfs.h
index e847b2e..172b2a7 100644
--- a/plat/rockchip/rk3399/drivers/dram/dfs.h
+++ b/plat/rockchip/rk3399/drivers/dram/dfs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SOC_ROCKCHIP_RK3399_DFS_H__
-#define __SOC_ROCKCHIP_RK3399_DFS_H__
+#ifndef DFS_H
+#define DFS_H
 
 #include <stdint.h>
 
@@ -47,4 +47,4 @@
 void ddr_prepare_for_sys_suspend(void);
 void ddr_prepare_for_sys_resume(void);
 
-#endif
+#endif /* DFS_H */
diff --git a/plat/rockchip/rk3399/drivers/dram/dram.h b/plat/rockchip/rk3399/drivers/dram/dram.h
index 0780fc3..ded511e 100644
--- a/plat/rockchip/rk3399/drivers/dram/dram.h
+++ b/plat/rockchip/rk3399/drivers/dram/dram.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SOC_ROCKCHIP_RK3399_DRAM_H__
-#define __SOC_ROCKCHIP_RK3399_DRAM_H__
+#ifndef DRAM_H
+#define DRAM_H
 
 #include <dram_regs.h>
 #include <plat_private.h>
@@ -152,4 +152,4 @@
 
 void dram_init(void);
 
-#endif
+#endif /* DRAM_H */
diff --git a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.h b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.h
index 30d3aea..9cda22c 100644
--- a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.h
+++ b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.h
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _DRAM_SPEC_TIMING_HEAD_
-#define _DRAM_SPEC_TIMING_HEAD_
+#ifndef DRAM_SPEC_TIMING_H
+#define DRAM_SPEC_TIMING_H
+
 #include <stdint.h>
 
 enum ddr3_speed_rate {
@@ -503,4 +504,4 @@
 void dram_get_parameter(struct timing_related_config *timing_config,
 			struct dram_timing_t *pdram_timing);
 
-#endif /* _DRAM_SPEC_TIMING_HEAD_ */
+#endif /* DRAM_SPEC_TIMING_H */
diff --git a/plat/rockchip/rk3399/drivers/dram/suspend.h b/plat/rockchip/rk3399/drivers/dram/suspend.h
index a8a8641..b99a926 100644
--- a/plat/rockchip/rk3399/drivers/dram/suspend.h
+++ b/plat/rockchip/rk3399/drivers/dram/suspend.h
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SOC_ROCKCHIP_RK3399_SUSPEND_H__
-#define __SOC_ROCKCHIP_RK3399_SUSPEND_H__
+#ifndef SUSPEND_H
+#define SUSPEND_H
+
 #include <dram.h>
 
 #define KHz (1000)
@@ -22,4 +23,4 @@
 void dmc_suspend(void);
 __pmusramfunc void dmc_resume(void);
 
-#endif /* __DRAM_H__ */
+#endif /* SUSPEND_H */
diff --git a/plat/rockchip/rk3399/drivers/m0/include/addressmap.h b/plat/rockchip/rk3399/drivers/m0/include/addressmap.h
index 5635e79..d431437 100644
--- a/plat/rockchip/rk3399/drivers/m0/include/addressmap.h
+++ b/plat/rockchip/rk3399/drivers/m0/include/addressmap.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __ROCKCHIP_RK3399_M0_INCLUDE_SHARED_ADDRESSMAP_H__
-#define __ROCKCHIP_RK3399_M0_INCLUDE_SHARED_ADDRESSMAP_H__
+#ifndef ADDRESSMAP_H
+#define ADDRESSMAP_H
 
 #include <addressmap_shared.h>
 
 /* Registers base address for M0 */
 #define MMIO_BASE			0x40000000
 
-#endif /* __ROCKCHIP_RK3399_M0_INCLUDE_SHARED_ADDRESSMAP_H__ */
+#endif /* ADDRESSMAP_H */
diff --git a/plat/rockchip/rk3399/drivers/m0/include/rk3399_mcu.h b/plat/rockchip/rk3399/drivers/m0/include/rk3399_mcu.h
index 176af3a..2e90694 100644
--- a/plat/rockchip/rk3399/drivers/m0/include/rk3399_mcu.h
+++ b/plat/rockchip/rk3399/drivers/m0/include/rk3399_mcu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __RK3399_MCU_H__
-#define __RK3399_MCU_H__
+#ifndef RK3399_MCU_H
+#define RK3399_MCU_H
 
 #include <addressmap.h>
 
@@ -29,4 +29,4 @@
 int stopwatch_expired(void);
 void stopwatch_reset(void);
 
-#endif /* __RK3399_MCU_H__ */
+#endif /* RK3399_MCU_H */
diff --git a/plat/rockchip/rk3399/drivers/pmu/m0_ctl.h b/plat/rockchip/rk3399/drivers/pmu/m0_ctl.h
index cb323c4..7542e22 100644
--- a/plat/rockchip/rk3399/drivers/pmu/m0_ctl.h
+++ b/plat/rockchip/rk3399/drivers/pmu/m0_ctl.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __M0_CTL_H__
-#define __M0_CTL_H__
+#ifndef M0_CTL_H
+#define M0_CTL_H
 
 #include <m0_param.h>
 
@@ -25,4 +25,5 @@
 extern void m0_stop(void);
 extern void m0_wait_done(void);
 extern void m0_configure_execute_addr(uintptr_t addr);
-#endif /* __M0_CTL_H__ */
+
+#endif /* M0_CTL_H */
diff --git a/plat/rockchip/rk3399/drivers/pmu/pmu.h b/plat/rockchip/rk3399/drivers/pmu/pmu.h
index 0265dde..e1ba410 100644
--- a/plat/rockchip/rk3399/drivers/pmu/pmu.h
+++ b/plat/rockchip/rk3399/drivers/pmu/pmu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PMU_H__
-#define __PMU_H__
+#ifndef PMU_H
+#define PMU_H
 
 #include <pmu_bits.h>
 #include <pmu_regs.h>
@@ -137,4 +137,4 @@
 
 extern void sram_func_set_ddrctl_pll(uint32_t pll_src);
 
-#endif /* __PMU_H__ */
+#endif /* PMU_H */
diff --git a/plat/rockchip/rk3399/drivers/pwm/pwm.h b/plat/rockchip/rk3399/drivers/pwm/pwm.h
index 57cfd1b..d665392 100644
--- a/plat/rockchip/rk3399/drivers/pwm/pwm.h
+++ b/plat/rockchip/rk3399/drivers/pwm/pwm.h
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PWM_H__
-#define __PWM_H__
+#ifndef PWM_H
+#define PWM_H
 
 void disable_pwms(void);
 void enable_pwms(void);
 
-#endif
+#endif /* PWM_H */
diff --git a/plat/rockchip/rk3399/drivers/secure/secure.h b/plat/rockchip/rk3399/drivers/secure/secure.h
index 8e80f2b..e31c999 100644
--- a/plat/rockchip/rk3399/drivers/secure/secure.h
+++ b/plat/rockchip/rk3399/drivers/secure/secure.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_ROCKCHIP_RK3399_DRIVER_SECURE_H__
-#define __PLAT_ROCKCHIP_RK3399_DRIVER_SECURE_H__
+#ifndef SECURE_H
+#define SECURE_H
 
 /**************************************************
  * sgrf reg, offset
@@ -102,4 +102,4 @@
 void secure_sgrf_ddr_rgn_init(void);
 __pmusramfunc void sram_secure_timer_init(void);
 
-#endif /* __PLAT_ROCKCHIP_RK3399_DRIVER_SECURE_H__ */
+#endif /* SECURE_H */
diff --git a/plat/rockchip/rk3399/drivers/soc/soc.h b/plat/rockchip/rk3399/drivers/soc/soc.h
index bc41933..1f7ec07 100644
--- a/plat/rockchip/rk3399/drivers/soc/soc.h
+++ b/plat/rockchip/rk3399/drivers/soc/soc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SOC_H__
-#define __SOC_H__
+#ifndef SOC_H
+#define SOC_H
 
 #include <utils.h>
 
@@ -281,4 +281,4 @@
 void pmu_sgrf_rst_hld(void);
 __pmusramfunc void pmu_sgrf_rst_hld_release(void);
 __pmusramfunc void restore_pmu_rsthold(void);
-#endif /* __SOC_H__ */
+#endif /* SOC_H */
diff --git a/plat/rockchip/rk3399/include/addressmap.h b/plat/rockchip/rk3399/include/addressmap.h
index 023050c..dc1c703 100644
--- a/plat/rockchip/rk3399/include/addressmap.h
+++ b/plat/rockchip/rk3399/include/addressmap.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __ROCKCHIP_RK3399_INCLUDE_ADDRESSMAP_H__
-#define __ROCKCHIP_RK3399_INCLUDE_ADDRESSMAP_H__
+#ifndef ADDRESSMAP_H
+#define ADDRESSMAP_H
 
 #include <addressmap_shared.h>
 
@@ -16,4 +16,4 @@
 #define DEV_RNG0_BASE		MMIO_BASE
 #define DEV_RNG0_SIZE		SIZE_M(125)
 
-#endif /* __ROCKCHIP_RK3399_INCLUDE_ADDRESSMAP_H__ */
+#endif /* ADDRESSMAP_H */
diff --git a/plat/rockchip/rk3399/include/plat.ld.S b/plat/rockchip/rk3399/include/plat.ld.S
index 528c150..5045ba8 100644
--- a/plat/rockchip/rk3399/include/plat.ld.S
+++ b/plat/rockchip/rk3399/include/plat.ld.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ROCKCHIP_PLAT_LD_S__
-#define __ROCKCHIP_PLAT_LD_S__
+#ifndef ROCKCHIP_PLAT_LD_S
+#define ROCKCHIP_PLAT_LD_S
 
 #include <xlat_tables_defs.h>
 
@@ -95,4 +95,4 @@
 	} >PMUSRAM
 }
 
-#endif /* __ROCKCHIP_PLAT_LD_S__ */
+#endif /* ROCKCHIP_PLAT_LD_S */
diff --git a/plat/rockchip/rk3399/include/plat_sip_calls.h b/plat/rockchip/rk3399/include/plat_sip_calls.h
index ead187e..66c4868 100644
--- a/plat/rockchip/rk3399/include/plat_sip_calls.h
+++ b/plat/rockchip/rk3399/include/plat_sip_calls.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_SIP_CALLS_H__
-#define __PLAT_SIP_CALLS_H__
+#ifndef PLAT_SIP_CALLS_H
+#define PLAT_SIP_CALLS_H
 
 #define RK_PLAT_SIP_NUM_CALLS	0
 
-#endif /* __PLAT_SIP_CALLS_H__ */
+#endif /* PLAT_SIP_CALLS_H */
diff --git a/plat/rockchip/rk3399/include/shared/addressmap_shared.h b/plat/rockchip/rk3399/include/shared/addressmap_shared.h
index dc5c8d5..84a31b2 100644
--- a/plat/rockchip/rk3399/include/shared/addressmap_shared.h
+++ b/plat/rockchip/rk3399/include/shared/addressmap_shared.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __ROCKCHIP_RK3399_INCLUDE_SHARED_ADDRESSMAP_SHARED_H__
-#define __ROCKCHIP_RK3399_INCLUDE_SHARED_ADDRESSMAP_SHARED_H__
+#ifndef ADDRESSMAP_SHARED_H
+#define ADDRESSMAP_SHARED_H
 
 #define SIZE_K(n)		((n) * 1024)
 #define SIZE_M(n)		((n) * 1024 * 1024)
@@ -101,4 +101,4 @@
 
 #define MSCH_BASE(ch)		(SERVICE_NOC_1_BASE + (ch) * 0x8000)
 
-#endif /* __ROCKCHIP_RK3399_INCLUDE_SHARED_ADDRESSMAP_SHARED_H__ */
+#endif /* ADDRESSMAP_SHARED_H */
diff --git a/plat/rockchip/rk3399/include/shared/bl31_param.h b/plat/rockchip/rk3399/include/shared/bl31_param.h
index 85a0f4a..e7f2226 100644
--- a/plat/rockchip/rk3399/include/shared/bl31_param.h
+++ b/plat/rockchip/rk3399/include/shared/bl31_param.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_ROCKCHIP_RK3399_INCLUDE_SHARED_BL31_PARAM_H__
-#define __PLAT_ROCKCHIP_RK3399_INCLUDE_SHARED_BL31_PARAM_H__
+#ifndef BL31_PARAM_H
+#define BL31_PARAM_H
 
 /*******************************************************************************
  * Platform memory map related constants
@@ -18,9 +18,9 @@
  * BL31 specific defines.
  ******************************************************************************/
 /*
- * Put BL3-1 at the top of the Trusted RAM
+ * Put BL31 at the top of the Trusted RAM
  */
 #define BL31_BASE		(TZRAM_BASE + 0x1000)
 #define BL31_LIMIT		(TZRAM_BASE + TZRAM_SIZE)
 
-#endif /*__PLAT_ROCKCHIP_RK3399_INCLUDE_SHARED_BL31_PARAM_H__*/
+#endif /* BL31_PARAM_H */
diff --git a/plat/rockchip/rk3399/include/shared/dram_regs.h b/plat/rockchip/rk3399/include/shared/dram_regs.h
index afe16bb..4d4ebf6 100644
--- a/plat/rockchip/rk3399/include/shared/dram_regs.h
+++ b/plat/rockchip/rk3399/include/shared/dram_regs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __DRAM_REGS_H__
-#define __DRAM_REGS_H__
+#ifndef DRAM_REGS_H
+#define DRAM_REGS_H
 
 #define CTL_REG_NUM		332
 #define PHY_REG_NUM		959
@@ -97,4 +97,4 @@
 #define DDR_STRIDE(n)		mmio_write_32(SGRF_BASE + SGRF_SOC_CON3_7(4), \
 					      (0x1f<<(10+16))|((n)<<10))
 
-#endif /* __DRAM_REGS_H__ */
+#endif /* DRAM_REGS_H */
diff --git a/plat/rockchip/rk3399/include/shared/m0_param.h b/plat/rockchip/rk3399/include/shared/m0_param.h
index 044e797..a5311c9 100644
--- a/plat/rockchip/rk3399/include/shared/m0_param.h
+++ b/plat/rockchip/rk3399/include/shared/m0_param.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __M0_PARAM_H__
-#define __M0_PARAM_H__
+#ifndef M0_PARAM_H
+#define M0_PARAM_H
 
 #define PARAM_ADDR		0xc0
 
@@ -22,4 +22,4 @@
 #define PARAM_M0_SIZE		0x28
 #define M0_DONE_FLAG		0xf59ec39a
 
-#endif /*__M0_PARAM_H__*/
+#endif /* M0_PARAM_H */
diff --git a/plat/rockchip/rk3399/include/shared/misc_regs.h b/plat/rockchip/rk3399/include/shared/misc_regs.h
index 02e001b..0160453 100644
--- a/plat/rockchip/rk3399/include/shared/misc_regs.h
+++ b/plat/rockchip/rk3399/include/shared/misc_regs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __ROCKCHIP_RK3399_INCLUDE_SHARED_MISC_REGS_H__
-#define __ROCKCHIP_RK3399_INCLUDE_SHARED_MISC_REGS_H__
+#ifndef MISC_REGS_H
+#define MISC_REGS_H
 
 /* CRU */
 #define CRU_DPLL_CON0		0x40
@@ -24,4 +24,4 @@
 /* PMU CRU */
 #define PMU_CRU_GATEDIS_CON0	0x130
 
-#endif /* __ROCKCHIP_RK3399_INCLUDE_SHARED_MISC_REGS_H__ */
+#endif /* MISC_REGS_H */
diff --git a/plat/rockchip/rk3399/include/shared/pmu_bits.h b/plat/rockchip/rk3399/include/shared/pmu_bits.h
index 7c25761..2968d5b 100644
--- a/plat/rockchip/rk3399/include/shared/pmu_bits.h
+++ b/plat/rockchip/rk3399/include/shared/pmu_bits.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PMU_BITS_H__
-#define __PMU_BITS_H__
+#ifndef PMU_BITS_H
+#define PMU_BITS_H
 
 enum pmu_powerdomain_id {
 	PD_CPUL0 = 0,
@@ -694,4 +694,4 @@
 	STANDBY_BY_WFIL2_CLUSTER_B,
 };
 
-#endif /* __PMU_BITS_H__ */
+#endif /* PMU_BITS_H */
diff --git a/plat/rockchip/rk3399/include/shared/pmu_regs.h b/plat/rockchip/rk3399/include/shared/pmu_regs.h
index 41c6a24..43e785e 100644
--- a/plat/rockchip/rk3399/include/shared/pmu_regs.h
+++ b/plat/rockchip/rk3399/include/shared/pmu_regs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PMU_REGS_H__
-#define __PMU_REGS_H__
+#ifndef PMU_REGS_H
+#define PMU_REGS_H
 
 #define PMU_WKUP_CFG0		0x00
 #define PMU_WKUP_CFG1		0x04
@@ -145,4 +145,4 @@
 #define GRF_GPIO4C_P		0xe068
 #define GRF_GPIO4D_P		0xe06C
 
-#endif /* __PMU_REGS_H__ */
+#endif /* PMU_REGS_H */
diff --git a/plat/rockchip/rk3399/rk3399_def.h b/plat/rockchip/rk3399/rk3399_def.h
index 32e439e..ba83242 100644
--- a/plat/rockchip/rk3399/rk3399_def.h
+++ b/plat/rockchip/rk3399/rk3399_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_DEF_H__
-#define __PLAT_DEF_H__
+#ifndef RK3399_DEF_H
+#define RK3399_DEF_H
 
 #include <addressmap.h>
 
@@ -62,4 +62,4 @@
 	INTR_PROP_DESC(ARM_IRQ_SEC_SGI_6, GIC_HIGHEST_SEC_PRIORITY,	\
 		       INTR_GROUP0, GIC_INTR_CFG_LEVEL)
 
-#endif /* __PLAT_DEF_H__ */
+#endif /* RK3399_DEF_H */
diff --git a/plat/rpi3/include/platform_def.h b/plat/rpi3/include/platform_def.h
index 76a5ff4..7122401 100644
--- a/plat/rpi3/include/platform_def.h
+++ b/plat/rpi3/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>
 #include <common_def.h>
@@ -236,4 +236,4 @@
  */
 #define SYS_COUNTER_FREQ_IN_TICKS	ULL(19200000)
 
-#endif /* __PLATFORM_DEF_H__ */
+#endif /* PLATFORM_DEF_H */
diff --git a/plat/rpi3/rpi3_hw.h b/plat/rpi3/rpi3_hw.h
index 1a26053..822644c 100644
--- a/plat/rpi3/rpi3_hw.h
+++ b/plat/rpi3/rpi3_hw.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __RPI3_HW__
-#define __RPI3_HW__
+#ifndef RPI3_HW_H
+#define RPI3_HW_H
 
 #include <utils_def.h>
 
@@ -95,4 +95,4 @@
 #define RPI3_INTC_PENDING_FIQ_OFFSET		ULL(0x00000070)
 #define RPI3_INTC_PENDING_FIQ_MBOX3		ULL(0x00000080)
 
-#endif /* __RPI3_HW__ */
+#endif /* RPI3_HW_H */
diff --git a/plat/rpi3/rpi3_private.h b/plat/rpi3/rpi3_private.h
index 368d09b..53078f8 100644
--- a/plat/rpi3/rpi3_private.h
+++ b/plat/rpi3/rpi3_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __RPI3_PRIVATE_H__
-#define __RPI3_PRIVATE_H__
+#ifndef RPI3_PRIVATE_H
+#define RPI3_PRIVATE_H
 
 #include <stdint.h>
 
@@ -39,4 +39,4 @@
 /* VideoCore firmware commands */
 int rpi3_vc_hardware_get_board_revision(uint32_t *revision);
 
-#endif /*__RPI3_PRIVATE_H__ */
+#endif /* RPI3_PRIVATE_H */
diff --git a/plat/socionext/synquacer/drivers/mhu/sq_mhu.h b/plat/socionext/synquacer/drivers/mhu/sq_mhu.h
index bef117d..f6b5cc3 100644
--- a/plat/socionext/synquacer/drivers/mhu/sq_mhu.h
+++ b/plat/socionext/synquacer/drivers/mhu/sq_mhu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SQ_MHU_H__
-#define __SQ_MHU_H__
+#ifndef SQ_MHU_H
+#define SQ_MHU_H
 
 #include <stdint.h>
 
@@ -16,4 +16,4 @@
 
 void mhu_secure_init(void);
 
-#endif	/* __SQ_MHU_H__ */
+#endif /* SQ_MHU_H */
diff --git a/plat/socionext/synquacer/drivers/scpi/sq_scpi.h b/plat/socionext/synquacer/drivers/scpi/sq_scpi.h
index 30fa5c7..38cc19e 100644
--- a/plat/socionext/synquacer/drivers/scpi/sq_scpi.h
+++ b/plat/socionext/synquacer/drivers/scpi/sq_scpi.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SQ_SCPI_H__
-#define __SQ_SCPI_H__
+#ifndef SQ_SCPI_H
+#define SQ_SCPI_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -79,4 +79,4 @@
 					scpi_power_state_t css_state);
 uint32_t scpi_sys_power_state(scpi_system_state_t system_state);
 
-#endif	/* __SQ_SCPI_H__ */
+#endif /* SQ_SCPI_H */
diff --git a/plat/socionext/synquacer/include/plat_macros.S b/plat/socionext/synquacer/include/plat_macros.S
index 3dc06aa..932b21d 100644
--- a/plat/socionext/synquacer/include/plat_macros.S
+++ b/plat/socionext/synquacer/include/plat_macros.S
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 /*
  * Print CCN registers
  */
 	.macro plat_crash_print_regs
 	.endm
-#endif /* __PLAT_MACROS_S__ */
+
+#endif /* PLAT_MACROS_S */
diff --git a/plat/socionext/synquacer/include/sq_common.h b/plat/socionext/synquacer/include/sq_common.h
index 7f0633a..c395640 100644
--- a/plat/socionext/synquacer/include/sq_common.h
+++ b/plat/socionext/synquacer/include/sq_common.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SQ_COMMON_H__
-#define __SQ_COMMON_H__
+#ifndef SQ_COMMON_H
+#define SQ_COMMON_H
 
 #include <stdint.h>
 #include <xlat_tables_v2.h>
@@ -40,4 +40,4 @@
 void sq_mmap_setup(uintptr_t total_base, size_t total_size,
 		   const struct mmap_region *mmap);
 
-#endif /* __SQ_COMMON_H__ */
+#endif /* SQ_COMMON_H */
diff --git a/plat/socionext/uniphier/include/plat_macros.S b/plat/socionext/uniphier/include/plat_macros.S
index 6de4dde..d6d2579 100644
--- a/plat/socionext/uniphier/include/plat_macros.S
+++ b/plat/socionext/uniphier/include/plat_macros.S
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 	.macro plat_crash_print_regs
 	.endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/socionext/uniphier/uniphier.h b/plat/socionext/uniphier/uniphier.h
index 89ed362..648c2b9 100644
--- a/plat/socionext/uniphier/uniphier.h
+++ b/plat/socionext/uniphier/uniphier.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __UNIPHIER_H__
-#define __UNIPHIER_H__
+#ifndef UNIPHIER_H
+#define UNIPHIER_H
 
 #include <stdint.h>
 #include <string.h>
@@ -88,4 +88,4 @@
 #define UNIPHIER_IMAGE_BUF_SIZE		((UNIPHIER_NS_DRAM_LIMIT) - \
 					 (UNIPHIER_IMAGE_BUF_BASE))
 
-#endif /* __UNIPHIER_H__ */
+#endif /* UNIPHIER_H */
diff --git a/plat/st/stm32mp1/include/boot_api.h b/plat/st/stm32mp1/include/boot_api.h
index e019cff..c841a74 100644
--- a/plat/st/stm32mp1/include/boot_api.h
+++ b/plat/st/stm32mp1/include/boot_api.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BOOT_API_H
-#define __BOOT_API_H
+#ifndef BOOT_API_H
+#define BOOT_API_H
 
 #include <stdint.h>
 #include <stdio.h>
@@ -235,4 +235,4 @@
 	uint8_t binary_type;
 } __packed boot_api_image_header_t;
 
-#endif /* __BOOT_API_H */
+#endif /* BOOT_API_H */
diff --git a/plat/st/stm32mp1/include/stm32mp1_context.h b/plat/st/stm32mp1/include/stm32mp1_context.h
index fd08afc..698415a 100644
--- a/plat/st/stm32mp1/include/stm32mp1_context.h
+++ b/plat/st/stm32mp1/include/stm32mp1_context.h
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_CONTEXT_H__
-#define __STM32MP1_CONTEXT_H__
+#ifndef STM32MP1_CONTEXT_H
+#define STM32MP1_CONTEXT_H
 
 #include <stdint.h>
 
 int stm32_save_boot_interface(uint32_t interface, uint32_t instance);
 
-#endif /* __STM32MP1_CONTEXT_H__ */
+#endif /* STM32MP1_CONTEXT_H */
diff --git a/plat/st/stm32mp1/include/stm32mp1_dt.h b/plat/st/stm32mp1/include/stm32mp1_dt.h
index 58e10d1..19549ee 100644
--- a/plat/st/stm32mp1/include/stm32mp1_dt.h
+++ b/plat/st/stm32mp1/include/stm32mp1_dt.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_DT_H__
-#define __STM32MP1_DT_H__
+#ifndef STM32MP1_DT_H
+#define STM32MP1_DT_H
 
 #include <stdbool.h>
 
@@ -38,4 +38,4 @@
 uint32_t dt_get_ddr_size(void);
 const char *dt_get_board_model(void);
 
-#endif /* __STM32MP1_DT_H__ */
+#endif /* STM32MP1_DT_H */
diff --git a/plat/st/stm32mp1/include/stm32mp1_private.h b/plat/st/stm32mp1/include/stm32mp1_private.h
index a789d53..3404bc6 100644
--- a/plat/st/stm32mp1/include/stm32mp1_private.h
+++ b/plat/st/stm32mp1/include/stm32mp1_private.h
@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_PRIVATE_H__
-#define __STM32MP1_PRIVATE_H__
+#ifndef STM32MP1_PRIVATE_H
+#define STM32MP1_PRIVATE_H
+
+#include <stdint.h>
 
 void stm32mp1_io_setup(void);
 void configure_mmu(void);
@@ -19,4 +21,4 @@
 void stm32mp1_gic_pcpu_init(void);
 void stm32mp1_gic_init(void);
 
-#endif /* __STM32MP1_PRIVATE_H__ */
+#endif /* STM32MP1_PRIVATE_H */
diff --git a/plat/st/stm32mp1/stm32mp1.ld.S b/plat/st/stm32mp1/stm32mp1.ld.S
index 0d7a8bb..50c926f 100644
--- a/plat/st/stm32mp1/stm32mp1.ld.S
+++ b/plat/st/stm32mp1/stm32mp1.ld.S
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STM32MP1_LD_S__
-#define __STM32MP1_LD_S__
+#ifndef STM32MP1_LD_S
+#define STM32MP1_LD_S
+
 #include <platform_def.h>
 #include <xlat_tables_defs.h>
 
@@ -73,4 +74,4 @@
     __TF_END__ = .;
 
 }
-#endif /*__STM32MP1_LD_S__*/
+#endif /* STM32MP1_LD_S */
diff --git a/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.h b/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.h
index facfd19..2d987f8 100644
--- a/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.h
+++ b/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.h
@@ -7,8 +7,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef K3_SEC_PROXY_H
-#define K3_SEC_PROXY_H
+#ifndef SEC_PROXY_H
+#define SEC_PROXY_H
 
 #include <stdint.h>
 
@@ -55,4 +55,4 @@
  */
 int k3_sec_proxy_recv(enum k3_sec_proxy_chan_id id, struct k3_sec_proxy_msg *msg);
 
-#endif /* K3_SEC_PROXY_H */
+#endif /* SEC_PROXY_H */
diff --git a/plat/ti/k3/common/drivers/ti_sci/ti_sci.h b/plat/ti/k3/common/drivers/ti_sci/ti_sci.h
index e40ad6b..1176b00 100644
--- a/plat/ti/k3/common/drivers/ti_sci/ti_sci.h
+++ b/plat/ti/k3/common/drivers/ti_sci/ti_sci.h
@@ -7,8 +7,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TI_SCI_H
-#define __TI_SCI_H
+#ifndef TI_SCI_H
+#define TI_SCI_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -205,4 +205,4 @@
  */
 int ti_sci_init(void);
 
-#endif	/* __TI_SCI_H */
+#endif /* TI_SCI_H */
diff --git a/plat/ti/k3/common/drivers/ti_sci/ti_sci_protocol.h b/plat/ti/k3/common/drivers/ti_sci/ti_sci_protocol.h
index 2c4b23f..c6d76d7 100644
--- a/plat/ti/k3/common/drivers/ti_sci/ti_sci_protocol.h
+++ b/plat/ti/k3/common/drivers/ti_sci/ti_sci_protocol.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TI_SCI_PROTOCOL_H
-#define __TI_SCI_PROTOCOL_H
+#ifndef TI_SCI_PROTOCOL_H
+#define TI_SCI_PROTOCOL_H
 
 #include <stdint.h>
 
@@ -647,4 +647,4 @@
 	uint32_t status_flags;
 } __packed;
 
-#endif /* __TI_SCI_PROTOCOL_H */
+#endif /* TI_SCI_PROTOCOL_H */
diff --git a/plat/ti/k3/include/k3_console.h b/plat/ti/k3/include/k3_console.h
index 5b01a31..6376ab3 100644
--- a/plat/ti/k3/include/k3_console.h
+++ b/plat/ti/k3/include/k3_console.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __K3_CONSOLE_H__
-#define __K3_CONSOLE_H__
+#ifndef K3_CONSOLE_H
+#define K3_CONSOLE_H
 
 void bl31_console_setup(void);
 
-#endif /* __K3_CONSOLE_H__ */
+#endif /* K3_CONSOLE_H */
diff --git a/plat/ti/k3/include/k3_gicv3.h b/plat/ti/k3/include/k3_gicv3.h
index bbf5bf9..52f34ff 100644
--- a/plat/ti/k3/include/k3_gicv3.h
+++ b/plat/ti/k3/include/k3_gicv3.h
@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __K3_GICV3_H__
-#define __K3_GICV3_H__
+#ifndef K3_GICV3_H
+#define K3_GICV3_H
+
+#include <stdint.h>
 
 void k3_gic_driver_init(uintptr_t gicd_base, uintptr_t gicr_base);
 void k3_gic_init(void);
@@ -13,4 +15,4 @@
 void k3_gic_cpuif_disable(void);
 void k3_gic_pcpu_init(void);
 
-#endif /* __K3_GICV3_H__ */
+#endif /* K3_GICV3_H */
diff --git a/plat/ti/k3/include/plat_macros.S b/plat/ti/k3/include/plat_macros.S
index 96d1cd2..38056b5 100644
--- a/plat/ti/k3/include/plat_macros.S
+++ b/plat/ti/k3/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
 
 	/* ---------------------------------------------
 	 * The below required platform porting macro
@@ -18,4 +18,4 @@
 	/* STUB */
 	.endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/ti/k3/include/platform_def.h b/plat/ti/k3/include/platform_def.h
index ab0739e..7d1df0a 100644
--- a/plat/ti/k3/include/platform_def.h
+++ b/plat/ti/k3/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>
 #include <board_def.h>
@@ -206,4 +206,4 @@
 #define TI_SCI_HOST_ID			10
 #define TI_SCI_MAX_MESSAGE_SIZE		52
 
-#endif /* __PLATFORM_DEF_H__ */
+#endif /* PLATFORM_DEF_H */
diff --git a/plat/xilinx/zynqmp/include/plat_macros.S b/plat/xilinx/zynqmp/include/plat_macros.S
index 41bc174..e54cfc4 100644
--- a/plat/xilinx/zynqmp/include/plat_macros.S
+++ b/plat/xilinx/zynqmp/include/plat_macros.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 #include <arm_macros.S>
 #include <cci_macros.S>
@@ -25,4 +25,4 @@
 	print_cci_regs
 	.endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h
index 387ffd2..197c788 100644
--- a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h
+++ b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h
@@ -6,8 +6,8 @@
 
 /* ZynqMP IPI mailbox doorbell service enums and defines */
 
-#ifndef _IPI_MAILBOX_SVC_H_
-#define _IPI_MAILBOX_SVC_H_
+#ifndef IPI_MAILBOX_SVC_H
+#define IPI_MAILBOX_SVC_H
 
 #include <stdint.h>
 
@@ -36,4 +36,4 @@
 			 uint64_t x3, uint64_t x4, void *cookie, void *handle,
 			 uint64_t flags);
 
-#endif /* _IPI_MAILBOX_SVC_H_ */
+#endif /* IPI_MAILBOX_SVC_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h
index 386f275..f7cbdba 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h
@@ -8,8 +8,8 @@
  * ZynqMP system level PM-API functions for clock control.
  */
 
-#ifndef _PM_API_CLOCK_H_
-#define _PM_API_CLOCK_H_
+#ifndef PM_API_CLOCK_H
+#define PM_API_CLOCK_H
 
 #include <utils_def.h>
 #include "pm_common.h"
@@ -313,4 +313,4 @@
 enum pm_ret_status pm_api_clk_get_pll_frac_data(unsigned int pll,
 						unsigned int *data);
 
-#endif /* _PM_API_CLOCK_H_ */
+#endif /* PM_API_CLOCK_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h
index d68c5e3..337f732 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h
@@ -8,8 +8,8 @@
  * ZynqMP system level PM-API functions for pin control.
  */
 
-#ifndef _PM_API_IOCTL_H_
-#define _PM_API_IOCTL_H_
+#ifndef PM_API_IOCTL_H
+#define PM_API_IOCTL_H
 
 #include "pm_common.h"
 
@@ -80,4 +80,4 @@
 				unsigned int arg1,
 				unsigned int arg2,
 				unsigned int *value);
-#endif /* _PM_API_IOCTL_H_ */
+#endif /* PM_API_IOCTL_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h
index c70a774..9923c00 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h
@@ -8,8 +8,8 @@
  * ZynqMP system level PM-API functions for pin control.
  */
 
-#ifndef _PM_API_PINCTRL_H_
-#define _PM_API_PINCTRL_H_
+#ifndef PM_API_PINCTRL_H
+#define PM_API_PINCTRL_H
 
 #include "pm_common.h"
 
@@ -731,4 +731,4 @@
 enum pm_ret_status pm_api_pinctrl_get_num_functions(unsigned int *nfuncs);
 enum pm_ret_status pm_api_pinctrl_get_num_func_groups(unsigned int fid,
 						      unsigned int *ngroups);
-#endif /* _PM_API_PINCTRL_H_ */
+#endif /* PM_API_PINCTRL_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h
index 1c9255e..fee91cd 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PM_API_SYS_H_
-#define _PM_API_SYS_H_
+#ifndef PM_API_SYS_H
+#define PM_API_SYS_H
 
 #include <stdint.h>
 #include "pm_defs.h"
@@ -176,4 +176,4 @@
 				 uint32_t address_low,
 				 uint32_t  *value);
 
-#endif /* _PM_API_SYS_H_ */
+#endif /* PM_API_SYS_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.h b/plat/xilinx/zynqmp/pm_service/pm_client.h
index 070db89..0a34a07 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_client.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_client.h
@@ -9,8 +9,8 @@
  * the execution environment.
  */
 
-#ifndef _PM_CLIENT_H_
-#define _PM_CLIENT_H_
+#ifndef PM_CLIENT_H
+#define PM_CLIENT_H
 
 #include "pm_common.h"
 #include "pm_defs.h"
@@ -25,4 +25,4 @@
 /* Global variables to be set in pm_client.c */
 extern const struct pm_proc *primary_proc;
 
-#endif /* _PM_CLIENT_H_ */
+#endif /* PM_CLIENT_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_common.h b/plat/xilinx/zynqmp/pm_service/pm_common.h
index 4d03bc0..5474627 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_common.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_common.h
@@ -9,8 +9,8 @@
  * for PU Power Management. This file should be common for all PU's.
  */
 
-#ifndef _PM_COMMON_H_
-#define _PM_COMMON_H_
+#ifndef PM_COMMON_H
+#define PM_COMMON_H
 
 #include <debug.h>
 #include <stdint.h>
@@ -52,4 +52,4 @@
 const struct pm_proc *pm_get_proc(unsigned int cpuid);
 const struct pm_proc *pm_get_proc_by_node(enum pm_node_id nid);
 
-#endif /* _PM_COMMON_H_ */
+#endif /* PM_COMMON_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_defs.h b/plat/xilinx/zynqmp/pm_service/pm_defs.h
index 1fbf6ee..7a0d978 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_defs.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_defs.h
@@ -6,8 +6,8 @@
 
 /* ZynqMP power management enums and defines */
 
-#ifndef _PM_DEFS_H_
-#define _PM_DEFS_H_
+#ifndef PM_DEFS_H
+#define PM_DEFS_H
 
 /*********************************************************************
  * Macro definitions
@@ -265,4 +265,4 @@
 	PMF_SHUTDOWN_SUBTYPE_SYSTEM,
 };
 
-#endif /* _PM_DEFS_H_ */
+#endif /* PM_DEFS_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_ipi.h b/plat/xilinx/zynqmp/pm_service/pm_ipi.h
index 439dcf4..650de52 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_ipi.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_ipi.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PM_IPI_H_
-#define _PM_IPI_H_
+#ifndef PM_IPI_H
+#define PM_IPI_H
 
 #include "pm_common.h"
 
@@ -22,4 +22,4 @@
 void pm_ipi_irq_enable(const struct pm_proc *proc);
 void pm_ipi_irq_clear(const struct pm_proc *proc);
 
-#endif /* _PM_IPI_H_ */
+#endif /* PM_IPI_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_svc_main.h b/plat/xilinx/zynqmp/pm_service/pm_svc_main.h
index d895321..0968f64 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_svc_main.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_svc_main.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PM_SVC_MAIN_H_
-#define _PM_SVC_MAIN_H_
+#ifndef PM_SVC_MAIN_H
+#define PM_SVC_MAIN_H
 
 #include "pm_common.h"
 
@@ -14,4 +14,4 @@
 			uint64_t x4, void *cookie, void *handle,
 			uint64_t flags);
 
-#endif /*  _PM_SVC_MAIN_H_ */
+#endif /* PM_SVC_MAIN_H */
diff --git a/plat/xilinx/zynqmp/zynqmp_def.h b/plat/xilinx/zynqmp/zynqmp_def.h
index 9d19b1b..ba382dd 100644
--- a/plat/xilinx/zynqmp/zynqmp_def.h
+++ b/plat/xilinx/zynqmp/zynqmp_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __ZYNQMP_DEF_H__
-#define __ZYNQMP_DEF_H__
+#ifndef ZYNQMP_DEF_H
+#define ZYNQMP_DEF_H
 
 #include <common_def.h>
 
@@ -340,4 +340,4 @@
 #define  AFIFM6_WRCTRL		U(13)
 #define  FABRIC_WIDTH		U(3)
 
-#endif /* __ZYNQMP_DEF_H__ */
+#endif /* ZYNQMP_DEF_H */
diff --git a/plat/xilinx/zynqmp/zynqmp_ipi.h b/plat/xilinx/zynqmp/zynqmp_ipi.h
index 0544ddb..b9b40dd 100644
--- a/plat/xilinx/zynqmp/zynqmp_ipi.h
+++ b/plat/xilinx/zynqmp/zynqmp_ipi.h
@@ -6,8 +6,8 @@
 
 /* ZynqMP IPI management enums and defines */
 
-#ifndef _ZYNQMP_IPI_H_
-#define _ZYNQMP_IPI_H_
+#ifndef ZYNQMP_IPI_H
+#define ZYNQMP_IPI_H
 
 #include <stdint.h>
 
@@ -67,4 +67,4 @@
 /* Enable IPI mailbox notification interrupt */
 void ipi_mb_enable_irq(uint32_t local, uint32_t remote);
 
-#endif /* _ZYNQMP_IPI_H_ */
+#endif /* ZYNQMP_IPI_H */
diff --git a/plat/xilinx/zynqmp/zynqmp_private.h b/plat/xilinx/zynqmp/zynqmp_private.h
index d5024c3..8a8d38a 100644
--- a/plat/xilinx/zynqmp/zynqmp_private.h
+++ b/plat/xilinx/zynqmp/zynqmp_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __ZYNQMP_PRIVATE_H__
-#define __ZYNQMP_PRIVATE_H__
+#ifndef ZYNQMP_PRIVATE_H
+#define ZYNQMP_PRIVATE_H
 
 #include <bl_common.h>
 #include <interrupt_mgmt.h>
@@ -38,4 +38,4 @@
 enum fsbl_handoff fsbl_atf_handover(entry_point_info_t *bl32_image_ep_info,
 		       entry_point_info_t *bl33_image_ep_info);
 
-#endif /* __ZYNQMP_PRIVATE_H__ */
+#endif /* ZYNQMP_PRIVATE_H */
diff --git a/services/spd/opteed/opteed_private.h b/services/spd/opteed/opteed_private.h
index a5f0a41..1a67fce 100644
--- a/services/spd/opteed/opteed_private.h
+++ b/services/spd/opteed/opteed_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __OPTEED_PRIVATE_H__
-#define __OPTEED_PRIVATE_H__
+#ifndef OPTEED_PRIVATE_H
+#define OPTEED_PRIVATE_H
 
 #include <arch.h>
 #include <context.h>
@@ -157,4 +157,4 @@
 extern struct optee_vectors *optee_vector_table;
 #endif /*__ASSEMBLY__*/
 
-#endif /* __OPTEED_PRIVATE_H__ */
+#endif /* OPTEED_PRIVATE_H */
diff --git a/services/spd/opteed/teesmc_opteed_macros.h b/services/spd/opteed/teesmc_opteed_macros.h
index 14f8a2d..0068dc7 100644
--- a/services/spd/opteed/teesmc_opteed_macros.h
+++ b/services/spd/opteed/teesmc_opteed_macros.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __TEESMC_OPTEED_MACROS_H__
-#define __TEESMC_OPTEED_MACROS_H__
+#ifndef TEESMC_OPTEED_MACROS_H
+#define TEESMC_OPTEED_MACROS_H
 
 #include <runtime_svc.h>
 
@@ -14,4 +14,4 @@
 		 (62 << FUNCID_OEN_SHIFT) | \
 		 ((func_num) & FUNCID_NUM_MASK))
 
-#endif /*__TEESMC_OPTEED_MACROS_H__*/
+#endif /* TEESMC_OPTEED_MACROS_H */
diff --git a/services/spd/tlkd/tlkd_private.h b/services/spd/tlkd/tlkd_private.h
index ba66098..525cc3a 100644
--- a/services/spd/tlkd/tlkd_private.h
+++ b/services/spd/tlkd/tlkd_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TLKD_PRIVATE_H__
-#define __TLKD_PRIVATE_H__
+#ifndef TLKD_PRIVATE_H
+#define TLKD_PRIVATE_H
 
 #include <arch.h>
 #include <context.h>
@@ -119,4 +119,4 @@
 
 #endif /*__ASSEMBLY__*/
 
-#endif /* __TLKD_PRIVATE_H__ */
+#endif /* TLKD_PRIVATE_H */
diff --git a/services/spd/trusty/sm_err.h b/services/spd/trusty/sm_err.h
index 4342466..80a8748 100644
--- a/services/spd/trusty/sm_err.h
+++ b/services/spd/trusty/sm_err.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __LIB_SM_SM_ERR_H
-#define __LIB_SM_SM_ERR_H
+#ifndef SM_ERR_H
+#define SM_ERR_H
 
 /* Errors from the secure monitor */
 #define SM_ERR_UNDEFINED_SMC		0xFFFFFFFF /* Unknown SMC (defined by ARM DEN 0028A(0.9.0) */
@@ -19,4 +19,4 @@
 #define SM_ERR_NOT_ALLOWED		-9	/* SMC call not allowed */
 #define SM_ERR_END_OF_INPUT		-10
 
-#endif
+#endif /* SM_ERR_H */
diff --git a/services/spd/trusty/smcall.h b/services/spd/trusty/smcall.h
index 99f1608..742c8c4 100644
--- a/services/spd/trusty/smcall.h
+++ b/services/spd/trusty/smcall.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __LIB_SM_SMCALL_H
-#define __LIB_SM_SMCALL_H
+#ifndef SMCALL_H
+#define SMCALL_H
 
 #define SMC_NUM_ENTITIES	64
 #define SMC_NUM_ARGS		4
@@ -72,4 +72,4 @@
 #define SMC_YC_VDEV_KICK_VQ	  SMC_YIELDCALL_NR(SMC_ENTITY_TRUSTED_OS, 24)
 #define SMC_YC_SET_ROT_PARAMS	  SMC_YIELDCALL_NR(SMC_ENTITY_TRUSTED_OS, 65535)
 
-#endif /* __LIB_SM_SMCALL_H */
+#endif /* SMCALL_H */
diff --git a/services/spd/tspd/tspd_private.h b/services/spd/tspd/tspd_private.h
index 080e757..e2e333d 100644
--- a/services/spd/tspd/tspd_private.h
+++ b/services/spd/tspd/tspd_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TSPD_PRIVATE_H__
-#define __TSPD_PRIVATE_H__
+#ifndef TSPD_PRIVATE_H
+#define TSPD_PRIVATE_H
 
 #include <arch.h>
 #include <context.h>
@@ -227,4 +227,4 @@
 extern tsp_vectors_t *tsp_vectors;
 #endif /*__ASSEMBLY__*/
 
-#endif /* __TSPD_PRIVATE_H__ */
+#endif /* TSPD_PRIVATE_H */
diff --git a/services/std_svc/spm/spm_private.h b/services/std_svc/spm/spm_private.h
index f094739..ec3f48e 100644
--- a/services/std_svc/spm/spm_private.h
+++ b/services/std_svc/spm/spm_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SPM_PRIVATE_H__
-#define __SPM_PRIVATE_H__
+#ifndef SPM_PRIVATE_H
+#define SPM_PRIVATE_H
 
 #include <context.h>
 
@@ -67,4 +67,4 @@
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __SPM_PRIVATE_H__ */
+#endif /* SPM_PRIVATE_H */
diff --git a/services/std_svc/spm/spm_shim_private.h b/services/std_svc/spm/spm_shim_private.h
index e65ac44..f2a7e05 100644
--- a/services/std_svc/spm/spm_shim_private.h
+++ b/services/std_svc/spm/spm_shim_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SPM_SHIM_PRIVATE__
-#define __SPM_SHIM_PRIVATE__
+#ifndef SPM_SHIM_PRIVATE_H
+#define SPM_SHIM_PRIVATE_H
 
 #include <stdint.h>
 #include <utils_def.h>
@@ -22,4 +22,4 @@
 #define SPM_SHIM_EXCEPTIONS_SIZE	\
 	(SPM_SHIM_EXCEPTIONS_END - SPM_SHIM_EXCEPTIONS_START)
 
-#endif /* __SPM_SHIM_PRIVATE__ */
+#endif /* SPM_SHIM_PRIVATE_H */
diff --git a/tools/cert_create/include/cert.h b/tools/cert_create/include/cert.h
index 07bb337..39b45b5 100644
--- a/tools/cert_create/include/cert.h
+++ b/tools/cert_create/include/cert.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef CERT_H_
-#define CERT_H_
+#ifndef CERT_H
+#define CERT_H
 
 #include <openssl/ossl_typ.h>
 #include <openssl/x509.h>
@@ -65,4 +65,4 @@
 extern cert_t *certs;
 extern const unsigned int num_certs;
 
-#endif /* CERT_H_ */
+#endif /* CERT_H */
diff --git a/tools/cert_create/include/cmd_opt.h b/tools/cert_create/include/cmd_opt.h
index 5095ed1..10df00e 100644
--- a/tools/cert_create/include/cmd_opt.h
+++ b/tools/cert_create/include/cmd_opt.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef CMD_OPT_H_
-#define CMD_OPT_H_
+#ifndef CMD_OPT_H
+#define CMD_OPT_H
 
 #include <getopt.h>
 
@@ -30,4 +30,4 @@
 const char *cmd_opt_get_name(int idx);
 const char *cmd_opt_get_help_msg(int idx);
 
-#endif /* CMD_OPT_H_ */
+#endif /* CMD_OPT_H */
diff --git a/tools/cert_create/include/debug.h b/tools/cert_create/include/debug.h
index 6302b41..ee8f1f5 100644
--- a/tools/cert_create/include/debug.h
+++ b/tools/cert_create/include/debug.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __DEBUG_H__
-#define __DEBUG_H__
+#ifndef DEBUG_H
+#define DEBUG_H
 
 #include <stdio.h>
 
@@ -56,4 +56,4 @@
 # define VERBOSE(...)
 #endif
 
-#endif /* __DEBUG_H__ */
+#endif /* DEBUG_H */
diff --git a/tools/cert_create/include/ext.h b/tools/cert_create/include/ext.h
index d432e63..9c0b5c3 100644
--- a/tools/cert_create/include/ext.h
+++ b/tools/cert_create/include/ext.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef EXT_H_
-#define EXT_H_
+#ifndef EXT_H
+#define EXT_H
 
 #include <openssl/x509v3.h>
 #include "key.h"
@@ -82,4 +82,4 @@
 extern ext_t *extensions;
 extern const unsigned int num_extensions;
 
-#endif /* EXT_H_ */
+#endif /* EXT_H */
diff --git a/tools/cert_create/include/key.h b/tools/cert_create/include/key.h
index 1a253cc..310a77f 100644
--- a/tools/cert_create/include/key.h
+++ b/tools/cert_create/include/key.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef KEY_H_
-#define KEY_H_
+#ifndef KEY_H
+#define KEY_H
 
 #include <openssl/ossl_typ.h>
 
@@ -71,4 +71,4 @@
 extern key_t *keys;
 extern const unsigned int num_keys;
 
-#endif /* KEY_H_ */
+#endif /* KEY_H */
diff --git a/tools/cert_create/include/sha.h b/tools/cert_create/include/sha.h
index 4d07a1e..4c55f37 100644
--- a/tools/cert_create/include/sha.h
+++ b/tools/cert_create/include/sha.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef SHA_H_
-#define SHA_H_
+#ifndef SHA_H
+#define SHA_H
 
 int sha_file(int md_alg, const char *filename, unsigned char *md);
 
-#endif /* SHA_H_ */
+#endif /* SHA_H */
diff --git a/tools/cert_create/include/tbbr/tbb_cert.h b/tools/cert_create/include/tbbr/tbb_cert.h
index 716b570..628ef3a 100644
--- a/tools/cert_create/include/tbbr/tbb_cert.h
+++ b/tools/cert_create/include/tbbr/tbb_cert.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef TBB_CERT_H_
-#define TBB_CERT_H_
+#ifndef TBB_CERT_H
+#define TBB_CERT_H
 
 #include "cert.h"
 
@@ -26,4 +26,4 @@
 	FWU_CERT
 };
 
-#endif /* TBB_CERT_H_ */
+#endif /* TBB_CERT_H */
diff --git a/tools/cert_create/include/tbbr/tbb_ext.h b/tools/cert_create/include/tbbr/tbb_ext.h
index 075d5f3..462aafc 100644
--- a/tools/cert_create/include/tbbr/tbb_ext.h
+++ b/tools/cert_create/include/tbbr/tbb_ext.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef TBB_EXT_H_
-#define TBB_EXT_H_
+#ifndef TBB_EXT_H
+#define TBB_EXT_H
 
 #include "ext.h"
 
@@ -35,4 +35,4 @@
 	FWU_HASH_EXT
 };
 
-#endif /* TBB_EXT_H_ */
+#endif /* TBB_EXT_H */
diff --git a/tools/cert_create/include/tbbr/tbb_key.h b/tools/cert_create/include/tbbr/tbb_key.h
index df634c6..47ad1de 100644
--- a/tools/cert_create/include/tbbr/tbb_key.h
+++ b/tools/cert_create/include/tbbr/tbb_key.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef TBB_KEY_H_
-#define TBB_KEY_H_
+#ifndef TBB_KEY_H
+#define TBB_KEY_H
 
 #include "key.h"
 
@@ -22,4 +22,4 @@
 	NON_TRUSTED_FW_CONTENT_CERT_KEY
 };
 
-#endif /* TBB_KEY_H_ */
+#endif /* TBB_KEY_H */
diff --git a/tools/fiptool/fiptool.h b/tools/fiptool/fiptool.h
index d8a5d2c..af3fcbd 100644
--- a/tools/fiptool/fiptool.h
+++ b/tools/fiptool/fiptool.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __FIPTOOL_H__
-#define __FIPTOOL_H__
+#ifndef FIPTOOL_H
+#define FIPTOOL_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -51,4 +51,4 @@
 	void             (*usage)(void);
 } cmd_t;
 
-#endif /* __FIPTOOL_H__ */
+#endif /* FIPTOOL_H */
diff --git a/tools/fiptool/fiptool_platform.h b/tools/fiptool/fiptool_platform.h
index fd0a120..9bfa298 100644
--- a/tools/fiptool/fiptool_platform.h
+++ b/tools/fiptool/fiptool_platform.h
@@ -1,30 +1,31 @@
 /*
- * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
- *
+ */
+/*
  * Build platform specific handling.
  * This allows for builds on non-Posix platforms
  * e.g. Visual Studio on Windows
  */
 
-#ifndef __FIPTOOL_PLATFORM_H__
-#	define __FIPTOOL_PLATFORM_H__
+#ifndef FIPTOOL_PLATFORM_H
+#define FIPTOOL_PLATFORM_H
 
-#	ifndef _MSC_VER
+#ifndef _MSC_VER
 
-		/* Not Visual Studio, so include Posix Headers. */
-#		include <getopt.h>
-#		include <openssl/sha.h>
-#		include <unistd.h>
+/* Not Visual Studio, so include Posix Headers. */
+# include <getopt.h>
+# include <openssl/sha.h>
+# include <unistd.h>
 
-#		define  BLD_PLAT_STAT stat
+# define  BLD_PLAT_STAT stat
 
-#	else
+#else
 
-		/* Visual Studio. */
-#		include "win_posix.h"
+/* Visual Studio. */
+# include "win_posix.h"
 
-#	endif
+#endif
 
-#endif /* __FIPTOOL_PLATFORM_H__ */
+#endif /* FIPTOOL_PLATFORM_H */
diff --git a/tools/fiptool/tbbr_config.h b/tools/fiptool/tbbr_config.h
index bad757d..2d89777 100644
--- a/tools/fiptool/tbbr_config.h
+++ b/tools/fiptool/tbbr_config.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TBBR_CONFIG_H__
-#define __TBBR_CONFIG_H__
+#ifndef TBBR_CONFIG_H
+#define TBBR_CONFIG_H
 
 #include <stdint.h>
 
@@ -22,4 +22,4 @@
 
 extern toc_entry_t toc_entries[];
 
-#endif /* __TBBR_CONFIG_H__ */
+#endif /* TBBR_CONFIG_H */
diff --git a/tools/fiptool/win_posix.h b/tools/fiptool/win_posix.h
index c3fc399..836ffed 100644
--- a/tools/fiptool/win_posix.h
+++ b/tools/fiptool/win_posix.h
@@ -1,41 +1,40 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __WINPOSIX_H__
-#	define __WINPOSIX_H__
+#ifndef WIN_POSIX_H
+#define WIN_POSIX_H
 
-#	define _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
 
-#	include <direct.h>
-#	include <io.h>
-#	include <stdint.h>
-#	include <stdlib.h>
-#	include <string.h>
-#	include <sys/stat.h>
+#include <direct.h>
+#include <io.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
 
-#	include "uuid.h"
-
+#include "uuid.h"
 
 /* Derive or provide Windows equivalents of Posix/GCC/Unix stuff. */
-#	ifndef PATH_MAX
-#		ifdef MAX_PATH
-#			define PATH_MAX MAX_PATH
-#		else
-#			ifdef _MAX_PATH
-#				define MAX_PATH _MAX_PATH
-#				define PATH_MAX _MAX_PATH
-#			else
-#				define PATH_MAX 260
-#			endif
-#		endif
-#	endif
+#ifndef PATH_MAX
+# ifdef MAX_PATH
+#  define PATH_MAX MAX_PATH
+# else
+#  ifdef _MAX_PATH
+#   define MAX_PATH _MAX_PATH
+#   define PATH_MAX _MAX_PATH
+#  else
+#   define PATH_MAX 260
+#  endif
+# endif
+#endif
 
-#	ifndef _CRT_SECURE_NO_WARNINGS
-#		define _CRT_SECURE_NO_WARNINGS 1
-#	endif
+#ifndef _CRT_SECURE_NO_WARNINGS
+# define _CRT_SECURE_NO_WARNINGS 1
+#endif
 
 /*
  * Platform specific names.
@@ -46,13 +45,13 @@
  */
 
 /* fileno cannot be an inline function, because _fileno is a macro. */
-#	define fileno(fileptr) _fileno(fileptr)
+#define fileno(fileptr) _fileno(fileptr)
 
 /* _fstat uses the _stat structure, not stat. */
-#	define BLD_PLAT_STAT	_stat
+#define BLD_PLAT_STAT	_stat
 
 /* Define flag values for _access. */
-#	define F_OK	0
+#define F_OK	0
 
 
 /* getopt implementation for Windows: Data. */
@@ -184,4 +183,4 @@
 			   const struct option *longopts,
 			   int *indexptr);
 
-#endif /* __WINPOSIX_H__ */
+#endif /* WIN_POSIX_H */