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/drivers/adc/adc.cpp

@@ -43,8 +43,8 @@
 #include <lib/cdev/CDev.hpp>
 #include <lib/perf/perf_counter.h>
 #include <px4_arch/adc.h>
-#include <px4_config.h>
-#include <px4_log.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Publication.hpp>
 #include <uORB/topics/adc_report.h>

src/drivers/barometer/bmp280/bmp280.h

@@ -48,8 +48,8 @@
 #include <drivers/device/spi.h>
 #include <lib/cdev/CDev.hpp>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #include "board_config.h"

src/drivers/barometer/bmp388/bmp388_main.cpp

@@ -31,7 +31,7 @@
  *
  ****************************************************************************/
 
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 
 #include "bmp388.h"
 

src/drivers/barometer/lps22hb/LPS22HB.hpp

@@ -41,7 +41,7 @@
 #include <drivers/drv_baro.h>
 #include <lib/cdev/CDev.hpp>
 #include <perf/perf_counter.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>

src/drivers/barometer/lps25h/lps25h.h

@@ -48,7 +48,7 @@
 #include <drivers/drv_baro.h>
 #include <lib/cdev/CDev.hpp>
 #include <perf/perf_counter.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>

src/drivers/barometer/mpl3115a2/mpl3115a2.h

@@ -64,10 +64,10 @@
 #include <nuttx/arch.h>
 #include <nuttx/clock.h>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_getopt.h>
-#include <px4_log.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 

src/drivers/barometer/ms5611/ms5611.h

@@ -48,7 +48,7 @@
 #include <drivers/drv_baro.h>
 #include <lib/cdev/CDev.hpp>
 #include <lib/perf/perf_counter.h>
-#include <platforms/px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>

src/drivers/batt_smbus/batt_smbus.h

@@ -47,8 +47,8 @@
 #include <lib/drivers/smbus/SMBus.hpp>
 #include <mathlib/mathlib.h>
 #include <perf/perf_counter.h>
-#include <platforms/px4_module.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/battery_status.h>
 

src/drivers/boards/common/board_dma_alloc.c

@@ -37,7 +37,7 @@
  * Provide the board dma allocator interface.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include "board_config.h"
 
 #include <stdint.h>

src/drivers/boards/common/board_fat_dma_alloc.c

@@ -37,7 +37,7 @@
  * Provide the board dma allocator interface.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include "board_config.h"
 
 #include "board_dma_alloc.h"

src/drivers/boards/common/board_gpio_init.c

@@ -38,7 +38,7 @@
  * So this will work with any ARCH
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 /************************************************************************************
  * Name: board_gpio_init

src/drivers/boards/common/board_identity.c

@@ -37,7 +37,7 @@
  * Implementation of Non Arch specific Board identity API
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <stdio.h>
 #include <string.h>
 #if defined(BOARD_OVERRIDE_UUID) || defined(BOARD_OVERRIDE_MFGUID) || defined(BOARD_OVERRIDE_PX4_GUID)

src/drivers/boards/common/kinetis/board_identity.c

@@ -37,7 +37,7 @@
  * Implementation of Kientis based Board identity API
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>

src/drivers/boards/common/kinetis/board_mcu_version.c

@@ -37,8 +37,8 @@
  * Implementation of Kinetis based SoC version API
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
 
 #include "up_arch.h"
 #include "chip/kinetis_sim.h"

src/drivers/boards/common/kinetis/board_reset.c

@@ -37,7 +37,7 @@
  * Implementation of kinetis based Board RESET API
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <errno.h>
 #include <nuttx/board.h>
 

src/drivers/boards/common/stm32/board_hw_rev_ver.c

@@ -39,7 +39,7 @@
 
 #include <drivers/drv_adc.h>
 #include <px4_arch/adc.h>
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <stdio.h>
 #include "board_config.h"
 

src/drivers/boards/common/stm32/board_identity.c

@@ -37,7 +37,7 @@
  * Implementation of STM32 based Board identity API
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <stdio.h>
 #include <string.h>
 

src/drivers/boards/common/stm32/board_mcu_version.c

@@ -37,8 +37,8 @@
  * Implementation of STM32 based SoC version API
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
 
 /* magic numbers from reference manual */
 

src/drivers/boards/common/stm32/board_reset.c

@@ -37,7 +37,7 @@
  * Implementation of STM32 based Board RESET API
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <errno.h>
 #include <stm32_pwr.h>
 #include <stm32_rtc.h>

src/drivers/camera_capture/camera_capture.hpp

@@ -43,11 +43,11 @@
 #include <drivers/drv_input_capture.h>
 #include <drivers/drv_pwm_output.h>
 #include <lib/parameters/param.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_module.h>
-#include <px4_tasks.h>
-#include <px4_workqueue.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/workqueue.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Publication.hpp>
 #include <uORB/PublicationQueued.hpp>

src/drivers/camera_trigger/interfaces/src/camera_interface.cpp

@@ -1,5 +1,5 @@
 #include "camera_interface.h"
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 /**
  * @file camera_interface.cpp

src/drivers/camera_trigger/interfaces/src/camera_interface.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <parameters/param.h>
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 #define arraySize(a) (sizeof((a))/sizeof(((a)[0])))
 

src/drivers/camera_trigger/interfaces/src/pwm.h

@@ -10,7 +10,7 @@
 
 #include <drivers/drv_hrt.h>
 #include <parameters/param.h>
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 #include "camera_interface.h"
 

src/drivers/differential_pressure/ets/ets_airspeed.cpp

@@ -41,7 +41,7 @@
 #include <float.h>
 
 #include <drivers/airspeed/airspeed.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 
 /* I2C bus address */
 #define I2C_ADDRESS	0x75	/* 7-bit address. 8-bit address is 0xEA */

src/drivers/differential_pressure/ms4525/ms4525_airspeed.cpp

@@ -50,7 +50,7 @@
  */
 
 #include <mathlib/math/filter/LowPassFilter2p.hpp>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <uORB/topics/system_power.h>
 
 #include <drivers/airspeed/airspeed.h>

src/drivers/differential_pressure/ms5525/MS5525.hpp

@@ -37,7 +37,7 @@
 #include <drivers/airspeed/airspeed.h>
 #include <math.h>
 #include <mathlib/math/filter/LowPassFilter2p.hpp>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 
 /* The MS5525DSO address is 111011Cx, where C is the complementary value of the pin CSB */
 static constexpr uint8_t I2C_ADDRESS_1_MS5525DSO = 0x76;

src/drivers/differential_pressure/sdp3x/SDP3X.hpp

@@ -45,7 +45,7 @@
 #include <drivers/airspeed/airspeed.h>
 #include <math.h>
 #include <mathlib/math/filter/LowPassFilter2p.hpp>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 
 #define I2C_ADDRESS_1_SDP3X		0x21
 #define I2C_ADDRESS_2_SDP3X		0x22

src/drivers/distance_sensor/cm8jl65/CM8JL65.hpp

@@ -48,7 +48,7 @@
 #include <drivers/drv_hrt.h>
 #include <drivers/rangefinder/PX4Rangefinder.hpp>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 

src/drivers/distance_sensor/cm8jl65/cm8jl65_main.cpp

@@ -31,8 +31,8 @@
  *
  ****************************************************************************/
 
-#include <px4_cli.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/cli.h>
+#include <px4_platform_common/getopt.h>
 
 #include "CM8JL65.hpp"
 

src/drivers/distance_sensor/leddar_one/leddar_one.cpp

@@ -42,10 +42,10 @@
 #include <drivers/drv_hrt.h>
 #include <lib/drivers/rangefinder/PX4Rangefinder.hpp>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_getopt.h>
-#include <px4_module.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/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/distance_sensor.h>
 

src/drivers/distance_sensor/ll40ls/LidarLiteI2C.h

@@ -45,7 +45,7 @@
 #include <drivers/device/i2c.h>
 #include <drivers/drv_hrt.h>
 #include <mathlib/mathlib.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 

src/drivers/distance_sensor/ll40ls/LidarLitePWM.h

@@ -50,7 +50,7 @@
 
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_pwm_input.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/pwm_input.h>
 

src/drivers/distance_sensor/ll40ls/ll40ls.cpp

@@ -49,8 +49,8 @@
 
 #include <board_config.h>
 #include <drivers/device/i2c.h>
-#include <px4_getopt.h>
-#include <px4_module.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/module.h>
 
 #include "LidarLiteI2C.h"
 #include "LidarLitePWM.h"

src/drivers/distance_sensor/mappydot/MappyDot.cpp

@@ -45,8 +45,8 @@
 #include <drivers/device/i2c.h>
 #include <drivers/drv_range_finder.h>
 #include <perf/perf_counter.h>
-#include <px4_getopt.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/module_params.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/distance_sensor.h>
 

src/drivers/distance_sensor/mb12xx/mb12xx.cpp

@@ -60,9 +60,9 @@
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_range_finder.h>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_getopt.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/module_params.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/uORB.h>
 #include <uORB/topics/distance_sensor.h>

src/drivers/distance_sensor/pga460/pga460.h

@@ -49,9 +49,9 @@
 
 #include <uORB/topics/distance_sensor.h>
 
-#include <px4_module.h>
-#include <px4_module_params.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/module_params.h>
+#include <px4_platform_common/tasks.h>
 
 
 #define PGA460_DEFAULT_PORT "/dev/ttyS6"

src/drivers/distance_sensor/sf0x/sf0x.cpp

@@ -39,8 +39,8 @@
  * Driver for the Lightware SF0x laser rangefinder series
  */
 
-#include <px4_config.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #include <sys/types.h>

src/drivers/distance_sensor/sf1xx/sf1xx.cpp

@@ -41,11 +41,11 @@
  * Default I2C address 0x66 is used.
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
-#include <px4_module.h>
+#include <px4_platform_common/module.h>
 
 #include <drivers/device/i2c.h>
 

src/drivers/distance_sensor/srf02/srf02.cpp

@@ -37,9 +37,9 @@
  * Driver for the SRF02 sonar range finder adapted from the Maxbotix sonar range finder driver (srf02).
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <containers/Array.hpp>
 

src/drivers/distance_sensor/teraranger/teraranger.cpp

@@ -40,11 +40,11 @@
 
 #include <drivers/device/i2c.h>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
-#include <px4_module.h>
+#include <px4_platform_common/module.h>
 #include <uORB/topics/distance_sensor.h>
 #include <uORB/uORB.h>
 

src/drivers/distance_sensor/tfmini/TFMINI.hpp

@@ -48,8 +48,8 @@
 
 #include <drivers/drv_hrt.h>
 #include <lib/perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_module.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/module.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <lib/drivers/rangefinder/PX4Rangefinder.hpp>
 #include <uORB/topics/distance_sensor.h>

src/drivers/distance_sensor/tfmini/tfmini_main.cpp

@@ -33,7 +33,7 @@
 
 #include "TFMINI.hpp"
 
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 
 /**
  * Local functions in support of the shell command.

src/drivers/distance_sensor/ulanding/ulanding.cpp

@@ -59,10 +59,10 @@
 #include <drivers/drv_range_finder.h>
 #include <mathlib/mathlib.h>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_getopt.h>
-#include <px4_workqueue.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/workqueue.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/topics/distance_sensor.h>

src/drivers/distance_sensor/vl53lxx/vl53lxx.cpp

@@ -47,7 +47,7 @@
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_range_finder.h>
 #include <perf/perf_counter.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/distance_sensor.h>
 

src/drivers/driver_framework_wrapper/df_ak8963_wrapper/df_ak8963_wrapper.cpp

@@ -36,7 +36,7 @@
  * Lightweight driver to access the AK8963 of the DriverFramework.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -46,7 +46,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <errno.h>
 
 #include <perf/perf_counter.h>

src/drivers/driver_framework_wrapper/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp

@@ -42,9 +42,9 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include <px4_tasks.h>
-#include <px4_getopt.h>
-#include <px4_posix.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/posix.h>
 
 #include <errno.h>
 #include <string.h>

src/drivers/driver_framework_wrapper/df_bebop_rangefinder_wrapper/df_bebop_rangefinder_wrapper.cpp

@@ -36,7 +36,7 @@
  * Driver to access the Bebop rangefinder of the DriverFramework.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -46,7 +46,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <errno.h>
 #include <string>
 

src/drivers/driver_framework_wrapper/df_bmp280_wrapper/df_bmp280_wrapper.cpp

@@ -38,7 +38,7 @@
  * @author Julian Oes <julian@oes.ch>
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -48,7 +48,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <errno.h>
 
 #include <perf/perf_counter.h>

src/drivers/driver_framework_wrapper/df_hmc5883_wrapper/df_hmc5883_wrapper.cpp

@@ -38,7 +38,7 @@
  * @author Julian Oes <julian@oes.ch>
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -48,7 +48,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <errno.h>
 
 #include <perf/perf_counter.h>

src/drivers/driver_framework_wrapper/df_isl29501_wrapper/df_isl29501_wrapper.cpp

@@ -39,7 +39,7 @@
  * @author Siddharth B Purohit <sid@3drobotics.com>
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -49,7 +49,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <errno.h>
 #include <string>
 

src/drivers/driver_framework_wrapper/df_lsm9ds1_wrapper/df_lsm9ds1_wrapper.cpp

@@ -38,7 +38,7 @@
  * @author Miguel Arroyo <miguel@arroyo.me>
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -48,7 +48,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <errno.h>
 
 #include <systemlib/err.h>

src/drivers/driver_framework_wrapper/df_ltc2946_wrapper/df_ltc2946_wrapper.cpp

@@ -40,7 +40,7 @@
 
 
 #include <string>
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <systemlib/err.h>
 #include <battery/battery.h>
 #include <drivers/drv_hrt.h>

src/drivers/driver_framework_wrapper/df_mpu6050_wrapper/df_mpu6050_wrapper.cpp

@@ -36,7 +36,7 @@
  * Lightweight driver to access the MPU6050 of the DriverFramework.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -46,7 +46,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <errno.h>
 
 #include <systemlib/err.h>

src/drivers/driver_framework_wrapper/df_mpu9250_wrapper/df_mpu9250_wrapper.cpp

@@ -38,7 +38,7 @@
  * @author Julian Oes <julian@oes.ch>
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -48,7 +48,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <errno.h>
 
 #include <systemlib/err.h>

src/drivers/driver_framework_wrapper/df_ms5607_wrapper/df_ms5607_wrapper.cpp

@@ -36,7 +36,7 @@
  * Lightweight driver to access the MS5607 of the DriverFramework.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -46,7 +46,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <errno.h>
 
 #include <perf/perf_counter.h>

src/drivers/driver_framework_wrapper/df_ms5611_wrapper/df_ms5611_wrapper.cpp

@@ -36,7 +36,7 @@
  * Lightweight driver to access the MS5611 of the DriverFramework.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -46,7 +46,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <errno.h>
 
 #include <perf/perf_counter.h>

src/drivers/driver_framework_wrapper/df_trone_wrapper/df_trone_wrapper.cpp

@@ -38,7 +38,7 @@
  * @author Nicolas de Palezieux <ndepal@gmail.com>
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -48,7 +48,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <errno.h>
 #include <string>
 

src/drivers/drv_baro.h

@@ -40,7 +40,7 @@
 #ifndef _DRV_BARO_H
 #define _DRV_BARO_H
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <stdint.h>
 #include <sys/ioctl.h>
 

src/drivers/drv_blinkm.h

@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <stdint.h>
 #include <sys/ioctl.h>
 

src/drivers/drv_board_led.h

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <stdint.h>
 #include <sys/ioctl.h>
 

src/drivers/drv_hrt.h

@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <inttypes.h>
 
-#include <px4_time.h>
+#include <px4_platform_common/time.h>
 #include <queue.h>
 
 __BEGIN_DECLS

src/drivers/drv_input_capture.h

@@ -40,7 +40,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <stdint.h>
 #include <sys/ioctl.h>
 

src/drivers/drv_mixer.h

@@ -53,7 +53,7 @@
 #ifndef _DRV_MIXER_H
 #define _DRV_MIXER_H
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <stdint.h>
 #include <sys/ioctl.h>
 

src/drivers/drv_orb_dev.h

@@ -40,7 +40,7 @@
  * uORB published object driver.
  */
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <stdint.h>

src/drivers/drv_pwm_output.h

@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #include <stdint.h>
 #include <sys/ioctl.h>

src/drivers/drv_pwm_trigger.h

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

src/drivers/drv_sensor.h

@@ -40,7 +40,7 @@
 #ifndef _DRV_SENSOR_H
 #define _DRV_SENSOR_H
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <stdint.h>
 #include <sys/ioctl.h>
 

src/drivers/dshot/dshot.cpp

@@ -46,11 +46,11 @@
 #include <lib/parameters/param.h>
 #include <lib/perf/perf_counter.h>
 #include <px4_arch/dshot.h>
-#include <px4_atomic.h>
-#include <px4_config.h>
-#include <px4_getopt.h>
-#include <px4_log.h>
-#include <px4_module.h>
+#include <px4_platform_common/atomic.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/module.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Publication.hpp>
 #include <uORB/PublicationMulti.hpp>

src/drivers/dshot/telemetry.cpp

@@ -33,7 +33,7 @@
 
 #include "telemetry.h"
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 #include <unistd.h>
 #include <fcntl.h>

src/drivers/gps/definitions.h

@@ -40,7 +40,7 @@
 #pragma once
 
 #include <drivers/drv_hrt.h>
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <uORB/topics/vehicle_gps_position.h>
 #include <uORB/topics/satellite_info.h>
 

src/drivers/gps/gps.cpp

@@ -49,9 +49,9 @@
 
 #include <mathlib/mathlib.h>
 #include <matrix/math.hpp>
-#include <px4_cli.h>
-#include <px4_getopt.h>
-#include <px4_module.h>
+#include <px4_platform_common/cli.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/module.h>
 #include <uORB/PublicationQueued.hpp>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/gps_dump.h>

src/drivers/heater/heater.cpp

@@ -41,8 +41,8 @@
 
 #include "heater.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>
 
 #ifndef GPIO_HEATER_INPUT

src/drivers/heater/heater.h

@@ -41,10 +41,10 @@
 
 #pragma once
 
-#include <px4_config.h>
-#include <px4_getopt.h>
-#include <px4_module.h>
-#include <px4_module_params.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/getopt.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/topics/parameter_update.h>

src/drivers/imu/adis16477/ADIS16477.hpp

@@ -44,7 +44,7 @@
 #include <lib/drivers/accelerometer/PX4Accelerometer.hpp>
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 class ADIS16477 : public device::SPI, public px4::ScheduledWorkItem

src/drivers/imu/adis16497/ADIS16497.hpp

@@ -44,7 +44,7 @@
 #include <lib/drivers/accelerometer/PX4Accelerometer.hpp>
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 // TODO : This is a copy of the NuttX CRC32 table

src/drivers/imu/bma180/bma180.cpp

@@ -36,8 +36,8 @@
  * Driver for the Bosch BMA 180 MEMS accelerometer connected via SPI.
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
 #include <ecl/geo/geo.h>
 
 #include <sys/types.h>

src/drivers/imu/bmi055/BMI055.hpp

@@ -36,7 +36,7 @@
 #include <drivers/device/spi.h>
 #include <ecl/geo/geo.h>
 #include <lib/perf/perf_counter.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #define DIR_READ                0x80

src/drivers/imu/bmi088/BMI088.hpp

@@ -37,7 +37,7 @@
 #include <ecl/geo/geo.h>
 #include <lib/conversion/rotation.h>
 #include <lib/perf/perf_counter.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #define DIR_READ                0x80

src/drivers/imu/bmi160/bmi160.hpp

@@ -39,7 +39,7 @@
 #include <lib/drivers/accelerometer/PX4Accelerometer.hpp>
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/conversions.h>
 

src/drivers/imu/fxas21002c/FXAS21002C.hpp

@@ -42,7 +42,7 @@
 #include <drivers/device/spi.h>
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 

src/drivers/imu/fxos8701cq/fxos8701cq_main.cpp

@@ -39,7 +39,7 @@
 
 #include "FXOS8701CQ.hpp"
 
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 
 /**
  * Local functions in support of the shell command.

src/drivers/imu/icm20948/ICM20948_mag.cpp

@@ -40,9 +40,9 @@
  *
  */
 
-#include <px4_config.h>
-#include <px4_log.h>
-#include <px4_time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/time.h>
 #include <lib/perf/perf_counter.h>
 #include <drivers/drv_hrt.h>
 

src/drivers/imu/icm20948/icm20948.cpp

@@ -40,8 +40,8 @@
  * based on the mpu9250 driver
  */
 
-#include <px4_config.h>
-#include <px4_time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/time.h>
 #include <lib/ecl/geo/geo.h>
 #include <lib/perf/perf_counter.h>
 #include <systemlib/conversions.h>

src/drivers/imu/icm20948/icm20948_i2c.cpp

@@ -37,7 +37,7 @@
  * I2C interface for ICM20948
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <drivers/device/i2c.h>
 #include <drivers/drv_device.h>
 

src/drivers/imu/icm20948/icm20948_main.cpp

@@ -39,8 +39,8 @@
  * based on the mpu9250 driver
  */
 
-#include <px4_config.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/getopt.h>
 #include <lib/perf/perf_counter.h>
 #include <lib/systemlib/conversions.h>
 #include <board_config.h>

src/drivers/imu/l3gd20/l3gd20.cpp

@@ -43,7 +43,7 @@
 #include <lib/conversion/rotation.h>
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #define L3GD20_DEVICE_PATH "/dev/l3gd20"

src/drivers/imu/lsm303d/lsm303d_main.cpp

@@ -38,7 +38,7 @@
 
 #include "LSM303D.hpp"
 
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 
 /**
  * Local functions in support of the shell command.

src/drivers/imu/mpu6000/MPU6000.hpp

@@ -62,7 +62,7 @@
 #include <lib/drivers/device/spi.h>
 #include <lib/ecl/geo/geo.h>
 #include <lib/perf/perf_counter.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/conversions.h>
 #include <systemlib/px4_macros.h>

src/drivers/imu/mpu9250/AK8963_I2C.cpp

@@ -37,7 +37,7 @@
  * I2C interface for AK8963
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <drivers/device/i2c.h>
 #include <drivers/drv_device.h>
 

src/drivers/imu/mpu9250/mpu9250.h

@@ -34,7 +34,7 @@
 #include <lib/drivers/accelerometer/PX4Accelerometer.hpp>
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <lib/ecl/geo/geo.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/conversions.h>
 #include <systemlib/px4_macros.h>

src/drivers/irlock/irlock.cpp

@@ -45,7 +45,7 @@
 #include <drivers/device/i2c.h>
 #include <drivers/device/ringbuffer.h>
 
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 

src/drivers/lights/rgbled/rgbled.cpp

@@ -44,7 +44,7 @@
 
 #include <drivers/device/i2c.h>
 #include <lib/led/led.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/parameter_update.h>

src/drivers/lights/rgbled/rgbled_params.c

@@ -40,7 +40,7 @@
  */
 
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <parameters/param.h>
 
 /**

src/drivers/lights/rgbled_ncp5623c/rgbled_ncp5623c.cpp

@@ -43,7 +43,7 @@
 
 #include <drivers/device/i2c.h>
 #include <lib/led/led.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/parameter_update.h>

src/drivers/lights/rgbled_ncp5623c/rgbled_ncp5623c_params.c

@@ -40,7 +40,7 @@
  */
 
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <parameters/param.h>
 
 /**

src/drivers/lights/rgbled_pwm/rgbled_pwm.cpp

@@ -43,7 +43,7 @@
 
 #include <drivers/device/device.h>
 #include <lib/led/led.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 class RGBLED_PWM : public device::CDev, public px4::ScheduledWorkItem

src/drivers/linux_pwm_out/PCA9685.cpp

@@ -51,7 +51,7 @@
 
 #include "PCA9685.h"
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 using namespace linux_pwm_out;
 

src/drivers/linux_pwm_out/bbblue_pwm_rc.cpp

@@ -34,7 +34,7 @@
 
 #include <fcntl.h>
 #include <errno.h>
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 #include <robotcontrol.h>
 #include <board_config.h>

src/drivers/linux_pwm_out/linux_pwm_out.cpp

@@ -38,9 +38,9 @@
 
 #include <cmath>
 
-#include <px4_tasks.h>
-#include <px4_getopt.h>
-#include <px4_posix.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/posix.h>
 
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/actuator_controls.h>

src/drivers/linux_pwm_out/navio_sysfs.cpp

@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 
 using namespace linux_pwm_out;