Cleanup: Fix forward declaration of headers

47 files changed, 72 insertions, 8 deletions

diff --git a/source/blender/blenkernel/BKE_boids.h b/source/blender/blenkernel/BKE_boids.h
index f748143818c..f9fd814b5f2 100644
--- a/source/blender/blenkernel/BKE_boids.h
+++ b/source/blender/blenkernel/BKE_boids.h
@@ -25,6 +25,7 @@
  */
 
 #include "DNA_boid_types.h"
+#include "DNA_particle_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index 6a11471064c..164867b228b 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -27,6 +27,8 @@
 extern "C" {
 #endif
 
+#include "DNA_scene_types.h"
+
 struct BezTriple;
 struct Curve;
 struct Depsgraph;
diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h
index 8c6b16ed1e4..0dc133e34b3 100644
--- a/source/blender/blenkernel/BKE_dynamicpaint.h
+++ b/source/blender/blenkernel/BKE_dynamicpaint.h
@@ -25,10 +25,13 @@
 extern "C" {
 #endif
 
+#include "BLI_utildefines.h"
+
 struct Depsgraph;
 struct DynamicPaintCanvasSettings;
 struct DynamicPaintModifierData;
 struct DynamicPaintRuntime;
+struct Object;
 struct Scene;
 
 /* Actual surface point */
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 93840db49c9..fe050075bae 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -27,6 +27,7 @@
  *   for every fresh Blender run.
  */
 
+#include "BLI_utildefines.h"
 #include "DNA_listBase.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index a082e53cfc1..524bd3318f6 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -27,6 +27,8 @@
 extern "C" {
 #endif
 
+#include "BLI_utildefines.h"
+
 struct Depsgraph;
 struct ID;
 struct ImBuf;
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index ceb48783e20..9650f8eed6e 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -63,6 +63,7 @@ struct bToolRef;
 
 enum eOverlayFlags;
 
+#include "BLI_utildefines.h"
 #include "DNA_object_enums.h"
 
 extern const char PAINT_CURSOR_SCULPT[3];
diff --git a/source/blender/blenkernel/BKE_text_suggestions.h b/source/blender/blenkernel/BKE_text_suggestions.h
index 80c38719f96..dc908ee5232 100644
--- a/source/blender/blenkernel/BKE_text_suggestions.h
+++ b/source/blender/blenkernel/BKE_text_suggestions.h
@@ -27,6 +27,8 @@
 extern "C" {
 #endif
 
+#include "DNA_text_types.h"
+
 /* ****************************************************************************
  * Suggestions should be added in sorted order although a linear sorting method is
  * implemented. The list is then divided up based on the prefix provided by
diff --git a/source/blender/blenlib/BLI_array_utils.h b/source/blender/blenlib/BLI_array_utils.h
index f70aa3b54fa..afa9a3d2241 100644
--- a/source/blender/blenlib/BLI_array_utils.h
+++ b/source/blender/blenlib/BLI_array_utils.h
@@ -23,6 +23,7 @@
  */
 
 #include "BLI_compiler_typecheck.h"
+#include "BLI_sys_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenlib/BLI_bitmap.h b/source/blender/blenlib/BLI_bitmap.h
index 3772a063515..d67fbabd11c 100644
--- a/source/blender/blenlib/BLI_bitmap.h
+++ b/source/blender/blenlib/BLI_bitmap.h
@@ -28,6 +28,8 @@
 extern "C" {
 #endif
 
+#include "BLI_utildefines.h"
+
 typedef unsigned int BLI_bitmap;
 
 /* warning: the bitmap does not keep track of its own size or check
diff --git a/source/blender/blenlib/BLI_edgehash.h b/source/blender/blenlib/BLI_edgehash.h
index bd149e2eaa0..0e2d0b538c7 100644
--- a/source/blender/blenlib/BLI_edgehash.h
+++ b/source/blender/blenlib/BLI_edgehash.h
@@ -22,6 +22,7 @@
  */
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenlib/BLI_endian_switch.h b/source/blender/blenlib/BLI_endian_switch.h
index a07508e31a0..c67c098053d 100644
--- a/source/blender/blenlib/BLI_endian_switch.h
+++ b/source/blender/blenlib/BLI_endian_switch.h
@@ -22,6 +22,7 @@
  */
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
index 74e6c32b288..d908c47b400 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
@@ -25,9 +25,9 @@
 #ifndef __BLI_FILEOPS_H__
 #define __BLI_FILEOPS_H__
 
+#include <stdint.h>
 #include <stdio.h>
 #include <sys/stat.h>
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,6 +39,7 @@ extern "C" {
 #include <limits.h> /* for PATH_MAX */
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h"
 
 #ifndef PATH_MAX
 #  define PATH_MAX 4096
diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h
index f59d9ea99d0..141c631381b 100644
--- a/source/blender/blenlib/BLI_ghash.h
+++ b/source/blender/blenlib/BLI_ghash.h
@@ -28,8 +28,9 @@
  * This is also used to implement a 'set' (see #GSet below).
  */
 
-#include "BLI_sys_types.h" /* for bool */
 #include "BLI_compiler_attrs.h"
+#include "BLI_compiler_compat.h"
+#include "BLI_sys_types.h" /* for bool */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenlib/BLI_hash.h b/source/blender/blenlib/BLI_hash.h
index 59ed2b273b5..d09291b64be 100644
--- a/source/blender/blenlib/BLI_hash.h
+++ b/source/blender/blenlib/BLI_hash.h
@@ -25,6 +25,8 @@
 extern "C" {
 #endif
 
+#include "BLI_utildefines.h"
+
 BLI_INLINE unsigned int BLI_hash_int_2d(unsigned int kx, unsigned int ky)
 {
 #define rot(x, k) (((x) << (k)) | ((x) >> (32 - (k))))
diff --git a/source/blender/blenlib/BLI_heap.h b/source/blender/blenlib/BLI_heap.h
index 3ce8da7e03c..fa8e49ef376 100644
--- a/source/blender/blenlib/BLI_heap.h
+++ b/source/blender/blenlib/BLI_heap.h
@@ -26,6 +26,8 @@
 extern "C" {
 #endif
 
+#include "BLI_math.h"
+
 struct Heap;
 struct HeapNode;
 typedef struct Heap Heap;
diff --git a/source/blender/blenlib/BLI_kdtree_impl.h b/source/blender/blenlib/BLI_kdtree_impl.h
index c028266ef64..4b2a37830ae 100644
--- a/source/blender/blenlib/BLI_kdtree_impl.h
+++ b/source/blender/blenlib/BLI_kdtree_impl.h
@@ -20,6 +20,7 @@
  */
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_sys_types.h"
 
 #define _BLI_CONCAT_AUX(MACRO_ARG1, MACRO_ARG2) MACRO_ARG1##MACRO_ARG2
 #define _BLI_CONCAT(MACRO_ARG1, MACRO_ARG2) _BLI_CONCAT_AUX(MACRO_ARG1, MACRO_ARG2)
diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h
index 7845e0998e0..1221ecfb7b1 100644
--- a/source/blender/blenlib/BLI_math_matrix.h
+++ b/source/blender/blenlib/BLI_math_matrix.h
@@ -31,6 +31,7 @@ extern "C" {
 #endif
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_sys_types.h"
 
 /********************************* Init **************************************/
 
diff --git a/source/blender/blenlib/BLI_math_rotation.h b/source/blender/blenlib/BLI_math_rotation.h
index 1e56b80bcf2..b7ae35b2e23 100644
--- a/source/blender/blenlib/BLI_math_rotation.h
+++ b/source/blender/blenlib/BLI_math_rotation.h
@@ -27,6 +27,7 @@
  * \ingroup bli
  */
 
+#include "BLI_utildefines.h"
 #include "DNA_vec_types.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h
index b9d2a89784b..6cfa2d2ced6 100644
--- a/source/blender/blenlib/BLI_math_vector.h
+++ b/source/blender/blenlib/BLI_math_vector.h
@@ -33,6 +33,7 @@ extern "C" {
 
 #include "BLI_compiler_attrs.h"
 #include "BLI_math_inline.h"
+#include "BLI_utildefines.h"
 
 /************************************* Init ***********************************/
 
diff --git a/source/blender/blenlib/BLI_memory_utils_cxx.h b/source/blender/blenlib/BLI_memory_utils_cxx.h
index f15621b4e41..35b08f804cb 100644
--- a/source/blender/blenlib/BLI_memory_utils_cxx.h
+++ b/source/blender/blenlib/BLI_memory_utils_cxx.h
@@ -24,6 +24,8 @@
 #include <memory>
 #include <algorithm>
 
+#include "BLI_utildefines.h"
+
 namespace BLI {
 
 using std::copy;
diff --git a/source/blender/blenlib/BLI_mempool.h b/source/blender/blenlib/BLI_mempool.h
index 67851a63f8f..6491180c2fd 100644
--- a/source/blender/blenlib/BLI_mempool.h
+++ b/source/blender/blenlib/BLI_mempool.h
@@ -29,6 +29,7 @@ extern "C" {
 #endif
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h"
 
 struct BLI_mempool;
 struct BLI_mempool_chunk;
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
index d4e3ebdb2e1..4376aefdc25 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -28,6 +28,7 @@ extern "C" {
 #endif
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h"
 
 void BLI_setenv(const char *env, const char *val) ATTR_NONNULL(1);
 void BLI_setenv_if_new(const char *env, const char *val) ATTR_NONNULL(1);
diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h
index cc91c26a2ab..7c8290439c6 100644
--- a/source/blender/blenlib/BLI_string.h
+++ b/source/blender/blenlib/BLI_string.h
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 #include "BLI_compiler_attrs.h"
-#include "BLI_utildefines_variadic.h"
+#include "BLI_utildefines.h"
 
 char *BLI_strdupn(const char *str, const size_t len) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT
     ATTR_NONNULL();
diff --git a/source/blender/blenlib/BLI_string_utils.h b/source/blender/blenlib/BLI_string_utils.h
index 273f20315bd..7b0dd13e0c7 100644
--- a/source/blender/blenlib/BLI_string_utils.h
+++ b/source/blender/blenlib/BLI_string_utils.h
@@ -31,7 +31,7 @@ extern "C" {
 #endif
 
 #include "BLI_compiler_attrs.h"
-#include "BLI_utildefines_variadic.h"
+#include "BLI_utildefines.h"
 
 struct ListBase;
 
diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h
index 32b7f219605..c2127c1ec3a 100644
--- a/source/blender/blenlib/BLI_threads.h
+++ b/source/blender/blenlib/BLI_threads.h
@@ -29,6 +29,8 @@ extern "C" {
 
 #include <pthread.h>
 
+#include "BLI_sys_types.h"
+
 #ifdef __APPLE__
 #  include <libkern/OSAtomic.h>
 #endif
diff --git a/source/blender/blenlib/intern/math_geom_inline.c b/source/blender/blenlib/intern/math_geom_inline.c
index d275ea0862e..893c978d084 100644
--- a/source/blender/blenlib/intern/math_geom_inline.c
+++ b/source/blender/blenlib/intern/math_geom_inline.c
@@ -28,6 +28,7 @@
 #define __MATH_GEOM_INLINE_C__
 
 #include "BLI_math.h"
+#include "BLI_math_vector.h"
 
 #include <string.h>
 
diff --git a/source/blender/bmesh/intern/bmesh_construct.h b/source/blender/bmesh/intern/bmesh_construct.h
index a13392a88ba..ae2b137d38a 100644
--- a/source/blender/bmesh/intern/bmesh_construct.h
+++ b/source/blender/bmesh/intern/bmesh_construct.h
@@ -21,6 +21,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_core.h"
+
 struct BMAllocTemplate;
 
 bool BM_verts_from_edges(BMVert **vert_arr, BMEdge **edge_arr, const int len);
diff --git a/source/blender/bmesh/intern/bmesh_error.h b/source/blender/bmesh/intern/bmesh_error.h
index 7353012170c..289b603d134 100644
--- a/source/blender/bmesh/intern/bmesh_error.h
+++ b/source/blender/bmesh/intern/bmesh_error.h
@@ -21,6 +21,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_operator_api.h"
+
 /*----------- bmop error system ----------*/
 
 /* pushes an error onto the bmesh error stack.
diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h
index 604142445ae..ea0fea1f603 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.h
+++ b/source/blender/bmesh/intern/bmesh_mesh.h
@@ -21,6 +21,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.h"
+
 struct BMAllocTemplate;
 struct BMLoopNorEditDataArray;
 struct MLoopNorSpaceArray;
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.h b/source/blender/bmesh/intern/bmesh_mesh_conv.h
index 65d5c6d5494..1ad43558c60 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.h
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.h
@@ -24,6 +24,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh.h"
+
 struct CustomData_MeshMasks;
 struct Main;
 struct Mesh;
diff --git a/source/blender/compositor/intern/COM_MemoryProxy.h b/source/blender/compositor/intern/COM_MemoryProxy.h
index c363bf610cc..afbe0e3c166 100644
--- a/source/blender/compositor/intern/COM_MemoryProxy.h
+++ b/source/blender/compositor/intern/COM_MemoryProxy.h
@@ -21,6 +21,7 @@ class MemoryProxy;
 #ifndef __COM_MEMORYPROXY_H__
 #define __COM_MEMORYPROXY_H__
 #include "COM_ExecutionGroup.h"
+#include "COM_MemoryBuffer.h"
 
 class ExecutionGroup;
 class WriteBufferOperation;
diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h
index 6237d336c74..7eb2471ba67 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.h
+++ b/source/blender/compositor/operations/COM_ImageOperation.h
@@ -22,6 +22,7 @@
 #include "COM_NodeOperation.h"
 #include "MEM_guardedalloc.h"
 #include "BLI_listbase.h"
+#include "BLI_utildefines.h"
 #include "BKE_image.h"
 extern "C" {
 #include "RE_pipeline.h"
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
index 036468f9472..42457475848 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
@@ -19,6 +19,7 @@
 #ifndef __COM_OUTPUTFILEMULTIVIEWOPERATION_H__
 #define __COM_OUTPUTFILEMULTIVIEWOPERATION_H__
 #include "COM_NodeOperation.h"
+#include "COM_OutputFileOperation.h"
 
 #include "BLI_rect.h"
 #include "BLI_path_util.h"
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h
index ca7c18a0586..c0b759e68ba 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.h
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.h
@@ -23,7 +23,7 @@
 #include "MEM_guardedalloc.h"
 #include "DNA_scene_types.h"
 #include "BLI_listbase.h"
-#include "BKE_image.h"
+#include "BLI_utildefines.h"
 extern "C" {
 #include "RE_pipeline.h"
 }
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 248979e1ae7..24977848ae4 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -25,9 +25,10 @@
 #define __INTERFACE_INTERN_H__
 
 #include "BLI_compiler_attrs.h"
-#include "UI_resources.h"
-#include "RNA_types.h"
 #include "DNA_listBase.h"
+#include "RNA_types.h"
+#include "UI_interface.h"
+#include "UI_resources.h"
 
 struct ARegion;
 struct ID;
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index cc681c02009..5ed27d9a648 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -34,6 +34,7 @@ struct Image;
 struct ImageUser;
 struct Main;
 
+#include "BLI_utildefines.h"
 #include "DNA_object_enums.h"
 
 /* OpenGL drawing functions related to shading. */
diff --git a/source/blender/gpu/GPU_init_exit.h b/source/blender/gpu/GPU_init_exit.h
index 59aef162a9d..0046eaa942b 100644
--- a/source/blender/gpu/GPU_init_exit.h
+++ b/source/blender/gpu/GPU_init_exit.h
@@ -28,6 +28,8 @@
 extern "C" {
 #endif
 
+#include "BLI_utildefines.h"
+
 void GPU_init(void);
 void GPU_exit(void);
 bool GPU_is_initialized(void);
diff --git a/source/blender/imbuf/intern/IMB_filetype.h b/source/blender/imbuf/intern/IMB_filetype.h
index 52db0b80441..ce731a3a86d 100644
--- a/source/blender/imbuf/intern/IMB_filetype.h
+++ b/source/blender/imbuf/intern/IMB_filetype.h
@@ -21,6 +21,8 @@
 #ifndef __IMB_FILETYPE_H__
 #define __IMB_FILETYPE_H__
 
+#include "IMB_imbuf.h"
+
 /* Generic File Type */
 
 struct ImBuf;
diff --git a/source/blender/io/collada/AnimationClipExporter.h b/source/blender/io/collada/AnimationClipExporter.h
index 25c69fe6b93..036a03c3b53 100644
--- a/source/blender/io/collada/AnimationClipExporter.h
+++ b/source/blender/io/collada/AnimationClipExporter.h
@@ -22,6 +22,8 @@
 #include <math.h>
 
 #include "COLLADASWLibraryAnimationClips.h"
+#include "DEG_depsgraph.h"
+#include "ExportSettings.h"
 
 class AnimationClipExporter : COLLADASW::LibraryAnimationClips {
  private:
diff --git a/source/blender/makesdna/DNA_defaults.h b/source/blender/makesdna/DNA_defaults.h
index 5b9297ce46a..c20ccc05637 100644
--- a/source/blender/makesdna/DNA_defaults.h
+++ b/source/blender/makesdna/DNA_defaults.h
@@ -27,6 +27,8 @@
 #ifndef __DNA_DEFAULTS_H__
 #define __DNA_DEFAULTS_H__
 
+#include "BLI_utildefines.h"
+
 #include "dna_type_offsets.h"
 
 extern const void *DNA_default_table[SDNA_TYPE_MAX];
diff --git a/source/blender/makesdna/DNA_fluid_types.h b/source/blender/makesdna/DNA_fluid_types.h
index 12b1ac2b06d..631c1b71732 100644
--- a/source/blender/makesdna/DNA_fluid_types.h
+++ b/source/blender/makesdna/DNA_fluid_types.h
@@ -24,6 +24,8 @@
 #ifndef __DNA_FLUID_TYPES_H__
 #define __DNA_FLUID_TYPES_H__
 
+#include "DNA_listBase.h"
+
 /* Domain flags. */
 enum {
   FLUID_DOMAIN_USE_NOISE = (1 << 1),        /* Use noise. */
diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h
index 0a60d84a58a..5c514ef04e1 100644
--- a/source/blender/makesdna/DNA_rigidbody_types.h
+++ b/source/blender/makesdna/DNA_rigidbody_types.h
@@ -26,6 +26,7 @@
 #define __DNA_RIGIDBODY_TYPES_H__
 
 #include "DNA_listBase.h"
+#include "DNA_object_force_types.h"
 
 struct Collection;
 
diff --git a/source/blender/physics/intern/eigen_utils.h b/source/blender/physics/intern/eigen_utils.h
index 2b50da0d190..c186cf567df 100644
--- a/source/blender/physics/intern/eigen_utils.h
+++ b/source/blender/physics/intern/eigen_utils.h
@@ -38,6 +38,7 @@
 #endif
 
 #include "BLI_utildefines.h"
+#include "implicit.h"
 
 typedef float Scalar;
 
diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h
index 810c86c115a..d4e57f0beb6 100644
--- a/source/blender/python/BPY_extern.h
+++ b/source/blender/python/BPY_extern.h
@@ -39,6 +39,8 @@ struct bPythonConstraint; /* DNA_constraint_types.h */
 extern "C" {
 #endif
 
+#include "BLI_utildefines.h"
+
 void BPY_pyconstraint_exec(struct bPythonConstraint *con,
                            struct bConstraintOb *cob,
                            struct ListBase *targets);
diff --git a/source/blender/python/generic/blf_py_api.h b/source/blender/python/generic/blf_py_api.h
index d55dd85854e..919272df942 100644
--- a/source/blender/python/generic/blf_py_api.h
+++ b/source/blender/python/generic/blf_py_api.h
@@ -21,6 +21,8 @@
  * \ingroup pygen
  */
 
+#include <Python.h>
+
 PyObject *BPyInit_blf(void);
 
 #endif /* __BLF_PY_API_H__ */
diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus_intern.h b/source/blender/windowmanager/message_bus/intern/wm_message_bus_intern.h
index 0eac9e234be..ccf7034e3e0 100644
--- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_intern.h
+++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_intern.h
@@ -21,7 +21,7 @@
 #ifndef __WM_MESSAGE_BUS_INTERN_H__
 #define __WM_MESSAGE_BUS_INTERN_H__
 
-/* wm_message_bus.h must be included first */
+#include "../wm_message_bus.h"
 
 struct wmMsgBus {
   struct GSet *messages_gset[WM_MSG_TYPE_NUM];
diff --git a/source/blender/windowmanager/message_bus/wm_message_bus.h b/source/blender/windowmanager/message_bus/wm_message_bus.h
index 4ee087593ac..8020be3017a 100644
--- a/source/blender/windowmanager/message_bus/wm_message_bus.h
+++ b/source/blender/windowmanager/message_bus/wm_message_bus.h
@@ -21,6 +21,7 @@
 #ifndef __WM_MESSAGE_BUS_H__
 #define __WM_MESSAGE_BUS_H__
 
+#include "RNA_types.h"
 #include <stdio.h>
 
 struct ID;