[Bf-blender-cvs] [6f985574b77] master: Cleanup: take includes out of 'extern "C"' blocks

Jacques Lucke noreply at git.blender.org
Fri May 8 18:24:38 CEST 2020 

Commit: 6f985574b775882075f48f59835bc5a42b1374dd
Author: Jacques Lucke
Date:   Fri May 8 18:16:39 2020 +0200
Branches: master
https://developer.blender.org/rB6f985574b775882075f48f59835bc5a42b1374dd

Cleanup: take includes out of 'extern "C"' blocks

Surrounding includes with an 'extern "C"' block is not necessary anymore.
Also that made it harder to add any C++ code to some headers, or include headers
that have "optional" C++ code like `MEM_guardedalloc.h`.

I tested compilation on linux and windows (and got help from @LazyDodo).
If this still breaks compilation due to some linker error, the header containing
the symbol in question is probably missing an 'extern "C"' block.

Differential Revision: https://developer.blender.org/D7653

===================================================================

M	source/blender/blenkernel/BKE_action.h
M	source/blender/blenkernel/BKE_anim_data.h
M	source/blender/blenkernel/BKE_animsys.h
M	source/blender/blenkernel/BKE_armature.h
M	source/blender/blenkernel/BKE_blender_version.h
M	source/blender/blenkernel/BKE_context.h
M	source/blender/blenkernel/BKE_curve.h
M	source/blender/blenkernel/BKE_customdata.h
M	source/blender/blenkernel/BKE_data_transfer.h
M	source/blender/blenkernel/BKE_dynamicpaint.h
M	source/blender/blenkernel/BKE_fcurve.h
M	source/blender/blenkernel/BKE_fcurve_driver.h
M	source/blender/blenkernel/BKE_image.h
M	source/blender/blenkernel/BKE_lib_id.h
M	source/blender/blenkernel/BKE_lib_remap.h
M	source/blender/blenkernel/BKE_library.h
M	source/blender/blenkernel/BKE_light.h
M	source/blender/blenkernel/BKE_object.h
M	source/blender/blenkernel/BKE_paint.h
M	source/blender/blenkernel/BKE_report.h
M	source/blender/blenkernel/BKE_text_suggestions.h
M	source/blender/blenlib/BLI_bitmap.h
M	source/blender/blenlib/BLI_blenlib.h
M	source/blender/blenlib/BLI_fileops.h
M	source/blender/blenlib/BLI_hash.h
M	source/blender/blenlib/BLI_heap.h
M	source/blender/blenlib/BLI_math_base.h
M	source/blender/blenlib/BLI_math_bits.h
M	source/blender/blenlib/BLI_math_color.h
M	source/blender/blenlib/BLI_math_color_blend.h
M	source/blender/blenlib/BLI_math_geom.h
M	source/blender/blenlib/BLI_math_matrix.h
M	source/blender/blenlib/BLI_math_solvers.h
M	source/blender/blenlib/BLI_math_statistics.h
M	source/blender/blenlib/BLI_math_vector.h
M	source/blender/blenlib/BLI_memarena.h
M	source/blender/blenlib/BLI_memblock.h
M	source/blender/blenlib/BLI_memiter.h
M	source/blender/blenlib/BLI_mempool.h
M	source/blender/blenlib/BLI_path_util.h
M	source/blender/blenlib/BLI_string.h
M	source/blender/blenlib/BLI_string_utf8.h
M	source/blender/blenlib/BLI_string_utils.h
M	source/blender/blenlib/BLI_task.h
M	source/blender/blenlib/BLI_threads.h
M	source/blender/blenlib/BLI_utildefines.h
M	source/blender/blenlib/intern/math_base_inline.c
M	source/blender/bmesh/bmesh.h
M	source/blender/bmesh/intern/bmesh_operator_api.h
M	source/blender/bmesh/tools/bmesh_bevel.h
M	source/blender/compositor/COM_compositor.h
M	source/blender/compositor/intern/COM_Converter.cpp
M	source/blender/compositor/intern/COM_ExecutionSystem.cpp
M	source/blender/compositor/intern/COM_MemoryBuffer.h
M	source/blender/compositor/intern/COM_Node.cpp
M	source/blender/compositor/intern/COM_NodeConverter.cpp
M	source/blender/compositor/intern/COM_NodeGraph.cpp
M	source/blender/compositor/intern/COM_NodeGraph.h
M	source/blender/compositor/intern/COM_NodeOperation.h
M	source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
M	source/blender/compositor/intern/COM_WorkScheduler.h
M	source/blender/compositor/intern/COM_compositor.cpp
M	source/blender/compositor/nodes/COM_CornerPinNode.h
M	source/blender/compositor/nodes/COM_ImageNode.h
M	source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
M	source/blender/compositor/nodes/COM_MaskNode.cpp
M	source/blender/compositor/nodes/COM_MovieClipNode.cpp
M	source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
M	source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
M	source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
M	source/blender/compositor/nodes/COM_TimeNode.cpp
M	source/blender/compositor/nodes/COM_TrackPositionNode.cpp
M	source/blender/compositor/operations/COM_AntiAliasOperation.cpp
M	source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
M	source/blender/compositor/operations/COM_BlurBaseOperation.cpp
M	source/blender/compositor/operations/COM_BokehBlurOperation.cpp
M	source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
M	source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
M	source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
M	source/blender/compositor/operations/COM_ColorCurveOperation.cpp
M	source/blender/compositor/operations/COM_ColorRampOperation.cpp
M	source/blender/compositor/operations/COM_CompositorOperation.cpp
M	source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
M	source/blender/compositor/operations/COM_ConvertOperation.cpp
M	source/blender/compositor/operations/COM_CurveBaseOperation.cpp
M	source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
M	source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
M	source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
M	source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
M	source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
M	source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
M	source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
M	source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
M	source/blender/compositor/operations/COM_ImageOperation.cpp
M	source/blender/compositor/operations/COM_ImageOperation.h
M	source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
M	source/blender/compositor/operations/COM_KeyingScreenOperation.h
M	source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
M	source/blender/compositor/operations/COM_MaskOperation.cpp
M	source/blender/compositor/operations/COM_MathBaseOperation.cpp
M	source/blender/compositor/operations/COM_MixOperation.cpp
M	source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
M	source/blender/compositor/operations/COM_MovieClipOperation.cpp
M	source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
M	source/blender/compositor/operations/COM_MovieDistortionOperation.h
M	source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
M	source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
M	source/blender/compositor/operations/COM_OutputFileOperation.cpp
M	source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
M	source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
M	source/blender/compositor/operations/COM_PlaneTrackOperation.cpp
M	source/blender/compositor/operations/COM_PreviewOperation.cpp
M	source/blender/compositor/operations/COM_RenderLayersProg.cpp
M	source/blender/compositor/operations/COM_RenderLayersProg.h
M	source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
M	source/blender/compositor/operations/COM_SplitOperation.cpp
M	source/blender/compositor/operations/COM_TextureOperation.cpp
M	source/blender/compositor/operations/COM_TextureOperation.h
M	source/blender/compositor/operations/COM_TonemapOperation.cpp
M	source/blender/compositor/operations/COM_TrackPositionOperation.cpp
M	source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
M	source/blender/compositor/operations/COM_VectorBlurOperation.cpp
M	source/blender/compositor/operations/COM_VectorCurveOperation.cpp
M	source/blender/compositor/operations/COM_ViewerOperation.cpp
M	source/blender/depsgraph/DEG_depsgraph_build.h
M	source/blender/depsgraph/intern/builder/deg_builder_cache.cc
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
M	source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
M	source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
M	source/blender/depsgraph/intern/builder/deg_builder_rna.cc
M	source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
M	source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
M	source/blender/depsgraph/intern/depsgraph.cc
M	source/blender/depsgraph/intern/depsgraph_build.cc
M	source/blender/depsgraph/intern/depsgraph_debug.cc
M	source/blender/depsgraph/intern/depsgraph_eval.cc
M	source/blender/depsgraph/intern/depsgraph_physics.cc
M	source/blender/depsgraph/intern/depsgraph_query.cc
M	source/blender/depsgraph/intern/depsgraph_query_iter.cc
M	source/blender/depsgraph/intern/depsgraph_tag.cc
M	source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M	source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M	source/blender/depsgraph/intern/node/deg_node_component.cc
M	source/blender/depsgraph/intern/node/deg_node_id.cc
M	source/blender/draw/DRW_engine.h
M	source/blender/editors/include/ED_keyframes_edit.h
M	source/blender/editors/include/ED_keyframing.h
M	source/blender/editors/include/ED_object.h
M	source/blender/editors/include/UI_resources.h
M	source/blender/editors/uvedit/uvedit_parametrizer.h
M	source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M	source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
M	source/blender/freestyle/intern/geometry/Grid.h
M	source/blender/freestyle/intern/image/GaussianFilter.h
M	source/blender/freestyle/intern/scene_graph/NodeViewLayer.h
M	source/blender/freestyle/intern/stroke/Canvas.cpp
M	source/blender/freestyle/intern/stroke/StrokeRep.h
M	source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
M	source/blender/gpu/GPU_context.h
M	source/blender/gpu/GPU_draw.h
M	source/blender/gpu/GPU_init_exit.h
M	source/blender/gpu/intern/gpu_batch_private.h
M	source/blender/gpu/intern/gpu_context_private.h
M	source/blender/ikplugin/intern/itasc_plugin.cpp
M	source/blender/imbuf/intern/IMB_allocimbuf.h
M	source/blender/imbuf/intern/IMB_colormanagement_intern.h
M	source/blender/imbuf/intern/cineon/cineonlib.h
M	source/blender/imbuf/intern/cineon/dpxlib.h
M	source/blender/imbuf/intern/dds/dds_api.cpp
M	source/blender/imbuf/intern/dds/dds_api.h
M	source/blender/imbuf/intern/oiio/openimageio_api.cpp
M	source/blender/imbuf/intern/oiio/openimageio_api.h
M	source/blender/imbuf/intern/openexr/openexr_api.cpp
M	source/blender/imbuf/intern/openexr/openexr_api.h
M	source/blender/io/alembic/intern/abc_customdata.cc
M	source/blender/io/alembic/intern/abc_exporter.cc
M	source/blender/io/alembic/intern/abc_reader_archive.cc
M	source/blender/io/alembic/intern/abc_reader_camera.cc
M	source/blender/io/alembic/intern/abc_reader_curves.cc
M	source/blender/io/alembic/intern/abc_reader_mesh.cc
M	source/blender/io/alembic/intern/abc_reader_nurbs.cc
M	source/blender/io/alembic/intern/abc_reader_object.cc
M	source/blender/io/alembic/intern/abc_reader_object.h
M	source/blender/io/alembic/intern/abc_reader_points.cc
M	source/blender/io/alembic/intern/abc_reader_transform.cc
M	source/blender/io/alembic/intern/abc_util.cc
M	source/blender/io/alembic/intern/abc_writer_archive.cc
M	source/blender/io/alembic/intern/abc_writer_camera.cc
M	source/blender/io/alembic/intern/abc_writer_curves.cc
M	source/blender/io/alembic/intern/abc_writer_hair.cc
M	source/blender/io/alembic/intern/abc_writer_mball.cc
M	source/blender/io/alembic/intern/abc_writer_mesh.cc
M	source/blender/io/alembic/intern/abc_writer_nurbs.cc
M	source/blender/io/alembic/intern/abc_writer_object.cc
M	source/blender/io/alembic/intern/abc_writer_object.h
M	source/blender/io/alembic/intern/abc_writer_points.cc
M	source/blender/io/alembic/intern/abc_writer_transform.cc
M	source/blender/io/alembic/intern/alembic_capi.cc
M	source/blender/io/collada/AnimationExporter.h
M	source/blender/io/collada/AnimationImporter.h
M	source/blender/io/collada/ArmatureExporter.cpp
M	source/blender/io/collada/ArmatureImporter.cpp
M	source/blender/io/collada/ArmatureImporter.h
M	source/blender/io/collada/BCAnimationCurve.h
M	source/blender/io/collada/BCAnimationSampler.cpp
M	source/blender/io/collada/BCAnimationSampler.h
M	source/blender/io/collada/BCMath.h
M	source/blender/io/collada/BCSampleData.h
M	source/blender/io/collada/BlenderContext.h
M	source/blender/io/collada/CameraExporter.cpp
M	source/blender/io/collada/CameraExporter.h
M	source/blender/io/collada/ControllerExporter.cpp
M	source/blender/io/collada/DocumentExporter.cpp
M	source/blender/io/collada/DocumentExporter.h
M	source/blender/io/collada/DocumentImporter.cpp
M	source/blender/io/collada/EffectExporter.cpp
M	source/blender/io/collada/ExportSettings.h
M	source/blender/io/collada/GeometryExporter.cpp
M	source/blender/io/collada/ImageExporter.cpp
M	source/blender/io/collada/InstanceWriter.cpp
M	source/blender/io/collada/MaterialExporter.h
M	source/blender/io/collada/Materials.h
M	source/blender/io/collada/MeshImporter.cpp
M	source/blender/io/collada/MeshImporter.h
M	source/blender/io/collada/SceneExporter.cpp
M	source/blender/io/collada/SceneExporter.h
M	source/blender/io/collada/collada.cpp
M	source/blender/io/collada/collada.h
M	source/blender/io/collada/collada_utils.cpp
M	source/blender/io/collada/collada_utils.h
M	source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
M	source/blender/io/usd/intern/usd_capi.cc
M	source/blender/io/usd/intern/usd_hierarchy_iterator.cc
M	source/blender/io/usd/intern/usd_writer_abstract.h
M	source/blender/io/usd/intern/usd_writer_camera.cc
M	source/blender/io/usd/intern/usd_writer_hair.cc
M	source/blender/io/usd/intern/usd_writer_light.cc
M	source/blender/io/usd/intern/usd_writer_mesh.cc
M	source/blender/io/usd/intern/usd_writer_metaball.cc
M	source/blender/io/usd/intern/usd_writer_transform.cc
M	source/blender/io/usd/usd.h
M	source/blender/makesdna/DNA_ID.h
M	source/blender/makesdna/DNA_action_types.h
M	source/blender/makesdna/DNA_anim_types.h
M	source/blender/makesdna/DNA_customdata_types.h
M	source/blender/makesdna/DNA_defaults.h
M	source/blender/makesdna/DNA_layer_types.h
M	source/blender/makesdna/DNA_movieclip_types.h
M	source/blender/makesdna/DNA_object_force_types.h
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/physics/intern/BPH_mass_spring.cpp
M	source/blender/physics/intern/hair_volume.cpp
M	source/blender/python/BPY_extern.h
M	source/blender/render/extern/include/RE_pipeline.h
M	source/blender/render/extern/include/RE_shader_ext.h
M	source/blender/windowmanager/WM_types.h

===================================================================

diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index 5f4f3f35b82..104582be932 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -25,12 +25,12 @@
  * \brief Blender kernel action and pose functionality.
  */
 
+#include "DNA_listBase.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "DNA_listBase.h"
-
 /* The following structures are defined in DNA_action_types.h, and DNA_anim_types.h */
 struct FCurve;
 struct Main;
diff --git a/source/blender/blenkernel/BKE_anim_data.h b/source/blender/blenkernel/BKE_anim_data.h
index 071254be783..8809fadd55c 100644
--- a/source/blender/blenkernel/BKE_anim_data.h
+++ b/source/blender/blenkernel/BKE_anim_data.h
@@ -24,12 +24,12 @@
  * \ingroup bke
  */
 
+#include "BLI_sys_types.h" /* for bool */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_sys_types.h" /* for bool */
-
 struct AnimData;
 struct ID;
 struct Main;
diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h
index 4076bca3b19..4a2ad28f90f 100644
--- a/source/blender/blenkernel/BKE_animsys.h
+++ b/source/blender/blenkernel/BKE_animsys.h
@@ -24,12 +24,12 @@
  * \ingroup bke
  */
 
+#include "BLI_sys_types.h" /* for bool */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_sys_types.h" /* for bool */
-
 struct AnimData;
 struct Depsgraph;
 struct FCurve;
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index e59d5728350..5238853a105 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -22,13 +22,12 @@
 /** \file
  * \ingroup bke
  */
+#include "BLI_listbase.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_listbase.h"
-
 struct Bone;
 struct Depsgraph;
 struct ListBase;
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index bc64f78ffae..4b917beee17 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -16,6 +16,10 @@
 #ifndef __BKE_BLENDER_VERSION_H__
 #define __BKE_BLENDER_VERSION_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** \file
  * \ingroup bke
  */
@@ -43,4 +47,8 @@
 /** Defined in from blender.c */
 extern char versionstr[];
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_BLENDER_VERSION_H__ */
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index c4fb19ea355..70ca29d5795 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -25,6 +25,7 @@
  */
 
 #include "DNA_listBase.h"
+#include "DNA_object_enums.h"
 #include "RNA_types.h"
 
 #ifdef __cplusplus
@@ -66,8 +67,6 @@ struct bScreen;
 struct wmWindow;
 struct wmWindowManager;
 
-#include "DNA_object_enums.h"
-
 /* Structs */
 
 struct bContext;
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index 3524be99d0a..2b17cb7a875 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -23,12 +23,12 @@
  * \ingroup bke
  */
 
+#include "DNA_scene_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "DNA_scene_types.h"
-
 struct BezTriple;
 struct Curve;
 struct Depsgraph;
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index a4a36343ca3..1a919a33034 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -25,15 +25,15 @@
 #ifndef __BKE_CUSTOMDATA_H__
 #define __BKE_CUSTOMDATA_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_customdata_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BMesh;
 struct CustomData;
 struct CustomData_MeshMasks;
diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h
index 79ef512bc1f..463c672ca47 100644
--- a/source/blender/blenkernel/BKE_data_transfer.h
+++ b/source/blender/blenkernel/BKE_data_transfer.h
@@ -24,12 +24,12 @@
 #ifndef __BKE_DATA_TRANSFER_H__
 #define __BKE_DATA_TRANSFER_H__
 
+#include "BKE_customdata.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BKE_customdata.h"
-
 struct Depsgraph;
 struct Object;
 struct ReportList;
diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h
index 0dc133e34b3..5e3603a8339 100644
--- a/source/blender/blenkernel/BKE_dynamicpaint.h
+++ b/source/blender/blenkernel/BKE_dynamicpaint.h
@@ -21,12 +21,12 @@
  * \ingroup bke
  */
 
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_utildefines.h"
-
 struct Depsgraph;
 struct DynamicPaintCanvasSettings;
 struct DynamicPaintModifierData;
diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h
index e620beb6ccc..21a9b7b8b04 100644
--- a/source/blender/blenkernel/BKE_fcurve.h
+++ b/source/blender/blenkernel/BKE_fcurve.h
@@ -24,6 +24,8 @@
  * \ingroup bke
  */
 
+#include "DNA_curve_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -42,8 +44,6 @@ struct StructRNA;
 struct bAction;
 struct bContext;
 
-#include "DNA_curve_types.h"
-
 /* ************** Keyframe Tools ***************** */
 
 typedef struct CfraElem {
diff --git a/source/blender/blenkernel/BKE_fcurve_driver.h b/source/blender/blenkernel/BKE_fcurve_driver.h
index ee531abfb72..563ed408ed7 100644
--- a/source/blender/blenkernel/BKE_fcurve_driver.h
+++ b/source/blender/blenkernel/BKE_fcurve_driver.h
@@ -24,6 +24,8 @@
  * \ingroup bke
  */
 
+#include "DNA_curve_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -36,8 +38,6 @@ struct PathResolvedRNA;
 struct PointerRNA;
 struct PropertyRNA;
 
-#include "DNA_curve_types.h"
-
 /* ************** F-Curve Drivers ***************** */
 
 /* With these iterators for convenience, the variables "tarIndex" and "dtar" can be
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 37082947687..1e5573ab014 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -23,12 +23,12 @@
  * \ingroup bke
  */
 
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_utildefines.h"
-
 struct Depsgraph;
 struct ID;
 struct ImBuf;
diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h
index 0c91ba6231b..1f89edf905a 100644
--- a/source/blender/blenkernel/BKE_lib_id.h
+++ b/source/blender/blenkernel/BKE_lib_id.h
@@ -46,12 +46,12 @@
  * specific cases requiring advanced (and potentially dangerous) handling.
  */
 
+#include "BLI_compiler_attrs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 struct GHash;
 struct ID;
 struct Library;
diff --git a/source/blender/blenkernel/BKE_lib_remap.h b/source/blender/blenkernel/BKE_lib_remap.h
index 72c5f1d1b0e..8129b9dbafb 100644
--- a/source/blender/blenkernel/BKE_lib_remap.h
+++ b/source/blender/blenkernel/BKE_lib_remap.h
@@ -33,12 +33,12 @@
  * - `BKE_lib_remap_callback_` should be used for functions managing remapping callbacks.
  */
 
+#include "BLI_compiler_attrs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 struct wmWindowManager;
 
 /* BKE_libblock_free, delete are declared in BKE_lib_id.h for convenience. */
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index 5bc3d50bf8d..7883d740b0a 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -25,12 +25,12 @@
  * API to manage `Library` data-blocks.
  */
 
+#include "BLI_compiler_attrs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 struct Library;
 struct Main;
 
diff --git a/source/blender/blenkernel/BKE_light.h b/source/blender/blenkernel/BKE_light.h
index a6f0fdbc8a3..17f7a8596bf 100644
--- a/source/blender/blenkernel/BKE_light.h
+++ b/source/blender/blenkernel/BKE_light.h
@@ -24,12 +24,13 @@
  * \ingroup bke
  * \brief General operations, lookup, etc. for blender lights.
  */
+
+#include "BLI_compiler_attrs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 struct Light;
 struct Main;
 
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 70a44d6d8ce..3710ec810ce 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -21,12 +21,15 @@
  * \ingroup bke
  * \brief General operations, lookup, etc. for blender objects.
  */
+
+#include "BLI_compiler_attrs.h"
+
+#include "DNA_object_enums.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 struct Base;
 struct BoundBox;
 struct Depsgraph;
@@ -46,8 +49,6 @@ struct ShaderFxData;
 struct View3D;
 struct ViewLayer;
 
-#include "DNA_object_enums.h"
-
 void BKE_object_workob_clear(struct Object *workob);
 void BKE_object_workob_calc_parent(struct Depsgraph *depsgraph,
                                    struct Scene *scene,
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 7822f285c3b..5c126ed08d4 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -24,6 +24,9 @@
  * \ingroup bke
  */
 
+#include "BLI_utildefines.h"
+#include "DNA_object_enums.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -65,9 +68,6 @@ struct tPaletteColorHSV;
 
 enum eOverlayFlags;
 
-#include "BLI_utildefines.h"
-#include "DNA_object_enums.h"
-
 extern const char PAINT_CURSOR_SCULPT[3];
 extern const char PAINT_CURSOR_VERTEX_PAINT[3];
 extern const char PAINT_CURSOR_WEIGHT_PAINT[3];
diff --git a/source/blender/blenkernel/BKE_report.h b/source/blender/blenkernel/BKE_report.h
index d7ce9625548..063c0831a0d 100644
--- a/source/blender/blenkernel/BKE_report.h
+++ b/source/blender/blenkernel/BKE_report.h
@@ -21,16 +21,16 @@
  * \ingroup bke
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdio.h>
 
 #inc

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list