src/platforms/common: move to platforms/common

Script to update include paths: for i in $(grep -rl 'include <px4_work_queue' src platforms); do sed -i 's/#include <px4_work_queue/#include <px4_platform_common\/px4_work_queue/' $i; done
PX4 · Aug 30, 2019 · f8e0441 · f8e0441
1 parent 5d0e720
commit f8e0441
Show file tree

Hide file tree

Showing 124 changed files with 91 additions and 91 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -463,7 +463,7 @@ include(px4_add_library)
 add_subdirectory(src/lib EXCLUDE_FROM_ALL)
 
 add_subdirectory(platforms/${PX4_PLATFORM}/src/px4)
-add_subdirectory(src/platforms EXCLUDE_FROM_ALL)
+add_subdirectory(platforms EXCLUDE_FROM_ALL)
 add_subdirectory(src/modules/uORB EXCLUDE_FROM_ALL) # TODO: platform layer
 add_subdirectory(src/drivers/boards EXCLUDE_FROM_ALL)
 

diff --git a/cmake/px4_add_common_flags.cmake b/cmake/px4_add_common_flags.cmake
@@ -184,7 +184,6 @@ function(px4_add_common_flags)
 		${PX4_SOURCE_DIR}/src/lib/matrix
 		${PX4_SOURCE_DIR}/src/modules
 		${PX4_SOURCE_DIR}/src/platforms
-		${PX4_SOURCE_DIR}/src/platforms/common
 		)
 
 	add_definitions(

diff --git a/src/platforms/CMakeLists.txt → platforms/CMakeLists.txt b/src/platforms/CMakeLists.txt → platforms/CMakeLists.txt
@@ -33,3 +33,4 @@
 
 add_subdirectory(common)
 
+
diff --git a/src/platforms/common/CMakeLists.txt → platforms/common/CMakeLists.txt b/src/platforms/common/CMakeLists.txt → platforms/common/CMakeLists.txt
diff --git a/...mmon/px4_work_queue/ScheduledWorkItem.hpp → ...mmon/px4_work_queue/ScheduledWorkItem.hpp b/...mmon/px4_work_queue/ScheduledWorkItem.hpp → ...mmon/px4_work_queue/ScheduledWorkItem.hpp
diff --git a/...tforms/common/px4_work_queue/WorkItem.hpp → ...atform_common/px4_work_queue/WorkItem.hpp b/...tforms/common/px4_work_queue/WorkItem.hpp → ...atform_common/px4_work_queue/WorkItem.hpp
diff --git a/...forms/common/px4_work_queue/WorkQueue.hpp → ...tform_common/px4_work_queue/WorkQueue.hpp b/...forms/common/px4_work_queue/WorkQueue.hpp → ...tform_common/px4_work_queue/WorkQueue.hpp
diff --git a/...ommon/px4_work_queue/WorkQueueManager.hpp → ...ommon/px4_work_queue/WorkQueueManager.hpp b/...ommon/px4_work_queue/WorkQueueManager.hpp → ...ommon/px4_work_queue/WorkQueueManager.hpp
diff --git a/src/platforms/common/module.cpp → platforms/common/module.cpp b/src/platforms/common/module.cpp → platforms/common/module.cpp
diff --git a/src/platforms/common/px4_cli.cpp → platforms/common/px4_cli.cpp b/src/platforms/common/px4_cli.cpp → platforms/common/px4_cli.cpp
diff --git a/src/platforms/common/px4_getopt.c → platforms/common/px4_getopt.c b/src/platforms/common/px4_getopt.c → platforms/common/px4_getopt.c
diff --git a/src/platforms/common/px4_log.c → platforms/common/px4_log.c b/src/platforms/common/px4_log.c → platforms/common/px4_log.c
diff --git a/...orms/common/px4_work_queue/CMakeLists.txt → ...orms/common/px4_work_queue/CMakeLists.txt b/...orms/common/px4_work_queue/CMakeLists.txt → ...orms/common/px4_work_queue/CMakeLists.txt
diff --git a/...mmon/px4_work_queue/ScheduledWorkItem.cpp → ...mmon/px4_work_queue/ScheduledWorkItem.cpp b/...mmon/px4_work_queue/ScheduledWorkItem.cpp → ...mmon/px4_work_queue/ScheduledWorkItem.cpp
@@ -31,7 +31,7 @@
  *
  ****************************************************************************/
 
-#include "ScheduledWorkItem.hpp"
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 namespace px4
 {

diff --git a/...tforms/common/px4_work_queue/WorkItem.cpp → platforms/common/px4_work_queue/WorkItem.cpp b/...tforms/common/px4_work_queue/WorkItem.cpp → platforms/common/px4_work_queue/WorkItem.cpp
@@ -31,10 +31,10 @@
  *
  ****************************************************************************/
 
-#include "WorkItem.hpp"
+#include <px4_platform_common/px4_work_queue/WorkItem.hpp>
 
-#include "WorkQueue.hpp"
-#include "WorkQueueManager.hpp"
+#include <px4_platform_common/px4_work_queue/WorkQueue.hpp>
+#include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
 
 #include <px4_log.h>
 #include <drivers/drv_hrt.h>

diff --git a/...forms/common/px4_work_queue/WorkQueue.cpp → ...forms/common/px4_work_queue/WorkQueue.cpp b/...forms/common/px4_work_queue/WorkQueue.cpp → ...forms/common/px4_work_queue/WorkQueue.cpp
@@ -31,8 +31,8 @@
  *
  ****************************************************************************/
 
-#include "WorkQueue.hpp"
-#include "WorkItem.hpp"
+#include <px4_platform_common/px4_work_queue/WorkQueue.hpp>
+#include <px4_platform_common/px4_work_queue/WorkItem.hpp>
 
 #include <string.h>
 

diff --git a/...ommon/px4_work_queue/WorkQueueManager.cpp → ...ommon/px4_work_queue/WorkQueueManager.cpp b/...ommon/px4_work_queue/WorkQueueManager.cpp → ...ommon/px4_work_queue/WorkQueueManager.cpp
@@ -31,9 +31,9 @@
  *
  ****************************************************************************/
 
-#include "WorkQueueManager.hpp"
+#include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
 
-#include "WorkQueue.hpp"
+#include <px4_platform_common/px4_work_queue/WorkQueue.hpp>
 
 #include <drivers/drv_hrt.h>
 #include <px4_posix.h>

diff --git a/...common/px4_work_queue/test/CMakeLists.txt → ...common/px4_work_queue/test/CMakeLists.txt b/...common/px4_work_queue/test/CMakeLists.txt → ...common/px4_work_queue/test/CMakeLists.txt
diff --git a/...ommon/px4_work_queue/test/wqueue_main.cpp → ...ommon/px4_work_queue/test/wqueue_main.cpp b/...ommon/px4_work_queue/test/wqueue_main.cpp → ...ommon/px4_work_queue/test/wqueue_main.cpp
diff --git a/...work_queue/test/wqueue_scheduled_test.cpp → ...work_queue/test/wqueue_scheduled_test.cpp b/...work_queue/test/wqueue_scheduled_test.cpp → ...work_queue/test/wqueue_scheduled_test.cpp
diff --git a/...4_work_queue/test/wqueue_scheduled_test.h → ...4_work_queue/test/wqueue_scheduled_test.h b/...4_work_queue/test/wqueue_scheduled_test.h → ...4_work_queue/test/wqueue_scheduled_test.h
@@ -34,7 +34,7 @@
 #pragma once
 
 #include <px4_app.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <string.h>
 
 using namespace px4;

diff --git a/...mmon/px4_work_queue/test/wqueue_start.cpp → ...mmon/px4_work_queue/test/wqueue_start.cpp b/...mmon/px4_work_queue/test/wqueue_start.cpp → ...mmon/px4_work_queue/test/wqueue_start.cpp
diff --git a/...ommon/px4_work_queue/test/wqueue_test.cpp → ...ommon/px4_work_queue/test/wqueue_test.cpp b/...ommon/px4_work_queue/test/wqueue_test.cpp → ...ommon/px4_work_queue/test/wqueue_test.cpp
diff --git a/.../common/px4_work_queue/test/wqueue_test.h → .../common/px4_work_queue/test/wqueue_test.h b/.../common/px4_work_queue/test/wqueue_test.h → .../common/px4_work_queue/test/wqueue_test.h
@@ -34,7 +34,7 @@
 #pragma once
 
 #include <px4_app.h>
-#include <px4_work_queue/WorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/WorkItem.hpp>
 #include <string.h>
 
 using namespace px4;

diff --git a/src/platforms/common/shutdown.cpp → platforms/common/shutdown.cpp b/src/platforms/common/shutdown.cpp → platforms/common/shutdown.cpp
diff --git a/...latforms/common/work_queue/CMakeLists.txt → platforms/common/work_queue/CMakeLists.txt b/...latforms/common/work_queue/CMakeLists.txt → platforms/common/work_queue/CMakeLists.txt
diff --git a/src/platforms/common/work_queue/dq_addlast.c → platforms/common/work_queue/dq_addlast.c b/src/platforms/common/work_queue/dq_addlast.c → platforms/common/work_queue/dq_addlast.c
diff --git a/src/platforms/common/work_queue/dq_rem.c → platforms/common/work_queue/dq_rem.c b/src/platforms/common/work_queue/dq_rem.c → platforms/common/work_queue/dq_rem.c
diff --git a/...platforms/common/work_queue/dq_remfirst.c → platforms/common/work_queue/dq_remfirst.c b/...platforms/common/work_queue/dq_remfirst.c → platforms/common/work_queue/dq_remfirst.c
diff --git a/src/platforms/common/work_queue/hrt_queue.c → platforms/common/work_queue/hrt_queue.c b/src/platforms/common/work_queue/hrt_queue.c → platforms/common/work_queue/hrt_queue.c
diff --git a/src/platforms/common/work_queue/hrt_thread.c → platforms/common/work_queue/hrt_thread.c b/src/platforms/common/work_queue/hrt_thread.c → platforms/common/work_queue/hrt_thread.c
diff --git a/...forms/common/work_queue/hrt_work_cancel.c → ...forms/common/work_queue/hrt_work_cancel.c b/...forms/common/work_queue/hrt_work_cancel.c → ...forms/common/work_queue/hrt_work_cancel.c
diff --git a/src/platforms/common/work_queue/queue.c → platforms/common/work_queue/queue.c b/src/platforms/common/work_queue/queue.c → platforms/common/work_queue/queue.c
diff --git a/...platforms/common/work_queue/sq_addafter.c → platforms/common/work_queue/sq_addafter.c b/...platforms/common/work_queue/sq_addafter.c → platforms/common/work_queue/sq_addafter.c
diff --git a/src/platforms/common/work_queue/sq_addlast.c → platforms/common/work_queue/sq_addlast.c b/src/platforms/common/work_queue/sq_addlast.c → platforms/common/work_queue/sq_addlast.c
diff --git a/...platforms/common/work_queue/sq_remfirst.c → platforms/common/work_queue/sq_remfirst.c b/...platforms/common/work_queue/sq_remfirst.c → platforms/common/work_queue/sq_remfirst.c
diff --git a/...platforms/common/work_queue/work_cancel.c → platforms/common/work_queue/work_cancel.c b/...platforms/common/work_queue/work_cancel.c → platforms/common/work_queue/work_cancel.c
diff --git a/src/platforms/common/work_queue/work_lock.c → platforms/common/work_queue/work_lock.c b/src/platforms/common/work_queue/work_lock.c → platforms/common/work_queue/work_lock.c
diff --git a/src/platforms/common/work_queue/work_lock.h → platforms/common/work_queue/work_lock.h b/src/platforms/common/work_queue/work_lock.h → platforms/common/work_queue/work_lock.h
diff --git a/src/platforms/common/work_queue/work_queue.c → platforms/common/work_queue/work_queue.c b/src/platforms/common/work_queue/work_queue.c → platforms/common/work_queue/work_queue.c
diff --git a/...platforms/common/work_queue/work_thread.c → platforms/common/work_queue/work_thread.c b/...platforms/common/work_queue/work_thread.c → platforms/common/work_queue/work_thread.c
diff --git a/...mon/work_queue/wqueue_test/CMakeLists.txt → ...mon/work_queue/wqueue_test/CMakeLists.txt b/...mon/work_queue/wqueue_test/CMakeLists.txt → ...mon/work_queue/wqueue_test/CMakeLists.txt
diff --git a/...on/work_queue/wqueue_test/wqueue_main.cpp → ...on/work_queue/wqueue_test/wqueue_main.cpp b/...on/work_queue/wqueue_test/wqueue_main.cpp → ...on/work_queue/wqueue_test/wqueue_main.cpp
diff --git a/..._queue/wqueue_test/wqueue_start_posix.cpp → ..._queue/wqueue_test/wqueue_start_posix.cpp b/..._queue/wqueue_test/wqueue_start_posix.cpp → ..._queue/wqueue_test/wqueue_start_posix.cpp
diff --git a/...on/work_queue/wqueue_test/wqueue_test.cpp → ...on/work_queue/wqueue_test/wqueue_test.cpp b/...on/work_queue/wqueue_test/wqueue_test.cpp → ...on/work_queue/wqueue_test/wqueue_test.cpp
diff --git a/...mmon/work_queue/wqueue_test/wqueue_test.h → ...mmon/work_queue/wqueue_test/wqueue_test.h b/...mmon/work_queue/wqueue_test/wqueue_test.h → ...mmon/work_queue/wqueue_test/wqueue_test.h
diff --git a/platforms/nuttx/src/px4/common/px4_init.cpp b/platforms/nuttx/src/px4/common/px4_init.cpp
@@ -38,7 +38,7 @@
 #include <px4_defines.h>
 #include <drivers/drv_hrt.h>
 #include <lib/parameters/param.h>
-#include <px4_work_queue/WorkQueueManager.hpp>
+#include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
 #include <systemlib/cpuload.h>
 
 #include <fcntl.h>

diff --git a/platforms/posix/src/px4/common/px4_init.cpp b/platforms/posix/src/px4/common/px4_init.cpp
@@ -37,7 +37,7 @@
 #include <px4_defines.h>
 #include <drivers/drv_hrt.h>
 #include <lib/parameters/param.h>
-#include <px4_work_queue/WorkQueueManager.hpp>
+#include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
 
 int px4_platform_init(void)
 {

diff --git a/platforms/qurt/src/px4/common/px4_init.cpp b/platforms/qurt/src/px4/common/px4_init.cpp
@@ -37,7 +37,7 @@
 #include <px4_defines.h>
 #include <drivers/drv_hrt.h>
 #include <lib/parameters/param.h>
-#include <px4_work_queue/WorkQueueManager.hpp>
+#include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
 
 int px4_platform_init(void)
 {

diff --git a/src/drivers/adc/adc.cpp b/src/drivers/adc/adc.cpp
@@ -45,7 +45,7 @@
 #include <px4_arch/adc.h>
 #include <px4_config.h>
 #include <px4_log.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Publication.hpp>
 #include <uORB/topics/adc_report.h>
 #include <uORB/topics/system_power.h>

diff --git a/src/drivers/barometer/bmp280/bmp280.h b/src/drivers/barometer/bmp280/bmp280.h
@@ -50,7 +50,7 @@
 #include <perf/perf_counter.h>
 #include <px4_config.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #include "board_config.h"
 

diff --git a/src/drivers/barometer/lps22hb/LPS22HB.hpp b/src/drivers/barometer/lps22hb/LPS22HB.hpp
@@ -42,7 +42,7 @@
 #include <lib/cdev/CDev.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>
 

diff --git a/src/drivers/barometer/lps25h/lps25h.h b/src/drivers/barometer/lps25h/lps25h.h
@@ -49,7 +49,7 @@
 #include <lib/cdev/CDev.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>
 

diff --git a/src/drivers/barometer/mpl3115a2/mpl3115a2.h b/src/drivers/barometer/mpl3115a2/mpl3115a2.h
@@ -68,7 +68,7 @@
 #include <px4_defines.h>
 #include <px4_getopt.h>
 #include <px4_log.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 
 #include "board_config.h"

diff --git a/src/drivers/barometer/ms5611/ms5611.h b/src/drivers/barometer/ms5611/ms5611.h
@@ -49,7 +49,7 @@
 #include <lib/cdev/CDev.hpp>
 #include <lib/perf/perf_counter.h>
 #include <platforms/px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>
 

diff --git a/src/drivers/batt_smbus/batt_smbus.h b/src/drivers/batt_smbus/batt_smbus.h
@@ -49,7 +49,7 @@
 #include <perf/perf_counter.h>
 #include <platforms/px4_module.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/battery_status.h>
 
 #include "board_config.h"

diff --git a/src/drivers/camera_capture/camera_capture.hpp b/src/drivers/camera_capture/camera_capture.hpp
@@ -48,7 +48,7 @@
 #include <px4_module.h>
 #include <px4_tasks.h>
 #include <px4_workqueue.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Publication.hpp>
 #include <uORB/PublicationQueued.hpp>
 #include <uORB/Subscription.hpp>

diff --git a/src/drivers/camera_trigger/camera_trigger.cpp b/src/drivers/camera_trigger/camera_trigger.cpp
@@ -50,7 +50,7 @@
 #include <poll.h>
 #include <mathlib/mathlib.h>
 #include <matrix/math.hpp>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <parameters/param.h>
 #include <systemlib/mavlink_log.h>

diff --git a/src/drivers/distance_sensor/cm8jl65/cm8jl65.cpp b/src/drivers/distance_sensor/cm8jl65/cm8jl65.cpp
@@ -45,7 +45,7 @@
 #include <px4_cli.h>
 #include <px4_config.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>

diff --git a/src/drivers/distance_sensor/leddar_one/leddar_one.cpp b/src/drivers/distance_sensor/leddar_one/leddar_one.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 #include <px4_config.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <px4_getopt.h>
 #include <px4_defines.h>
 #include <px4_module.h>

diff --git a/src/drivers/distance_sensor/ll40ls/LidarLiteI2C.h b/src/drivers/distance_sensor/ll40ls/LidarLiteI2C.h
@@ -42,7 +42,7 @@
 
 #include "LidarLite.h"
 
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #include <drivers/device/i2c.h>
 

diff --git a/src/drivers/distance_sensor/ll40ls/LidarLitePWM.h b/src/drivers/distance_sensor/ll40ls/LidarLitePWM.h
@@ -45,7 +45,7 @@
 
 #include "LidarLite.h"
 
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/pwm_input.h>
 
 class LidarLitePWM : public LidarLite, public px4::ScheduledWorkItem

diff --git a/src/drivers/distance_sensor/mappydot/MappyDot.cpp b/src/drivers/distance_sensor/mappydot/MappyDot.cpp
@@ -47,7 +47,7 @@
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
 #include <px4_module_params.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/distance_sensor.h>
 
 /* MappyDot Registers */

diff --git a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
@@ -63,7 +63,7 @@
 #include <px4_config.h>
 #include <px4_getopt.h>
 #include <px4_module_params.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/uORB.h>
 #include <uORB/topics/distance_sensor.h>
 

diff --git a/src/drivers/distance_sensor/sf0x/sf0x.cpp b/src/drivers/distance_sensor/sf0x/sf0x.cpp
@@ -41,7 +41,7 @@
 
 #include <px4_config.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #include <sys/types.h>
 #include <stdint.h>

diff --git a/src/drivers/distance_sensor/sf1xx/sf1xx.cpp b/src/drivers/distance_sensor/sf1xx/sf1xx.cpp
@@ -44,7 +44,7 @@
 #include <px4_config.h>
 #include <px4_defines.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <px4_module.h>
 
 #include <drivers/device/i2c.h>

diff --git a/src/drivers/distance_sensor/srf02/srf02.cpp b/src/drivers/distance_sensor/srf02/srf02.cpp
@@ -40,7 +40,7 @@
 #include <px4_config.h>
 #include <px4_defines.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <containers/Array.hpp>
 
 #include <drivers/device/i2c.h>

diff --git a/src/drivers/distance_sensor/teraranger/teraranger.cpp b/src/drivers/distance_sensor/teraranger/teraranger.cpp
@@ -41,7 +41,7 @@
 #include <px4_config.h>
 #include <px4_defines.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <px4_module.h>
 
 #include <drivers/device/i2c.h>

diff --git a/src/drivers/distance_sensor/tfmini/tfmini.cpp b/src/drivers/distance_sensor/tfmini/tfmini.cpp
@@ -66,7 +66,7 @@
 #include <px4_config.h>
 #include <px4_getopt.h>
 #include <px4_module.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>
 #include <uORB/topics/distance_sensor.h>

diff --git a/src/drivers/distance_sensor/ulanding/ulanding.cpp b/src/drivers/distance_sensor/ulanding/ulanding.cpp
@@ -63,7 +63,7 @@
 #include <px4_defines.h>
 #include <px4_getopt.h>
 #include <px4_workqueue.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/topics/distance_sensor.h>
 #include <uORB/uORB.h>

diff --git a/src/drivers/distance_sensor/vl53lxx/vl53lxx.cpp b/src/drivers/distance_sensor/vl53lxx/vl53lxx.cpp
@@ -48,7 +48,7 @@
 #include <drivers/drv_range_finder.h>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/distance_sensor.h>
 
 /* Configuration Constants */

diff --git a/src/drivers/heater/heater.h b/src/drivers/heater/heater.h
@@ -45,7 +45,7 @@
 #include <px4_getopt.h>
 #include <px4_module.h>
 #include <px4_module_params.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/parameter_update.h>
 #include <uORB/topics/sensor_accel.h>

diff --git a/src/drivers/imu/adis16448/ADIS16448.h b/src/drivers/imu/adis16448/ADIS16448.h
@@ -50,7 +50,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <lib/drivers/magnetometer/PX4Magnetometer.hpp>
 #include <perf/perf_counter.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 using namespace time_literals;
 

diff --git a/src/drivers/imu/adis16477/ADIS16477.hpp b/src/drivers/imu/adis16477/ADIS16477.hpp
@@ -45,7 +45,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 class ADIS16477 : public device::SPI, public px4::ScheduledWorkItem
 {

diff --git a/src/drivers/imu/adis16497/ADIS16497.hpp b/src/drivers/imu/adis16497/ADIS16497.hpp
@@ -45,7 +45,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 // TODO : This is a copy of the NuttX CRC32 table
 static constexpr uint32_t crc32_tab[] = {

diff --git a/src/drivers/imu/bma180/bma180.cpp b/src/drivers/imu/bma180/bma180.cpp
@@ -57,7 +57,7 @@
 #include <perf/perf_counter.h>
 #include <systemlib/err.h>
 #include <nuttx/arch.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <nuttx/clock.h>
 
 #include <drivers/drv_hrt.h>
@@ -66,7 +66,7 @@
 #include <drivers/device/spi.h>
 #include <drivers/drv_accel.h>
 #include <drivers/device/ringbuffer.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #define ACCEL_DEVICE_PATH	"/dev/bma180"
 

diff --git a/src/drivers/imu/bmi055/BMI055.hpp b/src/drivers/imu/bmi055/BMI055.hpp
@@ -37,7 +37,7 @@
 #include <ecl/geo/geo.h>
 #include <lib/perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #define DIR_READ                0x80
 #define DIR_WRITE               0x00

diff --git a/src/drivers/imu/bmi088/BMI088.hpp b/src/drivers/imu/bmi088/BMI088.hpp
@@ -38,7 +38,7 @@
 #include <lib/conversion/rotation.h>
 #include <lib/perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #define DIR_READ                0x80
 #define DIR_WRITE               0x00

diff --git a/src/drivers/imu/bmi160/bmi160.hpp b/src/drivers/imu/bmi160/bmi160.hpp
@@ -40,7 +40,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/conversions.h>
 
 #define DIR_READ                0x80