diff --git a/arch/arm/include/stm32/stm32f10xxx_irq.h b/arch/arm/include/stm32/stm32f10xxx_irq.h
index 448e68c3089..3c62e1e2ea3 100644
--- a/arch/arm/include/stm32/stm32f10xxx_irq.h
+++ b/arch/arm/include/stm32/stm32f10xxx_irq.h
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/irq.h
  */
 
-#ifndef __ARCH_ARM_INCLUDE_STM32F10XXX_IRQ_H
-#define __ARCH_ARM_INCLUDE_STM32F10XXX_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_STM32_STM32F10XXX_IRQ_H
+#define __ARCH_ARM_INCLUDE_STM32_STM32F10XXX_IRQ_H
 
 /************************************************************************************
  * Included Files
@@ -309,5 +309,5 @@ extern "C"
 #endif
 #endif
 
-#endif /* __ARCH_ARM_INCLUDE_STM32F10XXX_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_STM32_STM32F10XXX_IRQ_H */
 
diff --git a/arch/arm/include/stm32/stm32f20xxx_irq.h b/arch/arm/include/stm32/stm32f20xxx_irq.h
index 1159933e096..43a2e218eb9 100644
--- a/arch/arm/include/stm32/stm32f20xxx_irq.h
+++ b/arch/arm/include/stm32/stm32f20xxx_irq.h
@@ -35,8 +35,8 @@
 
 /* This file should never be included directed but, rather, only indirectly through nuttx/irq.h */
 
-#ifndef __ARCH_ARM_INCLUDE_STM32F20XXX_IRQ_H
-#define __ARCH_ARM_INCLUDE_STM32F20XXX_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_STM32_STM32F20XXX_IRQ_H
+#define __ARCH_ARM_INCLUDE_STM32_STM32F20XXX_IRQ_H
 
 /****************************************************************************************************
  * Included Files
@@ -180,5 +180,5 @@ extern "C"
 #endif
 #endif
 
-#endif /* __ARCH_ARM_INCLUDE_STM32F40XXX_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_STM32_STM32F20XXX_IRQ_H */
 
diff --git a/arch/arm/include/stm32/stm32f30xxx_irq.h b/arch/arm/include/stm32/stm32f30xxx_irq.h
index 6977524f092..74c8a279a65 100644
--- a/arch/arm/include/stm32/stm32f30xxx_irq.h
+++ b/arch/arm/include/stm32/stm32f30xxx_irq.h
@@ -35,8 +35,8 @@
 
 /* This file should never be included directed but, rather, only indirectly through nuttx/irq.h */
 
-#ifndef __ARCH_ARM_INCLUDE_STM32F30XXX_IRQ_H
-#define __ARCH_ARM_INCLUDE_STM32F30XXX_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_STM32_STM32F30XXX_IRQ_H
+#define __ARCH_ARM_INCLUDE_STM32_STM32F30XXX_IRQ_H
 
 /****************************************************************************************************
  * Included Files
@@ -191,5 +191,5 @@ extern "C"
 #endif
 #endif
 
-#endif /* __ARCH_ARM_INCLUDE_STM32F30XXX_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_STM32_STM32F30XXX_IRQ_H */
 
diff --git a/arch/arm/include/stm32/stm32f37xxx_irq.h b/arch/arm/include/stm32/stm32f37xxx_irq.h
index 3c7e421f90a..22456683bc3 100644
--- a/arch/arm/include/stm32/stm32f37xxx_irq.h
+++ b/arch/arm/include/stm32/stm32f37xxx_irq.h
@@ -36,8 +36,8 @@
 
 /* This file should never be included directed but, rather, only indirectly through nuttx/irq.h */
 
-#ifndef __ARCH_ARM_INCLUDE_STM32F37XXX_IRQ_H
-#define __ARCH_ARM_INCLUDE_STM32F37XXX_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_STM32_STM32F37XXX_IRQ_H
+#define __ARCH_ARM_INCLUDE_STM32_STM32F37XXX_IRQ_H
 
 /****************************************************************************************************
  * Included Files
diff --git a/arch/arm/include/stm32/stm32f42xxx_irq.h b/arch/arm/include/stm32/stm32f42xxx_irq.h
index 4440b3b86ad..e7edfdd7524 100644
--- a/arch/arm/include/stm32/stm32f42xxx_irq.h
+++ b/arch/arm/include/stm32/stm32f42xxx_irq.h
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/irq.h
  */
 
-#ifndef __ARCH_ARM_INCLUDE_STM32F42XXX_IRQ_H
-#define __ARCH_ARM_INCLUDE_STM32F42XXX_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_STM32_STM32F40XXX_IRQ_H
+#define __ARCH_ARM_INCLUDE_STM32_STM32F40XXX_IRQ_H
 
 /****************************************************************************************************
  * Included Files
@@ -205,4 +205,4 @@ extern "C"
 #endif
 
 #endif /* CONFIG_STM32_STM32F427 || CONFIG_STM32_STM32F429 */
-#endif /* __ARCH_ARM_INCLUDE_STM32F42XXX_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_STM32_STM32F40XXX_IRQ_H */
diff --git a/arch/arm/include/stm32/stm32l15xxx_irq.h b/arch/arm/include/stm32/stm32l15xxx_irq.h
index 8bf15d70810..ca692932f9b 100644
--- a/arch/arm/include/stm32/stm32l15xxx_irq.h
+++ b/arch/arm/include/stm32/stm32l15xxx_irq.h
@@ -36,8 +36,8 @@
 
 /* This file should never be included directed but, rather, only indirectly through nuttx/irq.h */
 
-#ifndef __ARCH_ARM_INCLUDE_STM32L15XXX_IRQ_H
-#define __ARCH_ARM_INCLUDE_STM32L15XXX_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_STM32_STM32FL15XXX_IRQ_H
+#define __ARCH_ARM_INCLUDE_STM32_STM32FL15XXX_IRQ_H
 
 /****************************************************************************************************
  * Included Files
@@ -270,5 +270,5 @@ extern "C"
 #endif
 #endif
 
-#endif /* __ARCH_ARM_INCLUDE_STM32L15XXX_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_STM32_STM32FL15XXX_IRQ_H */