include headers in cmake source, added a script to check for consistency, reporting missing headers & C files.

this is important so IDE's using CMake integration always get blender headers. - QtCreator & MSVC for eg, probably others too.

73 files changed, 836 insertions, 17 deletions

diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt
index 62bf51dada3..917b2a8e3b0 100644
--- a/source/blender/avi/CMakeLists.txt
+++ b/source/blender/avi/CMakeLists.txt
@@ -38,6 +38,13 @@ SET(SRC
 	intern/mjpeg.c
 	intern/options.c
 	intern/rgb32.c
+
+	AVI_avi.h
+	intern/avi_intern.h
+	intern/avirgb.h
+	intern/endian.h
+	intern/mjpeg.h
+	intern/rgb32.h
 )
 
 BLENDERLIB(bf_avi "${SRC}" "${INC}")
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
index 131ff861a5c..202a8de687f 100644
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -40,6 +40,11 @@ SET(SRC
 	intern/blf_glyph.c
 	intern/blf_lang.c
 	intern/blf_util.c
+
+	BLF_api.h
+	BLF_types.h
+	intern/blf_internal.h
+	intern/blf_internal_types.h
 )
 
 IF(WITH_INTERNATIONAL)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index d88b25d4335..5ab4dbf0ba5 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -138,6 +138,91 @@ SET(SRC
 	intern/writeavi.c
 	intern/writeffmpeg.c
 	intern/writeframeserver.c
+
+	BKE_DerivedMesh.h
+	BKE_action.h
+	BKE_anim.h
+	BKE_animsys.h
+	BKE_armature.h
+	BKE_blender.h
+	BKE_bmesh.h
+	BKE_bmeshCustomData.h
+	BKE_bmfont.h
+	BKE_bmfont_types.h
+	BKE_boids.h
+	BKE_booleanops_mesh.h
+	BKE_brush.h
+	BKE_bullet.h
+	BKE_bvhutils.h
+	BKE_cdderivedmesh.h
+	BKE_cloth.h
+	BKE_collision.h
+	BKE_colortools.h
+	BKE_constraint.h
+	BKE_context.h
+	BKE_curve.h
+	BKE_customdata.h
+	BKE_customdata_file.h
+	BKE_deform.h
+	BKE_depsgraph.h
+	BKE_displist.h
+	BKE_effect.h
+	BKE_endian.h
+	BKE_exotic.h
+	BKE_fcurve.h
+	BKE_fluidsim.h
+	BKE_font.h
+	BKE_global.h
+	BKE_gpencil.h
+	BKE_group.h
+	BKE_icons.h
+	BKE_idcode.h
+	BKE_idprop.h
+	BKE_image.h
+	BKE_ipo.h
+	BKE_key.h
+	BKE_lattice.h
+	BKE_library.h
+	BKE_main.h
+	BKE_material.h
+	BKE_mball.h
+	BKE_mesh.h
+	BKE_modifier.h
+	BKE_multires.h
+	BKE_nla.h
+	BKE_node.h
+	BKE_object.h
+	BKE_packedFile.h
+	BKE_paint.h
+	BKE_particle.h
+	BKE_plugin_types.h
+	BKE_pointcache.h
+	BKE_property.h
+	BKE_report.h
+	BKE_sca.h
+	BKE_scene.h
+	BKE_screen.h
+	BKE_script.h
+	BKE_sequencer.h
+	BKE_shrinkwrap.h
+	BKE_sketch.h
+	BKE_smoke.h
+	BKE_softbody.h
+	BKE_sound.h
+	BKE_subsurf.h
+	BKE_suggestions.h
+	BKE_text.h
+	BKE_texture.h
+	BKE_unit.h
+	BKE_utildefines.h
+	BKE_world.h
+	BKE_writeavi.h
+	BKE_writeffmpeg.h
+	BKE_writeframeserver.h
+	depsgraph_private.h
+	intern/CCGSubSurf.h
+	intern/bmesh_private.h
+	nla_private.h
 )
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 04745336497..a30cbebb539 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -80,6 +80,55 @@ SET(SRC
 	intern/uvproject.c
 	intern/voxel.c
 	intern/winstuff.c
+
+	BLI_args.h
+	BLI_blenlib.h
+	BLI_boxpack2d.h
+	BLI_bpath.h
+	BLI_cpu.h
+	BLI_dlrbTree.h
+	BLI_dynstr.h
+	BLI_edgehash.h
+	BLI_editVert.h
+	BLI_fileops.h
+	BLI_fnmatch.h
+	BLI_ghash.h
+	BLI_graph.h
+	BLI_gsqueue.h
+	BLI_heap.h
+	BLI_jitter.h
+	BLI_kdopbvh.h
+	BLI_kdtree.h
+	BLI_linklist.h
+	BLI_listbase.h
+	BLI_math.h
+	BLI_math_base.h
+	BLI_math_color.h
+	BLI_math_geom.h
+	BLI_math_inline.h
+	BLI_math_matrix.h
+	BLI_math_rotation.h
+	BLI_math_vector.h
+	BLI_memarena.h
+	BLI_mempool.h
+	BLI_noise.h
+	BLI_path_util.h
+	BLI_pbvh.h
+	BLI_rand.h
+	BLI_rect.h
+	BLI_scanfill.h
+	BLI_storage.h
+	BLI_storage_types.h
+	BLI_string.h
+	BLI_threads.h
+	BLI_uvproject.h
+	BLI_vfontdata.h
+	BLI_voxel.h
+	BLI_winstuff.h
+	PIL_dynlib.h
+	PIL_time.h
+	intern/BLI_callbacks.h
+	intern/dynamiclist.h
 )
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 11bb3b14677..b84ee1df08d 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -41,6 +41,13 @@ SET(SRC
 	intern/readfile.c
 	intern/undofile.c
 	intern/writefile.c
+
+	BLO_readfile.h
+	BLO_soundfile.h
+	BLO_sys_types.h
+	BLO_undofile.h
+	BLO_writefile.h
+	intern/readfile.h
 )
 
 BLENDERLIB(bf_blenloader "${SRC}" "${INC}")
diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt
index 737fb3caf4b..d9b15cf8ec1 100644
--- a/source/blender/blenpluginapi/CMakeLists.txt
+++ b/source/blender/blenpluginapi/CMakeLists.txt
@@ -35,6 +35,13 @@ SET(INC
 
 SET(SRC
 	intern/pluginapi.c
+
+	documentation.h
+	externdef.h
+	floatpatch.h
+	iff.h
+	plugin.h
+	util.h
 )
 
 IF(WITH_QUICKTIME)
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index 98d9780a92e..9d33885eb59 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -73,6 +73,26 @@ SET(SRC
 	collada.cpp
 	collada_internal.cpp
 	collada_utils.cpp
+
+	AnimationImporter.h
+	ArmatureExporter.h
+	ArmatureImporter.h
+	CameraExporter.h
+	DocumentExporter.h
+	DocumentImporter.h
+	EffectExporter.h
+	GeometryExporter.h
+	ImageExporter.h
+	InstanceWriter.h
+	LightExporter.h
+	MaterialExporter.h
+	MeshImporter.h
+	SkinInfo.h
+	TransformReader.h
+	TransformWriter.h
+	collada.h
+	collada_internal.h
+	collada_utils.h
 )
 
 IF(WITH_BUILDINFO)
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index 7954e2c8313..1e0a42fcd4e 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -45,6 +45,8 @@ SET(SRC
 	keyframes_general.c
 	keyframing.c
 	keyingsets.c
+
+	anim_intern.h
 )
 
 BLENDERLIB(bf_editor_animation "${SRC}" "${INC}")
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index b79c77d6e97..e4243f77074 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -42,6 +42,12 @@ SET(SRC
 	poselib.c
 	poseobject.c
 	reeb.c
+
+	BIF_generate.h
+	BIF_retarget.h
+	armature_intern.h
+	meshlaplacian.h
+	reeb.h
 )
 
 BLENDERLIB(bf_editor_armature "${SRC}" "${INC}")
diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt
index 8e47dc9c264..577a144805f 100644
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -34,6 +34,8 @@ SET(SRC
 	editcurve.c
 	editfont.c
 	lorem.c
+
+	curve_intern.h
 )
 
 BLENDERLIB(bf_editor_curve "${SRC}" "${INC}")
diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt
index ab92f0a9b41..8e884149bb8 100644
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@ -37,6 +37,8 @@ SET(SRC
 	gpencil_edit.c
 	gpencil_ops.c
 	gpencil_paint.c
+
+	gpencil_intern.h
 )
 
 BLENDERLIB(bf_editor_gpencil "${SRC}" "${INC}")
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index 23a96cce3dc..80eddcfc08d 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -50,6 +50,8 @@ SET(SRC
 	resources.c
 	view2d.c
 	view2d_ops.c
+
+	interface_intern.h
 )
 
 IF(WITH_INTERNATIONAL)
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index 41685b7e8bb..977cbb79b7f 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -43,6 +43,8 @@ SET(SRC
 	mesh_data.c
 	mesh_ops.c
 	meshtools.c
+
+	mesh_intern.h
 )
 
 BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}")
diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt
index 9b9ca809f25..82e287c3e69 100644
--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@@ -33,6 +33,8 @@ SET(INC
 SET(SRC
 	mball_edit.c
 	mball_ops.c
+
+	mball_intern.h
 )
 
 BLENDERLIB(bf_editor_metaball "${SRC}" "${INC}")
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 01b49a9e80b..6fc06ab20c6 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -49,6 +49,8 @@ SET(SRC
 	object_shapekey.c
 	object_transform.c
 	object_vgroup.c
+
+	object_intern.h
 )
 
 IF(WITH_PYTHON)
diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt
index 82c48becb0b..da7247e264a 100644
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -37,6 +37,8 @@ SET(SRC
 	physics_fluid.c
 	physics_ops.c
 	physics_pointcache.c
+
+	physics_intern.h
 )
 
 IF(NOT WITH_MOD_FLUID)
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt
index c4e997ce3ee..eed0b0d435b 100644
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -41,6 +41,8 @@ SET(SRC
 	render_ops.c
 	render_preview.c
 	render_shading.c
+
+	render_intern.h
 )
 
 IF(WITH_QUICKTIME)
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index ff143bab469..a7483c60c85 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -38,6 +38,8 @@ SET(SRC
 	screen_edit.c
 	screen_ops.c
 	screendump.c
+
+	screen_intern.h
 )
 
 BLENDERLIB(bf_editor_screen "${SRC}" "${INC}")
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 6db61cee168..5f5211368f2 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -41,6 +41,9 @@ SET(SRC
 	paint_vertex.c
 	sculpt.c
 	sculpt_undo.c
+
+	paint_intern.h
+	sculpt_intern.h
 )
 
 BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}")
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt
index 377643a5463..d1314f649ee 100644
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -32,6 +32,8 @@ SET(INC
 
 SET(SRC
 	sound_ops.c
+
+	sound_intern.h
 )
 
 BLENDERLIB(bf_editor_sound "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt
index 2ddc60a9e59..44981a3177b 100644
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -35,6 +35,8 @@ SET(SRC
 	action_ops.c
 	action_select.c
 	space_action.c
+
+	action_intern.h
 )
 
 BLENDERLIB(bf_editor_space_action "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt
index b92f2051e74..47152bea9f0 100644
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -34,6 +34,8 @@ SET(SRC
 	buttons_header.c
 	buttons_ops.c
 	space_buttons.c
+
+	buttons_intern.h
 )
 
 BLENDERLIB(bf_editor_space_buttons "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt
index 83912388bcd..75eb20dfdc1 100644
--- a/source/blender/editors/space_console/CMakeLists.txt
+++ b/source/blender/editors/space_console/CMakeLists.txt
@@ -35,6 +35,8 @@ SET(SRC
 	console_draw.c
 	console_ops.c
 	space_console.c
+
+	console_intern.h
 )
 
 IF(WITH_PYTHON)
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index bc89b7e1850..d4e5d599c52 100644
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -41,6 +41,10 @@ SET(SRC
 	filesel.c
 	fsmenu.c
 	space_file.c
+
+	file_intern.h
+	filelist.h
+	fsmenu.h
 )
 
 IF(WITH_IMAGE_OPENEXR)
diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt
index d5c295cf251..2c1bdbed210 100644
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -38,6 +38,8 @@ SET(SRC
 	graph_select.c
 	graph_utils.c
 	space_graph.c
+
+	graph_intern.h
 )
 
 BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index d7415fb7067..f8f2d04daed 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -38,6 +38,8 @@ SET(SRC
 	image_ops.c
 	image_render.c
 	space_image.c
+
+	image_intern.h
 )
 
 IF(WITH_IMAGE_OPENJPEG)
diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt
index 47bbfec5fe5..4592a07ed85 100644
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -38,6 +38,9 @@ SET(SRC
 	info_report.c
 	textview.c
 	space_info.c
+
+	info_intern.h
+	textview.h
 )
 
 BLENDERLIB(bf_editor_space_info "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt
index 7716e45167f..7fcacb393af 100644
--- a/source/blender/editors/space_logic/CMakeLists.txt
+++ b/source/blender/editors/space_logic/CMakeLists.txt
@@ -35,6 +35,8 @@ SET(SRC
 	logic_ops.c
 	logic_window.c
 	space_logic.c
+
+	logic_intern.h
 )
 
 IF(WITH_GAMEENGINE)
diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt
index 0a5f484bb05..82d32d80442 100644
--- a/source/blender/editors/space_nla/CMakeLists.txt
+++ b/source/blender/editors/space_nla/CMakeLists.txt
@@ -37,6 +37,8 @@ SET(SRC
 	nla_ops.c
 	nla_select.c
 	space_nla.c
+
+	nla_intern.h
 )
 
 BLENDERLIB(bf_editor_space_nla "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index aa98bfc9c0b..1513f688e2c 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -43,6 +43,8 @@ SET(SRC
 	node_select.c
 	node_state.c
 	space_node.c
+
+	node_intern.h
 )
 
 BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index 33128bde986..b9383ef6388 100644
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -35,6 +35,8 @@ SET(SRC
 	outliner.c
 	outliner_ops.c
 	space_outliner.c
+
+	outliner_intern.h
 )
 
 BLENDERLIB(bf_editor_space_outliner "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt
index 17fcf2296e9..da4f90a103f 100644
--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -34,6 +34,8 @@ SET(SRC
 	script_header.c
 	script_ops.c
 	space_script.c
+
+	script_intern.h
 )
 
 IF(WITH_PYTHON)
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index 673c6af74c7..0fe9cc3580b 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -40,6 +40,8 @@ SET(SRC
 	sequencer_scopes.c
 	sequencer_select.c
 	space_sequencer.c
+
+	sequencer_intern.h
 )
 
 BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_sound/CMakeLists.txt b/source/blender/editors/space_sound/CMakeLists.txt
index 0f94e8a518e..90a522b8f3f 100644
--- a/source/blender/editors/space_sound/CMakeLists.txt
+++ b/source/blender/editors/space_sound/CMakeLists.txt
@@ -32,6 +32,8 @@ SET(INC
 SET(SRC
 	sound_header.c
 	space_sound.c
+
+	sound_intern.h
 )
 
 BLENDERLIB(bf_editor_space_sound "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt
index 708fc161655..acfb2f315f8 100644
--- a/source/blender/editors/space_text/CMakeLists.txt
+++ b/source/blender/editors/space_text/CMakeLists.txt
@@ -36,6 +36,8 @@ SET(SRC
 	text_header.c
 	text_ops.c
 	text_python.c
+
+	text_intern.h
 )
 
 IF(WITH_PYTHON)
diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt
index 65f71e0b89b..ad1df116081 100644
--- a/source/blender/editors/space_time/CMakeLists.txt
+++ b/source/blender/editors/space_time/CMakeLists.txt
@@ -32,6 +32,8 @@ SET(INC
 SET(SRC
 	space_time.c
 	time_ops.c
+
+	time_intern.h
 )
 
 BLENDERLIB(bf_editor_space_time "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt
index b8a04a16edc..d90092f75d0 100644
--- a/source/blender/editors/space_userpref/CMakeLists.txt
+++ b/source/blender/editors/space_userpref/CMakeLists.txt
@@ -32,6 +32,8 @@ SET(INC
 SET(SRC
 	space_userpref.c
 	userpref_ops.c
+
+	userpref_intern.h
 )
 
 BLENDERLIB(bf_editor_space_userpref "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index 0820b69ee46..36bc9c037a8 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -51,6 +51,8 @@ SET(SRC
 	view3d_snap.c
 	view3d_toolbar.c
 	view3d_view.c
+
+	view3d_intern.h
 )
 
 IF(WITH_GAMEENGINE)
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index 61508a48ecd..6f4d1ff3aaa 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -40,6 +40,8 @@ SET(SRC
 	transform_ops.c
 	transform_orientations.c
 	transform_snap.c
+
+	transform.h
 )
 
 BLENDERLIB(bf_editor_transform "${SRC}" "${INC}")
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 99f0d4bc2b2..65b52b876fa 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -34,6 +34,52 @@ SET(SRC
 	editmode_undo.c
 	numinput.c
 	undo.c
+
+	util_intern.h
+	# general includes
+	../include/BIF_gl.h
+	../include/BIF_glutil.h
+	../include/ED_anim_api.h
+	../include/ED_armature.h
+	../include/ED_curve.h
+	../include/ED_datafiles.h
+	../include/ED_fileselect.h
+	../include/ED_fluidsim.h
+	../include/ED_gpencil.h
+	../include/ED_image.h
+	../include/ED_info.h
+	../include/ED_keyframes_draw.h
+	../include/ED_keyframes_edit.h
+	../include/ED_keyframing.h
+	../include/ED_lattice.h
+	../include/ED_logic.h
+	../include/ED_markers.h
+	../include/ED_mball.h
+	../include/ED_mesh.h
+	../include/ED_node.h
+	../include/ED_numinput.h
+	../include/ED_object.h
+	../include/ED_particle.h
+	../include/ED_physics.h
+	../include/ED_render.h
+	../include/ED_retopo.h
+	../include/ED_screen.h
+	../include/ED_screen_types.h
+	../include/ED_sculpt.h
+	../include/ED_sequencer.h
+	../include/ED_sound.h
+	../include/ED_space_api.h
+	../include/ED_text.h
+	../include/ED_transform.h
+	../include/ED_types.h
+	../include/ED_util.h
+	../include/ED_uvedit.h
+	../include/ED_view3d.h
+	../include/UI_icons.h
+	../include/UI_interface.h
+	../include/UI_interface_icons.h
+	../include/UI_resources.h
+	../include/UI_view2d.h
 )
 
 BLENDERLIB(bf_editor_util "${SRC}" "${INC}")
diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt
index 33251cc6344..1cec055eb7f 100644
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -35,6 +35,9 @@ SET(SRC
 	uvedit_ops.c
 	uvedit_parametrizer.c
 	uvedit_unwrap_ops.c
+
+	uvedit_intern.h
+	uvedit_parametrizer.h
 )
 
 BLENDERLIB(bf_editor_uvedit "${SRC}" "${INC}")
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 4045e83dafa..63dedc75226 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -44,6 +44,12 @@ SET(SRC
 	intern/gpu_material.c
 	intern/gpu_shader_material.glsl.c
 	intern/gpu_shader_vertex.glsl.c
+
+	GPU_buffers.h
+	GPU_draw.h
+	GPU_extensions.h
+	GPU_material.h
+	intern/gpu_codegen.h
 )
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
index 1c1cc27611a..17e09b460af 100644
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -34,15 +34,22 @@ SET(INC
 )
 
 SET(SRC
-	./intern/ikplugin_api.c
-	./intern/iksolver_plugin.c
+	intern/ikplugin_api.c
+	intern/iksolver_plugin.c
+
+	BIK_api.h
+	intern/ikplugin_api.h
+	intern/iksolver_plugin.h
+	intern/itasc_plugin.h
 )
 
 IF(WITH_IK_ITASC)
 	ADD_DEFINITIONS(-DWITH_IK_ITASC)
 	LIST(APPEND INC ../../../extern/Eigen2)
 	LIST(APPEND INC ../../../intern/itasc)
-	LIST(APPEND SRC ./intern/itasc_plugin.cpp)
+	LIST(APPEND SRC
+		./intern/itasc_plugin.cpp
+	)
 ENDIF(WITH_IK_ITASC)
 
 BLENDERLIB(bf_ikplugin "${SRC}" "${INC}")
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 36dcfefdc1c..141833f70e1 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -64,6 +64,36 @@ SET(SRC
 	intern/tiff.c
 	intern/util.c
 	intern/writeimage.c
+
+	IMB_imbuf.h
+	IMB_imbuf_types.h
+	IMB_thumbs.h
+	intern/IMB_allocimbuf.h
+	intern/IMB_anim.h
+	intern/IMB_filetype.h
+	intern/IMB_filter.h
+	intern/IMB_metadata.h
+	intern/cineon/cin_debug_stuff.h
+	intern/cineon/cineonfile.h
+	intern/cineon/cineonlib.h
+	intern/cineon/dpxfile.h
+	intern/cineon/dpxlib.h
+	intern/cineon/logImageCore.h
+	intern/cineon/logImageLib.h
+	intern/cineon/logmemfile.h
+	intern/dds/BlockDXT.h
+	intern/dds/Color.h
+	intern/dds/ColorBlock.h
+	intern/dds/Common.h
+	intern/dds/DirectDrawSurface.h
+	intern/dds/Image.h
+	intern/dds/PixelFormat.h
+	intern/dds/Stream.h
+	intern/dds/dds_api.h
+	intern/imbuf.h
+	intern/md5.h
+	intern/openexr/openexr_api.h
+	intern/openexr/openexr_multi.h
 )
 
 IF(WITH_IMAGE_OPENEXR)
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index 61a6778c13f..ca01b231982 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -25,7 +25,6 @@
 # ***** END GPL LICENSE BLOCK *****
 
 INCLUDE_DIRECTORIES(../../../../intern/guardedalloc ..)
-FILE(GLOB INC_FILES ../*.h)
 
 # Build makesdna executable
 SET(SRC
@@ -34,10 +33,72 @@ SET(SRC
 )
 
 IF(WIN32 AND NOT UNIX)
-	LIST(APPEND SRC ../../../../intern/guardedalloc/intern/mmap_win.c)
+	LIST(APPEND SRC
+		../../../../intern/guardedalloc/intern/mmap_win.c
+	)
 ENDIF(WIN32 AND NOT UNIX)
 
-ADD_EXECUTABLE(makesdna ${SRC} ${INC_FILES})
+SET(SRC_DNA_INC
+	../DNA_ID.h
+	../DNA_action_types.h
+	../DNA_actuator_types.h
+	../DNA_anim_types.h
+	../DNA_armature_types.h
+	../DNA_boid_types.h
+	../DNA_brush_types.h
+	../DNA_camera_types.h
+	../DNA_cloth_types.h
+	../DNA_color_types.h
+	../DNA_constraint_types.h
+	../DNA_controller_types.h
+	../DNA_curve_types.h
+	../DNA_customdata_types.h
+	../DNA_documentation.h
+	../DNA_effect_types.h
+	../DNA_fileglobal_types.h
+	../DNA_genfile.h
+	../DNA_gpencil_types.h
+	../DNA_group_types.h
+	../DNA_image_types.h
+	../DNA_ipo_types.h
+	../DNA_key_types.h
+	../DNA_lamp_types.h
+	../DNA_lattice_types.h
+	../DNA_listBase.h
+	../DNA_material_types.h
+	../DNA_mesh_types.h
+	../DNA_meshdata_types.h
+	../DNA_meta_types.h
+	../DNA_modifier_types.h
+	../DNA_nla_types.h
+	../DNA_node_types.h
+	../DNA_object_fluidsim.h
+	../DNA_object_force.h
+	../DNA_object_types.h
+	../DNA_outliner_types.h
+	../DNA_packedFile_types.h
+	../DNA_particle_types.h
+	../DNA_property_types.h
+	../DNA_scene_types.h
+	../DNA_screen_types.h
+	../DNA_sdna_types.h
+	../DNA_sensor_types.h
+	../DNA_sequence_types.h
+	../DNA_smoke_types.h
+	../DNA_sound_types.h
+	../DNA_space_types.h
+	../DNA_text_types.h
+	../DNA_texture_types.h
+	../DNA_userdef_types.h
+	../DNA_vec_types.h
+	../DNA_vfont_types.h
+	../DNA_view2d_types.h
+	../DNA_view3d_types.h
+	../DNA_windowmanager_types.h
+	../DNA_world_types.h
+)
+
+ADD_EXECUTABLE(makesdna ${SRC} ${SRC_DNA_INC})
 
 # Output dna.c
 ADD_CUSTOM_COMMAND(
@@ -47,7 +108,12 @@ ADD_CUSTOM_COMMAND(
 )
 
 # Build bf_dna library
-SET(SRC dna_genfile.c dna.c)
+SET(SRC
+	dna_genfile.c
+	dna.c
+	${SRC_DNA_INC}
+)
+
 BLENDERLIB(bf_dna "${SRC}" "${INC}")
 
 MESSAGE(STATUS "Configuring makesdna")
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 0a0b555a12e..a464e9124b7 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -44,7 +44,8 @@ SET(SRC
 	${DEFSRC}
 	${APISRC}
 	../../../../intern/guardedalloc/intern/mallocn.c
-	../../../../intern/guardedalloc/intern/mmap_win.c)
+	../../../../intern/guardedalloc/intern/mmap_win.c
+)
 
 INCLUDE_DIRECTORIES(
 	../../../../intern/audaspace/intern
@@ -62,7 +63,8 @@ INCLUDE_DIRECTORIES(
 	../../imbuf
 	../../render/extern/include
 	../../../../extern/glew/include
-	. )
+	.
+)
 
 FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
 
@@ -150,5 +152,18 @@ ADD_CUSTOM_COMMAND(
 )
 
 # Build bf_rna
-SET(SRC rna_access.c ${GENSRC})
+SET(SRC
+	rna_access.c
+	${GENSRC}
+
+	../RNA_access.h
+	../RNA_define.h
+	../RNA_enum_types.h
+	../RNA_types.h
+
+	rna_internal.h
+	rna_internal_types.h
+	rna_nodetree_types.h
+)
+
 BLENDERLIB(bf_rna "${SRC}" "${INC}")
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 7524244c701..c14787aeae7 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -74,11 +74,18 @@ SET(SRC
 	intern/MOD_util.c
 	intern/MOD_uvproject.c
 	intern/MOD_wave.c
+
+	MOD_modifiertypes.h
+	intern/MOD_boolean_util.h
+	intern/MOD_fluidsim_util.h
+	intern/MOD_util.h
 )
 
 IF(WITH_MOD_BOOLEAN)
 	ADD_DEFINITIONS(-DWITH_MOD_BOOLEAN)
-	LIST(APPEND SRC intern/MOD_boolean_util.c)
+	LIST(APPEND SRC
+		intern/MOD_boolean_util.c
+	)
 	LIST(APPEND INC ../../../intern/bsp/extern)
 ENDIF(WITH_MOD_BOOLEAN)
 
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 38e670f256d..3628cb4f748 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -138,6 +138,14 @@ SET(SRC
 	intern/TEX_nodes/TEX_viewer.c
 	intern/TEX_util.c
 	intern/node_util.c
+
+	CMP_node.h
+	SHD_node.h
+	TEX_node.h
+	intern/CMP_util.h
+	intern/SHD_util.h
+	intern/TEX_util.h
+	intern/node_util.h
 )
 
 IF(WITH_PYTHON)
diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt
index 6513cf66c47..5f5575f206b 100644
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -42,6 +42,19 @@ SET(SRC
 	mathutils_vector.c
 	noise.c
 	py_capi_utils.c
+
+	IDProp.h
+	bgl.h
+	blf_api.h
+	bpy_internal_import.h
+	mathutils.h
+	mathutils_color.h
+	mathutils_euler.h
+	mathutils_geometry.h
+	mathutils_matrix.h
+	mathutils_quat.h
+	mathutils_vector.h
+	py_capi_utils.h
 )
 
 BLENDERLIB(bf_python_ext "${SRC}" "${INC}")
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index e849623ad65..b0ef6efb7d4 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -49,6 +49,16 @@ SET(SRC
 	bpy_rna_callback.c
 	bpy_util.c
 	stubs.c
+
+	bpy.h
+	bpy_app.h
+	bpy_operator.h
+	bpy_operator_wrap.h
+	bpy_props.h
+	bpy_rna.h
+	bpy_rna_callback.h
+	bpy_util.h
+	../BPY_extern.h
 )
 
 # only to check if buildinfo is available
diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt
index 8d993cbb7d6..ebb6949e2ce 100644
--- a/source/blender/quicktime/CMakeLists.txt
+++ b/source/blender/quicktime/CMakeLists.txt
@@ -25,9 +25,21 @@
 # ***** END GPL LICENSE BLOCK *****
 
 IF(USE_QTKIT)
-	SET(SRC apple/qtkit_import.m apple/qtkit_export.m)
+	SET(SRC
+		apple/qtkit_import.m
+		apple/qtkit_export.m
+
+		quicktime_export.h
+		quicktime_import.h
+	)
 ELSE(USE_QTKIT)
-	SET(SRC apple/quicktime_import.c apple/quicktime_export.c)
+	SET(SRC
+		apple/quicktime_import.c
+		apple/quicktime_export.c
+
+		quicktime_export.h
+		quicktime_import.h
+	)
 ENDIF(USE_QTKIT)
 
 SET(INC 
diff --git a/source/blender/readblenfile/CMakeLists.txt b/source/blender/readblenfile/CMakeLists.txt
index 0917599f3d4..11128274e20 100644
--- a/source/blender/readblenfile/CMakeLists.txt
+++ b/source/blender/readblenfile/CMakeLists.txt
@@ -36,6 +36,8 @@ SET(INC
 
 SET(SRC
 	intern/BLO_readblenfile.c
+
+	BLO_readblenfile.h
 )
 
 BLENDERLIB(bf_readblenfile "${SRC}" "${INC}")
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 7a2b92404ae..cf1d163a21c 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -75,6 +75,40 @@ SET(SRC
 	intern/source/volumetric.c
 	intern/source/voxeldata.c
 	intern/source/zbuf.c
+
+	extern/include/RE_pipeline.h
+	extern/include/RE_raytrace.h
+	extern/include/RE_render_ext.h
+	extern/include/RE_shader_ext.h
+	intern/include/envmap.h
+	intern/include/gammaCorrectionTables.h
+	intern/include/initrender.h
+	intern/include/occlusion.h
+	intern/include/pixelblending.h
+	intern/include/pixelshading.h
+	intern/include/pointdensity.h
+	intern/include/raycounter.h
+	intern/include/rayobject.h
+	intern/include/render_types.h
+	intern/include/rendercore.h
+	intern/include/renderdatabase.h
+	intern/include/renderpipeline.h
+	intern/include/shadbuf.h
+	intern/include/shading.h
+	intern/include/sss.h
+	intern/include/strand.h
+	intern/include/sunsky.h
+	intern/include/texture.h
+	intern/include/volume_precache.h
+	intern/include/volumetric.h
+	intern/include/voxeldata.h
+	intern/include/zbuf.h
+	intern/raytrace/bvh.h
+	intern/raytrace/rayobject_hint.h
+	intern/raytrace/rayobject_rtbuild.h
+	intern/raytrace/reorganize.h
+	intern/raytrace/svbvh.h
+	intern/raytrace/vbvh.h
 )
 
 IF(WITH_IMAGE_OPENEXR)
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index e47d85cd462..77c055e9c08 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -62,6 +62,17 @@ SET(SRC
 	intern/wm_operators.c
 	intern/wm_subwindow.c
 	intern/wm_window.c
+
+	WM_api.h
+	WM_types.h
+	wm.h
+	wm_cursors.h
+	wm_draw.h
+	wm_event_system.h
+	wm_event_types.h
+	wm_files.h
+	wm_subwindow.h
+	wm_window.h
 )
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index e039d67515e..9f3106153ee 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -90,10 +90,14 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 # Setup the exe sources and buildinfo
-SET(EXESRC creator.c)
+SET(SRC
+	creator.c
+)
 
 IF(WIN32 AND NOT UNIX)
-	LIST(APPEND EXESRC ../icons/winblender.rc)
+	LIST(APPEND SRC
+		../icons/winblender.rc
+	)
 ENDIF(WIN32 AND NOT UNIX)
 
 IF(WITH_BUILDINFO)
@@ -112,12 +116,14 @@ IF(WITH_BUILDINFO)
 		-DBUILD_SYSTEM="CMake"
 	)
 
-	LIST(APPEND EXESRC buildinfo.c)
+	LIST(APPEND SRC
+		buildinfo.c
+	)
 ENDIF(WITH_BUILDINFO)
 
 MESSAGE(STATUS "Configuring blender")
 
-ADD_EXECUTABLE(blender ${EXETYPE} ${EXESRC})
+ADD_EXECUTABLE(blender ${EXETYPE} ${SRC})
 
 # Post build steps for bundling/packaging.
 
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index 63382e1f325..68d86a94ce3 100644
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -41,6 +41,14 @@ SET(SRC
 	KX_BlenderMouseDevice.cpp
 	KX_BlenderRenderTools.cpp
 	KX_BlenderSystem.cpp
+
+	KX_BlenderCanvas.h
+	KX_BlenderGL.h
+	KX_BlenderInputDevice.h
+	KX_BlenderKeyboardDevice.h
+	KX_BlenderMouseDevice.h
+	KX_BlenderRenderTools.h
+	KX_BlenderSystem.h
 )
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index 4e64bcf8b11..7b05d1b8fd6 100644
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -81,6 +81,28 @@ SET(SRC
 	KX_ConvertSensors.cpp
 	KX_IpoConvert.cpp
 	KX_SoftBodyDeformer.cpp
+
+	BL_ActionActuator.h
+	BL_ArmatureActuator.h
+	BL_ArmatureChannel.h
+	BL_ArmatureConstraint.h
+	BL_ArmatureObject.h
+	BL_BlenderDataConversion.h
+	BL_DeformableGameObject.h
+	BL_MeshDeformer.h
+	BL_ModifierDeformer.h
+	BL_ShapeActionActuator.h
+	BL_ShapeDeformer.h
+	BL_SkinDeformer.h
+	BlenderWorldInfo.h
+	KX_BlenderScalarInterpolator.h
+	KX_BlenderSceneConverter.h
+	KX_ConvertActuators.h
+	KX_ConvertControllers.h
+	KX_ConvertProperties.h
+	KX_ConvertSensors.h
+	KX_IpoConvert.h
+	KX_SoftBodyDeformer.h
 )
 
 IF(WITH_PYTHON)
diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt
index 5ab7c6eeae2..bafab06f78f 100644
--- a/source/gameengine/Expressions/CMakeLists.txt
+++ b/source/gameengine/Expressions/CMakeLists.txt
@@ -54,6 +54,28 @@ SET(SRC
 	StringValue.cpp
 	Value.cpp
 	VectorValue.cpp
+
+	BoolValue.h
+	ConstExpr.h
+	EXP_C-Api.h
+	EmptyValue.h
+	ErrorValue.h
+	Expression.h
+	FloatValue.h
+	IdentifierExpr.h
+	IfExpr.h
+	InputParser.h
+	IntValue.h
+	KX_HashedPtr.h
+	KX_Python.h
+	ListValue.h
+	Operator1Expr.h
+	Operator2Expr.h
+	PyObjectPlus.h
+	StringValue.h
+	Value.h
+	VectorValue.h
+	VoidValue.h
 )
 
 IF(WITH_PYTHON)
diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt
index 1f0850d6970..ccf6741626c 100644
--- a/source/gameengine/GameLogic/CMakeLists.txt
+++ b/source/gameengine/GameLogic/CMakeLists.txt
@@ -77,6 +77,50 @@ SET(SRC
 	SCA_TimeEventManager.cpp
 	SCA_XNORController.cpp
 	SCA_XORController.cpp
+
+	Joystick/SCA_Joystick.h
+	Joystick/SCA_JoystickDefines.h
+	Joystick/SCA_JoystickPrivate.h
+	SCA_2DFilterActuator.h
+	SCA_ANDController.h
+	SCA_ActuatorEventManager.h
+	SCA_ActuatorSensor.h
+	SCA_AlwaysEventManager.h
+	SCA_AlwaysSensor.h
+	SCA_BasicEventManager.h
+	SCA_DelaySensor.h
+	SCA_EventManager.h
+	SCA_ExpressionController.h
+	SCA_IActuator.h
+	SCA_IController.h
+	SCA_IInputDevice.h
+	SCA_ILogicBrick.h
+	SCA_IObject.h
+	SCA_IScene.h
+	SCA_ISensor.h
+	SCA_JoystickManager.h
+	SCA_JoystickSensor.h
+	SCA_KeyboardManager.h
+	SCA_KeyboardSensor.h
+	SCA_LogicManager.h
+	SCA_MouseManager.h
+	SCA_MouseSensor.h
+	SCA_NANDController.h
+	SCA_NORController.h
+	SCA_ORController.h
+	SCA_PropertyActuator.h
+	SCA_PropertyEventManager.h
+	SCA_PropertySensor.h
+	SCA_PythonController.h
+	SCA_PythonKeyboard.h
+	SCA_PythonMouse.h
+	SCA_RandomActuator.h
+	SCA_RandomEventManager.h
+	SCA_RandomNumberGenerator.h
+	SCA_RandomSensor.h
+	SCA_TimeEventManager.h
+	SCA_XNORController.h
+	SCA_XORController.h
 )
 
 IF(WITH_SDL)
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index 3ed2490aadd..45d760d4efb 100644
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -67,6 +67,25 @@ SET(SRC
 	GPC_RawLogoArrays.cpp
 	GPC_RenderTools.cpp
 	GPC_System.cpp
+
+	GPC_Canvas.h
+	GPC_Engine.h
+	GPC_KeyboardDevice.h
+	GPC_MouseDevice.h
+	GPC_RawImage.h
+	GPC_RawLoadDotBlendArray.h
+	GPC_RawLogoArrays.h
+	GPC_RenderTools.h
+	GPC_System.h
+	unix/GPU_Canvas.h
+	unix/GPU_Engine.h
+	unix/GPU_KeyboardDevice.h
+	unix/GPU_PolygonMaterial.h
+	unix/GPU_System.h
+	windows/GPW_Canvas.h
+	windows/GPW_Engine.h
+	windows/GPW_KeyboardDevice.h
+	windows/GPW_System.h
 )
 
 IF(WITH_PYTHON)
diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index 8810e875810..fe8c787c937 100644
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -63,6 +63,11 @@ SET(SRC
 	GPG_ghost.cpp
 	GPG_KeyboardDevice.cpp
 	GPG_System.cpp
+
+	GPG_Application.h
+	GPG_Canvas.h
+	GPG_KeyboardDevice.h
+	GPG_System.h
 )
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index 7b5a70f0676..8ca6b98217f 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -122,6 +122,82 @@ SET(SRC
 	KX_VisibilityActuator.cpp
 	KX_WorldInfo.cpp
 	KX_WorldIpoController.cpp
+
+	KX_ArmatureSensor.h
+	KX_BlenderMaterial.h
+	KX_BulletPhysicsController.h
+	KX_Camera.h
+	KX_CameraActuator.h
+	KX_CameraIpoSGController.h
+	KX_ClientObjectInfo.h
+	KX_ConstraintActuator.h
+	KX_ConstraintWrapper.h
+	KX_ConvertPhysicsObject.h
+	KX_Dome.h
+	KX_EmptyObject.h
+	KX_GameActuator.h
+	KX_GameObject.h
+	KX_IInterpolator.h
+	KX_IPOTransform.h
+	KX_IPO_SGController.h
+	KX_IPhysicsController.h
+	KX_IScalarInterpolator.h
+	KX_ISceneConverter.h
+	KX_ISystem.h
+	KX_IpoActuator.h
+	KX_KetsjiEngine.h
+	KX_Light.h
+	KX_LightIpoSGController.h
+	KX_MaterialIpoController.h
+	KX_MeshProxy.h
+	KX_MotionState.h
+	KX_MouseFocusSensor.h
+	KX_NearSensor.h
+	KX_ObColorIpoSGController.h
+	KX_ObjectActuator.h
+	KX_OrientationInterpolator.h
+	KX_ParentActuator.h
+	KX_PhysicsEngineEnums.h
+	KX_PhysicsObjectWrapper.h
+	KX_PhysicsPropertiesobsolete.h
+	KX_PolyProxy.h
+	KX_PolygonMaterial.h
+	KX_PositionInterpolator.h
+	KX_PyConstraintBinding.h
+	KX_PyMath.h
+	KX_PythonInit.h
+	KX_PythonInitTypes.h
+	KX_PythonSeq.h
+	KX_RadarSensor.h
+	KX_RayCast.h
+	KX_RayEventManager.h
+	KX_RaySensor.h
+	KX_SCA_AddObjectActuator.h
+	KX_SCA_DynamicActuator.h
+	KX_SCA_EndObjectActuator.h
+	KX_SCA_ReplaceMeshActuator.h
+	KX_SG_BoneParentNodeRelationship.h
+	KX_SG_NodeRelationships.h
+	KX_ScalarInterpolator.h
+	KX_ScalingInterpolator.h
+	KX_Scene.h
+	KX_SceneActuator.h
+	KX_SoundActuator.h
+	KX_StateActuator.h
+	KX_TimeCategoryLogger.h
+	KX_TimeLogger.h
+	KX_TouchEventManager.h
+	KX_TouchSensor.h
+	KX_TrackToActuator.h
+	KX_VehicleWrapper.h
+	KX_VertexProxy.h
+	KX_VisibilityActuator.h
+	KX_WorldInfo.h
+	KX_WorldIpoController.h
+	BL_BlenderShader.h
+	BL_Material.h
+	BL_Shader.h
+	BL_Texture.h
 )
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
index ce9a7492ba1..538f2b8e60b 100644
--- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
+++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
@@ -42,6 +42,12 @@ SET(SRC
 	KX_NetworkMessageSensor.cpp
 	KX_NetworkObjectActuator.cpp
 	KX_NetworkObjectSensor.cpp
+
+	KX_NetworkEventManager.h
+	KX_NetworkMessageActuator.h
+	KX_NetworkMessageSensor.h
+	KX_NetworkObjectActuator.h
+	KX_NetworkObjectSensor.h
 )
 
 IF(WITH_PYTHON)
diff --git a/source/gameengine/Network/CMakeLists.txt b/source/gameengine/Network/CMakeLists.txt
index b46f6696efd..c337d6f48cb 100644
--- a/source/gameengine/Network/CMakeLists.txt
+++ b/source/gameengine/Network/CMakeLists.txt
@@ -35,6 +35,11 @@ SET(SRC
 	NG_NetworkMessage.cpp
 	NG_NetworkObject.cpp
 	NG_NetworkScene.cpp
+
+	NG_NetworkDeviceInterface.h
+	NG_NetworkMessage.h
+	NG_NetworkObject.h
+	NG_NetworkScene.h
 )
 
 BLENDERLIB(ge_logic_ngnetwork "${SRC}" "${INC}")
diff --git a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
index 9467b59310f..e7a170fef98 100644
--- a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
+++ b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
@@ -33,6 +33,8 @@ SET(INC
 
 SET(SRC
 	NG_LoopBackNetworkDeviceInterface.cpp
+
+	NG_LoopBackNetworkDeviceInterface.h
 )
 
 BLENDERLIB(ge_logic_loopbacknetwork "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt
index 89f2649cfc1..7a48c774cb9 100644
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@@ -51,6 +51,10 @@ SET(SRC
 	CcdPhysicsEnvironment.cpp
 	CcdPhysicsController.cpp
 	CcdGraphicController.cpp
+
+	CcdGraphicController.h
+	CcdPhysicsController.h
+	CcdPhysicsEnvironment.h
 )
 
 IF(WITH_BULLET)
diff --git a/source/gameengine/Physics/Dummy/CMakeLists.txt b/source/gameengine/Physics/Dummy/CMakeLists.txt
index 387fa9e7f8d..0e852f50c76 100644
--- a/source/gameengine/Physics/Dummy/CMakeLists.txt
+++ b/source/gameengine/Physics/Dummy/CMakeLists.txt
@@ -31,6 +31,8 @@ SET(INC
 
 SET(SRC
 	DummyPhysicsEnvironment.cpp
+
+	DummyPhysicsEnvironment.h
 )
 
 BLENDERLIB(ge_phys_dummy "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt
index 0710ba3e2c6..aacb497674d 100644
--- a/source/gameengine/Physics/common/CMakeLists.txt
+++ b/source/gameengine/Physics/common/CMakeLists.txt
@@ -36,6 +36,15 @@ SET(SRC
 	PHY_IGraphicController.cpp
 	PHY_IPhysicsEnvironment.cpp
 	PHY_IVehicle.cpp
+
+	PHY_DynamicTypes.h
+	PHY_IController.h
+	PHY_IGraphicController.h
+	PHY_IMotionState.h
+	PHY_IPhysicsController.h
+	PHY_IPhysicsEnvironment.h
+	PHY_IVehicle.h
+	PHY_Pro.h
 )
 
 BLENDERLIB(ge_phys_common "${SRC}" "${INC}")
diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt
index 88399f9ca9d..7aeeafc5aa1 100644
--- a/source/gameengine/Rasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/CMakeLists.txt
@@ -49,6 +49,34 @@ SET(SRC
 	RAS_Polygon.cpp
 	RAS_TexVert.cpp
 	RAS_texmatrix.cpp
+
+	RAS_2DFilterManager.h
+	RAS_BucketManager.h
+	RAS_CameraData.h
+	RAS_Deformer.h
+	RAS_FramingManager.h
+	RAS_ICanvas.h
+	RAS_IPolygonMaterial.h
+	RAS_IRasterizer.h
+	RAS_IRenderTools.h
+	RAS_LightObject.h
+	RAS_MaterialBucket.h
+	RAS_MeshObject.h
+	RAS_ObjectColor.h
+	RAS_Polygon.h
+	RAS_Rect.h
+	RAS_TexMatrix.h
+	RAS_TexVert.h
+	RAS_OpenGLFilters/RAS_Blur2DFilter.h
+	RAS_OpenGLFilters/RAS_Dilation2DFilter.h
+	RAS_OpenGLFilters/RAS_Erosion2DFilter.h
+	RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
+	RAS_OpenGLFilters/RAS_Invert2DFilter.h
+	RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
+	RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
+	RAS_OpenGLFilters/RAS_Sepia2DFilter.h
+	RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
+	RAS_OpenGLFilters/RAS_Sobel2DFilter.h
 )
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
index 36ccd79527b..bf0f979accf 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
@@ -44,6 +44,11 @@ SET(SRC
 	RAS_ListRasterizer.cpp
 	RAS_OpenGLRasterizer.cpp
 	RAS_VAOpenGLRasterizer.cpp
+
+	RAS_GLExtensionManager.h
+	RAS_ListRasterizer.h
+	RAS_OpenGLRasterizer.h
+	RAS_VAOpenGLRasterizer.h
 )
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
diff --git a/source/gameengine/SceneGraph/CMakeLists.txt b/source/gameengine/SceneGraph/CMakeLists.txt
index 1ba1f8175cd..72472cb9a23 100644
--- a/source/gameengine/SceneGraph/CMakeLists.txt
+++ b/source/gameengine/SceneGraph/CMakeLists.txt
@@ -36,6 +36,16 @@ SET(SRC
 	SG_Node.cpp
 	SG_Spatial.cpp
 	SG_Tree.cpp
+
+	SG_BBox.h
+	SG_Controller.h
+	SG_DList.h
+	SG_IObject.h
+	SG_Node.h
+	SG_ParentRelation.h
+	SG_QList.h
+	SG_Spatial.h
+	SG_Tree.h
 )
 
 BLENDERLIB(ge_scenegraph "${SRC}" "${INC}")
diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt
index 3ad74ef7860..e483d6c812b 100644
--- a/source/gameengine/VideoTexture/CMakeLists.txt
+++ b/source/gameengine/VideoTexture/CMakeLists.txt
@@ -65,6 +65,24 @@ SET(SRC
 	VideoBase.cpp
 	VideoFFmpeg.cpp
 	blendVideoTex.cpp
+
+	BlendType.h
+	Common.h
+	Exception.h
+	FilterBase.h
+	FilterBlueScreen.h
+	FilterColor.h
+	FilterNormal.h
+	FilterSource.h
+	ImageBase.h
+	ImageBuff.h
+	ImageMix.h
+	ImageRender.h
+	ImageViewport.h
+	PyTypeList.h
+	Texture.h
+	VideoBase.h
+	VideoFFmpeg.h
 )
 
 IF(WITH_FFMPEG)
diff --git a/source/kernel/CMakeLists.txt b/source/kernel/CMakeLists.txt
index 8705dbcdc24..aae553b7b6d 100644
--- a/source/kernel/CMakeLists.txt
+++ b/source/kernel/CMakeLists.txt
@@ -37,6 +37,12 @@ SET(SRC
 	gen_system/GEN_HashedPtr.cpp
 	gen_system/SYS_SingletonSystem.cpp
 	gen_system/SYS_System.cpp
+
+	gen_messaging/GEN_messaging.h
+	gen_system/GEN_HashedPtr.h
+	gen_system/GEN_Map.h
+	gen_system/SYS_SingletonSystem.h
+	gen_system/SYS_System.h
 )
 
 BLENDERLIB(bf_gen_system "${SRC}" "${INC}")