diff --git a/common/msg_control.h b/common/msg_control.h
index 2179881a04..e4da59e870 100644
--- a/common/msg_control.h
+++ b/common/msg_control.h
@@ -2,6 +2,7 @@
 #define MP_MSG_CONTROL_H
 
 #include <stdbool.h>
+#include "common/msg.h"
 
 struct mpv_global;
 struct MPOpts;
diff --git a/demux/timeline.h b/demux/timeline.h
index 93919a5c51..7bc7e9e053 100644
--- a/demux/timeline.h
+++ b/demux/timeline.h
@@ -2,6 +2,7 @@
 #define MP_TIMELINE_H_
 
 #include "common/common.h"
+#include "misc/bstr.h"
 
 // Single segment in a timeline.
 struct timeline_part {
diff --git a/filters/f_async_queue.h b/filters/f_async_queue.h
index e05b43a43b..46dafcdc97 100644
--- a/filters/f_async_queue.h
+++ b/filters/f_async_queue.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <stdint.h>
 #include "filter.h"
 
 // A thread safe queue, which buffers a configurable number of frames like a
diff --git a/filters/f_decoder_wrapper.h b/filters/f_decoder_wrapper.h
index 3100e6836b..9f1a8b5863 100644
--- a/filters/f_decoder_wrapper.h
+++ b/filters/f_decoder_wrapper.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <stdbool.h>
+#include <stddef.h>
 
 #include "filter.h"
 
diff --git a/misc/thread_pool.h b/misc/thread_pool.h
index 14954da58f..39106ee498 100644
--- a/misc/thread_pool.h
+++ b/misc/thread_pool.h
@@ -1,6 +1,7 @@
 #ifndef MPV_MP_THREAD_POOL_H
 #define MPV_MP_THREAD_POOL_H
 
+#include <stdbool.h>
 struct mp_thread_pool;
 
 // Create a thread pool with the given number of worker threads. This can return
diff --git a/player/command.h b/player/command.h
index ba3824cd9b..185b78fdbe 100644
--- a/player/command.h
+++ b/player/command.h
@@ -21,6 +21,7 @@
 #include <stdbool.h>
 
 #include "libmpv/client.h"
+#include "osdep/compiler.h"
 
 struct MPContext;
 struct mp_cmd;