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/systemcmds/bl_update/bl_update.c

@@ -37,9 +37,9 @@
  * STM32F4 & STM32F7 bootloader update tool.
  */
 
-#include <px4_config.h>
-#include <px4_log.h>
-#include <px4_module.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/module.h>
 
 #include <stdio.h>
 #include <stdlib.h>

src/systemcmds/config/config.c

@@ -39,9 +39,9 @@
  * config tool. Takes the device name as the first parameter.
  */
 
-#include <px4_config.h>
-#include <px4_log.h>
-#include <px4_module.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/module.h>
 
 #include <stdio.h>
 #include <stdlib.h>

src/systemcmds/dmesg/dmesg.cpp

@@ -31,10 +31,10 @@
  *
  ****************************************************************************/
 
-#include <px4_config.h>
-#include <px4_console_buffer.h>
-#include <px4_module.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/console_buffer.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/getopt.h>
 
 #ifndef BOARD_ENABLE_CONSOLE_BUFFER
 #error "This module can only be used on boards that enable BOARD_ENABLE_CONSOLE_BUFFER"

src/systemcmds/dumpfile/dumpfile.c

@@ -37,9 +37,9 @@
  * @author Anton Babushkin <anton.babushkin@me.com>
  */
 
-#include <px4_config.h>
-#include <px4_log.h>
-#include <px4_module.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/module.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>

src/systemcmds/dyn/dyn.cpp

@@ -39,8 +39,8 @@
 
 #include <dlfcn.h>
 
-#include <px4_module.h>
-#include <px4_log.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/log.h>
 
 static void usage();
 

src/systemcmds/esc_calib/esc_calib.c

@@ -36,11 +36,11 @@
  * @file esc_calib.c
  */
 
-#include <px4_config.h>
-#include <px4_getopt.h>
-#include <px4_module.h>
-#include <px4_defines.h>
-#include <px4_log.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 
 #include <stdio.h>
 #include <stdlib.h>

src/systemcmds/hardfault_log/hardfault_log.c

@@ -36,8 +36,8 @@
  * Included Files
  ****************************************************************************/
 
-#include <px4_config.h>
-#include <px4_module.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/module.h>
 #include <nuttx/compiler.h>
 #include <nuttx/arch.h>
 

src/systemcmds/i2cdetect/i2cdetect.cpp

@@ -38,11 +38,11 @@
  *
  */
 
-#include <px4_config.h>
-#include <px4_log.h>
-#include <px4_module.h>
-#include <px4_getopt.h>
-#include <px4_i2c.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/i2c.h>
 
 namespace i2cdetect
 {

src/systemcmds/led_control/led_control.cpp

@@ -35,9 +35,9 @@
  * @file led_control.cpp
  */
 
-#include <px4_getopt.h>
-#include <px4_module.h>
-#include <px4_log.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/log.h>
 
 #include <stdlib.h>
 #include <unistd.h>

src/systemcmds/mixer/mixer.cpp

@@ -37,9 +37,9 @@
  * Mixer utility.
  */
 
-#include <px4_config.h>
-#include <px4_module.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/posix.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>

src/systemcmds/motor_ramp/motor_ramp.cpp

@@ -38,12 +38,12 @@
  * @author Roman Bapst <bapstroman@gmail.com>
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_module.h>
-#include <px4_tasks.h>
-#include <px4_posix.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/tasks.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -55,7 +55,6 @@
 #include <arch/board/board.h>
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_pwm_output.h>
-#include <platforms/px4_defines.h>
 
 #include "systemlib/err.h"
 #include "uORB/topics/actuator_controls.h"

src/systemcmds/motor_test/motor_test.cpp

@@ -39,10 +39,10 @@
  */
 
 #include <drivers/drv_hrt.h>
-#include <px4_config.h>
-#include <px4_getopt.h>
-#include <px4_log.h>
-#include <px4_module.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 <uORB/PublicationQueued.hpp>
 #include <uORB/topics/test_motor.h>
 

src/systemcmds/mtd/24xxxx_mtd.c

@@ -50,8 +50,8 @@
  * Included Files
  ************************************************************************************/
 
-#include <px4_config.h>
-#include <px4_time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/time.h>
 
 #include <sys/types.h>
 #include <stdint.h>

src/systemcmds/mtd/mtd.c

@@ -39,9 +39,9 @@
  * @author Lorenz Meier <lm@inf.ethz.ch>
  */
 
-#include <px4_config.h>
-#include <px4_log.h>
-#include <px4_module.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/module.h>
 
 #include <stdio.h>
 #include <stdlib.h>

src/systemcmds/nshterm/nshterm.c

@@ -36,8 +36,8 @@
  * @file nshterm.c
  */
 
-#include <px4_config.h>
-#include <px4_module.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/module.h>
 #include <termios.h>
 #include <stdbool.h>
 #include <stdio.h>

src/systemcmds/param/param.cpp

@@ -39,10 +39,10 @@
  * Parameter tool.
  */
 
-#include <px4_config.h>
-#include <px4_log.h>
-#include <px4_module.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/posix.h>
 
 #include <errno.h>
 #include <stdio.h>

src/systemcmds/perf/perf.c

@@ -33,8 +33,8 @@
 
 
 
-#include <px4_config.h>
-#include <px4_module.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/module.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>

src/systemcmds/pwm/pwm.cpp

@@ -37,14 +37,14 @@
  * PWM servo output configuration and monitoring tool.
  */
 
-#include <px4_config.h>
-#include <px4_tasks.h>
-#include <px4_posix.h>
-#include <px4_getopt.h>
-#include <px4_defines.h>
-#include <px4_log.h>
-#include <px4_module.h>
-#include <px4_cli.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/tasks.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/cli.h>
 
 #include <stdio.h>
 #include <stdlib.h>

src/systemcmds/reboot/reboot.c

@@ -38,11 +38,11 @@
  * @author Lorenz Meier <lorenz@px4.io>
  */
 
-#include <px4_config.h>
-#include <px4_getopt.h>
-#include <px4_log.h>
-#include <px4_module.h>
-#include <px4_shutdown.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/shutdown.h>
 #include <string.h>
 
 __EXPORT int reboot_main(int argc, char *argv[]);

src/systemcmds/reflect/reflect.c

@@ -39,7 +39,7 @@
  * @author Andrew Tridgell
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>

src/systemcmds/sd_bench/sd_bench.c

@@ -42,10 +42,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <px4_config.h>
-#include <px4_module.h>
-#include <px4_getopt.h>
-#include <px4_log.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/log.h>
 
 #include <drivers/drv_hrt.h>
 

src/systemcmds/shutdown/shutdown.c

@@ -36,7 +36,7 @@
  * Tool similar to UNIX shutdown command.
  */
 
-#include <px4_tasks.h>
+#include <px4_platform_common/tasks.h>
 //#include <systemlib/systemlib.h>
 
 

src/systemcmds/tests/hrt_test/hrt_test.cpp

@@ -42,8 +42,8 @@
 #include "hrt_test.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 <unistd.h>
 #include <stdio.h>

src/systemcmds/tests/hrt_test/hrt_test.h

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

src/systemcmds/tests/hrt_test/hrt_test_main.cpp

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

src/systemcmds/tests/hrt_test/hrt_test_start.cpp

@@ -42,9 +42,9 @@
 #include <string.h>
 #include <sched.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>
 
 static int daemon_task;             /* Handle of deamon task / thread */
 

src/systemcmds/tests/test_adc.c

@@ -36,10 +36,10 @@
  * Test for the analog to digital converter.
  */
 
-#include <px4_time.h>
-#include <px4_config.h>
-#include <px4_posix.h>
-#include <px4_log.h>
+#include <px4_platform_common/time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/posix.h>
+#include <px4_platform_common/log.h>
 
 #include <sys/types.h>
 

src/systemcmds/tests/test_bson.cpp

@@ -38,7 +38,7 @@
 
 #include <inttypes.h>
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

src/systemcmds/tests/test_dataman.c

@@ -36,8 +36,8 @@
  * Tests for the data manager.
  */
 
-#include <px4_config.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/posix.h>
 
 #include <sys/types.h>
 

src/systemcmds/tests/test_file.c

@@ -37,8 +37,8 @@
  * @author Lorenz Meier <lm@inf.ethz.ch>
  */
 
-#include <px4_config.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/posix.h>
 
 #include <sys/stat.h>
 #include <poll.h>

src/systemcmds/tests/test_file2.c

@@ -36,7 +36,7 @@
  * File write test.
  */
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <stdio.h>
@@ -46,7 +46,7 @@
 #include <perf/perf_counter.h>
 #include <string.h>
 #include <stdlib.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/getopt.h>
 
 #include "tests_main.h"
 

src/systemcmds/tests/test_float.cpp

@@ -38,7 +38,7 @@
 
 #include <unit_test.h>
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <float.h>
 #include <math.h>

src/systemcmds/tests/test_hott_telemetry.c

@@ -36,11 +36,11 @@
  * Tests the Graupner HoTT telemetry support.
  */
 
-#include <px4_time.h>
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_log.h>
-#include <px4_posix.h>
+#include <px4_platform_common/time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/posix.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 

src/systemcmds/tests/test_hrt.cpp

@@ -37,7 +37,7 @@
  */
 
 #include <drivers/drv_hrt.h>
-#include <px4_posix.h>
+#include <px4_platform_common/posix.h>
 #include <sys/time.h>
 
 #include "tests_main.h"

src/systemcmds/tests/test_int.cpp

@@ -42,7 +42,7 @@
 #include <fcntl.h>
 #include <float.h>
 #include <math.h>
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>

src/systemcmds/tests/test_jig_voltages.c

@@ -36,8 +36,8 @@
  * Tests for jig voltages.
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
 
 #include <sys/types.h>
 

src/systemcmds/tests/test_led.c

@@ -36,9 +36,9 @@
  * Tests for led functionality.
  */
 
-#include <px4_time.h>
-#include <px4_config.h>
-#include <px4_posix.h>
+#include <px4_platform_common/time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/posix.h>
 
 #include <sys/types.h>
 

src/systemcmds/tests/test_mathlib.cpp

@@ -42,14 +42,14 @@
 #include <fcntl.h>
 #include <float.h>
 #include <math.h>
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <px4_log.h>
+#include <px4_platform_common/log.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

src/systemcmds/tests/test_microbench_hrt.cpp

@@ -44,8 +44,8 @@
 
 #include <drivers/drv_hrt.h>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_micro_hal.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/micro_hal.h>
 
 namespace MicroBenchHRT
 {

src/systemcmds/tests/test_microbench_math.cpp

@@ -45,8 +45,8 @@
 
 #include <drivers/drv_hrt.h>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_micro_hal.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/micro_hal.h>
 
 namespace MicroBenchMath
 {

src/systemcmds/tests/test_microbench_matrix.cpp

@@ -44,8 +44,8 @@
 
 #include <drivers/drv_hrt.h>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_micro_hal.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/micro_hal.h>
 
 #include <matrix/math.hpp>
 

src/systemcmds/tests/test_microbench_uorb.cpp

@@ -44,8 +44,8 @@
 
 #include <drivers/drv_hrt.h>
 #include <perf/perf_counter.h>
-#include <px4_config.h>
-#include <px4_micro_hal.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/micro_hal.h>
 
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/sensor_accel.h>

src/systemcmds/tests/test_mixer.cpp

@@ -42,7 +42,7 @@
 #include <unistd.h>
 #include <math.h>
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <mixer/mixer.h>
 #include <mixer/mixer_load.h>
 #include <output_limit/output_limit.h>

src/systemcmds/tests/test_mount.c

@@ -37,9 +37,9 @@
  * @author Lorenz Meier <lm@inf.ethz.ch>
  */
 
-#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 <sys/stat.h>
 #include <dirent.h>

src/systemcmds/tests/test_param.c

@@ -36,7 +36,7 @@
  * Tests related to the parameter system.
  */
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <stdio.h>
 #include "systemlib/err.h"
 #include <parameters/param.h>

src/systemcmds/tests/test_parameters.cpp

@@ -38,7 +38,7 @@
 
 #include <unit_test.h>
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 
 #include <errno.h>
 #include <fcntl.h>

src/systemcmds/tests/test_perf.c

@@ -36,8 +36,8 @@
  * Tests related to the performance counter.
  */
 
-#include <px4_config.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/posix.h>
 
 #include <perf/perf_counter.h>
 

src/systemcmds/tests/test_ppm_loopback.c

@@ -36,8 +36,8 @@
  * Tests the PWM outputs and PPM input
  */
 
-#include <px4_time.h>
-#include <px4_config.h>
+#include <px4_platform_common/time.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 

src/systemcmds/tests/test_rc.c

@@ -36,7 +36,7 @@
  * Tests RC input.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 

src/systemcmds/tests/test_servo.c

@@ -36,8 +36,8 @@
  * Tests the servo outputs
  */
 
-#include <px4_time.h>
-#include <px4_config.h>
+#include <px4_platform_common/time.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <sys/types.h>
 

src/systemcmds/tests/test_sleep.c

@@ -36,9 +36,9 @@
  * Tests the px4_usleep() method.
  */
 
-#include <px4_time.h>
-#include <px4_config.h>
-#include <px4_defines.h>
+#include <px4_platform_common/time.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
 
 #include <sys/types.h>
 

src/systemcmds/tests/test_time.c

@@ -36,9 +36,9 @@
  * Tests clocks/timekeeping.
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
-#include <px4_posix.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
+#include <px4_platform_common/posix.h>
 #include <sys/types.h>
 
 #include <stdio.h>

src/systemcmds/tests/test_tone.cpp

@@ -41,7 +41,7 @@
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_tone_alarm.h>
 #include <lib/tunes/tunes.h>
-#include <px4_posix.h>
+#include <px4_platform_common/posix.h>
 #include <uORB/topics/tune_control.h>
 
 #include "tests_main.h"

src/systemcmds/tests/test_uart_baudchange.c

@@ -36,8 +36,8 @@
  * @author Lorenz Meier <lorenz@px4.io>
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
 
 #include <sys/types.h>
 

src/systemcmds/tests/test_uart_break.c

@@ -37,8 +37,8 @@
  * @author David Sidrane <david_s5@nscdg.com>
  */
 
-#include <px4_config.h>
-#include <px4_defines.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/defines.h>
 
 #include <sys/types.h>
 #include <sys/ioctl.h>

src/systemcmds/tests/test_uart_console.c

@@ -39,8 +39,8 @@
  * @author David Sidrane <david_s5@nscdg.com>
  */
 
-#include <px4_config.h>
-#include <px4_tasks.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/tasks.h>
 
 #include <sys/types.h>
 

src/systemcmds/tests/test_uart_loopback.c

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

src/systemcmds/tests/test_uart_send.c

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

src/systemcmds/tests/tests_main.c

@@ -40,7 +40,7 @@
 
 #include "tests_main.h"
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #include <stdio.h>
 #include <string.h>

src/systemcmds/tests/tests_main.h

@@ -36,7 +36,7 @@
  * Tests declaration file.
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 
 #ifndef __APPS_PX4_TESTS_H
 #define __APPS_PX4_TESTS_H

src/systemcmds/top/top.c

@@ -39,7 +39,7 @@
  * @author Lorenz Meier <lorenz@px4.io>
  */
 
-#include <px4_config.h>
+#include <px4_platform_common/px4_config.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdbool.h>
@@ -50,7 +50,7 @@
 #include <systemlib/cpuload.h>
 #include <systemlib/printload.h>
 #include <drivers/drv_hrt.h>
-#include <px4_module.h>
+#include <px4_platform_common/module.h>
 
 /**
  * Start the top application.

src/systemcmds/topic_listener/generate_listener.py

@@ -89,9 +89,9 @@ print("""
  */
 
 #include <drivers/drv_hrt.h>
-#include <px4_app.h>
-#include <px4_config.h>
-#include <px4_log.h>
+#include <px4_platform_common/app.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 #include <uORB/uORB.h>
 #include <string.h>
 #include <stdint.h>

src/systemcmds/topic_listener/listener_main.cpp

@@ -37,8 +37,8 @@
  * Tool for listening to topics.
  */
 
-#include <px4_module.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/getopt.h>
 
 #include <poll.h>
 

src/systemcmds/topic_listener/topic_listener.hpp

@@ -38,11 +38,11 @@
 
 #pragma once
 
-#include <px4_defines.h>
+#include <px4_platform_common/defines.h>
 #include <drivers/drv_hrt.h>
-#include <px4_app.h>
-#include <px4_config.h>
-#include <px4_log.h>
+#include <px4_platform_common/app.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 #include <uORB/uORB.h>
 #include <string.h>
 #include <stdint.h>

src/systemcmds/tune_control/tune_control.cpp

@@ -38,15 +38,15 @@
  * To use it make sure there's a driver running, which handles the tune_control uorb topic.
  */
 
-#include <px4_getopt.h>
-#include <px4_log.h>
+#include <px4_platform_common/getopt.h>
+#include <px4_platform_common/log.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 
-#include <px4_module.h>
+#include <px4_platform_common/module.h>
 
 #include <lib/tunes/tunes.h>
 #include <uORB/topics/tune_control.h>

src/systemcmds/usb_connected/usb_connected.c

@@ -37,8 +37,8 @@
  * @author Andrew Tridgell
  */
 
-#include <px4_config.h>
-#include <px4_module.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/module.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>

src/systemcmds/ver/ver.c

@@ -40,8 +40,8 @@
 * @author Vladimir Kulla <ufon@kullaonline.net>
 */
 
-#include <px4_config.h>
-#include <px4_module.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/module.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <string.h>

src/systemcmds/work_queue/work_queue_main.cpp

@@ -31,9 +31,9 @@
  *
  ****************************************************************************/
 
-#include <px4_config.h>
-#include <px4_module.h>
-#include <px4_getopt.h>
+#include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/module.h>
+#include <px4_platform_common/getopt.h>
 #include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
 
 static void	usage();