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 */