diff --git a/cmake/cmake_hexagon b/cmake/cmake_hexagon
index eb1d242e57b..60b23cc6622 160000
--- a/cmake/cmake_hexagon
+++ b/cmake/cmake_hexagon
@@ -1 +1 @@
-Subproject commit eb1d242e57b34a28ba4b8ab4c04901bd85540d07
+Subproject commit 60b23cc66225628e33b40a9058b3451d92c047eb
diff --git a/cmake/configs/posix_bebop_default.cmake b/cmake/configs/posix_bebop_default.cmake
index b2af23166d6..206fd9d53a4 100644
--- a/cmake/configs/posix_bebop_default.cmake
+++ b/cmake/configs/posix_bebop_default.cmake
@@ -4,8 +4,8 @@ set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-
 
 add_definitions(
   -D__PX4_POSIX_BEBOP
-  -D__LINUX
-  -D__BEBOP
+  -D__DF_LINUX
+  -D__DF_BEBOP
 	)
 
 set(CMAKE_PROGRAM_PATH
diff --git a/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake b/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake
index 681a338d27a..38679de71c9 100644
--- a/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake
+++ b/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake
@@ -56,7 +56,7 @@ foreach(tool echo grep rm mkdir nm cp touch make unzip)
 endforeach()
 
 add_definitions(
-	-D __RPI
+	-D __DF_RPI
 	)
 
 # where is the target environment
diff --git a/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake b/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake
index 4806222740d..aa85ceeca57 100644
--- a/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake
+++ b/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake
@@ -71,7 +71,7 @@ foreach(tool echo grep rm mkdir nm cp touch make unzip)
 endforeach()
 
 add_definitions(
-	-D __RPI
+	-D __DF_RPI
 	)
 
 set(LINKER_FLAGS "-Wl,-gc-sections")
diff --git a/src/lib/DriverFramework b/src/lib/DriverFramework
index d3bbb32d401..b7800e508ea 160000
--- a/src/lib/DriverFramework
+++ b/src/lib/DriverFramework
@@ -1 +1 @@
-Subproject commit d3bbb32d4013b520fede0f88fee71f6e17121062
+Subproject commit b7800e508ea817ca877e4526989946da4d5b1292
diff --git a/src/platforms/posix/px4_layer/drv_hrt.c b/src/platforms/posix/px4_layer/drv_hrt.c
index b7f90297153..8f7b99592db 100644
--- a/src/platforms/posix/px4_layer/drv_hrt.c
+++ b/src/platforms/posix/px4_layer/drv_hrt.c
@@ -118,7 +118,7 @@ int px4_clock_settime(clockid_t clk_id, struct timespec *tp)
 	return 0;
 }
 
-#elif defined(__QURT)
+#elif defined(__PX4_QURT)
 
 #include "dspal_time.h"