diff --git a/platforms/nuttx/src/px4/stm/stm32f1/CMakeLists.txt b/platforms/nuttx/src/px4/stm/stm32f1/CMakeLists.txt
index ead07409b1a..65766e3d23d 100644
--- a/platforms/nuttx/src/px4/stm/stm32f1/CMakeLists.txt
+++ b/platforms/nuttx/src/px4/stm/stm32f1/CMakeLists.txt
@@ -31,6 +31,8 @@
 #
 ############################################################################
 
-
 add_subdirectory(../stm32_common/io_pins io_pins)
 add_subdirectory(../stm32_common/hrt hrt)
+add_subdirectory(../stm32_common/board_critmon board_critmon)
+add_subdirectory(../stm32_common/board_reset board_reset)
+add_subdirectory(../stm32_common/version version)
diff --git a/src/drivers/uavcan/libuavcan b/src/drivers/uavcan/libuavcan
index 6174b8c10a2..0c6ed108f5b 160000
--- a/src/drivers/uavcan/libuavcan
+++ b/src/drivers/uavcan/libuavcan
@@ -1 +1 @@
-Subproject commit 6174b8c10a2dbf47076ca7a7b5820a4c36c8a988
+Subproject commit 0c6ed108f5bd13efb02d1a233f236439fa5de8b2
diff --git a/src/drivers/uavcan/uavcan_drivers/kinetis/driver/src/internal.hpp b/src/drivers/uavcan/uavcan_drivers/kinetis/driver/src/internal.hpp
index 3e5bf18a44f..f71de5627d2 100644
--- a/src/drivers/uavcan/uavcan_drivers/kinetis/driver/src/internal.hpp
+++ b/src/drivers/uavcan/uavcan_drivers/kinetis/driver/src/internal.hpp
@@ -11,8 +11,8 @@
 # include <nuttx/arch.h>
 # include "up_arch.h"
 # include <arch/board/board.h>
-# include <chip/kinetis_pit.h>
-# include <chip/kinetis_sim.h>
+# include <hardware/kinetis_pit.h>
+# include <hardware/kinetis_sim.h>
 # include <syslog.h>
 #else
 # error "Unknown OS"
diff --git a/src/drivers/uavcan/uavcan_drivers/stm32/driver/src/internal.hpp b/src/drivers/uavcan/uavcan_drivers/stm32/driver/src/internal.hpp
index bc3350ccbd1..1b1c9b10740 100644
--- a/src/drivers/uavcan/uavcan_drivers/stm32/driver/src/internal.hpp
+++ b/src/drivers/uavcan/uavcan_drivers/stm32/driver/src/internal.hpp
@@ -9,7 +9,7 @@
 #if UAVCAN_STM32_NUTTX
 # include <nuttx/arch.h>
 # include <arch/board/board.h>
-# include <chip/stm32_tim.h>
+# include <hardware/stm32_tim.h>
 # include <syslog.h>
 #else
 # error "Unknown OS"