diff --git a/platforms/nuttx/src/px4/nxp/imxrt/board_hw_info/CMakeLists.txt b/platforms/nuttx/src/px4/nxp/imxrt/board_hw_info/CMakeLists.txt
index f926bf71b0..cc1563990c 100644
--- a/platforms/nuttx/src/px4/nxp/imxrt/board_hw_info/CMakeLists.txt
+++ b/platforms/nuttx/src/px4/nxp/imxrt/board_hw_info/CMakeLists.txt
@@ -34,4 +34,4 @@
 px4_add_library(arch_board_hw_info
 	board_hw_rev_ver.c
 )
-target_link_libraries(arch_board_hw_info PRIVATE arch_adc systemlib)
\ No newline at end of file
+target_link_libraries(arch_board_hw_info PRIVATE arch_adc crc)
\ No newline at end of file
diff --git a/platforms/nuttx/src/px4/nxp/imxrt/board_hw_info/board_hw_rev_ver.c b/platforms/nuttx/src/px4/nxp/imxrt/board_hw_info/board_hw_rev_ver.c
index 45aea44bd3..e22dddbd7d 100644
--- a/platforms/nuttx/src/px4/nxp/imxrt/board_hw_info/board_hw_rev_ver.c
+++ b/platforms/nuttx/src/px4/nxp/imxrt/board_hw_info/board_hw_rev_ver.c
@@ -47,8 +47,8 @@
 #include <fcntl.h>
 #include <board_config.h>
 
-#include <systemlib/crc.h>
-#include <systemlib/px4_macros.h>
+#include <lib/crc/crc.h>
+#include <lib/systemlib/px4_macros.h>
 
 #if defined(BOARD_HAS_HW_VERSIONING)