From 8f21a43535cb200c0569566a1b012aec883aa53c Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 7 Jan 2011 18:36:47 +0000
Subject: split BKE_utildefines.h, now it only has blender specific defines
 like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to
 BLI_utildefines.h. no functional changes.

---
 source/blender/makesrna/intern/makesrna.c         | 6 +++---
 source/blender/makesrna/intern/rna_ID.c           | 2 ++
 source/blender/makesrna/intern/rna_access.c       | 1 +
 source/blender/makesrna/intern/rna_actuator.c     | 2 ++
 source/blender/makesrna/intern/rna_animation.c    | 2 ++
 source/blender/makesrna/intern/rna_animviz.c      | 2 ++
 source/blender/makesrna/intern/rna_armature.c     | 2 ++
 source/blender/makesrna/intern/rna_boid.c         | 2 ++
 source/blender/makesrna/intern/rna_brush.c        | 4 ++--
 source/blender/makesrna/intern/rna_camera.c       | 2 ++
 source/blender/makesrna/intern/rna_cloth.c        | 2 ++
 source/blender/makesrna/intern/rna_color.c        | 2 ++
 source/blender/makesrna/intern/rna_constraint.c   | 2 ++
 source/blender/makesrna/intern/rna_curve.c        | 1 +
 source/blender/makesrna/intern/rna_define.c       | 7 ++++---
 source/blender/makesrna/intern/rna_fcurve.c       | 2 ++
 source/blender/makesrna/intern/rna_fluidsim.c     | 2 ++
 source/blender/makesrna/intern/rna_gpencil.c      | 2 ++
 source/blender/makesrna/intern/rna_group.c        | 2 ++
 source/blender/makesrna/intern/rna_image.c        | 2 ++
 source/blender/makesrna/intern/rna_key.c          | 2 ++
 source/blender/makesrna/intern/rna_lamp.c         | 2 ++
 source/blender/makesrna/intern/rna_lattice.c      | 2 ++
 source/blender/makesrna/intern/rna_main_api.c     | 2 ++
 source/blender/makesrna/intern/rna_material.c     | 2 ++
 source/blender/makesrna/intern/rna_mesh.c         | 1 +
 source/blender/makesrna/intern/rna_meta.c         | 1 +
 source/blender/makesrna/intern/rna_modifier.c     | 1 +
 source/blender/makesrna/intern/rna_nla.c          | 2 ++
 source/blender/makesrna/intern/rna_nodetree.c     | 1 +
 source/blender/makesrna/intern/rna_object.c       | 3 +++
 source/blender/makesrna/intern/rna_object_api.c   | 1 +
 source/blender/makesrna/intern/rna_object_force.c | 2 ++
 source/blender/makesrna/intern/rna_particle.c     | 7 ++++---
 source/blender/makesrna/intern/rna_pose.c         | 1 +
 source/blender/makesrna/intern/rna_property.c     | 2 ++
 source/blender/makesrna/intern/rna_rna.c          | 1 +
 source/blender/makesrna/intern/rna_scene.c        | 9 +++++----
 source/blender/makesrna/intern/rna_scene_api.c    | 1 +
 source/blender/makesrna/intern/rna_sculpt_paint.c | 2 ++
 source/blender/makesrna/intern/rna_sensor.c       | 2 ++
 source/blender/makesrna/intern/rna_sequencer.c    | 2 ++
 source/blender/makesrna/intern/rna_smoke.c        | 2 ++
 source/blender/makesrna/intern/rna_space.c        | 1 +
 source/blender/makesrna/intern/rna_text.c         | 2 ++
 source/blender/makesrna/intern/rna_texture.c      | 2 ++
 source/blender/makesrna/intern/rna_ui.c           | 1 +
 source/blender/makesrna/intern/rna_userdef.c      | 2 ++
 source/blender/makesrna/intern/rna_wm.c           | 2 ++
 source/blender/makesrna/intern/rna_world.c        | 2 ++
 50 files changed, 97 insertions(+), 15 deletions(-)

(limited to 'source/blender/makesrna')

diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 22b8e92b6a9..5112f1067f2 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -974,7 +974,7 @@ static char *rna_def_property_lookup_int_func(FILE *f, StructRNA *srna, Property
 		return func;
 	}
 
-	fprintf(f, "	int found= FALSE;\n");
+	fprintf(f, "	int found= 0;\n");
 	fprintf(f, "	CollectionPropertyIterator iter;\n\n");
 
 	fprintf(f, "	%s_%s_begin(&iter, ptr);\n\n", srna->identifier, prop->identifier);
@@ -995,11 +995,11 @@ static char *rna_def_property_lookup_int_func(FILE *f, StructRNA *srna, Property
 		fprintf(f, "					internal->ptr += internal->itemsize;\n");
 		fprintf(f, "				} while(internal->skip(&iter, internal->ptr));\n");
 		fprintf(f, "			}\n");
-		fprintf(f, "			found= TRUE;\n");
+		fprintf(f, "			found= 1;\n");
 		fprintf(f, "		}\n");
 		fprintf(f, "		else {\n");
 		fprintf(f, "			internal->ptr += internal->itemsize*index;\n");
-		fprintf(f, "			found= TRUE;\n");
+		fprintf(f, "			found= 1;\n");
 		fprintf(f, "		}\n");
 	}
 	else if(strcmp(nextfunc, "rna_iterator_listbase_next") == 0) {
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index efef72913c9..63edd69fb41 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -70,6 +70,8 @@ EnumPropertyItem id_type_items[] = {
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 #include "BKE_idprop.h"
 #include "BKE_library.h"
 #include "BKE_animsys.h"
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index ce80bb6c6ed..7c1308ece97 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -34,6 +34,7 @@
 #include "DNA_windowmanager_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 #include "BLI_dynstr.h"
 #include "BLI_ghash.h"
 
diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c
index 2fa93bcecdd..dc5e5699699 100644
--- a/source/blender/makesrna/intern/rna_actuator.c
+++ b/source/blender/makesrna/intern/rna_actuator.c
@@ -59,6 +59,8 @@ EnumPropertyItem actuator_type_items[] ={
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 #include "BKE_sca.h"
 
 static StructRNA* rna_Actuator_refine(struct PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c
index 90c072bcfcb..4516afed72a 100644
--- a/source/blender/makesrna/intern/rna_animation.c
+++ b/source/blender/makesrna/intern/rna_animation.c
@@ -47,6 +47,8 @@ EnumPropertyItem keyingset_path_grouping_items[] = {
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 #include "BKE_animsys.h"
 
 static int rna_AnimData_action_editable(PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c
index 1fcd53d5d0f..fd568363423 100644
--- a/source/blender/makesrna/intern/rna_animviz.c
+++ b/source/blender/makesrna/intern/rna_animviz.c
@@ -38,6 +38,8 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 static PointerRNA rna_AnimViz_onion_skinning_get(PointerRNA *ptr)
 {
 	return rna_pointer_inherit_refine(ptr, &RNA_AnimVizOnionSkinning, ptr->data);
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c
index 40755e0dfd1..cb7865c51f5 100644
--- a/source/blender/makesrna/intern/rna_armature.c
+++ b/source/blender/makesrna/intern/rna_armature.c
@@ -39,6 +39,8 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_idprop.h"
diff --git a/source/blender/makesrna/intern/rna_boid.c b/source/blender/makesrna/intern/rna_boid.c
index 757952bb956..ca6147e46a7 100644
--- a/source/blender/makesrna/intern/rna_boid.c
+++ b/source/blender/makesrna/intern/rna_boid.c
@@ -67,6 +67,8 @@ EnumPropertyItem boidruleset_type_items[] ={
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_particle.h"
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index f7e0fb3cf30..7cfe918eabd 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -37,7 +37,6 @@
 
 #include "IMB_imbuf.h"
 
-
 #include "WM_types.h"
 
 static EnumPropertyItem prop_direction_items[]= {
@@ -90,10 +89,11 @@ EnumPropertyItem brush_imagepaint_tool_items[] = {
 
 #include "RNA_access.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_texture.h"
 #include "BKE_brush.h"
 #include "BKE_icons.h"
-
 #include "BKE_paint.h"
 
 #include "WM_api.h"
diff --git a/source/blender/makesrna/intern/rna_camera.c b/source/blender/makesrna/intern/rna_camera.c
index b0d93bcd09a..72a9af515dd 100644
--- a/source/blender/makesrna/intern/rna_camera.c
+++ b/source/blender/makesrna/intern/rna_camera.c
@@ -36,6 +36,8 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 #include "BKE_object.h"
 
 /* only for rad/deg conversion! can remove later */
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c
index 2d2c9ab8a5b..643b9979a44 100644
--- a/source/blender/makesrna/intern/rna_cloth.c
+++ b/source/blender/makesrna/intern/rna_cloth.c
@@ -41,6 +41,8 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index 01b5c3a9793..8eb1152d6d2 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -40,6 +40,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_colortools.h"
 #include "BKE_depsgraph.h"
 #include "BKE_node.h"
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index e23d9a288cb..11960d10d88 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -98,6 +98,8 @@ EnumPropertyItem constraint_ik_axisref_items[] ={
 
 #include <stdio.h>
 
+#include "BLI_utildefines.h"
+
 #include "BKE_animsys.h"
 #include "BKE_action.h"
 #include "BKE_constraint.h"
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 8b9166b919f..4fe7a1a4122 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -64,6 +64,7 @@ EnumPropertyItem curve_type_items[] = {
 #ifdef RNA_RUNTIME
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_object_types.h"
 
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 963c4b98758..d2bd974d62a 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -34,10 +34,11 @@
 #include "DNA_genfile.h"
 #include "DNA_sdna_types.h"
 
-#include "RNA_define.h"
-
-#include "BLI_ghash.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
+#include "BLI_ghash.h"
+
+#include "RNA_define.h"
 
 #include "rna_internal.h"
 
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index e71454ef9ec..b5573e0044d 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -98,6 +98,8 @@ static StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr)
 
 /* ****************************** */
 
+#include "BLI_utildefines.h"
+
 #include "BKE_fcurve.h"
 #include "BKE_depsgraph.h"
 #include "BKE_animsys.h"
diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c
index 81b4b75aa03..86164092d74 100644
--- a/source/blender/makesrna/intern/rna_fluidsim.c
+++ b/source/blender/makesrna/intern/rna_fluidsim.c
@@ -40,6 +40,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_particle_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_depsgraph.h"
 #include "BKE_fluidsim.h"
 #include "BKE_global.h"
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index a104ae9de5c..9e298f0e835 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -37,6 +37,8 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 static int rna_GPencilLayer_active_frame_editable(PointerRNA *ptr)
 {
 	bGPDlayer *gpl= (bGPDlayer *)ptr->data;
diff --git a/source/blender/makesrna/intern/rna_group.c b/source/blender/makesrna/intern/rna_group.c
index bd1b7c96998..f3fdb9091b3 100644
--- a/source/blender/makesrna/intern/rna_group.c
+++ b/source/blender/makesrna/intern/rna_group.c
@@ -35,6 +35,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_group.h"
 
 #include "WM_api.h"
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index cc3c25fdb0e..774c32ec67a 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -48,6 +48,8 @@ static EnumPropertyItem image_source_items[]= {
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 #include "IMB_imbuf_types.h"
 
 static void rna_Image_animated_update(Main *bmain, Scene *scene, PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c
index d4021dc1cec..1f74097a831 100644
--- a/source/blender/makesrna/intern/rna_key.c
+++ b/source/blender/makesrna/intern/rna_key.c
@@ -42,6 +42,8 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_animsys.h"
 #include "BKE_depsgraph.h"
 #include "BKE_key.h"
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c
index 68ff80f83dc..e0d79c5a852 100644
--- a/source/blender/makesrna/intern/rna_lamp.c
+++ b/source/blender/makesrna/intern/rna_lamp.c
@@ -38,6 +38,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_texture.h"
diff --git a/source/blender/makesrna/intern/rna_lattice.c b/source/blender/makesrna/intern/rna_lattice.c
index de09d9605cd..cc998dd49aa 100644
--- a/source/blender/makesrna/intern/rna_lattice.c
+++ b/source/blender/makesrna/intern/rna_lattice.c
@@ -38,6 +38,8 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_depsgraph.h"
 #include "BKE_lattice.h"
 #include "BKE_main.h"
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 3ab7d05cd8a..08af56f20e9 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -59,6 +59,8 @@
 #include "BKE_font.h"
 #include "BKE_node.h"
 
+#include "BLI_utildefines.h"
+
 #include "DNA_armature_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_curve_types.h"
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 0fdb42f9146..ca8c9eb26ba 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -55,6 +55,8 @@ static EnumPropertyItem prop_texture_coordinates_items[] = {
 
 #include "DNA_node_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 192825e3afa..bc1281638ca 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -41,6 +41,7 @@
 
 #include "BLI_editVert.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_customdata.h"
 #include "BKE_depsgraph.h"
diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c
index f1d41d86695..60c8b1a2693 100644
--- a/source/blender/makesrna/intern/rna_meta.c
+++ b/source/blender/makesrna/intern/rna_meta.c
@@ -35,6 +35,7 @@
 #ifdef RNA_RUNTIME
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 11b0e8f995e..2f5d6870aed 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -39,6 +39,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
 #include "BKE_bmesh.h" /* For BevelModifierData */
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c
index 15c8608e523..7756d0e7e51 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -40,6 +40,8 @@
 #include <math.h>
 
 /* needed for some of the validation stuff... */
+#include "BLI_utildefines.h"
+
 #include "BKE_animsys.h"
 #include "BKE_nla.h"
 
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index d13564b6621..e40506fcd83 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -41,6 +41,7 @@
 #include "BKE_texture.h"
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "WM_types.h"
 
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 6cb5a074c03..d33d433c32f 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -29,6 +29,8 @@
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "rna_internal.h"
 
 #include "DNA_action_types.h"
@@ -143,6 +145,7 @@ EnumPropertyItem object_type_curve_items[] = {
 #include "BKE_deform.h"
 
 #include "BLI_editVert.h" /* for EditMesh->mat_nr */
+#include "BLI_utildefines.h"
 
 #include "ED_mesh.h"
 #include "ED_object.h"
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 945d0dbb123..29f4582b0b8 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -59,6 +59,7 @@
 #include "BKE_modifier.h"
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index fb8617bc626..f817e03f150 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -84,6 +84,8 @@ EnumPropertyItem empty_vortex_shape_items[] = {
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+
 #include "DNA_modifier_types.h"
 #include "DNA_texture_types.h"
 
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 6a7b77df905..6a5578ef62b 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -95,6 +95,10 @@ EnumPropertyItem part_hair_ren_as_items[] = {
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_math.h"
+#include "BLI_listbase.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_cloth.h"
 #include "BKE_deform.h"
@@ -104,9 +108,6 @@ EnumPropertyItem part_hair_ren_as_items[] = {
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 
-#include "BLI_math.h"
-#include "BLI_listbase.h"
-
 /* use for object space hair get/set */
 static void rna_ParticleHairKey_location_object_info(PointerRNA *ptr, ParticleSystemModifierData **psmd_pt, ParticleData **pa_pt)
 {
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 7b1a46dd6e2..6ff73770e7a 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -50,6 +50,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
 #include "BKE_context.h"
diff --git a/source/blender/makesrna/intern/rna_property.c b/source/blender/makesrna/intern/rna_property.c
index b7ae1229c4a..f76ad8627e0 100644
--- a/source/blender/makesrna/intern/rna_property.c
+++ b/source/blender/makesrna/intern/rna_property.c
@@ -34,6 +34,8 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 #include "BKE_property.h"
 
 static StructRNA* rna_GameProperty_refine(struct PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index 9158f0c3e68..ec037ce59fa 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -54,6 +54,7 @@ EnumPropertyItem property_unit_items[] = {
 
 #ifdef RNA_RUNTIME
 #include "MEM_guardedalloc.h"
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
 /* Struct */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 68345efa9e4..ed7b88383f7 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -154,6 +154,11 @@ EnumPropertyItem image_type_items[] = {
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_threads.h"
+#include "BLI_editVert.h"
+#include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
@@ -168,10 +173,6 @@ EnumPropertyItem image_type_items[] = {
 #include "BKE_screen.h"
 #include "BKE_animsys.h"
 
-#include "BLI_threads.h"
-#include "BLI_editVert.h"
-#include "BLI_blenlib.h"
-
 #include "WM_api.h"
 
 #include "ED_info.h"
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index e891d64d514..3852e7a225d 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -37,6 +37,7 @@
 #include "BKE_utildefines.h"
 
 #ifdef RNA_RUNTIME
+#include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
 #include "BKE_depsgraph.h"
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index ae13e5c68d9..477121b79c4 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -51,6 +51,8 @@ static EnumPropertyItem particle_edit_hair_brush_items[] = {
 #ifdef RNA_RUNTIME
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_pointcache.h"
 #include "BKE_particle.h"
diff --git a/source/blender/makesrna/intern/rna_sensor.c b/source/blender/makesrna/intern/rna_sensor.c
index 47a619f661a..011e6a44980 100644
--- a/source/blender/makesrna/intern/rna_sensor.c
+++ b/source/blender/makesrna/intern/rna_sensor.c
@@ -57,6 +57,8 @@ EnumPropertyItem sensor_type_items[] ={
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 #include "BKE_sca.h"
 
 static StructRNA* rna_Sensor_refine(struct PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index 233ffd06188..36934d81611 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -46,6 +46,8 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 static float to_dB(float x)
 {
 	return logf(x * x + 1e-30f) * 4.34294480f;
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index fc1584c7a0f..6e48ff005d5 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -43,6 +43,8 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_particle.h"
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 4a98d71a76a..d573439c7de 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -107,6 +107,7 @@ EnumPropertyItem viewport_shade_items[] = {
 #include "DNA_screen_types.h"
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
 #include "BKE_brush.h"
diff --git a/source/blender/makesrna/intern/rna_text.c b/source/blender/makesrna/intern/rna_text.c
index 66046939350..31c372b493a 100644
--- a/source/blender/makesrna/intern/rna_text.c
+++ b/source/blender/makesrna/intern/rna_text.c
@@ -39,6 +39,8 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BLI_utildefines.h"
+
 int text_file_modified(Text *text);
 
 static void rna_Text_filename_get(PointerRNA *ptr, char *value)
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index 7ad59795732..f99355c0db9 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -74,6 +74,8 @@ EnumPropertyItem texture_type_items[] = {
 
 #include "RNA_access.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_depsgraph.h"
 #include "BKE_image.h"
 #include "BKE_texture.h"
diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c
index 0c26741f06c..ace35d6fb0a 100644
--- a/source/blender/makesrna/intern/rna_ui.c
+++ b/source/blender/makesrna/intern/rna_ui.c
@@ -58,6 +58,7 @@ EnumPropertyItem operator_context_items[] = {
 #include "RNA_access.h"
 
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_report.h"
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index bead4f39858..4793e7aace6 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -38,6 +38,8 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 
 #include "BKE_sound.h"
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index a7870243afc..5b5d94e3b93 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -297,6 +297,8 @@ EnumPropertyItem wm_report_items[] = {
 
 #include <assert.h>
 
+#include "BLI_utildefines.h"
+
 #include "WM_api.h"
 
 #include "BKE_idprop.h"
diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c
index 1358964a92b..53eba7cce8d 100644
--- a/source/blender/makesrna/intern/rna_world.c
+++ b/source/blender/makesrna/intern/rna_world.c
@@ -39,6 +39,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_texture.h"
-- 
cgit v1.2.3