diff --git a/boards/cuav/nora/src/CMakeLists.txt b/boards/cuav/nora/src/CMakeLists.txt
index 24ea41f174..2c040010bd 100644
--- a/boards/cuav/nora/src/CMakeLists.txt
+++ b/boards/cuav/nora/src/CMakeLists.txt
@@ -41,7 +41,7 @@ if("${PX4_BOARD_LABEL}" STREQUAL  "bootloader")
 			nuttx_drivers
 			bootloader
 	)
-	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader)
+	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader/common)
 
 else()
 	add_library(drivers_board
diff --git a/boards/cuav/x7pro/src/CMakeLists.txt b/boards/cuav/x7pro/src/CMakeLists.txt
index 24ea41f174..2c040010bd 100644
--- a/boards/cuav/x7pro/src/CMakeLists.txt
+++ b/boards/cuav/x7pro/src/CMakeLists.txt
@@ -41,7 +41,7 @@ if("${PX4_BOARD_LABEL}" STREQUAL  "bootloader")
 			nuttx_drivers
 			bootloader
 	)
-	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader)
+	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader/common)
 
 else()
 	add_library(drivers_board
diff --git a/boards/cubepilot/cubeorange/src/CMakeLists.txt b/boards/cubepilot/cubeorange/src/CMakeLists.txt
index 0c034edc6b..eacffd5702 100644
--- a/boards/cubepilot/cubeorange/src/CMakeLists.txt
+++ b/boards/cubepilot/cubeorange/src/CMakeLists.txt
@@ -41,7 +41,7 @@ if("${PX4_BOARD_LABEL}" STREQUAL  "bootloader")
 			nuttx_drivers
 			bootloader
 	)
-	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader)
+	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader/common)
 
 else()
 	add_library(drivers_board
diff --git a/boards/holybro/durandal-v1/src/CMakeLists.txt b/boards/holybro/durandal-v1/src/CMakeLists.txt
index 2be96b170d..8eec4e70c6 100644
--- a/boards/holybro/durandal-v1/src/CMakeLists.txt
+++ b/boards/holybro/durandal-v1/src/CMakeLists.txt
@@ -41,7 +41,7 @@ if("${PX4_BOARD_LABEL}" STREQUAL  "bootloader")
 			nuttx_drivers # sdio
 			bootloader
 	)
-	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader)
+	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader/common)
 
 else()
 	add_library(drivers_board
diff --git a/boards/mro/ctrl-zero-h7-oem/src/CMakeLists.txt b/boards/mro/ctrl-zero-h7-oem/src/CMakeLists.txt
index 8e734c6fca..822841a74a 100644
--- a/boards/mro/ctrl-zero-h7-oem/src/CMakeLists.txt
+++ b/boards/mro/ctrl-zero-h7-oem/src/CMakeLists.txt
@@ -41,7 +41,7 @@ if("${PX4_BOARD_LABEL}" STREQUAL  "bootloader")
 			nuttx_drivers
 			bootloader
 	)
-	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader)
+	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader/common)
 
 else()
 	add_library(drivers_board
diff --git a/boards/mro/ctrl-zero-h7/src/CMakeLists.txt b/boards/mro/ctrl-zero-h7/src/CMakeLists.txt
index 8e734c6fca..822841a74a 100644
--- a/boards/mro/ctrl-zero-h7/src/CMakeLists.txt
+++ b/boards/mro/ctrl-zero-h7/src/CMakeLists.txt
@@ -41,7 +41,7 @@ if("${PX4_BOARD_LABEL}" STREQUAL  "bootloader")
 			nuttx_drivers
 			bootloader
 	)
-	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader)
+	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader/common)
 
 else()
 	add_library(drivers_board
diff --git a/boards/mro/pixracerpro/src/CMakeLists.txt b/boards/mro/pixracerpro/src/CMakeLists.txt
index 0c034edc6b..eacffd5702 100644
--- a/boards/mro/pixracerpro/src/CMakeLists.txt
+++ b/boards/mro/pixracerpro/src/CMakeLists.txt
@@ -41,7 +41,7 @@ if("${PX4_BOARD_LABEL}" STREQUAL  "bootloader")
 			nuttx_drivers
 			bootloader
 	)
-	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader)
+	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader/common)
 
 else()
 	add_library(drivers_board
diff --git a/boards/px4/fmu-v6u/src/CMakeLists.txt b/boards/px4/fmu-v6u/src/CMakeLists.txt
index 2e4206dc4a..7ff9cdf5f5 100644
--- a/boards/px4/fmu-v6u/src/CMakeLists.txt
+++ b/boards/px4/fmu-v6u/src/CMakeLists.txt
@@ -41,7 +41,7 @@ if("${PX4_BOARD_LABEL}" STREQUAL  "bootloader")
 			nuttx_drivers # sdio
 			bootloader
 	)
-	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader)
+	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader/common)
 
 else()
 	add_library(drivers_board
diff --git a/boards/px4/fmu-v6x/src/CMakeLists.txt b/boards/px4/fmu-v6x/src/CMakeLists.txt
index 2e4206dc4a..7ff9cdf5f5 100644
--- a/boards/px4/fmu-v6x/src/CMakeLists.txt
+++ b/boards/px4/fmu-v6x/src/CMakeLists.txt
@@ -41,7 +41,7 @@ if("${PX4_BOARD_LABEL}" STREQUAL  "bootloader")
 			nuttx_drivers # sdio
 			bootloader
 	)
-	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader)
+	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader/common)
 
 else()
 	add_library(drivers_board