diff --git a/buttons.h b/buttons.h
index 78a0fe24f..58b718801 100644
--- a/buttons.h
+++ b/buttons.h
@@ -20,7 +20,7 @@
 #ifndef __BUTTONS_H__
 #define __BUTTONS_H__
 
-#include <libopencm3/stm32/f2/gpio.h>
+#include <libopencm3/stm32/gpio.h>
 
 struct buttonState {
 	volatile bool YesUp;
diff --git a/firmware/storage.c b/firmware/storage.c
index 4b1d1f499..a3a00c847 100644
--- a/firmware/storage.c
+++ b/firmware/storage.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdint.h>
 
-#include <libopencm3/stm32/f2/flash.h>
+#include <libopencm3/stm32/flash.h>
 
 #include "messages.pb.h"
 #include "storage.pb.h"
diff --git a/memory.c b/memory.c
index c82f9cf36..5dcc8bd46 100644
--- a/memory.c
+++ b/memory.c
@@ -17,7 +17,7 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/f2/flash.h>
+#include <libopencm3/stm32/flash.h>
 #include <stdint.h>
 #include "memory.h"
 #include "sha2.h"
diff --git a/oled.c b/oled.c
index d207a1419..a62b3c519 100644
--- a/oled.c
+++ b/oled.c
@@ -17,8 +17,8 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/f2/gpio.h>
-#include <libopencm3/stm32/f2/spi.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/spi.h>
 
 #include <string.h>
 
diff --git a/rng.c b/rng.c
index 7bf275ac3..787739f4a 100644
--- a/rng.c
+++ b/rng.c
@@ -17,6 +17,8 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/stm32/f2/rng.h>
 
 #include "rng.h"
diff --git a/setup.c b/setup.c
index 310d86bf0..340bb20aa 100644
--- a/setup.c
+++ b/setup.c
@@ -17,9 +17,9 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/f2/rcc.h>
-#include <libopencm3/stm32/f2/gpio.h>
-#include <libopencm3/stm32/f2/spi.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/spi.h>
 #include <libopencm3/stm32/f2/rng.h>
 
 void setup(void)