diff --git a/sw/airborne/arch/stm32/mcu_arch.c b/sw/airborne/arch/stm32/mcu_arch.c
index dfdfd500b0..e59f2cb077 100644
--- a/sw/airborne/arch/stm32/mcu_arch.c
+++ b/sw/airborne/arch/stm32/mcu_arch.c
@@ -30,7 +30,7 @@
 #include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/stm32/f1/flash.h>
-#include <libopencm3/stm32/f1/scb.h>
+#include <libopencm3/cm3/scb.h>
 
 void mcu_arch_init(void) {
 #if LUFTBOOT
diff --git a/sw/airborne/arch/stm32/mcu_periph/adc_arch.c b/sw/airborne/arch/stm32/mcu_periph/adc_arch.c
index 84bcf37315..1af5b12f20 100644
--- a/sw/airborne/arch/stm32/mcu_periph/adc_arch.c
+++ b/sw/airborne/arch/stm32/mcu_periph/adc_arch.c
@@ -88,14 +88,12 @@
 #include <libopencm3/stm32/f1/adc.h>
 #include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/timer.h>
-#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/f1/nvic.h>
 #include <string.h>
 #include "std.h"
 #include "led.h"
 #include BOARD_CONFIG
 
-void adc1_2_isr(void);
-
 volatile uint8_t adc_new_data_trigger;
 
 /* Static functions */
diff --git a/sw/airborne/arch/stm32/mcu_periph/i2c_arch.c b/sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
index af0bdb13ea..9a96ea6038 100644
--- a/sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
+++ b/sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
@@ -2,8 +2,8 @@
 
 #include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/stm32/f1/gpio.h>
-#include <libopencm3/stm32/f1/scb.h>
-#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/cm3/scb.h>
+#include <libopencm3/stm32/f1/nvic.h>
 
 //#define I2C_DEBUG_LED
 
@@ -172,13 +172,6 @@ static inline void __enable_irq(void)   { asm volatile ("cpsie i"); }
 #define __I2C_REG_CRITICAL_ZONE_START	__disable_irq();
 #define __I2C_REG_CRITICAL_ZONE_STOP	__enable_irq();
 
-/* Interrupt service routine forward declarations. */
-/* XXX: This should be somehow integrated into libopencm3. */
-void i2c1_ev_isr(void);
-void i2c1_er_isr(void);
-void i2c2_ev_isr(void);
-void i2c2_er_isr(void);
-
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
 
diff --git a/sw/airborne/arch/stm32/mcu_periph/spi_arch.c b/sw/airborne/arch/stm32/mcu_periph/spi_arch.c
index 3d4fdac2c3..5a5ea8482a 100644
--- a/sw/airborne/arch/stm32/mcu_periph/spi_arch.c
+++ b/sw/airborne/arch/stm32/mcu_periph/spi_arch.c
@@ -25,7 +25,7 @@
  * Handling of SPI hardware for STM32.
  */
 
-#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/f1/nvic.h>
 #include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/stm32/exti.h>
diff --git a/sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c b/sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
index ebd1e9872a..7b2b35ce40 100644
--- a/sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
+++ b/sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
@@ -28,7 +28,7 @@
 
 #include "mcu_periph/sys_time.h"
 
-#include "libopencm3/stm32/systick.h"
+#include "libopencm3/cm3/systick.h"
 
 #ifdef SYS_TIME_LED
 #include "led.h"
diff --git a/sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h b/sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
index 9432cb2909..205cb6aeed 100644
--- a/sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
+++ b/sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
@@ -34,7 +34,7 @@
 
 #include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/f1/rcc.h>
-#include <libopencm3/stm32/systick.h>
+#include <libopencm3/cm3/systick.h>
 #include "std.h"
 
 extern void sys_tick_handler(void);
diff --git a/sw/airborne/arch/stm32/mcu_periph/uart_arch.c b/sw/airborne/arch/stm32/mcu_periph/uart_arch.c
index 75eddfd531..906ee8deea 100644
--- a/sw/airborne/arch/stm32/mcu_periph/uart_arch.c
+++ b/sw/airborne/arch/stm32/mcu_periph/uart_arch.c
@@ -23,7 +23,7 @@
 
 #include "mcu_periph/uart.h"
 
-#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/f1/nvic.h>
 #include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/stm32/f1/gpio.h>
diff --git a/sw/airborne/arch/stm32/mcu_periph/uart_arch.h b/sw/airborne/arch/stm32/mcu_periph/uart_arch.h
index a6f537f04c..a2448121c8 100644
--- a/sw/airborne/arch/stm32/mcu_periph/uart_arch.h
+++ b/sw/airborne/arch/stm32/mcu_periph/uart_arch.h
@@ -37,20 +37,4 @@
 #define B57600   57600
 #define B115200 115200
 
-#if defined USE_UART1 || OVERRIDE_UART1_IRQ_HANDLER
-extern void usart1_isr(void);
-#endif
-
-#if defined USE_UART2 || OVERRIDE_UART2_IRQ_HANDLER
-extern void usart2_isr(void);
-#endif
-
-#if defined USE_UART3 || OVERRIDE_UART3_IRQ_HANDLER
-extern void usart3_isr(void);
-#endif
-
-#if defined USE_UART5 || OVERRIDE_UART5_IRQ_HANDLER
-extern void uart5_isr(void);
-#endif
-
 #endif /* STM32_UART_ARCH_H */
diff --git a/sw/airborne/arch/stm32/peripherals/hmc5843_arch.c b/sw/airborne/arch/stm32/peripherals/hmc5843_arch.c
index a9b131a846..e258c418b8 100644
--- a/sw/airborne/arch/stm32/peripherals/hmc5843_arch.c
+++ b/sw/airborne/arch/stm32/peripherals/hmc5843_arch.c
@@ -28,8 +28,6 @@
 #include <libopencm3/stm32/exti.h>
 #include "mcu_periph/i2c.h"
 
-void exti9_5_isr(void);
-
 void hmc5843_arch_init( void ) {
   /* configure external interrupt exti5 on PB5( mag int ) */
 
diff --git a/sw/airborne/arch/stm32/peripherals/max1168_arch.c b/sw/airborne/arch/stm32/peripherals/max1168_arch.c
index 1cbef0bb0e..f61eb0bc96 100644
--- a/sw/airborne/arch/stm32/peripherals/max1168_arch.c
+++ b/sw/airborne/arch/stm32/peripherals/max1168_arch.c
@@ -23,9 +23,7 @@
 #include "libopencm3/stm32/f1/rcc.h"
 #include "libopencm3/stm32/f1/gpio.h"
 #include "libopencm3/stm32/exti.h"
-#include "libopencm3/stm32/nvic.h"
-
-void exti2_isr(void);
+#include "libopencm3/stm32/f1/nvic.h"
 
 void max1168_arch_init( void ) {
 
diff --git a/sw/airborne/arch/stm32/subsystems/imu/imu_aspirin_arch.c b/sw/airborne/arch/stm32/subsystems/imu/imu_aspirin_arch.c
index 92d2127ef2..4911f2747e 100644
--- a/sw/airborne/arch/stm32/subsystems/imu/imu_aspirin_arch.c
+++ b/sw/airborne/arch/stm32/subsystems/imu/imu_aspirin_arch.c
@@ -5,18 +5,10 @@
 #include <libopencm3/stm32/exti.h>
 #include <libopencm3/stm32/spi.h>
 #include <libopencm3/stm32/f1/dma.h>
-#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/f1/nvic.h>
 
 #include "mcu_periph/i2c.h"
 
-/* gyro int handler */
-void exti15_10_isr(void);
-/* mag int handler  */
-void exti9_5_isr(void);
-/* accelerometer int handler */
-void exti2_isr(void);
-/* dma1 channel 4 int handler */
-void dma1_channel4_isr(void);
 /* accelerometer SPI selection */
 #define Adxl345Unselect() GPIOB_BSRR = GPIO12
 #define Adxl345Select()   GPIOB_BRR = GPIO12
diff --git a/sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c b/sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
index 9eedd70281..f09b17d6fe 100644
--- a/sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
+++ b/sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
@@ -27,7 +27,7 @@
 #include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/timer.h>
-#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/f1/nvic.h>
 
 #include "mcu_periph/sys_time.h"
 
@@ -57,8 +57,6 @@ static uint32_t timer_rollover_cnt;
 #define PPM_GPIO_PORT		GPIOA
 #define PPM_GPIO_PIN		GPIO1
 
-void tim2_isr(void);
-
 #elif defined USE_TIM1_IRQ
 
 #pragma message "Using PPM input on UART1_RX pin!"
@@ -75,9 +73,6 @@ void tim2_isr(void);
 #define PPM_GPIO_PORT		GPIOA
 #define PPM_GPIO_PIN		GPIO10
 
-void tim1_up_isr(void);
-void tim1_cc_isr(void);
-
 #endif
 
 void ppm_arch_init ( void ) {
diff --git a/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c b/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
index ab4269a204..de2e1637c9 100644
--- a/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
+++ b/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
@@ -24,16 +24,13 @@
 #include <stdint.h>
 #include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/f1/rcc.h>
-#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/f1/nvic.h>
 #include <libopencm3/stm32/timer.h>
 #include <libopencm3/stm32/usart.h>
 #include "subsystems/radio_control.h"
 #include "subsystems/radio_control/spektrum_arch.h"
 #include "mcu_periph/uart.h"
 
-/* XXX: this should be declared in some libopencm3 header */
-void tim6_isr(void);
-
 #define SPEKTRUM_CHANNELS_PER_FRAME 7
 #define MAX_SPEKTRUM_FRAMES 2
 #define MAX_SPEKTRUM_CHANNELS 16
diff --git a/sw/airborne/lisa/test/lisa_test_adxl345.c b/sw/airborne/lisa/test/lisa_test_adxl345.c
index c7e6b77519..8568efe4e3 100644
--- a/sw/airborne/lisa/test/lisa_test_adxl345.c
+++ b/sw/airborne/lisa/test/lisa_test_adxl345.c
@@ -47,8 +47,6 @@ static inline void main_event_task( void );
 
 static inline void main_init_hw(void);
 
-void exti2_isr(void);
-
 int main(void) {
   main_init();
 
diff --git a/sw/airborne/lisa/test/lisa_test_adxl345_dma.c b/sw/airborne/lisa/test/lisa_test_adxl345_dma.c
index 895cf2f04c..b8196cd95d 100644
--- a/sw/airborne/lisa/test/lisa_test_adxl345_dma.c
+++ b/sw/airborne/lisa/test/lisa_test_adxl345_dma.c
@@ -42,9 +42,6 @@ static inline void main_event_task( void );
 
 static inline void main_init_hw(void);
 
-void exti2_isr(void);
-void dma1_channel4_isr(void);
-
 int main(void) {
   main_init();
 
diff --git a/sw/airborne/lisa/test/lisa_test_hmc5843.c b/sw/airborne/lisa/test/lisa_test_hmc5843.c
index 38d85caecc..a7f616db66 100644
--- a/sw/airborne/lisa/test/lisa_test_hmc5843.c
+++ b/sw/airborne/lisa/test/lisa_test_hmc5843.c
@@ -60,9 +60,6 @@ static uint8_t mag_state = 0;
 static volatile uint8_t mag_ready_for_read = FALSE;
 static uint8_t reading_mag = FALSE;
 
-extern void exti9_5_isr(void);
-
-
 int main(void) {
   main_init();
 
diff --git a/sw/airborne/lisa/test/lisa_test_itg3200.c b/sw/airborne/lisa/test/lisa_test_itg3200.c
index ccebfd903e..fa9569a6c6 100644
--- a/sw/airborne/lisa/test/lisa_test_itg3200.c
+++ b/sw/airborne/lisa/test/lisa_test_itg3200.c
@@ -57,9 +57,6 @@ static uint8_t gyro_state = 0;
 static volatile uint8_t gyro_ready_for_read = FALSE;
 static uint8_t reading_gyro = FALSE;
 
-void exti15_10_isr(void);
-
-
 int main(void) {
   main_init();
 
diff --git a/sw/airborne/subsystems/imu/imu_aspirin.h b/sw/airborne/subsystems/imu/imu_aspirin.h
index 7cc0554c7d..b368fbf875 100644
--- a/sw/airborne/subsystems/imu/imu_aspirin.h
+++ b/sw/airborne/subsystems/imu/imu_aspirin.h
@@ -192,9 +192,6 @@ static inline void accel_copy_spi(void)
   VECT3_ASSIGN(imu.accel_unscaled, ax, ay, az);
 }
 
-// FIXME, remove stm32 specific stuff here
-void i2c2_er_isr(void);
-
 static inline void imu_aspirin_event(void (* _gyro_handler)(void), void (* _accel_handler)(void), void (* _mag_handler)(void))
 {
   if (imu_aspirin.status == AspirinStatusUninit) return;