remove redundant includes from cmake and scons.

24 files changed, 7 insertions, 40 deletions

diff --git a/source/blender/editors/animation/SConscript b/source/blender/editors/animation/SConscript
index 0f4fb71242b..91d480978c4 100644
--- a/source/blender/editors/animation/SConscript
+++ b/source/blender/editors/animation/SConscript
@@ -36,8 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
diff --git a/source/blender/editors/armature/SConscript b/source/blender/editors/armature/SConscript
index 51345d94e60..b3c1ea2dbe9 100644
--- a/source/blender/editors/armature/SConscript
+++ b/source/blender/editors/armature/SConscript
@@ -37,12 +37,8 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
-    '../../gpu',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
-    '../../render/extern/include',
     '../../windowmanager',
     ]
 incs = ' '.join(incs)
diff --git a/source/blender/editors/curve/SConscript b/source/blender/editors/curve/SConscript
index de395a6cd46..4760a212a8a 100644
--- a/source/blender/editors/curve/SConscript
+++ b/source/blender/editors/curve/SConscript
@@ -33,15 +33,10 @@ defs = []
 
 incs = [
     '#/intern/guardedalloc',
-    '#/extern/glew/include',
-    '#/intern/elbeem/extern',
     '../include',
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
-    '../../gpu',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../render/extern/include',
diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c
index 406c26e901e..07dd2b82a06 100644
--- a/source/blender/editors/curve/curve_ops.c
+++ b/source/blender/editors/curve/curve_ops.c
@@ -269,4 +269,3 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
 	ED_keymap_proportional_cycle(keyconf, keymap);
 	ED_keymap_proportional_editmode(keyconf, keymap, TRUE);
 }
-
diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript
index 0dc77ec5a3e..1936e17a7bb 100644
--- a/source/blender/editors/interface/SConscript
+++ b/source/blender/editors/interface/SConscript
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
     '../../gpu',
     '../../imbuf',
     '../../makesdna',
diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript
index e7ed3aae7d1..6fa48c12eca 100644
--- a/source/blender/editors/mesh/SConscript
+++ b/source/blender/editors/mesh/SConscript
@@ -34,7 +34,6 @@ defs = []
 incs = [
     '#/intern/guardedalloc',
     '#/extern/glew/include',
-    '#/intern/elbeem/extern',
     '../include',
     '../uvedit',
     '../../blenfont',
diff --git a/source/blender/editors/metaball/SConscript b/source/blender/editors/metaball/SConscript
index fb82cb032c8..d31a10afe90 100644
--- a/source/blender/editors/metaball/SConscript
+++ b/source/blender/editors/metaball/SConscript
@@ -31,13 +31,9 @@ sources = env.Glob('*.c')
 
 incs = [
     '#/intern/guardedalloc',
-    '#/extern/glew/include',
-    '#/intern/elbeem/extern',
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../gpu',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../render/extern/include',
diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript
index 0fda34a86b1..9436280de43 100644
--- a/source/blender/editors/physics/SConscript
+++ b/source/blender/editors/physics/SConscript
@@ -38,12 +38,8 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
-    '../../gpu',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
-    '../../render/extern/include',
     '../../windowmanager',
     ]
 incs = ' '.join(incs)
diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript
index affa28863c9..28a6cbb02e6 100644
--- a/source/blender/editors/screen/SConscript
+++ b/source/blender/editors/screen/SConscript
@@ -41,7 +41,6 @@ incs = [
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
-    '../../render/extern/include',
     '../../windowmanager',
     ]
 incs = ' '.join(incs)
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index 79b8cd5e695..639f2e8d506 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -35,6 +35,7 @@
 #include "BLI_utildefines.h"
 
 #include "DNA_brush_types.h"
+#include "DNA_customdata_types.h"
 #include "DNA_color_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c
index 14eb358f20f..e0d578ec210 100644
--- a/source/blender/editors/sculpt_paint/paint_hide.c
+++ b/source/blender/editors/sculpt_paint/paint_hide.c
@@ -64,6 +64,8 @@
 #include "RNA_access.h"
 #include "RNA_define.h"
 
+#include "bmesh.h"
+
 #include "paint_intern.h"
 #include "sculpt_intern.h" /* for undo push */
 
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c
index d42a7778a58..8767b080355 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@ -54,6 +54,8 @@
 #include "ED_screen.h"
 #include "ED_sculpt.h"
 
+#include "bmesh.h"
+
 #include "paint_intern.h"
 #include "sculpt_intern.h" /* for undo push */
 
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index badd49cb8fb..df1978c49f6 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -30,6 +30,7 @@
 #include "BLI_utildefines.h"
 #include "BLI_math_vector.h"
 
+#include "DNA_customdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_brush_types.h"
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 053ace4e59d..5647a8562c7 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -44,6 +44,7 @@
 
 #include "BLF_translation.h"
 
+#include "DNA_customdata_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
diff --git a/source/blender/editors/space_action/SConscript b/source/blender/editors/space_action/SConscript
index 0421c4cc3ee..2776bd2989a 100644
--- a/source/blender/editors/space_action/SConscript
+++ b/source/blender/editors/space_action/SConscript
@@ -35,7 +35,6 @@ incs = [
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt
index 3932924a521..bf3257389ce 100644
--- a/source/blender/editors/space_api/CMakeLists.txt
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -23,7 +23,6 @@ set(INC
 	../io
 	../../blenkernel
 	../../blenlib
-	../../bmesh
 	../../makesdna
 	../../makesrna
 	../../windowmanager
diff --git a/source/blender/editors/space_api/SConscript b/source/blender/editors/space_api/SConscript
index bd0f490a56d..2ba918ffc84 100644
--- a/source/blender/editors/space_api/SConscript
+++ b/source/blender/editors/space_api/SConscript
@@ -36,10 +36,8 @@ incs = [
     '../io',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
     '../../makesdna',
     '../../makesrna',
-    '../../python',
     '../../windowmanager',
     ]
 incs = ' '.join(incs)
diff --git a/source/blender/editors/space_nla/SConscript b/source/blender/editors/space_nla/SConscript
index a3063dae946..a00337e0b58 100644
--- a/source/blender/editors/space_nla/SConscript
+++ b/source/blender/editors/space_nla/SConscript
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt
index 7aa07f4e022..26c4183f7df 100644
--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -44,9 +44,6 @@ if(WITH_PYTHON)
 	list(APPEND INC
 		../../python
 	)
-	list(APPEND INC_SYS
-		${PYTHON_INCLUDE_DIRS}
-	)
 	add_definitions(-DWITH_PYTHON)
 endif()
 
diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt
index d848ce33503..0bb8ede7cca 100644
--- a/source/blender/editors/space_text/CMakeLists.txt
+++ b/source/blender/editors/space_text/CMakeLists.txt
@@ -52,9 +52,6 @@ if(WITH_PYTHON)
 	list(APPEND INC
 		../../python
 	)
-	list(APPEND INC_SYS
-		${PYTHON_INCLUDE_DIRS}
-	)
 	add_definitions(-DWITH_PYTHON)
 endif()
 
diff --git a/source/blender/editors/space_time/SConscript b/source/blender/editors/space_time/SConscript
index fb09fe2c11b..bf1b918f4f1 100644
--- a/source/blender/editors/space_time/SConscript
+++ b/source/blender/editors/space_time/SConscript
@@ -35,7 +35,6 @@ incs = [
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
diff --git a/source/blender/editors/transform/SConscript b/source/blender/editors/transform/SConscript
index eeefcedd014..f3c8c13647a 100644
--- a/source/blender/editors/transform/SConscript
+++ b/source/blender/editors/transform/SConscript
@@ -37,12 +37,9 @@ incs = [
     '../../blenkernel',
     '../../blenlib',
     '../../bmesh',
-    '../../gpu',
     '../../ikplugin',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
-    '../../render/extern/include',
     '../../windowmanager',
     ]
 
diff --git a/source/blender/editors/util/SConscript b/source/blender/editors/util/SConscript
index 120ffc69bc8..223ee5731f1 100644
--- a/source/blender/editors/util/SConscript
+++ b/source/blender/editors/util/SConscript
@@ -38,7 +38,6 @@ incs = [
     '../../blenkernel',
     '../../blenlib',
     '../../bmesh',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
diff --git a/source/blender/editors/uvedit/SConscript b/source/blender/editors/uvedit/SConscript
index 8b1cbd06f2c..413503191cd 100644
--- a/source/blender/editors/uvedit/SConscript
+++ b/source/blender/editors/uvedit/SConscript
@@ -41,7 +41,6 @@ incs = [
     '../../blenlib',
     '../../bmesh',
     '../../gpu',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',