diff --git a/firmware/common/Makefile_inc.mk b/firmware/common/Makefile_inc.mk
index 2118fa61..80f834d9 100644
--- a/firmware/common/Makefile_inc.mk
+++ b/firmware/common/Makefile_inc.mk
@@ -29,7 +29,7 @@
 #BOARD ?= JELLYBEAN
 BOARD ?= JAWBREAKER
 
-HACKRF_OPTS = -D$(BOARD) -DLPC43XX
+HACKRF_OPTS = -D$(BOARD) -DLPC43XX -DLPC43XX_M4
 
 # comment to disable RF transmission
 HACKRF_OPTS += -DTX_ENABLE
diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c
index fdf10249..a175ea3d 100644
--- a/firmware/hackrf_usb/hackrf_usb.c
+++ b/firmware/hackrf_usb/hackrf_usb.c
@@ -24,7 +24,7 @@
 
 #include <libopencm3/lpc43xx/cgu.h>
 #include <libopencm3/lpc43xx/gpio.h>
-#include <libopencm3/lpc43xx/nvic.h>
+#include <libopencm3/lpc43xx/m4/nvic.h>
 #include <libopencm3/lpc43xx/sgpio.h>
 
 #include <hackrf_core.h>
diff --git a/firmware/hackrf_usb/usb.c b/firmware/hackrf_usb/usb.c
index c647fb7e..8396e1bf 100644
--- a/firmware/hackrf_usb/usb.c
+++ b/firmware/hackrf_usb/usb.c
@@ -27,7 +27,7 @@
 #include "usb_standard_request.h"
 
 #include <libopencm3/lpc43xx/creg.h>
-#include <libopencm3/lpc43xx/nvic.h>
+#include <libopencm3/lpc43xx/m4/nvic.h>
 #include <libopencm3/lpc43xx/rgu.h>
 #include <libopencm3/lpc43xx/usb.h>
 
diff --git a/firmware/libopencm3 b/firmware/libopencm3
index 59474cf6..7d095fe5 160000
--- a/firmware/libopencm3
+++ b/firmware/libopencm3
@@ -1 +1 @@
-Subproject commit 59474cf648721ed7c8cd284aabce67940b0e60a4
+Subproject commit 7d095fe5f48b12b781a2d2d3849a18d95b8e2b24