Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Bernal <jbernalmartinez@gmail.com>2015-07-12 17:55:33 +0300
committerJorge Bernal <jbernalmartinez@gmail.com>2015-07-12 17:58:12 +0300
commit6ffc988ae3aa57822be89e9580146908c938e0a0 (patch)
tree6c9299a519b8d4b1da0780cf0cd2bc4bba108fb8 /source/gameengine/Ketsji
parent5b0f674e0948d079332718e165b4a42369517ed6 (diff)
BGE Clean-up: New EXP prefix for the BGE Expression module
The expression module now uses an EXP prefix and it follows a distribution similar to blender. Additionally the hash function in EXP_HashedPtr.h was simplified and the files EXP_C-Api.h &.EXP_C-Api.cpp were deleted because were unused. Reviewers: campbellbarton, moguri, sybren, hg1 Projects: #game_engine Differential Revision: https://developer.blender.org/D1221
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r--source/gameengine/Ketsji/BL_Shader.h2
-rw-r--r--source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp6
-rw-r--r--source/gameengine/Ketsji/KX_BlenderMaterial.h2
-rw-r--r--source/gameengine/Ketsji/KX_Camera.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_Camera.h2
-rw-r--r--source/gameengine/Ketsji/KX_CameraActuator.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_CharacterWrapper.h2
-rw-r--r--source/gameengine/Ketsji/KX_ConstraintWrapper.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_ConstraintWrapper.h2
-rw-r--r--source/gameengine/Ketsji/KX_FontObject.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_GameObject.cpp4
-rw-r--r--source/gameengine/Ketsji/KX_GameObject.h2
-rw-r--r--source/gameengine/Ketsji/KX_ISceneConverter.h2
-rw-r--r--source/gameengine/Ketsji/KX_IpoActuator.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_KetsjiEngine.cpp10
-rw-r--r--source/gameengine/Ketsji/KX_KetsjiEngine.h2
-rw-r--r--source/gameengine/Ketsji/KX_MeshProxy.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_NavMeshObject.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_NavMeshObject.h2
-rw-r--r--source/gameengine/Ketsji/KX_ParentActuator.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_PyConstraintBinding.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_PyMath.cpp4
-rw-r--r--source/gameengine/Ketsji/KX_PyMath.h4
-rw-r--r--source/gameengine/Ketsji/KX_PythonInit.cpp8
-rw-r--r--source/gameengine/Ketsji/KX_PythonInit.h2
-rw-r--r--source/gameengine/Ketsji/KX_PythonSeq.h2
-rw-r--r--source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_Scene.cpp6
-rw-r--r--source/gameengine/Ketsji/KX_Scene.h2
-rw-r--r--source/gameengine/Ketsji/KX_TouchSensor.h2
-rw-r--r--source/gameengine/Ketsji/KX_TrackToActuator.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_VehicleWrapper.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_VehicleWrapper.h2
-rw-r--r--source/gameengine/Ketsji/KX_WorldInfo.h2
35 files changed, 49 insertions, 49 deletions
diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h
index 4c671d0c9a3..e3dc4b19773 100644
--- a/source/gameengine/Ketsji/BL_Shader.h
+++ b/source/gameengine/Ketsji/BL_Shader.h
@@ -6,7 +6,7 @@
#ifndef __BL_SHADER_H__
#define __BL_SHADER_H__
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
#include "BL_Material.h"
#include "BL_Texture.h"
// --
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
index 6260596159d..1fadd9382e0 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
@@ -39,9 +39,9 @@
#include "NG_NetworkScene.h"
#include "NG_NetworkObject.h"
#include "SCA_IObject.h"
-#include "InputParser.h"
-#include "ListValue.h"
-#include "StringValue.h"
+#include "EXP_InputParser.h"
+#include "EXP_ListValue.h"
+#include "EXP_StringValue.h"
#ifdef NAN_NET_DEBUG
#include <iostream>
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h
index 0448236b10c..9364abb8eed 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -15,7 +15,7 @@
#include "BL_Shader.h"
#include "BL_BlenderShader.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
#include "MT_Vector3.h"
#include "MT_Vector4.h"
diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp
index 3b69d4005cd..644c71a68e4 100644
--- a/source/gameengine/Ketsji/KX_Camera.cpp
+++ b/source/gameengine/Ketsji/KX_Camera.cpp
@@ -35,7 +35,7 @@
#include "KX_Camera.h"
#include "KX_Scene.h"
#include "KX_PythonInit.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
#include "KX_PyMath.h"
#include "RAS_ICanvas.h"
diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h
index 991d8813a00..8addf0b7aed 100644
--- a/source/gameengine/Ketsji/KX_Camera.h
+++ b/source/gameengine/Ketsji/KX_Camera.h
@@ -40,7 +40,7 @@
#include "MT_Vector3.h"
#include "MT_Point3.h"
#include "KX_GameObject.h"
-#include "IntValue.h"
+#include "EXP_IntValue.h"
#include "RAS_CameraData.h"
#ifdef WITH_PYTHON
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp
index 3d1802bb2a6..f065e3f0001 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.cpp
+++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp
@@ -40,7 +40,7 @@
#include <float.h>
#include "KX_GameObject.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
/* ------------------------------------------------------------------------- */
/* Native functions */
diff --git a/source/gameengine/Ketsji/KX_CharacterWrapper.h b/source/gameengine/Ketsji/KX_CharacterWrapper.h
index d4d8f195102..dd7ba680ec7 100644
--- a/source/gameengine/Ketsji/KX_CharacterWrapper.h
+++ b/source/gameengine/Ketsji/KX_CharacterWrapper.h
@@ -6,7 +6,7 @@
#ifndef __KX_CHARACTERWRAPPER_H__
#define __KX_CHARACTERWRAPPER_H__
-#include "Value.h"
+#include "EXP_Value.h"
#include "PHY_DynamicTypes.h"
class PHY_ICharacter;
diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp b/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
index 29d92762285..2f32b5e3216 100644
--- a/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
+++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
@@ -30,7 +30,7 @@
*/
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
#include "KX_ConstraintWrapper.h"
#include "PHY_IPhysicsEnvironment.h"
diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.h b/source/gameengine/Ketsji/KX_ConstraintWrapper.h
index b7124c76439..5e20b7a9aca 100644
--- a/source/gameengine/Ketsji/KX_ConstraintWrapper.h
+++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.h
@@ -32,7 +32,7 @@
#ifndef __KX_CONSTRAINTWRAPPER_H__
#define __KX_CONSTRAINTWRAPPER_H__
-#include "Value.h"
+#include "EXP_Value.h"
#include "PHY_DynamicTypes.h"
class KX_ConstraintWrapper : public PyObjectPlus
diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp
index f3b098f407a..420f1f7eb98 100644
--- a/source/gameengine/Ketsji/KX_FontObject.cpp
+++ b/source/gameengine/Ketsji/KX_FontObject.cpp
@@ -35,7 +35,7 @@
#include "KX_Scene.h"
#include "KX_PythonInit.h"
#include "BLI_math.h"
-#include "StringValue.h"
+#include "EXP_StringValue.h"
#include "RAS_IRasterizer.h"
/* paths needed for font load */
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index eabe0765d3b..536670dde1a 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -69,11 +69,11 @@
#include "BL_ActionManager.h"
#include "BL_Action.h"
-#include "PyObjectPlus.h" /* python stuff */
+#include "EXP_PyObjectPlus.h" /* python stuff */
#include "BLI_utildefines.h"
#ifdef WITH_PYTHON
-# include "KX_PythonCallBack.h"
+# include "EXP_PythonCallBack.h"
# include "python_utildefines.h"
#endif
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 3639d73d1e5..99c8a6d718b 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -40,7 +40,7 @@
#include <stddef.h>
-#include "ListValue.h"
+#include "EXP_ListValue.h"
#include "SCA_IObject.h"
#include "SG_Node.h"
#include "MT_Transform.h"
diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h
index b6647cdf3dc..2e1c16c6e32 100644
--- a/source/gameengine/Ketsji/KX_ISceneConverter.h
+++ b/source/gameengine/Ketsji/KX_ISceneConverter.h
@@ -33,7 +33,7 @@
#define __KX_ISCENECONVERTER_H__
#include "STR_String.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp
index 1597d7f8809..ec7a4146b7d 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.cpp
+++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp
@@ -36,7 +36,7 @@
#include "KX_IpoActuator.h"
#include "KX_GameObject.h"
-#include "FloatValue.h"
+#include "EXP_FloatValue.h"
#include "KX_KetsjiEngine.h"
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index 91963713dad..423e41e4e7f 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -41,11 +41,11 @@
#include "KX_KetsjiEngine.h"
-#include "ListValue.h"
-#include "IntValue.h"
-#include "VectorValue.h"
-#include "BoolValue.h"
-#include "FloatValue.h"
+#include "EXP_ListValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_VectorValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_FloatValue.h"
#include "RAS_BucketManager.h"
#include "RAS_Rect.h"
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index cd473451111..b4bd8a64f78 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -38,7 +38,7 @@
#include "STR_String.h"
#include "KX_ISystem.h"
#include "KX_Scene.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
#include "KX_WorldInfo.h"
#include <vector>
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp
index a6f2f728674..c98766c9c81 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.cpp
+++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp
@@ -43,7 +43,7 @@
#include "KX_PyMath.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
PyTypeObject KX_MeshProxy::Type = {
PyVarObject_HEAD_INIT(NULL, 0)
diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp
index 8360681759a..891eb00cae6 100644
--- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp
+++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp
@@ -45,7 +45,7 @@ extern "C" {
#include "KX_PythonInit.h"
#include "KX_PyMath.h"
-#include "Value.h"
+#include "EXP_Value.h"
#include "Recast.h"
#include "DetourStatNavMeshBuilder.h"
#include "KX_ObstacleSimulation.h"
diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.h b/source/gameengine/Ketsji/KX_NavMeshObject.h
index 1599361b334..af178f9aaee 100644
--- a/source/gameengine/Ketsji/KX_NavMeshObject.h
+++ b/source/gameengine/Ketsji/KX_NavMeshObject.h
@@ -28,7 +28,7 @@
#define __KX_NAVMESHOBJECT_H__
#include "DetourStatNavMesh.h"
#include "KX_GameObject.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
#include <vector>
class RAS_MeshObject;
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.cpp b/source/gameengine/Ketsji/KX_ParentActuator.cpp
index 6926fdb1d4c..6ffa2593792 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ParentActuator.cpp
@@ -37,7 +37,7 @@
#include "KX_GameObject.h"
#include "KX_PythonInit.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
/* ------------------------------------------------------------------------- */
/* Native functions */
diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
index bfac9a87512..5877df5f289 100644
--- a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
+++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
@@ -41,7 +41,7 @@
#include "KX_GameObject.h" // ConvertPythonToGameObject()
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
#ifdef WITH_BULLET
# include "LinearMath/btIDebugDraw.h"
diff --git a/source/gameengine/Ketsji/KX_PyMath.cpp b/source/gameengine/Ketsji/KX_PyMath.cpp
index 798e93a12e9..ee05fd442ab 100644
--- a/source/gameengine/Ketsji/KX_PyMath.cpp
+++ b/source/gameengine/Ketsji/KX_PyMath.cpp
@@ -42,9 +42,9 @@
#include "MT_Matrix4x4.h"
#include "MT_Point2.h"
-#include "ListValue.h"
+#include "EXP_ListValue.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
#include "KX_PyMath.h"
bool PyOrientationTo(PyObject *pyval, MT_Matrix3x3 &rot, const char *error_prefix)
diff --git a/source/gameengine/Ketsji/KX_PyMath.h b/source/gameengine/Ketsji/KX_PyMath.h
index 63a37806fb6..917fd0fcda6 100644
--- a/source/gameengine/Ketsji/KX_PyMath.h
+++ b/source/gameengine/Ketsji/KX_PyMath.h
@@ -41,8 +41,8 @@
#include "MT_Matrix3x3.h"
#include "MT_Matrix4x4.h"
-#include "KX_Python.h"
-#include "PyObjectPlus.h"
+#include "EXP_Python.h"
+#include "EXP_PyObjectPlus.h"
#ifdef WITH_PYTHON
#ifdef USE_MATHUTILS
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index a5fb2dede72..b7ca6248079 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -112,8 +112,8 @@ extern "C" {
#include "RAS_2DFilterManager.h"
#include "MT_Vector3.h"
#include "MT_Point3.h"
-#include "ListValue.h"
-#include "InputParser.h"
+#include "EXP_ListValue.h"
+#include "EXP_InputParser.h"
#include "KX_Scene.h"
#include "NG_NetworkScene.h" //Needed for sendMessage()
@@ -123,7 +123,7 @@ extern "C" {
#include "KX_PyMath.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
#include "KX_PythonInitTypes.h"
@@ -221,7 +221,7 @@ static void KX_MACRO_addTypesToDict_fn(PyObject *dict, const char *name, long va
// temporarily python stuff, will be put in another place later !
-#include "KX_Python.h"
+#include "EXP_Python.h"
#include "SCA_PythonController.h"
// List of methods defined in the module
diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h
index 06aeb5a4fca..6550934a916 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.h
+++ b/source/gameengine/Ketsji/KX_PythonInit.h
@@ -32,7 +32,7 @@
#ifndef __KX_PYTHONINIT_H__
#define __KX_PYTHONINIT_H__
-#include "KX_Python.h"
+#include "EXP_Python.h"
#include "STR_String.h"
#include "MT_Vector3.h"
diff --git a/source/gameengine/Ketsji/KX_PythonSeq.h b/source/gameengine/Ketsji/KX_PythonSeq.h
index 568d59119c0..33b5335ddf4 100644
--- a/source/gameengine/Ketsji/KX_PythonSeq.h
+++ b/source/gameengine/Ketsji/KX_PythonSeq.h
@@ -35,7 +35,7 @@
#ifdef WITH_PYTHON
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
// -------------------------
enum KX_PYGENSEQ_TYPE {
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
index f8f79269eaa..fdcfd22270b 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
@@ -38,7 +38,7 @@
#include "KX_SCA_AddObjectActuator.h"
#include "SCA_IScene.h"
#include "KX_GameObject.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
/* ------------------------------------------------------------------------- */
/* Native functions */
diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
index b105256836b..6b6b090c1c4 100644
--- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
@@ -43,7 +43,7 @@
#include "KX_SCA_ReplaceMeshActuator.h"
#include "KX_MeshProxy.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
#ifdef WITH_PYTHON
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index d33cbb9e2ae..1959b3d8b0a 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -44,7 +44,7 @@
#include "KX_BlenderMaterial.h"
#include "KX_FontObject.h"
#include "RAS_IPolygonMaterial.h"
-#include "ListValue.h"
+#include "EXP_ListValue.h"
#include "SCA_LogicManager.h"
#include "SCA_TimeEventManager.h"
//#include "SCA_AlwaysEventManager.h"
@@ -68,7 +68,7 @@
#include "RAS_ICanvas.h"
#include "RAS_BucketManager.h"
-#include "FloatValue.h"
+#include "EXP_FloatValue.h"
#include "SCA_IController.h"
#include "SCA_IActuator.h"
#include "SG_Node.h"
@@ -100,7 +100,7 @@
#endif
#ifdef WITH_PYTHON
-# include "KX_PythonCallBack.h"
+# include "EXP_PythonCallBack.h"
#endif
#include "KX_Light.h"
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index a5645ea6448..4f7ad98f30d 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -49,7 +49,7 @@
#include "RAS_Rect.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
#include "RAS_2DFilterManager.h"
/**
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h
index 0edca44296a..e1b5725a32b 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.h
+++ b/source/gameengine/Ketsji/KX_TouchSensor.h
@@ -34,7 +34,7 @@
#define __KX_TOUCHSENSOR_H__
#include "SCA_ISensor.h"
-#include "ListValue.h"
+#include "EXP_ListValue.h"
struct PHY_CollData;
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
index 75baf5fac1d..3ed8eba759f 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
@@ -44,7 +44,7 @@
#include <iostream>
#include "KX_GameObject.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
/* ------------------------------------------------------------------------- */
/* Native functions */
diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
index b42200783e4..ee791a44782 100644
--- a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
+++ b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
@@ -22,7 +22,7 @@
* \ingroup ketsji
*/
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
#include "KX_VehicleWrapper.h"
#include "PHY_IPhysicsEnvironment.h"
diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.h b/source/gameengine/Ketsji/KX_VehicleWrapper.h
index c38f57d8b9f..22b9591f48b 100644
--- a/source/gameengine/Ketsji/KX_VehicleWrapper.h
+++ b/source/gameengine/Ketsji/KX_VehicleWrapper.h
@@ -6,7 +6,7 @@
#ifndef __KX_VEHICLEWRAPPER_H__
#define __KX_VEHICLEWRAPPER_H__
-#include "Value.h"
+#include "EXP_Value.h"
class PHY_IVehicle;
class PHY_IMotionState;
diff --git a/source/gameengine/Ketsji/KX_WorldInfo.h b/source/gameengine/Ketsji/KX_WorldInfo.h
index 22851d3e269..f2b37ec5587 100644
--- a/source/gameengine/Ketsji/KX_WorldInfo.h
+++ b/source/gameengine/Ketsji/KX_WorldInfo.h
@@ -34,7 +34,7 @@
#include "MT_Scalar.h"
#include "KX_KetsjiEngine.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"