diff --git a/src/drivers/mpu9250/mag.h b/src/drivers/mpu9250/mag.h
index 892d4c0e40..8790ca1412 100644
--- a/src/drivers/mpu9250/mag.h
+++ b/src/drivers/mpu9250/mag.h
@@ -33,6 +33,9 @@
 
 #pragma once
 
+#include "drivers/device/ringbuffer.h"	// ringbuffer::RingBuffer
+#include "drivers/drv_mag.h"		// mag_calibration_s
+#include "systemlib/perf_counter.h"	// perf_counter_t
 
 /* in 16-bit sampling mode the mag resolution is 1.5 milli Gauss per bit */
 
diff --git a/src/lib/controllib/block/BlockParam.hpp b/src/lib/controllib/block/BlockParam.hpp
index 3690372c7f..77874f6181 100644
--- a/src/lib/controllib/block/BlockParam.hpp
+++ b/src/lib/controllib/block/BlockParam.hpp
@@ -43,6 +43,7 @@
 
 #include "Block.hpp"
 #include <containers/List.hpp>
+#include <cstddef>	// NULL
 
 namespace control
 {
diff --git a/src/lib/mathlib/math/Matrix.hpp b/src/lib/mathlib/math/Matrix.hpp
index e68e436a0c..e50fef6b1b 100644
--- a/src/lib/mathlib/math/Matrix.hpp
+++ b/src/lib/mathlib/math/Matrix.hpp
@@ -46,6 +46,8 @@
 #include <stdio.h>
 #include <cmath>
 
+#include "Vector.hpp"	// Vector and eigen_matrix_instance
+
 #include "matrix/math.hpp"
 #include <platforms/px4_defines.h>
 
diff --git a/src/modules/mavlink/mavlink_bridge_header.h b/src/modules/mavlink/mavlink_bridge_header.h
index 6d10ec9c3f..43e274a228 100644
--- a/src/modules/mavlink/mavlink_bridge_header.h
+++ b/src/modules/mavlink/mavlink_bridge_header.h
@@ -52,6 +52,7 @@
 #define MAVLINK_GET_CHANNEL_BUFFER mavlink_get_channel_buffer
 #define MAVLINK_GET_CHANNEL_STATUS mavlink_get_channel_status
 
+#include <stdbool.h>			// Needs to be included before v2.0/mavlink_types.h until https://github.com/ArduPilot/pymavlink/pull/22 makes it through.
 #include <v2.0/mavlink_types.h>
 #include <unistd.h>
 
diff --git a/src/modules/mavlink/mavlink_log_handler.h b/src/modules/mavlink/mavlink_log_handler.h
index 59fb162993..e7d47e4508 100644
--- a/src/modules/mavlink/mavlink_log_handler.h
+++ b/src/modules/mavlink/mavlink_log_handler.h
@@ -40,6 +40,7 @@
 #include <queue.h>
 #include <time.h>
 #include <stdio.h>
+#include <cstdbool>
 #include <v2.0/mavlink_types.h>
 #include "mavlink_stream.h"
 
diff --git a/src/modules/mavlink/mavlink_orb_subscription.h b/src/modules/mavlink/mavlink_orb_subscription.h
index 9154e6a2b8..c4240f5306 100644
--- a/src/modules/mavlink/mavlink_orb_subscription.h
+++ b/src/modules/mavlink/mavlink_orb_subscription.h
@@ -43,7 +43,7 @@
 
 #include <systemlib/uthash/utlist.h>
 #include <drivers/drv_hrt.h>
-
+#include "uORB/uORB.h"	// orb_id_t
 
 class MavlinkOrbSubscription
 {
diff --git a/src/modules/px4iofirmware/px4io.c b/src/modules/px4iofirmware/px4io.c
index e24b66633f..49195ef6e2 100644
--- a/src/modules/px4iofirmware/px4io.c
+++ b/src/modules/px4iofirmware/px4io.c
@@ -47,6 +47,7 @@
 #include <poll.h>
 #include <signal.h>
 #include <crc32.h>
+#include <syslog.h>
 
 #include <drivers/drv_pwm_output.h>
 #include <drivers/drv_hrt.h>
diff --git a/src/modules/systemlib/board_serial.h b/src/modules/systemlib/board_serial.h
index 873d9657ba..72187f17a1 100644
--- a/src/modules/systemlib/board_serial.h
+++ b/src/modules/systemlib/board_serial.h
@@ -42,6 +42,8 @@
 
 #pragma once
 
+#include <stdint.h>	// uint8_t
+
 __BEGIN_DECLS
 
 __EXPORT int get_board_serial(uint8_t *serialid);
diff --git a/src/modules/systemlib/cpuload.h b/src/modules/systemlib/cpuload.h
index b5be48b59e..5bad4b7a85 100644
--- a/src/modules/systemlib/cpuload.h
+++ b/src/modules/systemlib/cpuload.h
@@ -37,6 +37,7 @@
 
 #include <sched.h>
 #include <stdint.h>
+#include <stdbool.h>
 
 struct system_load_taskinfo_s {
 	uint64_t total_runtime;			///< Runtime since start (start_time - total_runtime)/(start_time - current_time) = load
diff --git a/src/modules/uavcan/uavcan_servers.hpp b/src/modules/uavcan/uavcan_servers.hpp
index 868ffacc62..16364797cb 100644
--- a/src/modules/uavcan/uavcan_servers.hpp
+++ b/src/modules/uavcan/uavcan_servers.hpp
@@ -41,6 +41,8 @@
 
 #include <uavcan/node/sub_node.hpp>
 #include <uavcan/protocol/node_status_monitor.hpp>
+#include <uavcan/protocol/param/GetSet.hpp>
+#include <uavcan/protocol/param/ExecuteOpcode.hpp>
 
 #include <uavcan/protocol/dynamic_node_id_server/centralized.hpp>
 #include <uavcan/protocol/node_info_retriever.hpp>