code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on.

57 files changed, 941 insertions, 287 deletions

diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index 4df3f3929d6..30c58b06421 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -40,7 +40,16 @@ if window_system == 'darwin':
 pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget', 'GHOST_NDOFManager', 'GHOST_Sizer']
 defs=['_USE_MATH_DEFINES']
 
-incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC']
+incs = [
+    '.',
+    '#extern/glew/include',
+    '#source/blender/imbuf',
+    '#source/blender/makesdna',
+    '../string',
+    ]
+incs = ' '.join(incs)
+
+incs += ' ' + env['BF_OPENGL_INC']
 
 if env['WITH_GHOST_SDL']:
     for f in pf:
diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript
index 0e46781b768..6caeada0e05 100644
--- a/source/blender/avi/SConscript
+++ b/source/blender/avi/SConscript
@@ -29,7 +29,13 @@ Import ('env')
 
 sources = env.Glob('intern/*.c')
 
-incs = '. #/intern/guardedalloc ../blenlib'
-incs += ' ' + env['BF_JPEG_INC']
+incs = [
+    '.',
+    '#/intern/guardedalloc',
+    '../blenlib',
+    env['BF_JPEG_INC'],
+    ]
 
-env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [190,120] )
+defs = []
+
+env.BlenderLib ('bf_avi', sources, incs, defs, libtype=['core','player'], priority = [190,120] )
diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript
index 3529330a308..e2ff41e9b9c 100644
--- a/source/blender/blenfont/SConscript
+++ b/source/blender/blenfont/SConscript
@@ -30,10 +30,23 @@ Import ('env')
 
 sources = env.Glob('intern/*.c')
 
-incs = '. intern  #/intern/guardedalloc #/intern/locale ../blenkernel ../blenlib ../blenloader'
-incs += ' ../makesdna ../makesrna ../python ../imbuf ../editors/include'
-incs += ' #/extern/glew/include'
-incs += ' ' + env['BF_FREETYPE_INC']
+incs = [
+    '.',
+    'intern',
+    '#/intern/guardedalloc',
+    '#/intern/locale',
+    '#/extern/glew/include',
+    '../blenkernel',
+    '../blenlib',
+    '../blenloader',
+    '../editors/include',
+    '../imbuf',
+    '../makesdna',
+    '../makesrna',
+    '../python',
+    ]
+
+incs.extend(Split(env['BF_FREETYPE_INC']))
 
 defs = ['GLEW_STATIC']
 
@@ -43,4 +56,4 @@ if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross':
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_blenfont', sources, Split(incs), defines=defs, libtype=['core','player'], priority=[210,210] )
+env.BlenderLib('bf_blenfont', sources, incs, defines=defs, libtype=['core', 'player'], priority=[210, 210])
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 41684e5e535..6d080fea031 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -35,27 +35,45 @@ sources.remove('intern' + os.sep + 'mask.c')
 
 sources_mask = env.Glob('intern/mask*.c')
 
-incs = '. #/intern/guardedalloc #/intern/memutil'
-incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager'
-incs += ' ../render/extern/include ../makesrna'
-incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers'
-incs += ' #/intern/iksolver/extern ../blenloader'
-incs += ' #/extern/bullet2/src'
-incs += ' #/intern/rigidbody'
-incs += ' #/intern/opennl/extern #/intern/bsp/extern'
-incs += ' ../gpu #/extern/glew/include'
-incs += ' ../bmesh'
-incs += ' #/intern/smoke/extern'
-incs += ' #/intern/mikktspace'
-incs += ' #/intern/audaspace/intern'
-incs += ' #/intern/ffmpeg'
-incs += ' #/intern/raskter'
-incs += ' #/extern/libmv'
-
-incs += ' ' + env['BF_OPENGL_INC']
-incs += ' ' + env['BF_ZLIB_INC']
-
-defs = [ 'GLEW_STATIC' ]
+incs = [
+    '.',
+    '#/extern/libmv',
+    '#/intern/ffmpeg',
+    '#/intern/guardedalloc',
+    '#/intern/memutil',
+    '#/intern/mikktspace',
+    '#/intern/raskter',
+    '#/intern/rigidbody',
+    '#/extern/bullet2/src',
+    '#/extern/glew/include',
+    '#/intern/audaspace/intern',
+    '#/intern/bsp/extern',
+    '#/intern/elbeem/extern',
+    '#/intern/iksolver/extern',
+    '#/intern/opennl/extern',
+    '#/intern/smoke/extern',
+    '../avi',
+    '../blenfont',
+    '../blenlib',
+    '../blenloader',
+    '../bmesh',
+    '../gpu',
+    '../ikplugin',
+    '../imbuf',
+    '../makesdna',
+    '../makesrna',
+    '../modifiers',
+    '../nodes',
+    '../render/extern/include',
+    '../windowmanager',
+    env['BF_OPENGL_INC'],
+    env['BF_ZLIB_INC'],
+    ]
+incs = ' '.join(incs)
+
+defs = [
+    'GLEW_STATIC',
+    ]
 
 if env['WITH_BF_SMOKE']:
     defs.append('WITH_SMOKE')
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index 0a2c3c0ebca..76b1c522b64 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -31,10 +31,17 @@ sources = env.Glob('intern/*.c')
 
 cflags=''
 # don't add ../blenkernel back!
-incs = '. ../makesdna #/intern/guardedalloc #/intern/ghost #/extern/wcwidth'
+incs = [
+    '.',
+    '#/extern/wcwidth',
+    '#/intern/ghost',
+    '#/intern/guardedalloc',
+    '../makesdna',
+    env['BF_FREETYPE_INC'],
+    env['BF_ZLIB_INC'],
+    ]
+incs = ' '.join(incs)
 
-incs += ' ' + env['BF_FREETYPE_INC']
-incs += ' ' + env['BF_ZLIB_INC']
 defs = []
 
 if env['WITH_BF_BINRELOC']:
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript
index 778cbef2a8b..30cbc79a40d 100644
--- a/source/blender/blenloader/SConscript
+++ b/source/blender/blenloader/SConscript
@@ -29,14 +29,24 @@ Import ('env')
 
 sources = env.Glob('intern/*.c')
 
-incs = '. #/intern/guardedalloc ../blenfont ../blenlib ../blenkernel'
-incs += ' ../makesdna ../editors/include'
-incs += ' ../render/extern/include ../makesrna ../nodes ../bmesh ../imbuf'
-
-incs += ' ' + env['BF_ZLIB_INC']
+incs = [
+    '.',
+    '#/intern/guardedalloc',
+    '../blenfont',
+    '../blenkernel',
+    '../blenlib',
+    '../bmesh',
+    '../editors/include',
+    '../imbuf',
+    '../makesdna',
+    '../makesrna',
+    '../nodes',
+    '../render/extern/include',
+    env['BF_ZLIB_INC'],
+    ]
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    incs += ' ' + env['BF_PTHREADS_INC']
+    incs.append(env['BF_PTHREADS_INC'])
 
 defs = []
 
@@ -44,6 +54,6 @@ if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [167,30]) #, cc_compileflags=['/WX'] )
+    env.BlenderLib('bf_blenloader', sources, incs, defs, libtype=['core', 'player'], priority = [167, 30]) #, cc_compileflags=['/WX'])
 else:
-    env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player','player2'], priority = [167,30,5] )
+    env.BlenderLib('bf_blenloader', sources, incs, defs, libtype=['core', 'player', 'player2'], priority=[167, 30, 5])
diff --git a/source/blender/compositor/SConscript b/source/blender/compositor/SConscript
index 64169ac7403..df22d99f76d 100644
--- a/source/blender/compositor/SConscript
+++ b/source/blender/compositor/SConscript
@@ -30,14 +30,31 @@ defs = ['GLEW_STATIC']
 
 sources = env.Glob('intern/*.cpp') + env.Glob('nodes/*.cpp') + env.Glob('operations/*.cpp')
 
-incs = '. nodes intern operations ../blenlib ../blenkernel ../makesdna ../render/extern/include ../render/intern/include'
-incs += ' ../makesrna ../blenloader ../../../intern/guardedalloc ../imbuf ../windowmanager '
-incs += '#intern/opencl ../nodes ../nodes/intern ../nodes/composite '
+incs = [
+    '.',
+    'intern',
+    'nodes',
+    'operations',
+    '#/intern/opencl',
+    '../blenkernel',
+    '../blenlib',
+    '../blenloader',
+    '../imbuf',
+    '../makesdna',
+    '../makesrna',
+    '../nodes',
+    '../nodes/composite',
+    '../nodes/intern',
+    '../render/extern/include',
+    '../render/intern/include',
+    '../windowmanager',
+    '../../../intern/guardedalloc',
 
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
-    incs += ' ' + env['BF_PTHREADS_INC']
+    # data files
+    env['DATA_HEADERS'],
+    ]
 
-# data files
-incs += ' ' + env['DATA_HEADERS']
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+    incs.append(env['BF_PTHREADS_INC'])
 
-env.BlenderLib ( 'bf_composite', sources, Split(incs), defines=defs, libtype=['core'], priority = [164] )
+env.BlenderLib('bf_composite', sources, incs, defines=defs, libtype=['core'], priority=[164])
diff --git a/source/blender/editors/animation/SConscript b/source/blender/editors/animation/SConscript
index 2a6b381ba66..e48e35e9e69 100644
--- a/source/blender/editors/animation/SConscript
+++ b/source/blender/editors/animation/SConscript
@@ -29,12 +29,24 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont'
-incs += ' ../../bmesh ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
 
 defs = []
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), defs, libtype=['core'], priority=[125] )
+env.BlenderLib('bf_editors_animation', sources, incs, defs, libtype=['core'], priority=[125])
diff --git a/source/blender/editors/armature/SConscript b/source/blender/editors/armature/SConscript
index 1911d76a894..96098ee2085 100644
--- a/source/blender/editors/armature/SConscript
+++ b/source/blender/editors/armature/SConscript
@@ -29,10 +29,24 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf ../../blenloader'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../render/extern/include ../../bmesh'
-incs += ' ../../gpu ../../makesrna #/intern/opennl/extern'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '#/intern/opennl/extern',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/editors/curve/SConscript b/source/blender/editors/curve/SConscript
index 21c6a3732fa..a7d8b15da32 100644
--- a/source/blender/editors/curve/SConscript
+++ b/source/blender/editors/curve/SConscript
@@ -31,12 +31,25 @@ sources = env.Glob('*.c')
 
 defs = []
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../bmesh ../../gpu ../../blenloader'
-incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '#/intern/elbeem/extern',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_editors_curve', sources, Split(incs), defs, libtype=['core'], priority=[45] )
+env.BlenderLib('bf_editors_curve', sources, incs, defs, libtype=['core'], priority=[45])
diff --git a/source/blender/editors/datafiles/SConscript b/source/blender/editors/datafiles/SConscript
index d4e6ed4aff8..dadd4bd1f19 100644
--- a/source/blender/editors/datafiles/SConscript
+++ b/source/blender/editors/datafiles/SConscript
@@ -30,7 +30,8 @@ Import ('env')
 # all source generated now
 # sources = env.Glob('*.c')
 sources = []
-incs = ""
+incs = []
+defs = []
 
 # generated data files
 import os
@@ -106,4 +107,4 @@ sources.extend((
 
     ))
 
-env.BlenderLib ( 'bf_editor_datafiles', sources, Split(incs), [], libtype=['core', 'player'], priority=[235, 30] )
+env.BlenderLib ( 'bf_editor_datafiles', sources, incs, defs, libtype=['core', 'player'], priority=[235, 30] )
diff --git a/source/blender/editors/gpencil/SConscript b/source/blender/editors/gpencil/SConscript
index f72e124e862..4ce9921bb09 100644
--- a/source/blender/editors/gpencil/SConscript
+++ b/source/blender/editors/gpencil/SConscript
@@ -29,14 +29,27 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../gpu ../../blenloader ../../bmesh ../../blenfont'
-incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '#/intern/elbeem/extern',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
 
 defs = []
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), defs, libtype=['core'], priority=[45] )
+env.BlenderLib('bf_editors_gpencil', sources, incs, defs, libtype=['core'], priority=[45])
diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript
index 8d277d6cd35..734b9565884 100644
--- a/source/blender/editors/interface/SConscript
+++ b/source/blender/editors/interface/SConscript
@@ -29,13 +29,23 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-for source in env.Glob('*_api.c'):
-    sources.remove(source)
-
-incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc ../../gpu'
-incs += ' #/extern/glew/include ../../blenloader ../../bmesh'
-incs += ' ../../python/' # python button eval
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    # python button eval
+    '../../python',
+    '../../windowmanager',
+    ]
 
 defs = []
 
@@ -45,4 +55,4 @@ if env['WITH_BF_INTERNATIONAL']:
 if env['WITH_BF_PYTHON']:
     defs.append('WITH_PYTHON')
     
-env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), defs, libtype=['core'], priority=[110] )
+env.BlenderLib('bf_editors_interface', sources, incs, defs, libtype=['core'], priority=[110])
diff --git a/source/blender/editors/io/SConscript b/source/blender/editors/io/SConscript
index b7449ccad79..0a4b6f19a3e 100644
--- a/source/blender/editors/io/SConscript
+++ b/source/blender/editors/io/SConscript
@@ -28,10 +28,20 @@
 Import ('env')
 
 sources = env.Glob('*.c')
+
 defs = []
 
-incs = '../include ../../blenfont ../../blenkernel ../../blenlib ../../blenloader ../../bmesh'
-incs += '../../makesdna ../../makesrna ../../windowmanager ../../collada'
+incs = [
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../collada',
+    '../../makesrna',
+    '../../windowmanager',
+    '../../bmesh../../makesdna',
+    ]
 
 if env['WITH_BF_COLLADA']:
     defs += ['WITH_COLLADA']
@@ -39,4 +49,4 @@ if env['WITH_BF_COLLADA']:
 if env['WITH_BF_INTERNATIONAL']:
     defs += ['WITH_INTERNATIONAL']
 
-env.BlenderLib ( 'bf_editor_io', sources, Split(incs), defines=defs, libtype=['core','player'], priority=[330,210] )
+env.BlenderLib ( 'bf_editor_io', sources, incs, defines=defs, libtype=['core','player'], priority=[330,210] )
diff --git a/source/blender/editors/mask/SConscript b/source/blender/editors/mask/SConscript
index 3200362b580..0db3208bbba 100644
--- a/source/blender/editors/mask/SConscript
+++ b/source/blender/editors/mask/SConscript
@@ -28,8 +28,19 @@
 Import ('env')
 
 sources = env.Glob('*.c')
+
 defs = []
-incs = '../include ../../blenkernel ../../blenloader ../../blenlib ../../windowmanager ../../makesdna'
-incs += ' ../../makesrna #/extern/glew/include #/intern/guardedalloc'
 
-env.BlenderLib ( 'bf_editors_mask', sources, Split(incs), defs, libtype=['core'], priority=[100] )
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
+
+env.BlenderLib('bf_editors_mask', sources, incs, defs, libtype=['core'], priority=[100])
diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript
index 55ad14a50fc..e36c46ee534 100644
--- a/source/blender/editors/mesh/SConscript
+++ b/source/blender/editors/mesh/SConscript
@@ -31,11 +31,25 @@ sources = env.Glob('*.c')
 
 defs = []
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../gpu ../../blenloader'
-incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
-incs += ' ../../bmesh ../uvedit '
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '#/intern/elbeem/extern',
+    '../include',
+    '../uvedit',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 if env['OURPLATFORM'] == 'linux':
     cflags='-pthread'
diff --git a/source/blender/editors/metaball/SConscript b/source/blender/editors/metaball/SConscript
index 7083eff863e..2ee2f1d1bd8 100644
--- a/source/blender/editors/metaball/SConscript
+++ b/source/blender/editors/metaball/SConscript
@@ -29,9 +29,22 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../gpu ../../blenloader'
-incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '#/intern/elbeem/extern',
+    '../include',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
 
-env.BlenderLib ( 'bf_editors_metaball', sources, Split(incs), [], libtype=['core'], priority=[45] )
+defs = []
+
+env.BlenderLib ( 'bf_editors_metaball', sources, incs, defs, libtype=['core'], priority=[45] )
diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript
index 203d7dff768..44c3c33c0d9 100644
--- a/source/blender/editors/object/SConscript
+++ b/source/blender/editors/object/SConscript
@@ -29,11 +29,26 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc ../../blenloader'
-incs += ' ../../makesrna ../../python ../../ikplugin ../../bmesh'
-incs += ' ../../render/extern/include ../../gpu' # for object_bake.c
-incs += ' #extern/recastnavigation'
+incs = [
+    '#/extern/recastnavigation',
+    '#/intern/guardedalloc',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../ikplugin',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../python',
+    # for object_bake.c
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript
index 2583c9f964a..8c77cd13179 100644
--- a/source/blender/editors/physics/SConscript
+++ b/source/blender/editors/physics/SConscript
@@ -29,11 +29,25 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../gpu ../../blenloader ../../bmesh'
-incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
-incs += ' #/intern/rigidbody'
+incs = [
+    '#/intern/guardedalloc',
+    '#/intern/rigidbody',
+    '#/extern/glew/include',
+    '#/intern/elbeem/extern',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript
index db968590093..4d0e81fdee1 100644
--- a/source/blender/editors/render/SConscript
+++ b/source/blender/editors/render/SConscript
@@ -29,11 +29,24 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../gpu'
-incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
-incs += ' ../../blenloader ../../bmesh ../../blenfont'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '#/intern/elbeem/extern',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript
index c0a14ce5377..3b6963ec88d 100644
--- a/source/blender/editors/screen/SConscript
+++ b/source/blender/editors/screen/SConscript
@@ -29,10 +29,23 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf'
-incs += ' ../../blenloader ../../windowmanager ../../makesrna ../../gpu'
-incs += ' ../../render/extern/include ../../bmesh'
-incs += ' #/intern/guardedalloc #/extern/glew/include'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript
index d10666de637..63a1525adcc 100644
--- a/source/blender/editors/sculpt_paint/SConscript
+++ b/source/blender/editors/sculpt_paint/SConscript
@@ -31,10 +31,24 @@ sources = env.Glob('*.c')
 
 defs = []
 
-incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../render/extern/include'
-incs += ' ../../gpu ../../makesrna ../../blenloader ../../bmesh ../uvedit'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../uvedit',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 if env['OURPLATFORM'] == 'linux':
     cflags='-pthread'
diff --git a/source/blender/editors/sound/SConscript b/source/blender/editors/sound/SConscript
index 1eaf9c2e945..67bc799dd6f 100644
--- a/source/blender/editors/sound/SConscript
+++ b/source/blender/editors/sound/SConscript
@@ -29,10 +29,19 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc'
-incs += ' ../../makesrna ../../blenloader'
-incs += ' #/intern/audaspace/intern'
+incs = [
+    '#/intern/guardedalloc',
+    '#/intern/audaspace/intern',
+    '../include',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/editors/space_action/SConscript b/source/blender/editors/space_action/SConscript
index abaf6154a42..579d3604382 100644
--- a/source/blender/editors/space_action/SConscript
+++ b/source/blender/editors/space_action/SConscript
@@ -29,7 +29,18 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 env.BlenderLib ( 'bf_editors_space_action', sources, Split(incs), [], libtype=['core'], priority=[40] )
diff --git a/source/blender/editors/space_api/SConscript b/source/blender/editors/space_api/SConscript
index a07be054011..b7d8342f6fa 100644
--- a/source/blender/editors/space_api/SConscript
+++ b/source/blender/editors/space_api/SConscript
@@ -29,9 +29,21 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../io ../../blenlib ../../blenkernel ../../blenloader ../../makesdna'
-incs += ' ../../windowmanager ../../python ../../makesrna ../../bmesh'
-incs += ' #/intern/guardedalloc #/extern/glew/include'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../io',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../makesdna',
+    '../../makesrna',
+    '../../python',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = ''
 
diff --git a/source/blender/editors/space_buttons/SConscript b/source/blender/editors/space_buttons/SConscript
index 1f7939598c8..764ed4b1388 100644
--- a/source/blender/editors/space_buttons/SConscript
+++ b/source/blender/editors/space_buttons/SConscript
@@ -29,10 +29,22 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../bmesh ../../makesrna ../../render/extern/include ../../blenloader'
-
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 defs = []
 
 if env['WITH_BF_INTERNATIONAL']:
diff --git a/source/blender/editors/space_clip/SConscript b/source/blender/editors/space_clip/SConscript
index 840a3b49f2b..b200be0fd91 100644
--- a/source/blender/editors/space_clip/SConscript
+++ b/source/blender/editors/space_clip/SConscript
@@ -29,8 +29,21 @@ Import ('env')
 
 sources = env.Glob('*.c')
 defs = []
-incs = '../include ../../blenkernel ../../blenloader ../../blenfont ../../blenlib ../../imbuf ../../makesdna'
-incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../gpu'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
diff --git a/source/blender/editors/space_console/SConscript b/source/blender/editors/space_console/SConscript
index 3e2c9d6dfdf..5af5818b220 100644
--- a/source/blender/editors/space_console/SConscript
+++ b/source/blender/editors/space_console/SConscript
@@ -32,7 +32,7 @@ defs = []
 
 incs = [
     '../include',
-    '#extern/glew/include',
+    '#/extern/glew/include',
     '#/intern/guardedalloc',
     '../../makesdna',
     '../../makesrna',
@@ -41,7 +41,7 @@ incs = [
     '../../windowmanager',
     '../../blenfont',
     '../../blenloader',
-]
+    ]
 
 if env['WITH_BF_PYTHON']:
     defs.append('WITH_PYTHON')
diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript
index 6459f880bc4..c220da3de05 100644
--- a/source/blender/editors/space_file/SConscript
+++ b/source/blender/editors/space_file/SConscript
@@ -28,11 +28,21 @@
 Import ('env')
 
 sources = env.Glob('*.c')
-
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../blenloader ../../makesrna ../../blenfont'
-incs += ' ../../render/extern/include'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/editors/space_graph/SConscript b/source/blender/editors/space_graph/SConscript
index 84ac27a8962..2eab8c31dc5 100644
--- a/source/blender/editors/space_graph/SConscript
+++ b/source/blender/editors/space_graph/SConscript
@@ -29,13 +29,24 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' #/intern/audaspace/intern ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '#/intern/audaspace/intern',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
 
 defs = []
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_editors_space_graph', sources, Split(incs), defs, libtype=['core'], priority=[50] )
+env.BlenderLib('bf_editors_space_graph', sources, incs, defs, libtype=['core'], priority=[50])
diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript
index 68f747270a3..1a60061fd11 100644
--- a/source/blender/editors/space_image/SConscript
+++ b/source/blender/editors/space_image/SConscript
@@ -29,9 +29,22 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../bmesh ../../render/extern/include ../../makesrna ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/editors/space_info/SConscript b/source/blender/editors/space_info/SConscript
index bacc28161d3..2a1419984c6 100644
--- a/source/blender/editors/space_info/SConscript
+++ b/source/blender/editors/space_info/SConscript
@@ -29,8 +29,21 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont'
-incs += ' ../../bmesh ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/editors/space_logic/SConscript b/source/blender/editors/space_logic/SConscript
index e5a19b7f30b..f5ac244d50f 100644
--- a/source/blender/editors/space_logic/SConscript
+++ b/source/blender/editors/space_logic/SConscript
@@ -29,9 +29,21 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../makesrna ../interface ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../interface',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/editors/space_nla/SConscript b/source/blender/editors/space_nla/SConscript
index 18c6392eee9..ae82e451c7f 100644
--- a/source/blender/editors/space_nla/SConscript
+++ b/source/blender/editors/space_nla/SConscript
@@ -29,8 +29,20 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript
index 70837fa766a..e423d39cba4 100644
--- a/source/blender/editors/space_node/SConscript
+++ b/source/blender/editors/space_node/SConscript
@@ -29,9 +29,25 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
-incs += ' ../../nodes ../../render/extern/include ../../blenloader ../../gpu ../../compositor'
-incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../compositor',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../nodes',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
+
 defs = []
 cf = []
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
diff --git a/source/blender/editors/space_outliner/SConscript b/source/blender/editors/space_outliner/SConscript
index 1bb71941a43..e3c87bd7b8c 100644
--- a/source/blender/editors/space_outliner/SConscript
+++ b/source/blender/editors/space_outliner/SConscript
@@ -30,11 +30,21 @@ Import ('env')
 sources = env.Glob('*.c')
 defs = []
 
-incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc ../../makesrna ../../blenloader'
-incs += ' #/extern/glew/include'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_editors_space_outliner', sources, Split(incs), defines=defs, libtype=['core'], priority=[60] )
+env.BlenderLib ( 'bf_editors_space_outliner', sources, incs, defines=defs, libtype=['core'], priority=[60] )
diff --git a/source/blender/editors/space_script/SConscript b/source/blender/editors/space_script/SConscript
index eff603a3e2d..e51838aa124 100644
--- a/source/blender/editors/space_script/SConscript
+++ b/source/blender/editors/space_script/SConscript
@@ -29,14 +29,23 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../makesrna ../../blenloader'
-incs += ' ../../python'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../python',
+    '../../windowmanager',
+    ]
 
 defs = []
 
 if env['WITH_BF_PYTHON']:
     defs.append('WITH_PYTHON')
 
-env.BlenderLib ( 'bf_editors_space_script', sources, Split(incs), defs, libtype=['core'], priority=[90] )
+env.BlenderLib ( 'bf_editors_space_script', sources, incs, defs, libtype=['core'], priority=[90] )
diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript
index 060c7892bd1..3103754bb4f 100644
--- a/source/blender/editors/space_sequencer/SConscript
+++ b/source/blender/editors/space_sequencer/SConscript
@@ -29,17 +29,27 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../makesrna ../../blenloader ../../blenfont'
-incs += ' #/intern/audaspace/intern'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '#/intern/audaspace/intern',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
 
 defs = []
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    incs += ' ' + env['BF_PTHREADS_INC']
+    incs.append(env['BF_PTHREADS_INC'])
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_editors_space_sequencer', sources, Split(incs), defs, libtype=['core'], priority=[100] )
+env.BlenderLib('bf_editors_space_sequencer', sources, incs, defs, libtype=['core'], priority=[100])
diff --git a/source/blender/editors/space_text/SConscript b/source/blender/editors/space_text/SConscript
index 4b6d9fbd693..51ce3131800 100644
--- a/source/blender/editors/space_text/SConscript
+++ b/source/blender/editors/space_text/SConscript
@@ -29,9 +29,20 @@ Import ('env')
 
 sources = env.Glob('*.c')
 defs = []
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../python ../../makesrna ../../blenfont ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../python',
+    '../../windowmanager',
+    ]
 
 if env['WITH_BF_PYTHON']:
     defs.append('WITH_PYTHON')
@@ -39,4 +50,4 @@ if env['WITH_BF_PYTHON']:
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_editors_space_text', sources, Split(incs), defs, libtype=['core'], priority=[95] )
+env.BlenderLib('bf_editors_space_text', sources, incs, defs, libtype=['core'], priority=[95])
diff --git a/source/blender/editors/space_time/SConscript b/source/blender/editors/space_time/SConscript
index 32f02bff008..da0c3713851 100644
--- a/source/blender/editors/space_time/SConscript
+++ b/source/blender/editors/space_time/SConscript
@@ -29,8 +29,19 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../makesrna ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
 
-env.BlenderLib ( 'bf_editors_space_time', sources, Split(incs), [], libtype=['core'], priority=[65] )
+defs = []
+
+env.BlenderLib('bf_editors_space_time', sources, incs, defs, libtype=['core'], priority=[65])
diff --git a/source/blender/editors/space_userpref/SConscript b/source/blender/editors/space_userpref/SConscript
index d5aa9304364..e495085f658 100644
--- a/source/blender/editors/space_userpref/SConscript
+++ b/source/blender/editors/space_userpref/SConscript
@@ -29,9 +29,20 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
 
 defs = []
 
-env.BlenderLib ( 'bf_editors_space_userpref', sources, Split(incs), defs, libtype=['core'], priority=[70] )
+env.BlenderLib('bf_editors_space_userpref', sources, incs, defs, libtype=['core'], priority=[70])
diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript
index b775c5bba59..313711d4e91 100644
--- a/source/blender/editors/space_view3d/SConscript
+++ b/source/blender/editors/space_view3d/SConscript
@@ -30,17 +30,29 @@ Import ('env')
 sources = env.Glob('*.c')
 defs = [ 'GLEW_STATIC' ]
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../render/extern/include ../../blenloader'
-incs += ' ../../gpu ../../makesrna ../../blenfont ../../bmesh'
-incs += ' #/intern/smoke/extern'
-incs += ' #source/gameengine/BlenderRoutines'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '#/intern/smoke/extern',
+    '#/source/gameengine/BlenderRoutines',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
 
 if env['WITH_BF_GAMEENGINE']:
     defs.append('WITH_GAMEENGINE')
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    incs += ' ' + env['BF_PTHREADS_INC']
+    incs.append(env['BF_PTHREADS_INC'])
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
@@ -48,4 +60,4 @@ if env['WITH_BF_INTERNATIONAL']:
 if env['WITH_BF_FREESTYLE']:
     defs.append('WITH_FREESTYLE')
 
-env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), defines = defs, libtype=['core'], priority=[40] )
+env.BlenderLib ( 'bf_editors_space_view3d', sources, incs, defines = defs, libtype=['core'], priority=[40] )
diff --git a/source/blender/editors/transform/SConscript b/source/blender/editors/transform/SConscript
index d579fd73db3..2f0823955ba 100644
--- a/source/blender/editors/transform/SConscript
+++ b/source/blender/editors/transform/SConscript
@@ -29,14 +29,27 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../render/extern/include'
-incs += ' ../../gpu ../../makesrna ../../blenloader ../../bmesh ../../ikplugin'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../ikplugin',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
 
 defs = []
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_editors_transform', sources, Split(incs), defs, libtype=['core'], priority=[40] )
+env.BlenderLib ( 'bf_editors_transform', sources, incs, defs, libtype=['core'], priority=[40] )
diff --git a/source/blender/editors/util/SConscript b/source/blender/editors/util/SConscript
index 8460b307f0d..521854ad21b 100644
--- a/source/blender/editors/util/SConscript
+++ b/source/blender/editors/util/SConscript
@@ -30,12 +30,22 @@ Import ('env')
 sources = env.Glob('*.c')
 defs = [ 'GLEW_STATIC' ]
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../makesrna ../../bmesh'
-incs += ' ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_editors_util', sources, Split(incs), defines=defs, libtype=['core','player'], priority=[330,210] )
+env.BlenderLib ( 'bf_editors_util', sources, incs, defines=defs, libtype=['core','player'], priority=[330,210] )
diff --git a/source/blender/editors/uvedit/SConscript b/source/blender/editors/uvedit/SConscript
index dfa15d2de4f..51e473bc5ba 100644
--- a/source/blender/editors/uvedit/SConscript
+++ b/source/blender/editors/uvedit/SConscript
@@ -31,11 +31,24 @@ defs = []
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../bmesh ../../makesrna #/intern/opennl/extern ../../gpu ../../blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '#/intern/opennl/extern',
+    '../include',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../gpu',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../windowmanager',
+    ]
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_editors_uvedit', sources, Split(incs), defs, libtype=['core'], priority=[45] )
+env.BlenderLib ( 'bf_editors_uvedit', sources, incs, defs, libtype=['core'], priority=[45] )
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index d5ccf12d2db..37213ab856a 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -3,14 +3,27 @@ import sys
 Import ('env')
 
 sources = []
-defs = ['WITH_FREESTYLE']
-incs = ''
 
-incs += '../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna'
-incs += ' ../python ../python/intern ../render/extern/include ../render/intern/include'
-incs += ' #/extern/glew/include #/intern/guardedalloc ../freestyle'
-incs += ' ' + env['BF_PYTHON_INC']
-incs += ' ' + env['BF_PNG_INC']
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../blenkernel',
+    '../blenlib',
+    '../blenloader',
+    '../freestyle',
+    '../imbuf',
+    '../makesdna',
+    '../makesrna',
+    '../python',
+    '../python/intern',
+    '../render/extern/include',
+    '../render/intern/include',
+    env['BF_PYTHON_INC'],
+    env['BF_PNG_INC'],
+    ]
+incs = ' '.join(incs)
+
+defs = ['WITH_FREESTYLE']
 
 if env['OURPLATFORM'] == 'linux2':
     cflags='-pthread'
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript
index 6e3722e403a..be3d3f5a927 100644
--- a/source/blender/gpu/SConscript
+++ b/source/blender/gpu/SConscript
@@ -32,13 +32,26 @@ sources += env.Glob('shaders/*.c')
 
 defs = [ 'GLEW_STATIC' ]
 
-incs = '../blenlib ../blenkernel ../makesdna ../makesrna ../include ../blenloader ../nodes ../nodes/intern'
-incs += ' #/extern/glew/include #intern/guardedalloc #intern/smoke/extern ../imbuf ../bmesh .'
+incs = [
+    '.',
+    '#/intern/guardedalloc',
+    '#/intern/smoke/extern',
+    '#/extern/glew/include',
+    '../blenkernel',
+    '../blenlib',
+    '../blenloader',
+    '../bmesh',
+    '../imbuf',
+    '../include',
+    '../makesdna',
+    '../makesrna',
+    '../nodes',
+    '../nodes/intern',
+    env['BF_OPENGL_INC'],
+    ]
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    incs += ' ' + env['BF_PTHREADS_INC']
-
-incs += ' ' + env['BF_OPENGL_INC']
+    incs.append(env['BF_PTHREADS_INC'])
 
 if env['WITH_BF_SMOKE']:
     defs.append('WITH_SMOKE')
@@ -59,4 +72,4 @@ sources.extend((
     os.path.join(env['DATA_SOURCES'], "gpu_shader_vsm_store_vert.glsl.c"),
     ))
 
-env.BlenderLib ( 'bf_gpu', sources, Split(incs), defines = defs, libtype=['core','player'], priority=[160,110] )
+env.BlenderLib('bf_gpu', sources, incs, defines=defs, libtype=['core', 'player'], priority=[160, 110])
diff --git a/source/blender/ikplugin/SConscript b/source/blender/ikplugin/SConscript
index 0d201cb423c..4a4cb4f2cbd 100644
--- a/source/blender/ikplugin/SConscript
+++ b/source/blender/ikplugin/SConscript
@@ -26,13 +26,24 @@
 # ***** END GPL LICENSE BLOCK *****
 
 Import ('env')
-defs = []
+
 sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
 
-incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
-incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
+incs = [
+    '#/extern/Eigen3',
+    '#/intern/guardedalloc',
+    '#/intern/itasc',
+    '#/intern/iksolver/extern',
+    '../blenkernel',
+    '../blenlib',
+    '../ikplugin',
+    '../include',
+    '../makesdna',
+    ]
 
-defs.append('WITH_IK_ITASC')
-defs.append('WITH_IK_SOLVER')
+defs = [
+    'WITH_IK_ITASC',
+    'WITH_IK_SOLVER',
+    ]
 
-env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), defs, libtype=['core','player'], priority=[180, 190] )
+env.BlenderLib('bf_ikplugin', sources, incs, defs, libtype=['core', 'player'], priority=[180, 190])
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 453cf6a509e..03064df293d 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -30,14 +30,24 @@ Import ('env')
 
 sources = env.Glob('intern/*.c')
 
-incs = '. ../makesdna ../makesrna #/intern/guardedalloc #/intern/memutil ../blenlib'
-incs += ' ../avi ../blenkernel ../blenloader'
-incs += ' #/intern/ffmpeg #intern/opencolorio'
-
-incs += ' ' + env['BF_JPEG_INC']
-incs += ' ' + env['BF_PNG_INC']
-incs += ' ' + env['BF_TIFF_INC']
-incs += ' ' + env['BF_ZLIB_INC']
+incs = [
+    '.',
+    '#/intern/opencolorio',
+    '#/intern/ffmpeg',
+    '#/intern/guardedalloc',
+    '#/intern/memutil',
+    '../avi',
+    '../blenkernel',
+    '../blenlib',
+    '../blenloader',
+    '../makesdna',
+    '../makesrna',
+    env['BF_JPEG_INC'],
+    env['BF_PNG_INC'],
+    env['BF_TIFF_INC'],
+    env['BF_ZLIB_INC'],
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript
index dba0f84170e..f276070f3dc 100644
--- a/source/blender/makesdna/SConscript
+++ b/source/blender/makesdna/SConscript
@@ -33,9 +33,13 @@ defs = []
 o = SConscript('intern/SConscript')
 objs += o
 
-incs = '#/intern/guardedalloc . ../blenlib'
+incs = [
+    '.',
+    '#/intern/guardedalloc',
+    '../blenlib',
+    ]
 
 if env['WITH_BF_FREESTYLE']:
     defs.append('WITH_FREESTYLE')
 
-env.BlenderLib ( 'bf_dna', objs, Split(incs), defs, libtype=['core','player'], priority = [215,200] )
+env.BlenderLib('bf_dna', objs, incs, defs, libtype=['core', 'player'], priority = [215, 200])
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 62a7cb674fc..3bc56b017b3 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -32,14 +32,30 @@ objs = []
 o = SConscript('intern/SConscript')
 objs += o
 
-incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
-incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont ../blenloader'
-incs += ' ../render/extern/include #/intern/cycles/blender'
-incs += ' ../nodes'
-incs += ' #/extern/glew/include'
-incs += ' #/intern/smoke/extern'
-
-incs += ' ../bmesh'
+incs = [
+    '.',
+    './intern',
+    '#/intern/guardedalloc',
+    '#/intern/memutil',
+    '#/extern/glew/include',
+    '#/intern/audaspace/intern',
+    '#/intern/cycles/blender',
+    '#/intern/smoke/extern',
+    '../blenfont',
+    '../blenkernel',
+    '../blenlib',
+    '../blenloader',
+    '../bmesh',
+    '../editors/include',
+    '../gpu',
+    '../ikplugin',
+    '../imbuf',
+    '../makesdna',
+    '../nodes',
+    '../render/extern/include',
+    '../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 defs = []
 
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 98f82ee7909..857cebd78b4 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -57,13 +57,26 @@ makesrna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesrna/\\"" '
 
 defs = []
 
-incs = '#/intern/guardedalloc ../../blenlib ../../blenkernel ../../blenloader'
-incs += ' ../../imbuf ../../makesdna ../../makesrna ../../ikplugin'
-incs += ' ../../windowmanager ../../editors/include ../../blenfont'
-incs += ' ../../render/extern/include ../../bmesh'
-incs += ' #/intern/audaspace/intern #/intern/cycles/blender'
-incs += ' #/extern/glew/include '
-incs += ' #/intern/smoke/extern'
+incs = [
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '#/intern/audaspace/intern',
+    '#/intern/cycles/blender',
+    '#/intern/smoke/extern',
+    '../../blenfont',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../blenloader',
+    '../../bmesh',
+    '../../editors/include',
+    '../../ikplugin',
+    '../../imbuf',
+    '../../makesdna',
+    '../../makesrna',
+    '../../render/extern/include',
+    '../../windowmanager',
+    ]
+incs = ' '.join(incs)
 
 if env['WITH_BF_SMOKE']:
     defs.append('WITH_SMOKE')
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript
index 9f56689bf43..9a72ab28c03 100644
--- a/source/blender/nodes/SConscript
+++ b/source/blender/nodes/SConscript
@@ -31,17 +31,31 @@ sources = env.Glob('intern/*.c')
 cmpsources = env.Glob('composite/*.c') + env.Glob('composite/nodes/*.c')
 shdsources = env.Glob('shader/*.c') + env.Glob('shader/nodes/*.c')
 texsources = env.Glob('texture/*.c') + env.Glob('texture/nodes/*.c')
-incs = '. ./intern '
-incs += './composite ./shader ./texture '
-incs += '#/intern/guardedalloc ../editors/include ../blenlib ../makesdna'
-incs += ' ../render/extern/include ../makesrna '
-incs += ' ../imbuf ../avi '
-incs += ' ../blenloader'
-incs += ' ../blenfont ../blenkernel ../renderconverter '
-incs += ' ../gpu #/extern/glew/include '
 
-incs += ' ' + env['BF_OPENGL_INC']
-incs += ' ' + env['BF_ZLIB_INC']
+incs = [
+    '.',
+    './composite',
+    './intern',
+    './shader',
+    './texture',
+    '#/intern/guardedalloc',
+    '#/extern/glew/include',
+    '../avi',
+    '../blenfont',
+    '../blenkernel',
+    '../blenlib',
+    '../blenloader',
+    '../editors/include',
+    '../gpu',
+    '../imbuf',
+    '../makesdna',
+    '../makesrna',
+    '../render/extern/include',
+    '../renderconverter',
+    env['BF_OPENGL_INC'],
+    env['BF_ZLIB_INC'],
+    ]
+incs = ' '.join(incs)
 
 defs = [] 
 
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index d3905a6f413..0ac0285031e 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -29,10 +29,29 @@
 
 Import ('env')
 
-incs = '. ../editors/include ../makesdna ../makesrna ../blenfont ../blenlib ../blenkernel ../nodes'
-incs += ' ../imbuf ../blenloader ../bmesh ../gpu ../render/extern/include ../windowmanager'
-incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include #intern/cycles/blender'
-incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC']
+incs = [
+    '.',
+    '#/intern/guardedalloc',
+    '#/intern/memutil',
+    '#/extern/glew/include',
+    '#/intern/audaspace/intern',
+    '#/intern/cycles/blender',
+    '../blenfont',
+    '../blenkernel',
+    '../blenlib',
+    '../blenloader',
+    '../bmesh',
+    '../editors/include',
+    '../gpu',
+    '../imbuf',
+    '../makesdna',
+    '../makesrna',
+    '../nodes',
+    '../render/extern/include',
+    '../windowmanager',
+    env['BF_PYTHON_INC'],
+    ]
+incs = ' '.join(incs)
 
 is_debug = (env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc', 'win64-mingw') and env['BF_DEBUG'])
 
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index 9606c2c0f9c..109558c71ce 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -30,9 +30,23 @@ Import ('env')
 sources = env.Glob('intern/source/*.c')
 raysources = env.Glob('intern/raytrace/*.cpp')
 
-incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna'
-incs += ' extern/include ../blenkernel ../imbuf ../blenfont'
-incs += ' ../include ../blenloader ../../../intern/smoke/extern ../../../intern/mikktspace ../bmesh'
+incs = [
+    'extern/include',
+    'intern/include',
+    '#/intern/guardedalloc',
+    '../blenfont',
+    '../blenkernel',
+    '../blenlib',
+    '../blenloader',
+    '../bmesh',
+    '../imbuf',
+    '../include',
+    '../makesdna',
+    '../makesrna',
+    '../../../intern/mikktspace',
+    '../../../intern/smoke/extern',
+    ]
+incs = ' '.join(incs)
 
 cflags_raytrace = env['CCFLAGS']
 cxxflags_raytrace = env['CXXFLAGS']
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript
index 6db0e142ac4..62c00c0897d 100644
--- a/source/blender/windowmanager/SConscript
+++ b/source/blender/windowmanager/SConscript
@@ -30,19 +30,32 @@ import os
 
 sources = env.Glob('intern/*.c')
 
-#incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel'
-#incs += ' ../imbuf ../editors/include ../render/extern/include ../render/intern/include'
-
-incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel'
-incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include'
-incs += ' ../radiosity/extern/include'
-incs += ' ../makesrna ../gpu ../blenfont ../bmesh ../compositor'
-
-incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost'
-incs += ' #/intern/elbeem #/extern/glew/include'
-incs += ' #source/gameengine/BlenderRoutines'
-
-incs += ' ' + env['BF_ZLIB_INC']
+incs = [
+    '.',
+    '#/intern/elbeem',
+    '#/intern/ghost',
+    '#/intern/guardedalloc',
+    '#/intern/memutil',
+    '#/source/gameengine/BlenderRoutines',
+    '#/extern/glew/include',
+    '../blenfont',
+    '../blenkernel',
+    '../blenlib',
+    '../blenloader',
+    '../bmesh',
+    '../compositor',
+    '../editors/include',
+    '../gpu',
+    '../imbuf',
+    '../makesdna',
+    '../makesrna',
+    '../nodes',
+    '../python',
+    '../radiosity/extern/include',
+    '../render/extern/include',
+    env['BF_ZLIB_INC'],
+    ]
+incs = ' '.join(incs)
 
 defs = [ 'GLEW_STATIC' ]
 
diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index 3e7dacad8ba..860b5992daa 100644
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -31,17 +31,17 @@ sources = env.Glob('*.cpp')
 
 incs = [
     '.',
-    '#intern/guardedalloc',
-    '#intern/string',
-    '#intern/moto/include',
-    '#intern/container',
-    '#source/gameengine/BlenderRoutines',
-    '#extern/glew/include',
-    '#source/gameengine/Expressions',
-    '#source/gameengine/SceneGraph',
-    '#source/blender/blenlib',
-    '#source/blender/blenkernel',
-    '#source/blender/makesdna',
+    '#/intern/guardedalloc',
+    '#/intern/string',
+    '#/intern/moto/include',
+    '#/intern/container',
+    '#/source/gameengine/BlenderRoutines',
+    '#/extern/glew/include',
+    '#/source/gameengine/Expressions',
+    '#/source/gameengine/SceneGraph',
+    '#/source/blender/blenlib',
+    '#/source/blender/blenkernel',
+    '#/source/blender/makesdna',
     ]
 
 defs = ['GLEW_STATIC']