diff --git a/cocos/2d/Android.mk b/cocos/2d/Android.mk
index f050e91226..cf07e20906 100644
--- a/cocos/2d/Android.mk
+++ b/cocos/2d/Android.mk
@@ -142,19 +142,20 @@ renderer/CCRenderMaterial.cpp \
 ../base/CCValue.cpp \
 ../base/etc1.cpp \
 ../base/s3tc.cpp \
-../math/kazmath/src/aabb.c \
-../math/kazmath/src/mat3.c \
-../math/kazmath/src/mat4.c \
-../math/kazmath/src/neon_matrix_impl.c \
-../math/kazmath/src/plane.c \
-../math/kazmath/src/quaternion.c \
-../math/kazmath/src/ray2.c \
-../math/kazmath/src/utility.c \
-../math/kazmath/src/vec2.c \
-../math/kazmath/src/vec3.c \
-../math/kazmath/src/vec4.c \
-../math/kazmath/src/GL/mat4stack.c \
-../math/kazmath/src/GL/matrix.c \
+../math/kazmath/kazmath/aabb.c \
+../math/kazmath/kazmath/mat3.c \
+../math/kazmath/kazmath/mat4.c \
+../math/kazmath/kazmath/neon_matrix_impl.c \
+../math/kazmath/kazmath/plane.c \
+../math/kazmath/kazmath/quaternion.c \
+../math/kazmath/kazmath/ray2.c \
+../math/kazmath/kazmath/ray3.c \
+../math/kazmath/kazmath/utility.c \
+../math/kazmath/kazmath/vec2.c \
+../math/kazmath/kazmath/vec3.c \
+../math/kazmath/kazmath/vec4.c \
+../math/kazmath/kazmath/GL/mat4stack.c \
+../math/kazmath/kazmath/GL/matrix.c \
 ../physics/CCPhysicsBody.cpp \
 ../physics/CCPhysicsContact.cpp \
 ../physics/CCPhysicsJoint.cpp \
@@ -173,7 +174,7 @@ renderer/CCRenderMaterial.cpp \
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/renderer \
-                    $(LOCAL_PATH)/../math/kazmath/include \
+                    $(LOCAL_PATH)/../math/kazmath \
                     platform/android \
                     $(LOCAL_PATH)/../physics \
                     $(LOCAL_PATH)/../base \
@@ -183,7 +184,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/renderer \
-                    $(LOCAL_PATH)/../math/kazmath/include \
+                    $(LOCAL_PATH)/../math/kazmath \
                     $(LOCAL_PATH)/platform/android \
                     $(LOCAL_PATH)/../physics \
                     $(LOCAL_PATH)/../base \
diff --git a/cocos/2d/platform/android/Android.mk b/cocos/2d/platform/android/Android.mk
index f84ea6d5ca..1c57245387 100644
--- a/cocos/2d/platform/android/Android.mk
+++ b/cocos/2d/platform/android/Android.mk
@@ -24,7 +24,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/../.. \
                     $(LOCAL_PATH)/../../../base \
-                    $(LOCAL_PATH)/../../../math/kazmath/include \
+                    $(LOCAL_PATH)/../../../math/kazmath \
                     $(LOCAL_PATH)/../../../physics
 
 LOCAL_LDLIBS := -lGLESv1_CM \
diff --git a/cocos/audio/android/Android.mk b/cocos/audio/android/Android.mk
index ed44e77cf7..19dfcdb906 100644
--- a/cocos/audio/android/Android.mk
+++ b/cocos/audio/android/Android.mk
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES := cddSimpleAudioEngine.cpp \
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \
-                    $(LOCAL_PATH)/../../math/kazmath/include \
+                    $(LOCAL_PATH)/../../math/kazmath \
                     $(LOCAL_PATH)/../../2d \
                     $(LOCAL_PATH)/../../2d/platform/android \
                     $(LOCAL_PATH)/../../base \
diff --git a/cocos/math/kazmath/kazmath/aabb.c b/cocos/math/kazmath/kazmath/aabb.c
index 0c5ef54013..52d4550d19 100644
--- a/cocos/math/kazmath/kazmath/aabb.c
+++ b/cocos/math/kazmath/kazmath/aabb.c
@@ -100,8 +100,9 @@ kmEnum kmAABBContainsAABB(const kmAABB* container, const kmAABB* to_check) {
     kmVec3Fill(&corners[5], to_check->max.x, to_check->min.y, to_check->max.z);
     kmVec3Fill(&corners[6], to_check->max.x, to_check->max.y, to_check->max.z);
     kmVec3Fill(&corners[7], to_check->min.x, to_check->max.y, to_check->max.z);
-        
-    for(kmUchar i = 0; i < 8; ++i) {
+
+    kmUchar i;
+    for(i = 0; i < 8; ++i) {
         if(!kmAABBContainsPoint(container, &corners[i])) {
             result = KM_CONTAINS_PARTIAL;
             if(found) {