diff --git a/arch/arm/src/stm32/chip.h b/arch/arm/src/stm32/chip.h
index c80ea97c20..c58331d7b6 100755
--- a/arch/arm/src/stm32/chip.h
+++ b/arch/arm/src/stm32/chip.h
@@ -54,17 +54,17 @@
 #  undef  CONFIG_STM32_MEDIUMDENSITY        /* STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
 #  define CONFIG_STM32_HIGHDENSITY      1   /* STM32F101x  and STM32F103x w/ 256/512 Kbytes */
 #  undef  CONFIG_STM32_CONNECTIVITYLINE     /* STM32F105x and STM32F107x */
-#  define STM32_NATIM                   2   /* Advanced timers TIM1,8 */
+#  define STM32_NATIM                   1   /* One advanced timers TIM1 */
 #  define STM32_NGTIM                   4   /* General timers TIM2,3,4,5 */
-#  define STM32 NBTIM                   2   /* Basic timers TIM6,7 */
-#  define STM32_NSPI                    1   /* SPI1 */
-#  define STM32_NUSART                  5   /* USART1-3, UART4-5 */
+#  define STM32 NBTIM                   0   /* No basic timers */
+#  define STM32_NSPI                    2   /* SPI1-2 */
+#  define STM32_NUSART                  3   /* USART1-3 */
 #  define STM32_NI2C                    2   /* I2C1-2 */
 #  define STM32_NCAN                    1   /* bxCAN1 */
 #  define STM32_NSDIO                   1   /* 1 */
 #  define STM32_NGPIO                   112 /* GPIOA-G */
-#  define STM32_NADC                    3   /* ADC 1-3 */
-#  define STM32_NDAC                    2   /* No DAC */
+#  define STM32_NADC                    1   /* ADC1 */
+#  define STM32_NDAC                    0   /* No DAC */
 #  define STM32_NCRC                    0   /* No CRC */
 #  define STM32_NTHERNET                0   /* No ethernet */
 #else
diff --git a/arch/arm/src/stm32/stm32_gpio.c b/arch/arm/src/stm32/stm32_gpio.c
index 33c4296aa6..3d849f96a6 100755
--- a/arch/arm/src/stm32/stm32_gpio.c
+++ b/arch/arm/src/stm32/stm32_gpio.c
@@ -40,6 +40,7 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 #include <debug.h>
+#include <arch/irq.h>
 
 #include "up_arch.h"
 #include "chip.h"