From 59e86c490d9cc4fd2ef368ccdac88994325bc4d3 Mon Sep 17 00:00:00 2001
From: Ville Juven <ville.juven@unikie.com>
Date: Fri, 23 Sep 2022 13:58:44 +0300
Subject: [PATCH] Remove include <log.h> from defines.h

The reason for this is that log.h includes drv_hrt.h which sucks in
half the project's include files with it, which causes strange build
issues
---
 platforms/common/include/px4_platform_common/defines.h        | 2 +-
 platforms/common/include/px4_platform_common/i2c_spi_buses.h  | 1 +
 platforms/common/px4_work_queue/ScheduledWorkItem.cpp         | 1 +
 platforms/common/px4_work_queue/WorkQueue.cpp                 | 1 +
 platforms/common/px4_work_queue/WorkQueueManager.cpp          | 1 +
 platforms/common/work_queue/work_thread.c                     | 1 +
 platforms/nuttx/src/px4/common/print_load.cpp                 | 1 +
 platforms/nuttx/src/px4/common/px4_init.cpp                   | 1 +
 platforms/nuttx/src/px4/common/px4_nuttx_impl.cpp             | 2 ++
 platforms/nuttx/src/px4/common/px4_usr_crypto.cpp             | 1 +
 platforms/nuttx/src/px4/common/usr_board_ctrl.c               | 2 ++
 platforms/nuttx/src/px4/common/usr_mcu_version.cpp            | 1 +
 platforms/posix/src/px4/common/print_load.cpp                 | 1 +
 platforms/posix/src/px4/common/px4_init.cpp                   | 1 +
 platforms/posix/src/px4/common/px4_sem.cpp                    | 1 +
 src/drivers/cyphal/Publishers/Publisher.hpp                   | 1 +
 src/drivers/cyphal/Subscribers/BaseSubscriber.hpp             | 1 +
 src/drivers/distance_sensor/broadcom/afbrs50/argus_hal_test.c | 1 +
 src/drivers/gps/definitions.h                                 | 1 +
 src/drivers/magnetometer/hmc5883/HMC5883.hpp                  | 1 +
 src/drivers/magnetometer/hmc5883/hmc5883_i2c.cpp              | 1 +
 src/drivers/magnetometer/hmc5883/hmc5883_spi.cpp              | 1 +
 src/drivers/tap_esc/tap_esc_common.cpp                        | 1 +
 src/drivers/uavcan/sensors/battery.cpp                        | 1 +
 src/examples/px4_simple_app/px4_simple_app.c                  | 1 +
 src/lib/cdev/CDev.cpp                                         | 1 +
 src/lib/cdev/test/cdevtest_example.cpp                        | 1 +
 src/lib/controllib/block/Block.cpp                            | 3 +++
 src/lib/controllib/block/BlockParam.cpp                       | 3 +++
 src/lib/drivers/device/CDev.cpp                               | 1 +
 src/lib/drivers/device/Device.hpp                             | 3 +++
 src/lib/drivers/led/led.cpp                                   | 1 +
 src/lib/geo/geo.h                                             | 2 ++
 src/lib/parameters/flashparams/flashparams.cpp                | 1 +
 src/lib/parameters/parameters_common.cpp                      | 2 ++
 src/lib/parameters/parameters_ioctl.cpp                       | 3 +++
 src/lib/parameters/parameters_ioctl.h                         | 1 +
 src/lib/parameters/usr_parameters_if.cpp                      | 1 +
 src/lib/rc/dsm.cpp                                            | 1 +
 src/lib/wind_estimator/WindEstimator.hpp                      | 2 ++
 src/modules/commander/lm_fit.hpp                              | 2 ++
 src/modules/ekf2/EKF/estimator_interface.h                    | 1 +
 src/modules/gimbal/input_rc.cpp                               | 2 +-
 src/modules/gimbal/input_test.cpp                             | 1 +
 src/modules/logger/log_writer_file.cpp                        | 1 +
 src/modules/mavlink/mavlink_shell.cpp                         | 2 ++
 src/systemcmds/tests/test_dataman.c                           | 1 +
 src/systemcmds/tests/test_hrt.cpp                             | 1 +
 src/systemcmds/tests/test_perf.c                              | 1 +
 src/systemcmds/tests/test_sleep.c                             | 2 ++
 50 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/platforms/common/include/px4_platform_common/defines.h b/platforms/common/include/px4_platform_common/defines.h
index 6c325fa803a..e0a740943ba 100644
--- a/platforms/common/include/px4_platform_common/defines.h
+++ b/platforms/common/include/px4_platform_common/defines.h
@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_platform_common/log.h>
+#include <sys/ioctl.h>
 
 /****************************************************************************
  * Defines for all platforms.
diff --git a/platforms/common/include/px4_platform_common/i2c_spi_buses.h b/platforms/common/include/px4_platform_common/i2c_spi_buses.h
index 85c8c634847..aa6dc90703f 100644
--- a/platforms/common/include/px4_platform_common/i2c_spi_buses.h
+++ b/platforms/common/include/px4_platform_common/i2c_spi_buses.h
@@ -40,6 +40,7 @@
 #include <containers/List.hpp>
 #include <lib/conversion/rotation.h>
 #include <px4_platform_common/atomic.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <px4_platform_common/sem.h>
 
diff --git a/platforms/common/px4_work_queue/ScheduledWorkItem.cpp b/platforms/common/px4_work_queue/ScheduledWorkItem.cpp
index f5f9e130f07..794e390b371 100644
--- a/platforms/common/px4_work_queue/ScheduledWorkItem.cpp
+++ b/platforms/common/px4_work_queue/ScheduledWorkItem.cpp
@@ -31,6 +31,7 @@
  *
  ****************************************************************************/
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 namespace px4
diff --git a/platforms/common/px4_work_queue/WorkQueue.cpp b/platforms/common/px4_work_queue/WorkQueue.cpp
index fa32017912f..c8aa15995ba 100644
--- a/platforms/common/px4_work_queue/WorkQueue.cpp
+++ b/platforms/common/px4_work_queue/WorkQueue.cpp
@@ -36,6 +36,7 @@
 
 #include <string.h>
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/tasks.h>
 #include <px4_platform_common/time.h>
 #include <drivers/drv_hrt.h>
diff --git a/platforms/common/px4_work_queue/WorkQueueManager.cpp b/platforms/common/px4_work_queue/WorkQueueManager.cpp
index 95f9a47147a..3852215b299 100644
--- a/platforms/common/px4_work_queue/WorkQueueManager.cpp
+++ b/platforms/common/px4_work_queue/WorkQueueManager.cpp
@@ -36,6 +36,7 @@
 #include <px4_platform_common/px4_work_queue/WorkQueue.hpp>
 
 #include <drivers/drv_hrt.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/posix.h>
 #include <px4_platform_common/tasks.h>
 #include <px4_platform_common/time.h>
diff --git a/platforms/common/work_queue/work_thread.c b/platforms/common/work_queue/work_thread.c
index 7f2ee905338..4e4713a19ce 100644
--- a/platforms/common/work_queue/work_thread.c
+++ b/platforms/common/work_queue/work_thread.c
@@ -39,6 +39,7 @@
 
 #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 <px4_platform_common/time.h>
 #include <px4_platform_common/tasks.h>
diff --git a/platforms/nuttx/src/px4/common/print_load.cpp b/platforms/nuttx/src/px4/common/print_load.cpp
index fa341c7824a..8c6486453ad 100644
--- a/platforms/nuttx/src/px4/common/print_load.cpp
+++ b/platforms/nuttx/src/px4/common/print_load.cpp
@@ -43,6 +43,7 @@
 #include <stdio.h>
 
 #include <px4_platform/cpuload.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/printload.h>
 #include <drivers/drv_hrt.h>
 
diff --git a/platforms/nuttx/src/px4/common/px4_init.cpp b/platforms/nuttx/src/px4/common/px4_init.cpp
index 599f0719555..fb371b9093a 100644
--- a/platforms/nuttx/src/px4/common/px4_init.cpp
+++ b/platforms/nuttx/src/px4/common/px4_init.cpp
@@ -32,6 +32,7 @@
  ****************************************************************************/
 
 #include <px4_platform_common/init.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/px4_manifest.h>
 #include <px4_platform_common/console_buffer.h>
diff --git a/platforms/nuttx/src/px4/common/px4_nuttx_impl.cpp b/platforms/nuttx/src/px4/common/px4_nuttx_impl.cpp
index c736784f36f..3c38ac3b093 100644
--- a/platforms/nuttx/src/px4/common/px4_nuttx_impl.cpp
+++ b/platforms/nuttx/src/px4/common/px4_nuttx_impl.cpp
@@ -37,6 +37,8 @@
  * PX4 Middleware Wrapper NuttX Implementation
  */
 
+#include <cstdio>
+
 #include <px4_platform_common/defines.h>
 #include <drivers/drv_hrt.h>
 
diff --git a/platforms/nuttx/src/px4/common/px4_usr_crypto.cpp b/platforms/nuttx/src/px4/common/px4_usr_crypto.cpp
index bb48cad6aae..4a12a306836 100644
--- a/platforms/nuttx/src/px4/common/px4_usr_crypto.cpp
+++ b/platforms/nuttx/src/px4/common/px4_usr_crypto.cpp
@@ -33,6 +33,7 @@
 
 #if defined(PX4_CRYPTO)
 
+#include <px4_platform/board_ctrl.h>
 #include <px4_platform_common/crypto.h>
 #include <px4_platform_common/crypto_backend.h>
 #include <sys/boardctl.h>
diff --git a/platforms/nuttx/src/px4/common/usr_board_ctrl.c b/platforms/nuttx/src/px4/common/usr_board_ctrl.c
index 89ec05090c3..2da5e9dfbfd 100644
--- a/platforms/nuttx/src/px4/common/usr_board_ctrl.c
+++ b/platforms/nuttx/src/px4/common/usr_board_ctrl.c
@@ -33,6 +33,8 @@
 
 #include <nuttx/config.h>
 
+#include <stdbool.h>
+
 #include <px4_platform/board_ctrl.h>
 
 #include <sys/boardctl.h>
diff --git a/platforms/nuttx/src/px4/common/usr_mcu_version.cpp b/platforms/nuttx/src/px4/common/usr_mcu_version.cpp
index e89693a2d10..1fc3f57b2dd 100644
--- a/platforms/nuttx/src/px4/common/usr_mcu_version.cpp
+++ b/platforms/nuttx/src/px4/common/usr_mcu_version.cpp
@@ -38,6 +38,7 @@
  */
 
 #include <systemlib/px4_macros.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
 #include <px4_platform/board_determine_hw_info.h>
diff --git a/platforms/posix/src/px4/common/print_load.cpp b/platforms/posix/src/px4/common/print_load.cpp
index 4cfce909d0a..a392fb823fe 100644
--- a/platforms/posix/src/px4/common/print_load.cpp
+++ b/platforms/posix/src/px4/common/print_load.cpp
@@ -46,6 +46,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/printload.h>
 #include <drivers/drv_hrt.h>
 
diff --git a/platforms/posix/src/px4/common/px4_init.cpp b/platforms/posix/src/px4/common/px4_init.cpp
index b93a53ba5fd..71af70565d4 100644
--- a/platforms/posix/src/px4/common/px4_init.cpp
+++ b/platforms/posix/src/px4/common/px4_init.cpp
@@ -34,6 +34,7 @@
 #include <px4_platform_common/init.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 #include <drivers/drv_hrt.h>
 #include <lib/parameters/param.h>
 #include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
diff --git a/platforms/posix/src/px4/common/px4_sem.cpp b/platforms/posix/src/px4/common/px4_sem.cpp
index 272ee45ac7d..fd43ae0e85d 100644
--- a/platforms/posix/src/px4/common/px4_sem.cpp
+++ b/platforms/posix/src/px4/common/px4_sem.cpp
@@ -38,6 +38,7 @@
  */
 
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/workqueue.h>
 #include <px4_platform_common/time.h>
 #include <stdint.h>
diff --git a/src/drivers/cyphal/Publishers/Publisher.hpp b/src/drivers/cyphal/Publishers/Publisher.hpp
index 2661a053ef0..e0d07698672 100644
--- a/src/drivers/cyphal/Publishers/Publisher.hpp
+++ b/src/drivers/cyphal/Publishers/Publisher.hpp
@@ -42,6 +42,7 @@
 #pragma once
 
 #include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 
 #include <lib/parameters/param.h>
 #include <containers/List.hpp>
diff --git a/src/drivers/cyphal/Subscribers/BaseSubscriber.hpp b/src/drivers/cyphal/Subscribers/BaseSubscriber.hpp
index a673bd046bc..33b8f0ea87e 100644
--- a/src/drivers/cyphal/Subscribers/BaseSubscriber.hpp
+++ b/src/drivers/cyphal/Subscribers/BaseSubscriber.hpp
@@ -42,6 +42,7 @@
 #pragma once
 
 #include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 
 #include <lib/parameters/param.h>
 
diff --git a/src/drivers/distance_sensor/broadcom/afbrs50/argus_hal_test.c b/src/drivers/distance_sensor/broadcom/afbrs50/argus_hal_test.c
index 8b877fa1d47..5f8fd4b1f1d 100644
--- a/src/drivers/distance_sensor/broadcom/afbrs50/argus_hal_test.c
+++ b/src/drivers/distance_sensor/broadcom/afbrs50/argus_hal_test.c
@@ -48,6 +48,7 @@
 
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 
 /*******************************************************************************
  * Definitions
diff --git a/src/drivers/gps/definitions.h b/src/drivers/gps/definitions.h
index 5aa4cbb1771..a1f5ac6a175 100644
--- a/src/drivers/gps/definitions.h
+++ b/src/drivers/gps/definitions.h
@@ -41,6 +41,7 @@
 
 #include <drivers/drv_hrt.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 #include <uORB/topics/satellite_info.h>
 #include <uORB/topics/sensor_gps.h>
 #include <uORB/topics/sensor_gnss_relative.h>
diff --git a/src/drivers/magnetometer/hmc5883/HMC5883.hpp b/src/drivers/magnetometer/hmc5883/HMC5883.hpp
index 9192fb5565d..98b8bd457ac 100644
--- a/src/drivers/magnetometer/hmc5883/HMC5883.hpp
+++ b/src/drivers/magnetometer/hmc5883/HMC5883.hpp
@@ -35,6 +35,7 @@
 
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/time.h>
 #include <drivers/device/i2c.h>
 #include <px4_platform_common/i2c_spi_buses.h>
diff --git a/src/drivers/magnetometer/hmc5883/hmc5883_i2c.cpp b/src/drivers/magnetometer/hmc5883/hmc5883_i2c.cpp
index 99ba88bebff..ebc6ccde673 100644
--- a/src/drivers/magnetometer/hmc5883/hmc5883_i2c.cpp
+++ b/src/drivers/magnetometer/hmc5883/hmc5883_i2c.cpp
@@ -38,6 +38,7 @@
  */
 
 #include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 #include <drivers/device/i2c.h>
 
 #include "hmc5883.h"
diff --git a/src/drivers/magnetometer/hmc5883/hmc5883_spi.cpp b/src/drivers/magnetometer/hmc5883/hmc5883_spi.cpp
index 1f3b0175b80..1cceeb1e526 100644
--- a/src/drivers/magnetometer/hmc5883/hmc5883_spi.cpp
+++ b/src/drivers/magnetometer/hmc5883/hmc5883_spi.cpp
@@ -38,6 +38,7 @@
  */
 
 #include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 #include <drivers/device/spi.h>
 
 #include "hmc5883.h"
diff --git a/src/drivers/tap_esc/tap_esc_common.cpp b/src/drivers/tap_esc/tap_esc_common.cpp
index d2ba932dbc4..cf66afe29ee 100644
--- a/src/drivers/tap_esc/tap_esc_common.cpp
+++ b/src/drivers/tap_esc/tap_esc_common.cpp
@@ -44,6 +44,7 @@
 #include <systemlib/px4_macros.h> // arraySize
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 
 #ifndef B250000
 #define B250000 250000
diff --git a/src/drivers/uavcan/sensors/battery.cpp b/src/drivers/uavcan/sensors/battery.cpp
index b8d6f098ea4..bace756c657 100644
--- a/src/drivers/uavcan/sensors/battery.cpp
+++ b/src/drivers/uavcan/sensors/battery.cpp
@@ -35,6 +35,7 @@
 
 #include <lib/geo/geo.h>
 #include <px4_defines.h>
+#include <px4_platform_common/log.h>
 
 const char *const UavcanBatteryBridge::NAME = "battery";
 
diff --git a/src/examples/px4_simple_app/px4_simple_app.c b/src/examples/px4_simple_app/px4_simple_app.c
index c9f9d619270..25e89efcf1f 100644
--- a/src/examples/px4_simple_app/px4_simple_app.c
+++ b/src/examples/px4_simple_app/px4_simple_app.c
@@ -39,6 +39,7 @@
  */
 
 #include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/tasks.h>
 #include <px4_platform_common/posix.h>
 #include <unistd.h>
diff --git a/src/lib/cdev/CDev.cpp b/src/lib/cdev/CDev.cpp
index de5e0482e96..b5bcce2dd34 100644
--- a/src/lib/cdev/CDev.cpp
+++ b/src/lib/cdev/CDev.cpp
@@ -41,6 +41,7 @@
 
 #include <cstring>
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/posix.h>
 
 namespace cdev
diff --git a/src/lib/cdev/test/cdevtest_example.cpp b/src/lib/cdev/test/cdevtest_example.cpp
index 51eb3f731c1..48bed08d0b8 100644
--- a/src/lib/cdev/test/cdevtest_example.cpp
+++ b/src/lib/cdev/test/cdevtest_example.cpp
@@ -41,6 +41,7 @@
 
 #include "cdevtest_example.h"
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/tasks.h>
 #include <px4_platform_common/time.h>
 #include <lib/cdev/CDev.hpp>
diff --git a/src/lib/controllib/block/Block.cpp b/src/lib/controllib/block/Block.cpp
index 32662d6cf17..bc9a7983220 100644
--- a/src/lib/controllib/block/Block.cpp
+++ b/src/lib/controllib/block/Block.cpp
@@ -40,8 +40,11 @@
 #include "Block.hpp"
 #include "BlockParam.hpp"
 
+#include <cstdio>
 #include <cstring>
 
+#include <px4_platform_common/log.h>
+
 namespace control
 {
 
diff --git a/src/lib/controllib/block/BlockParam.cpp b/src/lib/controllib/block/BlockParam.cpp
index 94b885ec2ca..f78258ade38 100644
--- a/src/lib/controllib/block/BlockParam.cpp
+++ b/src/lib/controllib/block/BlockParam.cpp
@@ -39,10 +39,13 @@
 
 #include "BlockParam.hpp"
 
+#include <cstdio>
 #include <cstring>
 
 #include <containers/List.hpp>
 
+#include <px4_platform_common/log.h>
+
 namespace control
 {
 
diff --git a/src/lib/drivers/device/CDev.cpp b/src/lib/drivers/device/CDev.cpp
index f5b9ddb8d5a..835454b8213 100644
--- a/src/lib/drivers/device/CDev.cpp
+++ b/src/lib/drivers/device/CDev.cpp
@@ -41,6 +41,7 @@
 
 #include <cstring>
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/posix.h>
 
 namespace device
diff --git a/src/lib/drivers/device/Device.hpp b/src/lib/drivers/device/Device.hpp
index 689467f2aba..8e3ffa1cba8 100644
--- a/src/lib/drivers/device/Device.hpp
+++ b/src/lib/drivers/device/Device.hpp
@@ -40,9 +40,12 @@
 #ifndef _DEVICE_DEVICE_HPP
 #define _DEVICE_DEVICE_HPP
 
+#include <cstdio>
+
 /*
  * Includes here should only cover the needs of the framework definitions.
  */
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/posix.h>
 
diff --git a/src/lib/drivers/led/led.cpp b/src/lib/drivers/led/led.cpp
index c99ddfe2e54..e472e859e30 100644
--- a/src/lib/drivers/led/led.cpp
+++ b/src/lib/drivers/led/led.cpp
@@ -37,6 +37,7 @@
  * LED driver to control the onboard LED(s) via ioctl interface.
  */
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <lib/cdev/CDev.hpp>
 #include <drivers/drv_board_led.h>
diff --git a/src/lib/geo/geo.h b/src/lib/geo/geo.h
index 0b49c112a24..cb93e99be52 100644
--- a/src/lib/geo/geo.h
+++ b/src/lib/geo/geo.h
@@ -48,6 +48,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <drivers/drv_hrt.h>
+
 #include <lib/mathlib/mathlib.h>
 #include <lib/matrix/matrix/math.hpp>
 
diff --git a/src/lib/parameters/flashparams/flashparams.cpp b/src/lib/parameters/flashparams/flashparams.cpp
index f5221daf7a5..6eb8c9e8a2b 100644
--- a/src/lib/parameters/flashparams/flashparams.cpp
+++ b/src/lib/parameters/flashparams/flashparams.cpp
@@ -43,6 +43,7 @@
  */
 
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/posix.h>
 #include <px4_platform_common/shutdown.h>
 
diff --git a/src/lib/parameters/parameters_common.cpp b/src/lib/parameters/parameters_common.cpp
index 0fc6eaaca29..215bc7e1b13 100644
--- a/src/lib/parameters/parameters_common.cpp
+++ b/src/lib/parameters/parameters_common.cpp
@@ -31,6 +31,8 @@
  *
  ****************************************************************************/
 
+#include <string.h>
+
 /**
  * @file parameters_common.cpp
  *
diff --git a/src/lib/parameters/parameters_ioctl.cpp b/src/lib/parameters/parameters_ioctl.cpp
index 2c742cae789..47a567ec93e 100644
--- a/src/lib/parameters/parameters_ioctl.cpp
+++ b/src/lib/parameters/parameters_ioctl.cpp
@@ -38,6 +38,9 @@
  */
 
 #define PARAM_IMPLEMENTATION
+
+#include <errno.h>
+
 #include "param.h"
 #include "parameters_ioctl.h"
 #include <px4_platform_common/defines.h>
diff --git a/src/lib/parameters/parameters_ioctl.h b/src/lib/parameters/parameters_ioctl.h
index d8e185cb1ef..4e046d213ab 100644
--- a/src/lib/parameters/parameters_ioctl.h
+++ b/src/lib/parameters/parameters_ioctl.h
@@ -42,6 +42,7 @@
 #define PARAM_IMPLEMENTATION
 #include "param.h"
 #include <px4_platform/board_ctrl.h>
+#include <px4_platform_common/defines.h>
 
 #define _PARAMIOC(_n) (_PX4_IOC(_PARAMIOCBASE, _n))
 
diff --git a/src/lib/parameters/usr_parameters_if.cpp b/src/lib/parameters/usr_parameters_if.cpp
index 86a64d5c1fb..04be2219ff8 100644
--- a/src/lib/parameters/usr_parameters_if.cpp
+++ b/src/lib/parameters/usr_parameters_if.cpp
@@ -42,6 +42,7 @@
 #include <parameters/px4_parameters.hpp>
 #include <sys/boardctl.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 
 #include "parameters_common.cpp"
 
diff --git a/src/lib/rc/dsm.cpp b/src/lib/rc/dsm.cpp
index 4792e01ed46..d1b78a99bf6 100644
--- a/src/lib/rc/dsm.cpp
+++ b/src/lib/rc/dsm.cpp
@@ -42,6 +42,7 @@
 #include <px4_platform_common/px4_config.h>
 #include <board_config.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 
 #include <fcntl.h>
 #include <math.h>
diff --git a/src/lib/wind_estimator/WindEstimator.hpp b/src/lib/wind_estimator/WindEstimator.hpp
index 8dbb2251f79..f168ecbe3f2 100644
--- a/src/lib/wind_estimator/WindEstimator.hpp
+++ b/src/lib/wind_estimator/WindEstimator.hpp
@@ -38,6 +38,8 @@
 
 #pragma once
 
+#include <drivers/drv_hrt.h>
+
 #include <mathlib/mathlib.h>
 #include <matrix/math.hpp>
 
diff --git a/src/modules/commander/lm_fit.hpp b/src/modules/commander/lm_fit.hpp
index 52fa674d02b..620a0b5030f 100644
--- a/src/modules/commander/lm_fit.hpp
+++ b/src/modules/commander/lm_fit.hpp
@@ -33,6 +33,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include <matrix/matrix/math.hpp>
 #include <px4_platform_common/defines.h>
 
diff --git a/src/modules/ekf2/EKF/estimator_interface.h b/src/modules/ekf2/EKF/estimator_interface.h
index c7bd08c5280..37dfda4bdba 100644
--- a/src/modules/ekf2/EKF/estimator_interface.h
+++ b/src/modules/ekf2/EKF/estimator_interface.h
@@ -43,6 +43,7 @@
 #define EKF_ESTIMATOR_INTERFACE_H
 
 #if defined(MODULE_NAME)
+#include <px4_platform_common/log.h>
 # define ECL_INFO PX4_DEBUG
 # define ECL_WARN PX4_DEBUG
 # define ECL_ERR  PX4_DEBUG
diff --git a/src/modules/gimbal/input_rc.cpp b/src/modules/gimbal/input_rc.cpp
index 182bab9b05f..e95705ff664 100644
--- a/src/modules/gimbal/input_rc.cpp
+++ b/src/modules/gimbal/input_rc.cpp
@@ -40,7 +40,7 @@
 #include <matrix/matrix/math.hpp>
 #include <px4_platform_common/posix.h>
 #include <px4_platform_common/defines.h>
-
+#include <px4_platform_common/log.h>
 
 namespace gimbal
 {
diff --git a/src/modules/gimbal/input_test.cpp b/src/modules/gimbal/input_test.cpp
index 09f4a21d48c..c124ab869cf 100644
--- a/src/modules/gimbal/input_test.cpp
+++ b/src/modules/gimbal/input_test.cpp
@@ -34,6 +34,7 @@
 #include "input_test.h"
 
 #include <px4_platform_common/posix.h>
+#include <px4_platform_common/log.h>
 #include <lib/matrix/matrix/math.hpp>
 #include <lib/mathlib/mathlib.h>
 
diff --git a/src/modules/logger/log_writer_file.cpp b/src/modules/logger/log_writer_file.cpp
index e4f1787fb6c..f9f08fddb66 100644
--- a/src/modules/logger/log_writer_file.cpp
+++ b/src/modules/logger/log_writer_file.cpp
@@ -41,6 +41,7 @@
 #include <mathlib/mathlib.h>
 #include <px4_platform_common/posix.h>
 #include <px4_platform_common/crypto.h>
+#include <px4_platform_common/log.h>
 #ifdef __PX4_NUTTX
 #include <systemlib/hardfault_log.h>
 #endif /* __PX4_NUTTX */
diff --git a/src/modules/mavlink/mavlink_shell.cpp b/src/modules/mavlink/mavlink_shell.cpp
index 38bd12932e5..cce39a472fb 100644
--- a/src/modules/mavlink/mavlink_shell.cpp
+++ b/src/modules/mavlink/mavlink_shell.cpp
@@ -40,6 +40,8 @@
 
 #include "mavlink_shell.h"
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/posix.h>
 
 #include <unistd.h>
 #include <errno.h>
diff --git a/src/systemcmds/tests/test_dataman.c b/src/systemcmds/tests/test_dataman.c
index 44fb7475408..e5533230607 100644
--- a/src/systemcmds/tests/test_dataman.c
+++ b/src/systemcmds/tests/test_dataman.c
@@ -36,6 +36,7 @@
  * Tests for the data manager.
  */
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/posix.h>
 
diff --git a/src/systemcmds/tests/test_hrt.cpp b/src/systemcmds/tests/test_hrt.cpp
index 65eb529a869..e5274d72d7c 100644
--- a/src/systemcmds/tests/test_hrt.cpp
+++ b/src/systemcmds/tests/test_hrt.cpp
@@ -37,6 +37,7 @@
  */
 
 #include <drivers/drv_hrt.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/posix.h>
 #include <sys/time.h>
 
diff --git a/src/systemcmds/tests/test_perf.c b/src/systemcmds/tests/test_perf.c
index cdde16afc52..f3c23b8ea60 100644
--- a/src/systemcmds/tests/test_perf.c
+++ b/src/systemcmds/tests/test_perf.c
@@ -36,6 +36,7 @@
  * Tests related to the performance counter.
  */
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/posix.h>
 
diff --git a/src/systemcmds/tests/test_sleep.c b/src/systemcmds/tests/test_sleep.c
index 840e4bc4568..b5dbf64567e 100644
--- a/src/systemcmds/tests/test_sleep.c
+++ b/src/systemcmds/tests/test_sleep.c
@@ -36,6 +36,8 @@
  * Tests the px4_usleep() method.
  */
 
+#include <drivers/drv_hrt.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/time.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>