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