diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 9dd39ccd308..b83a65f2466 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -134,7 +134,7 @@ else:
             scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
             scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
 
-            scons_options.append('BF_BITNESS='+bitness)
+            scons_options.append('BF_BITNESS=' + bitness)
 
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index e779b10bd2a..5fdeb4a8ad5 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -98,7 +98,7 @@ if builder.find('scons') != -1:
             scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
             scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
 
-            scons_options.append('BF_BITNESS='+bitness)
+            scons_options.append('BF_BITNESS=' + bitness)
 
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index ed200abd419..27694bcb875 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -62,6 +62,10 @@ macro(blender_include_dirs
 	foreach(_INC ${ARGV})
 		get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
 		list(APPEND _ALL_INCS ${_ABS_INC})
+		# for checking for invalid includes, disable for regular use
+		##if(NOT EXISTS "${_ABS_INC}/")
+		##	message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
+		##endif()
 	endforeach()
 	include_directories(${_ALL_INCS})
 	unset(_INC)
@@ -75,6 +79,9 @@ macro(blender_include_dirs_sys
 	foreach(_INC ${ARGV})
 		get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
 		list(APPEND _ALL_INCS ${_ABS_INC})
+		##if(NOT EXISTS "${_ABS_INC}/")
+		##	message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
+		##endif()
 	endforeach()
 	include_directories(SYSTEM ${_ALL_INCS})
 	unset(_INC)
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 20ac3ba7077..dc83e29b497 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -67,6 +67,7 @@ set(SRC
 	intern/wm_window.c
 
 	WM_api.h
+	WM_keymap.h
 	WM_types.h
 	wm.h
 	wm_cursors.h