22 files changed, 23 insertions, 21 deletions
diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py
index 3887faa2ac9..15500c94b66 100644
--- a/release/scripts/modules/rna_info.py
+++ b/release/scripts/modules/rna_info.py
@@ -57,6 +57,8 @@ def rna_id_ignore(rna_id):
         return True
     if "_HT_" in rna_id:
         return True
+    if "_KSI_" in rna_id:
+        return True
     return False
 
 def range_str(val):
diff --git a/source/blender/python/generic/blf.c b/source/blender/python/generic/blf_api.c
index eda13db57b5..f1cbd0f7e7e 100644
--- a/source/blender/python/generic/blf.c
+++ b/source/blender/python/generic/blf_api.c
@@ -23,7 +23,7 @@
  */
 
 #include <Python.h>
-#include "blf.h"
+#include "blf_api.h"
 
 #include "../../blenfont/BLF_api.h"
 
diff --git a/source/blender/python/generic/blf.h b/source/blender/python/generic/blf_api.h
index fae20ace996..fae20ace996 100644
--- a/source/blender/python/generic/blf.h
+++ b/source/blender/python/generic/blf_api.h
diff --git a/source/blender/python/generic/Geometry.c b/source/blender/python/generic/geometry.c
index 158b07b1be5..5ba2d7f7a74 100644
--- a/source/blender/python/generic/Geometry.c
+++ b/source/blender/python/generic/geometry.c
@@ -27,7 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "Geometry.h"
+#include "geometry.h"
 
 /* Used for PolyFill */
 #include "BKE_displist.h"
diff --git a/source/blender/python/generic/Geometry.h b/source/blender/python/generic/geometry.h
index 1e17ca6bf27..401efcc7888 100644
--- a/source/blender/python/generic/Geometry.h
+++ b/source/blender/python/generic/geometry.h
@@ -32,7 +32,7 @@
 #define EXPP_Geometry_H
 
 #include <Python.h>
-#include "Mathutils.h"
+#include "mathutils.h"
 
 PyObject *Geometry_Init(void);
 
diff --git a/source/blender/python/generic/Mathutils.c b/source/blender/python/generic/mathutils.c
index 542bf7a6ca9..2a3912c1787 100644
--- a/source/blender/python/generic/Mathutils.c
+++ b/source/blender/python/generic/mathutils.c
@@ -47,7 +47,7 @@
  * Moved to Geometry module: Intersect, TriangleArea, TriangleNormal, QuadNormal, LineIntersect
  */
 
-#include "Mathutils.h"
+#include "mathutils.h"
 
 #include "BLI_math.h"
 
diff --git a/source/blender/python/generic/Mathutils.h b/source/blender/python/generic/mathutils.h
index 869ac4d70df..9457c254113 100644
--- a/source/blender/python/generic/Mathutils.h
+++ b/source/blender/python/generic/mathutils.h
@@ -33,10 +33,10 @@
 
 #include <Python.h>
 
-#include "vector.h"
-#include "matrix.h"
-#include "quat.h"
-#include "euler.h"
+#include "mathutils_vector.h"
+#include "mathutils_matrix.h"
+#include "mathutils_quat.h"
+#include "mathutils_euler.h"
 
 /* Can cast different mathutils types to this, use for generic funcs */
 
diff --git a/source/blender/python/generic/euler.c b/source/blender/python/generic/mathutils_euler.c
index 892e42657b7..e4759a57d22 100644
--- a/source/blender/python/generic/euler.c
+++ b/source/blender/python/generic/mathutils_euler.c
@@ -26,7 +26,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "Mathutils.h"
+#include "mathutils.h"
 
 #include "BLI_math.h"
 #include "BKE_utildefines.h"
diff --git a/source/blender/python/generic/euler.h b/source/blender/python/generic/mathutils_euler.h
index 994a5f1780e..994a5f1780e 100644
--- a/source/blender/python/generic/euler.h
+++ b/source/blender/python/generic/mathutils_euler.h
diff --git a/source/blender/python/generic/matrix.c b/source/blender/python/generic/mathutils_matrix.c
index 216139dc44f..67f91d19d1f 100644
--- a/source/blender/python/generic/matrix.c
+++ b/source/blender/python/generic/mathutils_matrix.c
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "Mathutils.h"
+#include "mathutils.h"
 
 #include "BKE_utildefines.h"
 #include "BLI_math.h"
diff --git a/source/blender/python/generic/matrix.h b/source/blender/python/generic/mathutils_matrix.h
index b18a3e8e6fe..b18a3e8e6fe 100644
--- a/source/blender/python/generic/matrix.h
+++ b/source/blender/python/generic/mathutils_matrix.h
diff --git a/source/blender/python/generic/quat.c b/source/blender/python/generic/mathutils_quat.c
index 36d01e7aa9f..2e51c5ae0ec 100644
--- a/source/blender/python/generic/quat.c
+++ b/source/blender/python/generic/mathutils_quat.c
@@ -26,7 +26,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "Mathutils.h"
+#include "mathutils.h"
 
 #include "BLI_math.h"
 #include "BKE_utildefines.h"
diff --git a/source/blender/python/generic/quat.h b/source/blender/python/generic/mathutils_quat.h
index 6e0c9d6dd1f..6e0c9d6dd1f 100644
--- a/source/blender/python/generic/quat.h
+++ b/source/blender/python/generic/mathutils_quat.h
diff --git a/source/blender/python/generic/vector.c b/source/blender/python/generic/mathutils_vector.c
index fa26946a682..e4364865d25 100644
--- a/source/blender/python/generic/vector.c
+++ b/source/blender/python/generic/mathutils_vector.c
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "Mathutils.h"
+#include "mathutils.h"
 
 #include "BLI_blenlib.h"
 #include "BKE_utildefines.h"
diff --git a/source/blender/python/generic/vector.h b/source/blender/python/generic/mathutils_vector.h
index fd95f5a6750..fd95f5a6750 100644
--- a/source/blender/python/generic/vector.h
+++ b/source/blender/python/generic/mathutils_vector.h
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index 3f8daec0161..9bd67f678f8 100644
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -35,9 +35,9 @@
 #include "BLI_path_util.h"
  
  /* external util modules */
-#include "../generic/Geometry.h"
+#include "../generic/geometry.h"
 #include "../generic/bgl.h"
-#include "../generic/blf.h"
+#include "../generic/blf_api.h"
 #include "../generic/IDProp.h"
 
 static char bpy_home_paths_doc[] =
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index adb8247682a..860c1e32875 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -50,7 +50,7 @@
 #define USE_MATHUTILS
 
 #ifdef USE_MATHUTILS
-#include "../generic/Mathutils.h" /* so we can have mathutils callbacks */
+#include "../generic/mathutils.h" /* so we can have mathutils callbacks */
 #include "../generic/IDProp.h" /* for IDprop lookups */
 
 
diff --git a/source/gameengine/Converter/KX_IpoConvert.cpp b/source/gameengine/Converter/KX_IpoConvert.cpp
index 7c6b59a42bd..4adfa842fd7 100644
--- a/source/gameengine/Converter/KX_IpoConvert.cpp
+++ b/source/gameengine/Converter/KX_IpoConvert.cpp
@@ -121,7 +121,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 			)
 		);
 
-		char *rotmode, *drotmode;
+		const char *rotmode, *drotmode;
 
 		switch(blenderobject->rotmode)
 		{
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index d81753ce64d..e19f4800ca5 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -46,7 +46,7 @@
 #ifndef DISABLE_PYTHON
 #ifdef USE_MATHUTILS
 extern "C" {
-#include "../../blender/python/generic/Mathutils.h" /* so we can have mathutils callbacks */
+#include "../../blender/python/generic/mathutils.h" /* so we can have mathutils callbacks */
 }
 #endif
 
diff --git a/source/gameengine/Ketsji/KX_PyMath.h b/source/gameengine/Ketsji/KX_PyMath.h
index 8c14ac0e96c..9c9688f79cd 100644
--- a/source/gameengine/Ketsji/KX_PyMath.h
+++ b/source/gameengine/Ketsji/KX_PyMath.h
@@ -45,7 +45,7 @@
 #ifndef DISABLE_PYTHON
 #ifdef USE_MATHUTILS
 extern "C" {
-#include "../../blender/python/generic/Mathutils.h" /* so we can have mathutils callbacks */
+#include "../../blender/python/generic/mathutils.h" /* so we can have mathutils callbacks */
 }
 #endif
 
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 7dec4e4f97f..8d4a6d3f897 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -38,8 +38,8 @@
 
 extern "C" {
 	#include "bpy_internal_import.h"  /* from the blender python api, but we want to import text too! */
-	#include "Mathutils.h" // Blender.Mathutils module copied here so the blenderlayer can use.
-	#include "Geometry.h" // Blender.Geometry module copied here so the blenderlayer can use.
+	#include "mathutils.h" // Blender.Mathutils module copied here so the blenderlayer can use.
+	#include "geometry.h" // Blender.Geometry module copied here so the blenderlayer can use.
 	#include "bgl.h"
 
 	#include "marshal.h" /* python header for loading/saving dicts */
diff --git a/source/gameengine/VideoTexture/ImageBuff.cpp b/source/gameengine/VideoTexture/ImageBuff.cpp
index 0bb0cf59511..926468c662e 100644
--- a/source/gameengine/VideoTexture/ImageBuff.cpp
+++ b/source/gameengine/VideoTexture/ImageBuff.cpp
@@ -128,7 +128,7 @@ void ImageBuff::clear (short width, short height, unsigned char color)
 	memset(m_image, color, size*4);
 	// and change the alpha channel
 	p = &((unsigned char*)m_image)[3];
-	for (size; size>0; size--)
+	for (; size>0; size--)
 	{
 		*p = 0xFF;
 		p += 4;