remove references to BKE_utildefines where its not needed.

- move GS() define into DNA_ID.h
- add BLI_utildefines as an automatic include with makesrna generated files.

18 files changed, 18 insertions, 18 deletions

diff --git a/source/blender/python/generic/IDProp.c b/source/blender/python/generic/IDProp.c
index 801b9b8e6b8..7bf7f06f989 100644
--- a/source/blender/python/generic/IDProp.c
+++ b/source/blender/python/generic/IDProp.c
@@ -30,7 +30,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_idprop.h"
-#include "BKE_utildefines.h"
+
 
 #define USE_STRING_COERCE
 
diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c
index 1c9a38cf150..e72f2136ee5 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -37,7 +37,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 
 static char Method_Buffer_doc[] =
 	"(type, dimensions, [template]) - Create a new Buffer object\n\n\
diff --git a/source/blender/python/generic/blf_py_api.c b/source/blender/python/generic/blf_py_api.c
index 3d645ab8482..0c0bf1a680d 100644
--- a/source/blender/python/generic/blf_py_api.c
+++ b/source/blender/python/generic/blf_py_api.c
@@ -29,7 +29,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 
 static char py_blf_position_doc[] =
 ".. function:: position(fontid, x, y, z)\n"
diff --git a/source/blender/python/generic/bpy_internal_import.c b/source/blender/python/generic/bpy_internal_import.c
index 99fca64238c..a1b99e12e94 100644
--- a/source/blender/python/generic/bpy_internal_import.c
+++ b/source/blender/python/generic/bpy_internal_import.c
@@ -43,7 +43,7 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h" /* UNUSED */	
+ /* UNUSED */	
 #include "BKE_text.h" /* txt_to_buf */	
 #include "BKE_main.h"
 #include "BKE_global.h" /* grr, only for G.main->name */
diff --git a/source/blender/python/generic/mathutils.c b/source/blender/python/generic/mathutils.c
index 137e27f948a..2e01dbe4cde 100644
--- a/source/blender/python/generic/mathutils.c
+++ b/source/blender/python/generic/mathutils.c
@@ -74,7 +74,7 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 
 //-------------------------DOC STRINGS ---------------------------
 static char M_Mathutils_doc[] =
diff --git a/source/blender/python/generic/mathutils_color.c b/source/blender/python/generic/mathutils_color.c
index 07838d3d938..bc82e11915e 100644
--- a/source/blender/python/generic/mathutils_color.c
+++ b/source/blender/python/generic/mathutils_color.c
@@ -27,7 +27,7 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 
 #define COLOR_SIZE 3
 
diff --git a/source/blender/python/generic/mathutils_euler.c b/source/blender/python/generic/mathutils_euler.c
index ae0923f544e..69237922666 100644
--- a/source/blender/python/generic/mathutils_euler.c
+++ b/source/blender/python/generic/mathutils_euler.c
@@ -31,7 +31,7 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 
 #ifndef int32_t
 #include "BLO_sys_types.h"
diff --git a/source/blender/python/generic/mathutils_geometry.c b/source/blender/python/generic/mathutils_geometry.c
index 1764dbc330b..9280dc4093c 100644
--- a/source/blender/python/generic/mathutils_geometry.c
+++ b/source/blender/python/generic/mathutils_geometry.c
@@ -38,7 +38,7 @@
 #include "BLI_utildefines.h"
  
 #include "BKE_displist.h"
-#include "BKE_utildefines.h"
+
 #include "BKE_curve.h"
 
 #define SWAP_FLOAT(a,b,tmp) tmp=a; a=b; b=tmp
diff --git a/source/blender/python/generic/mathutils_matrix.c b/source/blender/python/generic/mathutils_matrix.c
index 6994ace0f30..b67d4c54a7d 100644
--- a/source/blender/python/generic/mathutils_matrix.c
+++ b/source/blender/python/generic/mathutils_matrix.c
@@ -31,7 +31,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 
 /* matrix vector callbacks */
 int mathutils_matrix_vector_cb_index= -1;
diff --git a/source/blender/python/generic/mathutils_quat.c b/source/blender/python/generic/mathutils_quat.c
index d6053f3fae4..36fb0ad66bd 100644
--- a/source/blender/python/generic/mathutils_quat.c
+++ b/source/blender/python/generic/mathutils_quat.c
@@ -31,7 +31,7 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 
 #define QUAT_SIZE 4
 
diff --git a/source/blender/python/generic/mathutils_vector.c b/source/blender/python/generic/mathutils_vector.c
index d2319c0e38e..3d80f6bade4 100644
--- a/source/blender/python/generic/mathutils_vector.c
+++ b/source/blender/python/generic/mathutils_vector.c
@@ -31,7 +31,7 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 
 #define MAX_DIMENSIONS 4
 /* Swizzle axes get packed into a single value that is used as a closure. Each
diff --git a/source/blender/python/generic/noise.c b/source/blender/python/generic/noise.c
index 860ba8edf21..f266a666274 100644
--- a/source/blender/python/generic/noise.c
+++ b/source/blender/python/generic/noise.c
@@ -42,7 +42,7 @@
 
 #include "DNA_texture_types.h"
 
-#include "BKE_utildefines.h"
+
 /*-----------------------------------------*/
 /* 'mersenne twister' random number generator */
 
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index b6f92c63cb8..f287a69e3bb 100644
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -37,7 +37,7 @@
 #include "BLI_bpath.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 #include "BKE_global.h" /* XXX, G.main only */
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c
index 682986befef..0f6fd3f6415 100644
--- a/source/blender/python/intern/bpy_app.c
+++ b/source/blender/python/intern/bpy_app.c
@@ -27,7 +27,7 @@
 #include "BLI_path_util.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 #include "BKE_blender.h"
 #include "BKE_global.h"
 #include "structseq.h"
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index c01263a7e25..3c76e1a703f 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -44,7 +44,7 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_text.h"
 #include "BKE_font.h" /* only for utf8towchar */
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c
index ce63d58559f..dd3a49ad8b1 100644
--- a/source/blender/python/intern/bpy_props.c
+++ b/source/blender/python/intern/bpy_props.c
@@ -28,7 +28,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
+
 
 #include "RNA_define.h" /* for defining our own rna */
 #include "RNA_enum_types.h"
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index d9b2915c2c4..a95aa62b310 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -37,7 +37,7 @@
 #include "RNA_define.h" /* RNA_def_property_free_identifier */
 
 #include "MEM_guardedalloc.h"
-#include "BKE_utildefines.h"
+
 #include "BKE_idcode.h"
 #include "BKE_context.h"
 #include "BKE_global.h" /* evil G.* */
diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c
index 7973cbbc5f8..6d4cc035ece 100644
--- a/source/blender/python/intern/bpy_rna_callback.c
+++ b/source/blender/python/intern/bpy_rna_callback.c
@@ -29,7 +29,7 @@
 #include "BLI_utildefines.h"
 
 #include "DNA_screen_types.h"
-#include "BKE_utildefines.h"
+
 #include "BKE_context.h"
 #include "ED_space_api.h"