Cleanup: Fix forward declaration of headers

intern/ghost/intern/GHOST_EventButton.h

@@ -26,6 +26,7 @@
 #define __GHOST_EVENTBUTTON_H__
 
 #include "GHOST_Event.h"
+#include "GHOST_Window.h"
 
 /**
  * Mouse button event.

intern/memutil/CMakeLists.txt

@@ -21,6 +21,7 @@
 set(INC
   .
   ..
+  ../../source/blender/blenlib
 )
 
 set(INC_SYS

intern/memutil/MEM_CacheLimiterC-Api.h

@@ -25,6 +25,8 @@
 extern "C" {
 #endif
 
+#include "BLI_utildefines.h"
+
 struct MEM_CacheLimiter_s;
 struct MEM_CacheLimiterHandle_s;
 

source/blender/blenkernel/BKE_boids.h

@@ -25,6 +25,7 @@
  */
 
 #include "DNA_boid_types.h"
+#include "DNA_particle_types.h"
 
 #ifdef __cplusplus
 extern "C" {

source/blender/blenkernel/BKE_curve.h

@@ -27,6 +27,8 @@
 extern "C" {
 #endif
 
+#include "DNA_scene_types.h"
+
 struct BezTriple;
 struct Curve;
 struct Depsgraph;

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 */

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

source/blender/blenkernel/BKE_image.h

@@ -27,6 +27,8 @@
 extern "C" {
 #endif
 
+#include "BLI_utildefines.h"
+
 struct Depsgraph;
 struct ID;
 struct ImBuf;

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];

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

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" {

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

source/blender/blenlib/BLI_edgehash.h

@@ -22,6 +22,7 @@
  */
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h"
 
 #ifdef __cplusplus
 extern "C" {

source/blender/blenlib/BLI_endian_switch.h

@@ -22,6 +22,7 @@
  */
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h"
 
 #ifdef __cplusplus
 extern "C" {

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

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" {

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))))

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;

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)

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 **************************************/
 

source/blender/blenlib/BLI_math_rotation.h

@@ -27,6 +27,7 @@
  * \ingroup bli
  */
 
+#include "BLI_utildefines.h"
 #include "DNA_vec_types.h"
 
 #ifdef __cplusplus

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 ***********************************/
 

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;

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;

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);

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();

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;
 

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

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>
 

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);

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.

source/blender/bmesh/intern/bmesh_mesh.h

@@ -21,6 +21,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.h"
+
 struct BMAllocTemplate;
 struct BMLoopNorEditDataArray;
 struct MLoopNorSpaceArray;

source/blender/bmesh/intern/bmesh_mesh_conv.h

@@ -24,6 +24,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh.h"
+
 struct CustomData_MeshMasks;
 struct Main;
 struct Mesh;

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;

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"

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"

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"
 }

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;

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. */

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);

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;

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:

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];

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. */

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;
 

source/blender/physics/intern/eigen_utils.h

@@ -38,6 +38,7 @@
 #endif
 
 #include "BLI_utildefines.h"
+#include "implicit.h"
 
 typedef float Scalar;
 

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);

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__ */

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];

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;