diff --git a/cocos2dx/include/CCCamera.h b/cocos2dx/include/CCCamera.h
index 9ae19638a7..c33089049b 100644
--- a/cocos2dx/include/CCCamera.h
+++ b/cocos2dx/include/CCCamera.h
@@ -49,6 +49,11 @@ public:
 
 	std::string description(void);
 
+	// sets the dirty value
+	void setDirty(BOOL bValue);
+	// get the dirty value
+	BOOL getDirty(void);
+
 	// sets the camera in the defaul position
 	void restore(void);
 	// Sets the camera using gluLookAt using its eye, center and up_vector
diff --git a/cocos2dx/include/NSObject.h b/cocos2dx/include/NSObject.h
index cd6a9e6dab..234e7bb222 100644
--- a/cocos2dx/include/NSObject.h
+++ b/cocos2dx/include/NSObject.h
@@ -28,13 +28,13 @@ class NSZone;
 class NSObject;
 class NSString;
 
-class NSCopying
+class CCCopying
 {
 public:
 	virtual NSObject* copyWithZone(NSZone* pZone);
 };
 
-class NSObject : public NSCopying
+class NSObject : public CCCopying
 {
 protected:
 	// object id
diff --git a/cocos2dx/include/ccMacros.h b/cocos2dx/include/ccMacros.h
index 29c87d1289..b716d2df52 100644
--- a/cocos2dx/include/ccMacros.h
+++ b/cocos2dx/include/ccMacros.h
@@ -186,6 +186,10 @@ do {															\
 } while(0)
 */
 
+#ifndef FLT_EPSILON
+#define FLT_EPSILON     1.192092896e-07F
+#endif // FLT_EPSILON
+
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
 	        TypeName(const TypeName&);\
 			void operator=(const TypeName&)
diff --git a/cocos2dx/include/ccTypes.h b/cocos2dx/include/ccTypes.h
index b6fd216002..a595b46033 100644
--- a/cocos2dx/include/ccTypes.h
+++ b/cocos2dx/include/ccTypes.h
@@ -23,8 +23,8 @@ THE SOFTWARE.
 #ifndef __CCTYPES_H__
 #define __CCTYPES_H__
 
-#include "Cocoa/CGGeometry.h"
-#include "Support/Cocos2dTypes.h"
+#include "CGGeometry.h"
+#include "Cocos2dTypes.h"
 #include <GLES/gl.h>
 
 /** RGB color composed of bytes 3 bytes