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