src/platforms: move all headers to platforms/common/include/px4_platform_common

and remove the px4_ prefix, except for px4_config.h.

command to update includes:
for k in app.h atomic.h cli.h console_buffer.h defines.h getopt.h i2c.h init.h log.h micro_hal.h module.h module_params.h param.h param_macros.h posix.h sem.h sem.hpp shmem.h shutdown.h tasks.h time.h workqueue.h; do for i in $(grep -rl 'include <px4_'$k src platforms boards); do sed -i 's/#include <px4_'$k'/#include <px4_platform_common\/'$k/ $i; done; done
for in $(grep -rl 'include <px4_config.h' src platforms boards); do sed -i 's/#include <px4_config.h/#include <px4_platform_common\/px4_config.h'/ $i; done

Transitional headers for submodules are added (px4_{defines,log,time}.h)

src/modules/airspeed_selector/airspeed_selector_main.cpp

@@ -36,8 +36,8 @@
 #include <matrix/math.hpp>
 #include <parameters/param.h>
 #include <perf/perf_counter.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <lib/airspeed/airspeed.h>
 #include <AirspeedValidator.hpp>

src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp

@@ -47,9 +47,9 @@
 #include <lib/mathlib/mathlib.h>
 #include <lib/parameters/param.h>
 #include <matrix/math.hpp>
-#include <px4_config.h>
-#include <px4_posix.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/tasks.h>
 #include <uORB/Publication.hpp>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/parameter_update.h>

src/modules/battery_status/battery_status.cpp

@@ -41,14 +41,14 @@
  * @author Beat Küng <beat-kueng@gmx.net>
  */
 
-#include <px4_config.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
-#include <px4_getopt.h>
-#include <px4_posix.h>
-#include <px4_tasks.h>
-#include <px4_time.h>
-#include <px4_log.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/time.h>
+#include <px4_platform_common/log.h>
 #include <lib/mathlib/mathlib.h>
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_adc.h>

src/modules/battery_status/parameters.cpp

@@ -39,7 +39,7 @@
 
 #include "parameters.h"
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 namespace battery_status
 {

src/modules/battery_status/parameters.h

@@ -40,7 +40,7 @@
  *
  * @author Beat Kueng <beat-kueng@gmx.net>
  */
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <drivers/drv_rc_input.h>
 
 #include <parameters/param.h>

src/modules/camera_feedback/camera_feedback.hpp

@@ -48,10 +48,10 @@
 #include <systemlib/err.h>
 #include <parameters/param.h>
 
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_tasks.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/posix.h>
 #include <drivers/drv_hrt.h>
 
 #include <uORB/uORB.h>

src/modules/commander/Commander.cpp

@@ -67,12 +67,12 @@
 #include <lib/ecl/geo/geo.h>
 #include <mathlib/mathlib.h>
 #include <navigator/navigation.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_posix.h>
-#include <px4_shutdown.h>
-#include <px4_tasks.h>
-#include <px4_time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/shutdown.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/time.h>
 #include <circuit_breaker/circuit_breaker.h>
 #include <systemlib/mavlink_log.h>
 

src/modules/commander/Commander.hpp

@@ -39,8 +39,8 @@
 
 #include <lib/controllib/blocks.hpp>
 #include <lib/mathlib/mathlib.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
 #include <lib/hysteresis/hysteresis.h>
 
 // publications

src/modules/commander/accelerometer_calibration.cpp

@@ -127,9 +127,9 @@
 #include "calibration_routines.h"
 #include "commander_helper.h"
 
-#include <px4_defines.h>
-#include <px4_posix.h>
-#include <px4_time.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/time.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <poll.h>

src/modules/commander/airspeed_calibration.cpp

@@ -41,9 +41,9 @@
 #include "calibration_routines.h"
 #include "commander_helper.h"
 
-#include <px4_defines.h>
-#include <px4_posix.h>
-#include <px4_time.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/time.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>

src/modules/commander/arm_auth.cpp

@@ -35,8 +35,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <px4_defines.h>
-#include <px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <systemlib/mavlink_log.h>
 #include <uORB/PublicationQueued.hpp>

src/modules/commander/baro_calibration.cpp

@@ -41,7 +41,7 @@
 #include <poll.h>
 #include <math.h>
 #include <fcntl.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <drivers/drv_hrt.h>
 #include <uORB/topics/sensor_combined.h>
 #include <drivers/drv_baro.h>

src/modules/commander/calibration_routines.cpp

@@ -38,9 +38,9 @@
  * @author Lorenz Meier <lm@inf.ethz.ch>
  */
 
-#include <px4_defines.h>
-#include <px4_posix.h>
-#include <px4_time.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/time.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <math.h>

src/modules/commander/commander_helper.cpp

@@ -41,8 +41,8 @@
  *
  */
 
-#include <px4_defines.h>
-#include <px4_posix.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdint.h>

src/modules/commander/esc_calibration.cpp

@@ -45,9 +45,9 @@
 
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_pwm_output.h>
-#include <px4_defines.h>
-#include <px4_posix.h>
-#include <px4_time.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/time.h>
 #include <systemlib/mavlink_log.h>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/battery_status.h>

src/modules/commander/failure_detector/FailureDetector.hpp

@@ -45,7 +45,7 @@
 
 #include <matrix/matrix/math.hpp>
 #include <mathlib/mathlib.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <hysteresis/hysteresis.h>
 
 // subscriptions

src/modules/commander/failure_detector/failure_detector_params.c

@@ -39,7 +39,7 @@
  * @author Mathieu Bresciani <brescianimathieu@gmail.com>
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <parameters/param.h>
 
 /**

src/modules/commander/gyro_calibration.cpp

@@ -37,15 +37,15 @@
  * Gyroscope calibration routine
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include "gyro_calibration.h"
 #include "calibration_messages.h"
 #include "calibration_routines.h"
 #include "commander_helper.h"
 
-#include <px4_posix.h>
-#include <px4_defines.h>
-#include <px4_time.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/time.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>

src/modules/commander/health_flag_helper.h

@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 #include <uORB/topics/vehicle_status.h>
 
 void set_health_flags(uint64_t subsystem_type, bool present, bool enabled, bool ok, vehicle_status_s &status);

src/modules/commander/mag_calibration.cpp

@@ -42,9 +42,9 @@
 #include "calibration_routines.h"
 #include "calibration_messages.h"
 
-#include <px4_defines.h>
-#include <px4_posix.h>
-#include <px4_time.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/time.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>

src/modules/commander/rc_calibration.cpp

@@ -36,9 +36,9 @@
  * Remote Control calibration routine
  */
 
-#include <px4_posix.h>
-#include <px4_time.h>
-#include <px4_defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/time.h>
+#include <px4_platform_common/defines.h>
 
 #include "rc_calibration.h"
 #include "commander_helper.h"

src/modules/commander/rc_check.cpp

@@ -39,8 +39,8 @@
 
 #include "rc_check.h"
 
-#include <px4_config.h>
-#include <px4_time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/time.h>
 
 #include <stdio.h>
 #include <unistd.h>

src/modules/commander/state_machine_helper.cpp

@@ -39,7 +39,7 @@
  * @author Julian Oes		<julian@oes.ch>
  * @author Sander Smeets	<sander@droneslab.com>
  */
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <uORB/topics/vehicle_command.h>
 #include <uORB/topics/vehicle_command_ack.h>
 #include <uORB/topics/vehicle_status.h>

src/modules/dataman/dataman.cpp

@@ -41,12 +41,12 @@
  * @author David Sidrane
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_module.h>
-#include <px4_posix.h>
-#include <px4_tasks.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/getopt.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>

src/modules/ekf2/ekf2_main.cpp

@@ -44,12 +44,12 @@
 #include <lib/ecl/EKF/ekf.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/perf/perf_counter.h>
-#include <px4_defines.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
-#include <px4_posix.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
+#include <px4_platform_common/posix.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
-#include <px4_time.h>
+#include <px4_platform_common/time.h>
 #include <uORB/Publication.hpp>
 #include <uORB/PublicationMulti.hpp>
 #include <uORB/Subscription.hpp>

src/modules/events/events_params.c

@@ -37,7 +37,7 @@
  * Parameters defined by the events module.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <parameters/param.h>
 
 /**

src/modules/events/rc_loss_alarm.cpp

@@ -38,7 +38,7 @@
 
 #include "rc_loss_alarm.h"
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #include <drivers/drv_hrt.h>
 #include <stdint.h>

src/modules/events/send_event.cpp

@@ -36,8 +36,8 @@
 
 #include <math.h>
 
-#include <px4_getopt.h>
-#include <px4_log.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/log.h>
 #include <drivers/drv_hrt.h>
 
 namespace events

src/modules/events/send_event.h

@@ -37,9 +37,9 @@
 #include "status_display.h"
 #include "rc_loss_alarm.h"
 
-#include <px4_workqueue.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/workqueue.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
 #include <uORB/PublicationQueued.hpp>
 #include <uORB/topics/vehicle_command.h>
 #include <uORB/topics/vehicle_command_ack.h>

src/modules/events/subscriber_handler.cpp

@@ -1,7 +1,7 @@
 
 #include "subscriber_handler.h"
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 namespace events
 {

src/modules/events/temperature_calibration/common.h

@@ -40,7 +40,7 @@
 #define TC_DEBUG(fmt, ...)
 #endif
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 #include <mathlib/mathlib.h>
 
 #include "polyfit.hpp"

src/modules/events/temperature_calibration/polyfit.hpp

@@ -88,11 +88,11 @@ Author: Siddharth Bharat Purohit
 */
 
 #pragma once
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_tasks.h>
-#include <px4_posix.h>
-#include <px4_time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/modules/events/temperature_calibration/task.cpp

@@ -42,9 +42,9 @@
 #include <uORB/PublicationQueued.hpp>
 #include <uORB/topics/sensor_gyro.h>
 #include <mathlib/mathlib.h>
-#include <px4_log.h>
-#include <px4_posix.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/tasks.h>
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_led.h>
 

src/modules/fw_att_control/FixedwingAttitudeControl.hpp

@@ -41,13 +41,13 @@
 #include <lib/parameters/param.h>
 #include <lib/perf/perf_counter.h>
 #include <matrix/math.hpp>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/tasks.h>
 #include <px4_platform_common/px4_work_queue/WorkItem.hpp>
-#include <px4_posix.h>
-#include <px4_tasks.h>
 #include <uORB/Publication.hpp>
 #include <uORB/PublicationMulti.hpp>
 #include <uORB/Subscription.hpp>

src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp

@@ -60,11 +60,11 @@
 #include <lib/landing_slope/Landingslope.hpp>
 #include <lib/mathlib/mathlib.h>
 #include <lib/perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
+#include <px4_platform_common/posix.h>
 #include <px4_platform_common/px4_work_queue/WorkItem.hpp>
 #include <uORB/Publication.hpp>
 #include <uORB/Subscription.hpp>

src/modules/fw_pos_control_l1/launchdetection/CatapultLaunchMethod.cpp

@@ -41,7 +41,7 @@
 
 #include "CatapultLaunchMethod.h"
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 namespace launchdetection
 {

src/modules/fw_pos_control_l1/launchdetection/CatapultLaunchMethod.h

@@ -44,7 +44,7 @@
 #include "LaunchMethod.h"
 
 #include <drivers/drv_hrt.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 
 namespace launchdetection
 {

src/modules/fw_pos_control_l1/launchdetection/LaunchDetector.cpp

@@ -40,7 +40,7 @@
 #include "CatapultLaunchMethod.h"
 #include "LaunchDetector.h"
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 namespace launchdetection
 {

src/modules/fw_pos_control_l1/launchdetection/LaunchDetector.h

@@ -42,7 +42,7 @@
 #define LAUNCHDETECTOR_H
 
 #include "LaunchMethod.h"
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 
 namespace launchdetection
 {

src/modules/fw_pos_control_l1/runway_takeoff/RunwayTakeoff.h

@@ -46,7 +46,7 @@
 #include <math.h>
 
 #include <drivers/drv_hrt.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <systemlib/mavlink_log.h>
 #include <mathlib/mathlib.h>
 #include <matrix/math.hpp>

src/modules/land_detector/LandDetector.h

@@ -46,12 +46,12 @@
 #include <lib/hysteresis/hysteresis.h>
 #include <math.h>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Subscription.hpp>
 #include <uORB/Publication.hpp>

src/modules/land_detector/land_detector_main.cpp

@@ -40,10 +40,10 @@
  */
 
 #include <drivers/drv_hrt.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_posix.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/tasks.h>
 
 #include "FixedwingLandDetector.h"
 #include "MulticopterLandDetector.h"

src/modules/landing_target_estimator/LandingTargetEstimator.cpp

@@ -39,8 +39,8 @@
  *
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
 #include <drivers/drv_hrt.h>
 
 #include "LandingTargetEstimator.h"

src/modules/landing_target_estimator/LandingTargetEstimator.h

@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include <px4_workqueue.h>
+#include <px4_platform_common/workqueue.h>
 #include <drivers/drv_hrt.h>
 #include <parameters/param.h>
 #include <uORB/Publication.hpp>

src/modules/landing_target_estimator/landing_target_estimator_main.cpp

@@ -40,10 +40,10 @@
  *
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_tasks.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/posix.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>

src/modules/load_mon/load_mon.cpp

@@ -41,10 +41,10 @@
 
 #include <drivers/drv_hrt.h>
 #include <lib/perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/cpuload.h>
 #include <uORB/Publication.hpp>

src/modules/local_position_estimator/BlockLocalPositionEstimator.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <px4_posix.h>
+#include <px4_platform_common/posix.h>
 #include <drivers/drv_hrt.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <controllib/blocks.hpp>
 #include <mathlib/mathlib.h>
 #include <lib/ecl/geo/geo.h>

src/modules/local_position_estimator/local_position_estimator_main.cpp

@@ -40,9 +40,9 @@
  * Local position estimator
  */
 
-#include <px4_log.h>
-#include <px4_module.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/tasks.h>
 
 #include "BlockLocalPositionEstimator.hpp"
 

src/modules/logger/log_writer_file.cpp

@@ -39,7 +39,7 @@
 #include <errno.h>
 
 #include <mathlib/mathlib.h>
-#include <px4_posix.h>
+#include <px4_platform_common/posix.h>
 #ifdef __PX4_NUTTX
 #include <systemlib/hardfault_log.h>
 #endif /* __PX4_NUTTX */

src/modules/logger/log_writer_file.h

@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <stdint.h>
 #include <pthread.h>
 #include <drivers/drv_hrt.h>

src/modules/logger/log_writer_mavlink.cpp

@@ -36,8 +36,8 @@
 
 #include <drivers/drv_hrt.h>
 #include <mathlib/mathlib.h>
-#include <px4_log.h>
-#include <px4_posix.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/posix.h>
 #include <cstring>
 
 namespace px4

src/modules/logger/logger.cpp

@@ -31,8 +31,8 @@
  *
  ****************************************************************************/
 
-#include <px4_config.h>
-#include <px4_console_buffer.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/console_buffer.h>
 #include "logger.h"
 #include "messages.h"
 #include "watchdog.h"
@@ -51,12 +51,12 @@
 
 #include <drivers/drv_hrt.h>
 #include <mathlib/math/Limits.hpp>
-#include <px4_getopt.h>
-#include <px4_log.h>
-#include <px4_posix.h>
-#include <px4_sem.h>
-#include <px4_shutdown.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/sem.h>
+#include <px4_platform_common/shutdown.h>
+#include <px4_platform_common/tasks.h>
 #include <systemlib/mavlink_log.h>
 #include <replay/definitions.hpp>
 #include <version/version.h>

src/modules/logger/logger.h

@@ -37,12 +37,12 @@
 #include "messages.h"
 #include <containers/Array.hpp>
 #include "util.h"
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <drivers/drv_hrt.h>
 #include <version/version.h>
 #include <parameters/param.h>
 #include <systemlib/printload.h>
-#include <px4_module.h>
+#include <px4_platform_common/module.h>
 
 #include <uORB/Subscription.hpp>
 #include <uORB/SubscriptionInterval.hpp>

src/modules/logger/util.cpp

@@ -43,8 +43,8 @@
 #include <uORB/topics/vehicle_gps_position.h>
 
 #include <drivers/drv_hrt.h>
-#include <px4_log.h>
-#include <px4_time.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/time.h>
 #include <systemlib/mavlink_log.h>
 
 #if defined(__PX4_DARWIN)

src/modules/logger/watchdog.cpp

@@ -33,7 +33,7 @@
 
 #include "watchdog.h"
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 #if defined(__PX4_NUTTX) && !defined(CONFIG_SCHED_INSTRUMENTATION)
 #  error watchdog support requires CONFIG_SCHED_INSTRUMENTATION

src/modules/mavlink/mavlink.c

@@ -38,7 +38,7 @@
  * @author Lorenz Meier <lorenz@px4.io>
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdbool.h>

src/modules/mavlink/mavlink_command_sender.cpp

@@ -39,7 +39,7 @@
  */
 
 #include "mavlink_command_sender.h"
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 #define CMD_DEBUG(FMT, ...) PX4_LOG_NAMED_COND("cmd sender", _debug_enabled, FMT, ##__VA_ARGS__)
 

src/modules/mavlink/mavlink_command_sender.h

@@ -40,8 +40,8 @@
 
 #pragma once
 
-#include <px4_tasks.h>
-#include <px4_sem.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/sem.h>
 #include <drivers/drv_hrt.h>
 
 #include <uORB/topics/vehicle_command.h>

src/modules/mavlink/mavlink_ftp.h

@@ -39,7 +39,7 @@
 #include <dirent.h>
 #include <queue.h>
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <systemlib/err.h>
 #include <drivers/drv_hrt.h>
 

src/modules/mavlink/mavlink_main.h

@@ -62,13 +62,13 @@
 #include <drivers/device/ringbuffer.h>
 #include <parameters/param.h>
 #include <perf/perf_counter.h>
-#include <px4_cli.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_getopt.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
-#include <px4_posix.h>
+#include <px4_platform_common/cli.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
+#include <px4_platform_common/posix.h>
 #include <systemlib/mavlink_log.h>
 #include <systemlib/uthash/utlist.h>
 #include <uORB/PublicationQueued.hpp>

src/modules/mavlink/mavlink_messages.cpp

@@ -51,7 +51,7 @@
 #include <lib/ecl/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/matrix/matrix/math.hpp>
-#include <px4_time.h>
+#include <px4_platform_common/time.h>
 #include <systemlib/mavlink_log.h>
 #include <math.h>
 

src/modules/mavlink/mavlink_mission.cpp

@@ -46,7 +46,7 @@
 #include <lib/ecl/geo/geo.h>
 #include <systemlib/err.h>
 #include <drivers/drv_hrt.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <mathlib/mathlib.h>
 #include <matrix/math.hpp>
 #include <navigator/navigation.h>

src/modules/mavlink/mavlink_receiver.h

@@ -47,7 +47,7 @@
 #include "mavlink_parameters.h"
 #include "mavlink_timesync.h"
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <uORB/Publication.hpp>
 #include <uORB/PublicationQueued.hpp>
 #include <uORB/PublicationMulti.hpp>

src/modules/mavlink/mavlink_shell.cpp

@@ -39,7 +39,7 @@
  */
 
 #include "mavlink_shell.h"
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #include <unistd.h>
 #include <errno.h>

src/modules/mavlink/mavlink_shell.h

@@ -41,7 +41,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/tasks.h>
 
 #pragma once
 

src/modules/mavlink/mavlink_simple_analyzer.cpp

@@ -41,8 +41,8 @@
 
 #include <float.h>
 
-#include <px4_log.h>
-#include <px4_defines.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/defines.h>
 
 SimpleAnalyzer::SimpleAnalyzer(Mode mode, float window) :
 	_window(window),

src/modules/mavlink/mavlink_stream.h

@@ -42,7 +42,7 @@
 #define MAVLINK_STREAM_H_
 
 #include <drivers/drv_hrt.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <containers/List.hpp>
 
 class Mavlink;

src/modules/mavlink/mavlink_ulog.cpp

@@ -39,7 +39,7 @@
  */
 
 #include "mavlink_ulog.h"
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 #include <errno.h>
 #include <mathlib/mathlib.h>
 

src/modules/mavlink/mavlink_ulog.h

@@ -42,8 +42,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <px4_tasks.h>
-#include <px4_sem.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/sem.h>
 #include <drivers/drv_hrt.h>
 
 #include <uORB/Publication.hpp>

src/modules/mc_att_control/RateControl/RateControl.cpp

@@ -36,7 +36,7 @@
  */
 
 #include <RateControl.hpp>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 using namespace matrix;
 

src/modules/mc_att_control/mc_att_control.hpp

@@ -34,11 +34,11 @@
 #include <lib/mixer/mixer.h>
 #include <matrix/matrix/math.hpp>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
+#include <px4_platform_common/posix.h>
 #include <px4_platform_common/px4_work_queue/WorkItem.hpp>
 #include <uORB/Publication.hpp>
 #include <uORB/PublicationMulti.hpp>

src/modules/mc_pos_control/PositionControl/ControlMath.cpp

@@ -37,7 +37,7 @@
  */
 
 #include "ControlMath.hpp"
-#include <platforms/px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <float.h>
 #include <mathlib/mathlib.h>
 

src/modules/mc_pos_control/PositionControl/ControlMathTest.cpp

@@ -33,7 +33,7 @@
 
 #include <gtest/gtest.h>
 #include <ControlMath.hpp>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 using namespace matrix;
 using namespace ControlMath;

src/modules/mc_pos_control/PositionControl/PositionControl.cpp

@@ -39,7 +39,7 @@
 #include <float.h>
 #include <mathlib/mathlib.h>
 #include <ControlMath.hpp>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 using namespace matrix;
 

src/modules/mc_pos_control/PositionControl/PositionControl.hpp

@@ -43,7 +43,7 @@
 #include <uORB/topics/vehicle_local_position.h>
 #include <uORB/topics/vehicle_local_position_setpoint.h>
 #include <uORB/topics/vehicle_constraints.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #pragma once
 
 struct PositionControlStates {

src/modules/mc_pos_control/mc_pos_control_main.cpp

@@ -45,13 +45,13 @@
 #include <lib/perf/perf_counter.h>
 #include <lib/systemlib/mavlink_log.h>
 #include <lib/WeatherVane/WeatherVane.hpp>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
-#include <px4_posix.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/tasks.h>
 #include <uORB/Publication.hpp>
 #include <uORB/PublicationQueued.hpp>
 #include <uORB/Subscription.hpp>

src/modules/micrortps_bridge/micrortps_client/microRTPS_client.h

@@ -41,11 +41,11 @@
 #include <termios.h>
 
 #include <ucdr/microcdr.h>
-#include <px4_config.h>
-#include <px4_getopt.h>
-#include <px4_posix.h>
-#include <px4_tasks.h>
-#include <px4_time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/time.h>
 #include <uORB/uORB.h>
 
 #define BUFFER_SIZE 1024

src/modules/micrortps_bridge/micrortps_client/microRTPS_client_dummy.cpp

@@ -30,9 +30,9 @@
  *
  ****************************************************************************/
 
-#include <px4_config.h>
-#include <px4_posix.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/tasks.h>
 
 #include <cstring>
 

src/modules/micrortps_bridge/micrortps_client/microRTPS_client_main.cpp

@@ -39,13 +39,13 @@
 #include <ctime>
 #include <termios.h>
 
-#include <px4_config.h>
-#include <px4_getopt.h>
-#include <px4_cli.h>
-#include <px4_module.h>
-#include <px4_posix.h>
-#include <px4_tasks.h>
-#include <px4_time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/cli.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/time.h>
 
 extern "C" __EXPORT int micrortps_client_main(int argc, char *argv[]);
 

src/modules/muorb/adsp/px4muorb.cpp

@@ -35,14 +35,14 @@
 #include "uORBFastRpcChannel.hpp"
 #include "uORBManager.hpp"
 
-#include <px4_tasks.h>
-#include <px4_posix.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/posix.h>
 #include <dspal_platform.h>
-#include "px4_log.h"
 #include "uORB/topics/sensor_combined.h"
 #include "uORB.h"
 #include <parameters/param.h>
-#include <shmem.h>
+#include <px4_platform_common/shmem.h>
+#include <px4_platform_common/log.h>
 
 __BEGIN_DECLS
 extern int dspal_main(int argc, char *argv[]);

src/modules/muorb/adsp/uORBFastRpcChannel.cpp

@@ -31,7 +31,7 @@
  *
  ****************************************************************************/
 #include "uORBFastRpcChannel.hpp"
-#include "px4_log.h"
+#include <px4_platform_common/log.h>
 #include <algorithm>
 #include <string.h>
 #include <drivers/drv_hrt.h>

src/modules/muorb/adsp/uORBFastRpcChannel.hpp

@@ -39,7 +39,7 @@
 #include "uORB/uORBCommunicator.hpp"
 #include <semaphore.h>
 #include <set>
-#include <px4_sem.h>
+#include <px4_platform_common/sem.h>
 
 namespace uORB
 {

src/modules/muorb/krait/px4muorb_KraitRpcWrapper.cpp

@@ -37,8 +37,8 @@
 #include "px4muorb_KraitRpcWrapper.hpp"
 #include <rpcmem.h>
 #include <px4muorb.h>
-#include "px4_log.h"
-#include <shmem.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/shmem.h>
 #include <drivers/drv_hrt.h>
 #include <string.h>
 

src/modules/muorb/krait/uORBKraitFastRpcChannel.cpp

@@ -32,8 +32,8 @@
  ****************************************************************************/
 
 #include "uORBKraitFastRpcChannel.hpp"
-#include "px4_log.h"
-#include "px4_tasks.h"
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/tasks.h>
 #include <drivers/drv_hrt.h>
 #include <cstdio>
 #include <pthread.h>

src/modules/muorb/test/muorb_test_example.cpp

@@ -39,10 +39,10 @@
  */
 
 #include "muorb_test_example.h"
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <uORB/Publication.hpp>
 #include <uORB/PublicationQueued.hpp>
 #include <uORB/Subscription.hpp>

src/modules/muorb/test/muorb_test_example.h

@@ -39,7 +39,7 @@
  */
 #pragma once
 
-#include <px4_app.h>
+#include <px4_platform_common/app.h>
 #include "uORB/topics/esc_status.h"
 #include "uORB/topics/vehicle_command.h"
 

src/modules/muorb/test/muorb_test_main.cpp

@@ -37,9 +37,9 @@
  *
  * @author Mark Charlebois <charlebm@gmail.com>
  */
-#include <px4_log.h>
-#include <px4_app.h>
-#include <px4_init.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/app.h>
+#include <px4_platform_common/init.h>
 #include "muorb_test_example.h"
 #include <stdio.h>
 #include "uORB/uORBManager.hpp"

src/modules/muorb/test/muorb_test_start_posix.cpp

@@ -38,9 +38,9 @@
  * @author Mark Charlebois <mcharleb@gmail.com>
  */
 #include "muorb_test_example.h"
-#include <px4_log.h>
-#include <px4_app.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/app.h>
+#include <px4_platform_common/tasks.h>
 #include <stdio.h>
 #include <string.h>
 #include <sched.h>

src/modules/navigator/datalinkloss.h

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 
 #include "navigator_mode.h"
 #include "mission_block.h"

src/modules/navigator/follow_target.h

@@ -46,7 +46,7 @@
 #include <mathlib/mathlib.h>
 #include <matrix/math.hpp>
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/follow_target.h>
 

src/modules/navigator/geofence.h

@@ -42,10 +42,10 @@
 
 #include <float.h>
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <drivers/drv_hrt.h>
 #include <lib/ecl/geo/geo.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/home_position.h>
 #include <uORB/topics/vehicle_global_position.h>

src/modules/navigator/gpsfailure.h

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 
 #include "mission_block.h"
 

src/modules/navigator/loiter.h

@@ -43,7 +43,7 @@
 #include "navigator_mode.h"
 #include "mission_block.h"
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 
 class Loiter : public MissionBlock, public ModuleParams
 {

src/modules/navigator/mission.h

@@ -52,7 +52,7 @@
 
 #include <dataman/dataman.h>
 #include <drivers/drv_hrt.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/home_position.h>
 #include <uORB/topics/mission.h>

src/modules/navigator/navigator.h

@@ -58,8 +58,8 @@
 #include "navigation.h"
 
 #include <lib/perf/perf_counter.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
 #include <uORB/PublicationQueued.hpp>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/geofence_result.h>

src/modules/navigator/navigator_main.cpp

@@ -52,10 +52,10 @@
 #include <drivers/drv_hrt.h>
 #include <lib/ecl/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_posix.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/tasks.h>
 #include <systemlib/mavlink_log.h>
 
 /**

src/modules/navigator/precland.h

@@ -42,7 +42,7 @@
 
 #include <matrix/math.hpp>
 #include <lib/ecl/geo/geo.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/landing_target_pose.h>
 

src/modules/navigator/rcloss.h

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 
 #include "navigator_mode.h"
 #include "mission_block.h"

src/modules/navigator/rtl.h

@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 
 #include "navigator_mode.h"
 #include "mission_block.h"

src/modules/px4iofirmware/adc.c

@@ -36,7 +36,7 @@
  *
  * Simple ADC support for PX4IO on STM32.
  */
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <stdint.h>
 
 #include <nuttx/arch.h>