7 files changed, 15 insertions, 14 deletions
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index 8f0e8eb5113..bdd0769e0a3 100644
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -60,9 +60,7 @@ set(INC
 )
 
 set(SRC
-	BL_Action.cpp
 	BL_ActionActuator.cpp
-	BL_ActionManager.cpp
 	BL_ArmatureActuator.cpp
 	BL_ArmatureChannel.cpp
 	BL_ArmatureConstraint.cpp
@@ -84,9 +82,7 @@ set(SRC
 	KX_IpoConvert.cpp
 	KX_SoftBodyDeformer.cpp
 
-	BL_Action.h
 	BL_ActionActuator.h
-	BL_ActionManager.h
 	BL_ArmatureActuator.h
 	BL_ArmatureChannel.h
 	BL_ArmatureConstraint.h
diff --git a/source/gameengine/Converter/BL_Action.cpp b/source/gameengine/Ketsji/BL_Action.cpp
index dcd0c1402e1..dcd0c1402e1 100644
--- a/source/gameengine/Converter/BL_Action.cpp
+++ b/source/gameengine/Ketsji/BL_Action.cpp
diff --git a/source/gameengine/Converter/BL_Action.h b/source/gameengine/Ketsji/BL_Action.h
index 3d977f3984a..3d977f3984a 100644
--- a/source/gameengine/Converter/BL_Action.h
+++ b/source/gameengine/Ketsji/BL_Action.h
diff --git a/source/gameengine/Converter/BL_ActionManager.cpp b/source/gameengine/Ketsji/BL_ActionManager.cpp
index 359a7389b51..359a7389b51 100644
--- a/source/gameengine/Converter/BL_ActionManager.cpp
+++ b/source/gameengine/Ketsji/BL_ActionManager.cpp
diff --git a/source/gameengine/Converter/BL_ActionManager.h b/source/gameengine/Ketsji/BL_ActionManager.h
index 409d6c24e30..409d6c24e30 100644
--- a/source/gameengine/Converter/BL_ActionManager.h
+++ b/source/gameengine/Ketsji/BL_ActionManager.h
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index 0bfe1fd0266..1e61359d329 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -29,25 +29,26 @@ set(INC
 	../../../intern/string
 	../../../intern/guardedalloc
 	../../../intern/container
-	../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
+	../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
 	../../../source/gameengine/Converter
 	../../../source/gameengine/BlenderRoutines
 	../../../source/blender/imbuf
 	../../../intern/moto/include
-	../../../source/gameengine/Ketsji 
+	../../../source/gameengine/Ketsji
 	../../../source/blender/blenlib
 	../../../source/blender/blenfont
 	../../../source/blender/blenkernel
 	../../../source/blender/python
 	../../../source/blender/python/generic
-	../../../source/blender 
-	../../../source/blender/makesdna 
-	../../../source/gameengine/Rasterizer 
+	../../../source/blender
+	../../../source/blender/makesdna
+	../../../source/blender/makesrna
+	../../../source/gameengine/Rasterizer
 	../../../source/gameengine/GameLogic
-	../../../source/gameengine/Expressions 
+	../../../source/gameengine/Expressions
 	../../../source/gameengine/Ketsji/KXNetwork
 	../../../source/gameengine/Network
-	../../../source/gameengine/SceneGraph 
+	../../../source/gameengine/SceneGraph
 	../../../source/gameengine/Physics/common
 	../../../source/gameengine/Network/LoopBackNetwork
 	../../../intern/audaspace/intern
@@ -57,6 +58,8 @@ set(INC
 )
 
 set(SRC
+	BL_Action.cpp
+	BL_ActionManager.cpp
 	BL_BlenderShader.cpp
 	BL_Material.cpp
 	BL_Shader.cpp
@@ -126,6 +129,8 @@ set(SRC
 	KX_WorldInfo.cpp
 	KX_WorldIpoController.cpp
 
+	BL_Action.h
+	BL_ActionManager.h
 	KX_ArmatureSensor.h
 	KX_BlenderMaterial.h
 	KX_BulletPhysicsController.h
@@ -207,7 +212,7 @@ set(SRC
 add_definitions(-DGLEW_STATIC)
 
 if(WITH_SDL)
-	set(INC ${INC} ${SDL_INCLUDE_DIR})  
+	set(INC ${INC} ${SDL_INCLUDE_DIR})
 else()
 	add_definitions(-DDISABLE_SDL)
 endif()
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index 08642262724..da6361952e0 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -14,7 +14,7 @@ incs += ' #intern/audaspace/intern #source/gameengine/Converter'
 incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf #intern/moto/include'
 incs += ' #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork #source/blender/blenlib #source/blender/blenfont'
 incs += ' #source/blender/blenkernel #source/blender #source/blender/editors/include'
-incs += ' #source/blender/makesdna #source/blender/python #source/gameengine/Rasterizer'
+incs += ' #source/blender/makesdna #source/blender/makesrna #source/blender/python #source/gameengine/Rasterizer'
 incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network'
 incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common'
 incs += ' #source/gameengine/Physics/Dummy'
@@ -34,7 +34,7 @@ if env['WITH_BF_PYTHON']:
 
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
-    
+
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
     if env['BF_DEBUG']:
         defs.append('_DEBUG') # for Python