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/lib/CollisionPrevention/CollisionPrevention.hpp

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

src/lib/FlightTasks/tasks/FlightTask/FlightTask.hpp

@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <drivers/drv_hrt.h>
 #include <matrix/matrix/math.hpp>
 #include <uORB/Subscription.hpp>

src/lib/FlightTasks/tasks/Utility/ManualSmoothingXY.cpp

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

src/lib/FlightTasks/tasks/Utility/ManualSmoothingXY.hpp

@@ -47,7 +47,7 @@
 
 #pragma once
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <matrix/matrix/math.hpp>
 
 class ManualSmoothingXY : public ModuleParams

src/lib/FlightTasks/tasks/Utility/ManualSmoothingZ.hpp

@@ -40,7 +40,7 @@
 
 #pragma once
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 
 /**
  * User-intention.

src/lib/FlightTasks/tasks/Utility/ObstacleAvoidance.hpp

@@ -41,8 +41,8 @@
 
 #pragma once
 
-#include <px4_defines.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/module_params.h>
 #include <commander/px4_custom_mode.h>
 #include <drivers/drv_hrt.h>
 

src/lib/FlightTasks/tasks/Utility/StraightLine.cpp

@@ -37,7 +37,7 @@
 
 #include "StraightLine.hpp"
 #include <mathlib/mathlib.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 using namespace matrix;
 

src/lib/WeatherVane/WeatherVane.hpp

@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <matrix/matrix/math.hpp>
 
 class WeatherVane : public ModuleParams

src/lib/airspeed/airspeed.cpp

@@ -42,7 +42,7 @@
 
 #include "airspeed.h"
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <lib/ecl/geo/geo.h>
 
 /**

src/lib/battery/battery.cpp

@@ -42,7 +42,7 @@
 #include "battery.h"
 #include <mathlib/mathlib.h>
 #include <cstring>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 Battery::Battery() :
 	ModuleParams(nullptr),

src/lib/battery/battery.h

@@ -43,7 +43,7 @@
 
 #include <uORB/topics/battery_status.h>
 #include <drivers/drv_hrt.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 
 
 class Battery : public ModuleParams

src/lib/battery/battery_params.c

@@ -39,7 +39,7 @@
  * @author Julian Oes <julian@oes.ch>
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <parameters/param.h>
 
 /**

src/lib/cdev/CDev.cpp

@@ -41,7 +41,7 @@
 
 #include <cstring>
 
-#include <px4_posix.h>
+#include <px4_platform_common/posix.h>
 #include <drivers/drv_device.h>
 
 namespace cdev

src/lib/cdev/CDev.hpp

@@ -40,8 +40,8 @@
 #ifndef _CDEV_HPP
 #define _CDEV_HPP
 
-#include <px4_config.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/posix.h>
 
 #ifdef __PX4_NUTTX
 #include "nuttx/cdev_platform.hpp"

src/lib/cdev/nuttx/cdev_platform.cpp

@@ -39,7 +39,7 @@
 #include "cdev_platform.hpp"
 #include "../CDev.hpp"
 
-#include "px4_posix.h"
+#include <px4_platform_common/posix.h>
 #include "drivers/drv_device.h"
 #include <sys/ioctl.h>
 

src/lib/cdev/nuttx/cdev_platform.hpp

@@ -5,7 +5,7 @@
 
 #include <nuttx/arch.h>
 
-#include <px4_micro_hal.h>
+#include <px4_platform_common/micro_hal.h>
 
 #define ATOMIC_ENTER irqstate_t flags = px4_enter_critical_section()
 #define ATOMIC_LEAVE px4_leave_critical_section(flags)

src/lib/cdev/posix/cdev_platform.cpp

@@ -40,9 +40,9 @@
 #include "vfile.h"
 #include "../CDev.hpp"
 
-#include <px4_log.h>
-#include <px4_posix.h>
-#include <px4_time.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/time.h>
 
 #include "DevMgr.hpp"
 

src/lib/cdev/test/cdevtest_example.cpp

@@ -41,8 +41,8 @@
 
 #include "cdevtest_example.h"
 
-#include <px4_tasks.h>
-#include <px4_time.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/time.h>
 #include <drivers/drv_device.h>
 #include <lib/cdev/CDev.hpp>
 #include <unistd.h>

src/lib/cdev/test/cdevtest_example.h

@@ -39,7 +39,7 @@
  */
 #pragma once
 
-#include <px4_app.h>
+#include <px4_platform_common/app.h>
 
 class CDevNode;
 

src/lib/cdev/test/cdevtest_main.cpp

@@ -39,8 +39,8 @@
  */
 #include "cdevtest_example.h"
 
-#include <px4_app.h>
-#include <px4_init.h>
+#include <px4_platform_common/app.h>
+#include <px4_platform_common/init.h>
 #include <stdio.h>
 
 int PX4_MAIN(int argc, char **argv)

src/lib/cdev/test/cdevtest_start.cpp

@@ -39,8 +39,8 @@
  */
 #include "cdevtest_example.h"
 
-#include <px4_app.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/app.h>
+#include <px4_platform_common/tasks.h>
 #include <stdio.h>
 #include <string.h>
 

src/lib/circuit_breaker/circuit_breaker.cpp

@@ -45,7 +45,7 @@
 #include "circuit_breaker.h"
 
 #include <stdint.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 bool circuit_breaker_enabled(const char *breaker, int32_t magic)
 {

src/lib/controllib/BlockDelay.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockDerivative.hpp

@@ -41,7 +41,7 @@
 
 #include "BlockLowPass.hpp"
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <math.h>
 
 #include "block/Block.hpp"

src/lib/controllib/BlockHighPass.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockIntegralTrap.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockLimit.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockLimitSym.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockLowPass.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockLowPass2.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockLowPassVector.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockOutput.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockP.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockPD.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockPI.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockPID.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockRandGauss.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockRandUniform.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/BlockStats.hpp

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <assert.h>
 #include <time.h>
 #include <stdlib.h>

src/lib/controllib/block/BlockParam.hpp

@@ -42,7 +42,7 @@
 #include "Block.hpp"
 
 #include <containers/List.hpp>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <parameters/param.h>
 
 namespace control

src/lib/conversion/rotation.cpp

@@ -37,7 +37,7 @@
  * Vector rotation library
  */
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include "math.h"
 #include "rotation.h"
 

src/lib/drivers/accelerometer/PX4Accelerometer.hpp

@@ -39,7 +39,7 @@
 #include <lib/cdev/CDev.hpp>
 #include <lib/conversion/rotation.h>
 #include <mathlib/math/filter/LowPassFilter2pVector3f.hpp>
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <uORB/uORB.h>
 #include <uORB/PublicationMulti.hpp>
 #include <uORB/topics/sensor_accel.h>

src/lib/drivers/airspeed/airspeed.cpp

@@ -38,7 +38,7 @@
  *
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <drivers/device/device.h>
 
 #include <drivers/device/i2c.h>

src/lib/drivers/airspeed/airspeed.h

@@ -37,8 +37,8 @@
 #include <drivers/device/i2c.h>
 #include <drivers/drv_airspeed.h>
 #include <drivers/drv_hrt.h>
-#include <px4_config.h>
-#include <px4_defines.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
 #include <perf/perf_counter.h>
 #include <uORB/topics/differential_pressure.h>
 #include <uORB/uORB.h>

src/lib/drivers/device/CDev.cpp

@@ -41,8 +41,8 @@
 
 #include <cstring>
 
-#include "px4_posix.h"
-#include "drivers/drv_device.h"
+#include <px4_platform_common/posix.h>
+#include <drivers/drv_device.h>
 
 namespace device
 {

src/lib/drivers/device/CDev.hpp

@@ -43,8 +43,8 @@
 #include "Device.hpp"
 #include <lib/cdev/CDev.hpp>
 
-#include <px4_config.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/posix.h>
 
 /**
  * Namespace encapsulating all device framework classes, functions and data.

src/lib/drivers/device/Device.hpp

@@ -43,8 +43,8 @@
 /*
  * Includes here should only cover the needs of the framework definitions.
  */
-#include <px4_config.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/posix.h>
 
 #include <drivers/drv_device.h>
 

src/lib/drivers/device/nuttx/I2C.hpp

@@ -42,7 +42,7 @@
 
 #include "../CDev.hpp"
 
-#include <px4_i2c.h>
+#include <px4_platform_common/i2c.h>
 
 #if !defined(CONFIG_I2C)
 #  error I2C support requires CONFIG_I2C

src/lib/drivers/device/nuttx/SPI.cpp

@@ -47,7 +47,7 @@
 
 #include "SPI.hpp"
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <nuttx/arch.h>
 
 #ifndef CONFIG_SPI_EXCHANGE

src/lib/drivers/device/posix/I2C.hpp

@@ -42,7 +42,7 @@
 
 #include "../CDev.hpp"
 
-#include <px4_i2c.h>
+#include <px4_platform_common/i2c.h>
 
 #ifdef __PX4_LINUX
 #include <linux/i2c.h>

src/lib/drivers/device/posix/SPI.cpp

@@ -48,7 +48,7 @@
 #include <linux/types.h>
 #include <linux/spi/spidev.h>
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 namespace device
 {

src/lib/drivers/gyroscope/PX4Gyroscope.hpp

@@ -39,7 +39,7 @@
 #include <lib/cdev/CDev.hpp>
 #include <lib/conversion/rotation.h>
 #include <mathlib/math/filter/LowPassFilter2pVector3f.hpp>
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <uORB/uORB.h>
 #include <uORB/PublicationMulti.hpp>
 #include <uORB/topics/sensor_gyro.h>

src/lib/drivers/led/led.cpp

@@ -37,7 +37,7 @@
  * LED driver to control the onboard LED(s) via ioctl interface.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <lib/cdev/CDev.hpp>
 #include <drivers/drv_board_led.h>
 #include <stdio.h>

src/lib/drivers/linux_gpio/linux_gpio.cpp

@@ -40,7 +40,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <px4_posix.h>
+#include <px4_platform_common/posix.h>
 
 #define PIN_INDEX_BUFFER_MAX (16)
 #define PIN_DIRECTION_BUFFER_MAX (30 + PIN_INDEX_BUFFER_MAX)

src/lib/mathlib/math/filter/LowPassFilter2p.cpp

@@ -33,7 +33,7 @@
 
 #include "LowPassFilter2p.hpp"
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #include <cmath>
 

src/lib/mathlib/math/filter/LowPassFilter2pVector3f.cpp

@@ -33,7 +33,7 @@
 
 #include "LowPassFilter2pVector3f.hpp"
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #include <cmath>
 

src/lib/mathlib/math/matrix_alg.cpp

@@ -39,7 +39,7 @@
  */
 
 #include "matrix_alg.h"
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 /*
  *    Does matrix multiplication of two regular/square matrices

src/lib/mathlib/math/test/test.cpp

@@ -41,7 +41,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #include "test.hpp"
 

src/lib/mixer/mixer_group.cpp

@@ -37,7 +37,7 @@
  * Mixer collection.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <stdint.h>

src/lib/mixer/mixer_helicopter.cpp

@@ -41,7 +41,7 @@
 
 #include <mathlib/mathlib.h>
 #include <cstdio>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #define debug(fmt, args...)	do { } while(0)
 //#define debug(fmt, args...)	do { printf("[mixer] " fmt "\n", ##args); } while(0)

src/lib/mixer/mixer_load.h

@@ -40,7 +40,7 @@
 #ifndef _SYSTEMLIB_MIXER_LOAD_H
 #define _SYSTEMLIB_MIXER_LOAD_H value
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 __BEGIN_DECLS
 

src/lib/mixer_module/mixer_module.cpp

@@ -34,7 +34,7 @@
 #include "mixer_module.hpp"
 
 #include <uORB/PublicationQueued.hpp>
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 using namespace time_literals;
 

src/lib/mixer_module/mixer_module.hpp

@@ -38,8 +38,8 @@
 #include <lib/mixer/mixer.h>
 #include <lib/perf/perf_counter.h>
 #include <lib/output_limit/output_limit.h>
-#include <px4_atomic.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/atomic.h>
+#include <px4_platform_common/module_params.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Publication.hpp>
 #include <uORB/PublicationMulti.hpp>

src/lib/output_limit/output_limit.cpp

@@ -33,7 +33,7 @@
 
 #include "output_limit.h"
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <math.h>
 #include <stdbool.h>
 #include <drivers/drv_hrt.h>

src/lib/parameters/ParameterTest.cpp

@@ -31,7 +31,7 @@
  *
  ****************************************************************************/
 
-#include <px4_module_params.h>
+#include <px4_platform_common/module_params.h>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/obstacle_distance.h>
 #include <uORB/uORBManager.hpp>

src/lib/parameters/flashparams/flashfs.c

@@ -42,8 +42,8 @@
  * foot print device.
  */
 
-#include <px4_defines.h>
-#include <px4_posix.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
 #include <crc32.h>
 #include <stddef.h>
 #include <string.h>

src/lib/parameters/flashparams/flashparams.cpp

@@ -42,9 +42,9 @@
  * foot print device.
  */
 
-#include <px4_defines.h>
-#include <px4_posix.h>
-#include <px4_shutdown.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/shutdown.h>
 
 #include <string.h>
 #include <stdbool.h>

src/lib/parameters/parameters.cpp

@@ -51,11 +51,11 @@
 
 #include <drivers/drv_hrt.h>
 #include <lib/perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_posix.h>
-#include <px4_sem.h>
-#include <px4_shutdown.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/sem.h>
+#include <px4_platform_common/shutdown.h>
 #include <systemlib/uthash/utarray.h>
 
 using namespace time_literals;
@@ -91,7 +91,7 @@ static char *param_user_file = nullptr;
 #endif
 
 #ifndef PARAM_NO_AUTOSAVE
-#include <px4_workqueue.h>
+#include <px4_platform_common/workqueue.h>
 /* autosaving variables */
 static hrt_abstime last_autosave_timestamp = 0;
 static struct work_s autosave_work {};

src/lib/parameters/parameters_shmem.cpp

@@ -50,11 +50,11 @@
 #include <math.h>
 
 #include <drivers/drv_hrt.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_posix.h>
-#include <px4_sem.h>
-#include <px4_shutdown.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/sem.h>
+#include <px4_platform_common/shutdown.h>
 
 #include <perf/perf_counter.h>
 #include <systemlib/uthash/utarray.h>
@@ -73,7 +73,7 @@
 
 #include <sys/stat.h>
 
-#include "shmem.h"
+#include <px4_platform_common/shmem.h>
 
 #ifdef __PX4_QURT
 static const char *param_default_file = "/dev/fs/params";
@@ -91,7 +91,7 @@ static char *param_user_file = nullptr;
 #define PARAM_CLOSE	close
 
 #ifndef PARAM_NO_AUTOSAVE
-#include <px4_workqueue.h>
+#include <px4_platform_common/workqueue.h>
 /* autosaving variables */
 static hrt_abstime last_autosave_timestamp = 0;
 static struct work_s autosave_work;

src/lib/parameters/tinybson/tinybson.cpp

@@ -37,7 +37,7 @@
  * A simple subset SAX-style BSON parser and generator.
  */
 
-#include <px4_posix.h>
+#include <px4_platform_common/posix.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>

src/lib/perf/perf_counter.h

@@ -40,7 +40,7 @@
 #define _SYSTEMLIB_PERF_COUNTER_H value
 
 #include <stdint.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #define LATENCY_BUCKET_COUNT 8
 

src/lib/pid/pid.cpp

@@ -50,7 +50,7 @@
 
 #include "pid.h"
 #include <math.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #define SIGMA 0.000001f
 

src/lib/rc/crsf.h

@@ -45,7 +45,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 __BEGIN_DECLS
 

src/lib/rc/dsm.cpp

@@ -39,9 +39,9 @@
  * Decodes into the global PPM buffer and updates accordingly.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <board_config.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #include <fcntl.h>
 #include <unistd.h>

src/lib/rc/dsm.h

@@ -43,8 +43,8 @@
 
 #include <stdint.h>
 
-#include <px4_config.h>
-#include <px4_defines.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
 
 __BEGIN_DECLS
 

src/lib/rc/sbus.cpp

@@ -37,7 +37,7 @@
  * Serial protocol decoder for the Futaba S.bus protocol.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <fcntl.h>
 #include <unistd.h>

src/lib/systemlib/conversions.c

@@ -37,7 +37,7 @@
  * Implementation of commonly used conversions.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <float.h>
 
 #include "conversions.h"

src/lib/systemlib/cpuload.c

@@ -39,7 +39,7 @@
  * @author Lorenz Meier <lorenz@px4.io>
  * @author Petri Tanskanen <petri.tanskanen@inf.ethz.ch>
  */
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <stdint.h>

src/lib/systemlib/err.h

@@ -65,7 +65,7 @@
 #ifndef _SYSTEMLIB_ERR_H
 #define _SYSTEMLIB_ERR_H
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <stdlib.h>

src/lib/systemlib/hardfault_log.h

@@ -35,7 +35,7 @@
 /****************************************************************************
  * Included Files
  ****************************************************************************/
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <systemlib/px4_macros.h>
 
 /****************************************************************************

src/lib/systemlib/mavlink_log.cpp

@@ -39,7 +39,7 @@
  */
 
 #include <drivers/drv_hrt.h>
-#include <px4_posix.h>
+#include <px4_platform_common/posix.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>

src/lib/systemlib/otp.c

@@ -43,7 +43,7 @@
  *
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <board_config.h>
 #include <stdio.h>
 #include <math.h>

src/lib/systemlib/print_load_posix.c

@@ -39,7 +39,7 @@
  * @author Lorenz Meier <lorenz@px4.io>
  */
 
-#include <px4_posix.h>
+#include <px4_platform_common/posix.h>
 
 #include <unistd.h>
 #include <string.h>

src/lib/systemlib/printload.h

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

src/lib/terrain_estimation/terrain_estimator.cpp

@@ -38,7 +38,7 @@
 
 #include "terrain_estimator.h"
 #include <lib/ecl/geo/geo.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #define DISTANCE_TIMEOUT 100000		// time in usec after which laser is considered dead
 

src/lib/tunes/tunes.cpp

@@ -37,7 +37,7 @@
 
 #include "tunes.h"
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 #include <math.h>
 #include <ctype.h>
 #include <errno.h>

src/lib/version/version.h

@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <systemlib/px4_macros.h>
 #include <stdint.h>